Updating to 0.2.1

7 files changed, 3 insertions, 75 deletions

diff --git a/app/controllers/inboxes/base_controller.rb b/app/controllers/inboxes/base_controller.rb
index f1e77b1..fa14bec 100644
--- a/app/controllers/inboxes/base_controller.rb
+++ b/app/controllers/inboxes/base_controller.rb
@@ -4,10 +4,4 @@ class Inboxes::BaseController < ApplicationController
   def init_discussion
     @discussion = Discussion.find(params[:discussion_id])
   end
-
-  # Needs to be overriden so that we use Spree's Ability rather than anyone else's.
-  def current_ability
-    # raise "Loading Ability"
-    @current_ability ||= Inboxes::Ability.new(current_user)
-  end
 end
\ No newline at end of file
diff --git a/app/controllers/inboxes/discussions_controller.rb b/app/controllers/inboxes/discussions_controller.rb
index 04a8edd..51e2334 100644
--- a/app/controllers/inboxes/discussions_controller.rb
+++ b/app/controllers/inboxes/discussions_controller.rb
@@ -1,31 +1,22 @@
 class Inboxes::DiscussionsController < Inboxes::BaseController
   load_and_authorize_resource
-  # before_filter :authenticate_user!
-  # before_filter :init_and_check_permissions, :only => :show
   before_filter :load_and_check_discussion_recipient, :only => [:create, :new]
 
   def index
     @discussions = current_user.discussions
   end
 
-  # GET /discussions/1
-  # GET /discussions/1.json
   def show
-    # @discussion = Discussion.includes(:messages, :speakers).find(params[:id])
+    # raise current_user.inspect
     @discussion.mark_as_read_for(current_user)
   end
 
-  # GET /discussions/new
-  # GET /discussions/new.json
   def new
     # @discussion = Discussion.new
     @discussion.messages.build
   end
 
-  # POST /discussions
-  # POST /discussions.json
   def create
-    # @discussion = Discussion.new(params[:discussion])
     @discussion.add_recipient_token current_user.id
 
     @discussion.messages.each do |m|
@@ -42,11 +33,6 @@ class Inboxes::DiscussionsController < Inboxes::BaseController
 
   private
 
-  # def init_and_check_permissions
-  #   @discussion = Discussion.includes(:messages, :speakers).find(params[:id])
-  #   redirect_to discussions_url, :notice => t("inboxes.discussions.can_not_participate") unless @discussion.can_participate?(current_user)
-  # end
-
   def load_and_check_discussion_recipient
     # initializing model for new and create actions
     @discussion = Discussion.new(params[:discussion].presence || {})
@@ -61,7 +47,7 @@ class Inboxes::DiscussionsController < Inboxes::BaseController
         @discussion.messages.each do |message|
           Message.create(:discussion => discussion, :user => current_user, :body => message.body) if message.body
         end
-        # перекидываем на нее
+        # redirecting to that existing object
         redirect_to discussion_url(discussion), :notice => t("inboxes.discussions.exists", :user => user[Inboxes::config.user_name])
       end
     end
diff --git a/app/controllers/inboxes/messages_controller.rb b/app/controllers/inboxes/messages_controller.rb
index 697592a..9962c63 100644
--- a/app/controllers/inboxes/messages_controller.rb
+++ b/app/controllers/inboxes/messages_controller.rb
@@ -1,6 +1,4 @@
 class Inboxes::MessagesController < Inboxes::BaseController
-  # before_filter :init_discussion
-  # load_and_authorize_resource
   load_and_authorize_resource :discussion
   load_resource :message, :through => :discussion, :shallow => true
 
@@ -14,11 +12,4 @@ class Inboxes::MessagesController < Inboxes::BaseController
       format.js
     end
   end
-
-  # private
-  #
-  # def init_and_check_permissions
-  #   @discussion = Discussion.find(params[:discussion_id])
-  #   redirect_to discussions_url, :notice => t("inboxes.discussions.can_not_participate") unless @discussion.can_participate?(current_user)
-  # end
 end
diff --git a/app/controllers/inboxes/speakers_controller.rb b/app/controllers/inboxes/speakers_controller.rb
index 30c0b7f..ab79f70 100644
--- a/app/controllers/inboxes/speakers_controller.rb
+++ b/app/controllers/inboxes/speakers_controller.rb
@@ -1,8 +1,6 @@
 class Inboxes::SpeakersController < Inboxes::BaseController
-  # before_filter :init_discussion
   load_and_authorize_resource :discussion
   load_resource :speaker, :through => :discussion, :shallow => true
-  # load_and_authorize_resource
 
   def create
     raise ActiveRecord::RecordNotFound unless params[:speaker] && params[:speaker][:user_id]
diff --git a/app/helpers/inboxes_helper.rb b/app/helpers/inboxes_helper.rb
index 87bb763..b5fc455 100644
--- a/app/helpers/inboxes_helper.rb
+++ b/app/helpers/inboxes_helper.rb
@@ -3,7 +3,6 @@ module InboxesHelper
   def inboxes_faye_broadcast(channel, &block)
     message = {:channel => channel, :data => capture(&block), :ext => {:auth_token => defined?(FAYE_TOKEN) ? FAYE_TOKEN : ""}}
     uri = URI.parse("http://#{Inboxes::config.faye_host}:#{Inboxes::config.faye_port}/faye")
-    # Rails.logger.info "Faye URL: #{uri}"
-    res = Net::HTTP.post_form(uri, :message => message.to_json)
+    resource = Net::HTTP.post_form(uri, :message => message.to_json)
   end
 end
\ No newline at end of file
diff --git a/app/models/discussion.rb b/app/models/discussion.rb
index 675547d..6df0b1d 100644
--- a/app/models/discussion.rb
+++ b/app/models/discussion.rb
@@ -2,8 +2,6 @@ class Discussion < ActiveRecord::Base
   attr_accessor :recipient_tokens, :recipient_ids
   attr_reader :recipient_ids
 
-  # paginates_per 10
-
   # creater
   has_many :messages, :dependent => :destroy
 
diff --git a/app/models/inboxes/ability.rb b/app/models/inboxes/ability.rb
deleted file mode 100644
index deb3d81..0000000
--- a/app/models/inboxes/ability.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-# Implementation class for Cancan gem.  Instead of overriding this class, consider adding new permissions
-# using the special +register_ability+ method which allows extensions to add their own abilities.
-#
-# See http://github.com/ryanb/cancan for more details on cancan.
-module Inboxes
-  class Ability
-    include CanCan::Ability
-
-    class_attribute :abilities
-    self.abilities = Set.new
-
-    # Allows us to go beyond the standard cancan initialize method which makes it difficult for engines to
-    # modify the default +Ability+ of an application.  The +ability+ argument must be a class that includes
-    # the +CanCan::Ability+ module.  The registered ability should behave properly as a stand-alone class
-    # and therefore should be easy to test in isolation.
-    def self.register_ability(ability)
-      self.abilities.add(ability)
-
-    end
-
-    def initialize(user)
-      # raise "Initializing 3rd patry"
-      # self.clear_aliased_actions
-
-      # can [:index, :create], Discussion
-      # can :read, Discussion do |discussion|
-      #   discussion.can_participate?(user)
-      # end
-
-      #include any abilities registered by extensions, etc.
-
-      Ability.abilities.each do |clazz|
-        ability = clazz.send(:new, user)
-        @rules = rules + ability.send(:rules)
-      end
-    end
-  end
-end