inboxes 0.1.1 → 0.1.2

data/README.md

@@ -33,19 +33,15 @@ By default, the gem provides localized phrases for Russian and English languages
 #Integration with Faye
 
 1. Add `gem "faye"` to your Gemfile and run `bundle install`. Install Faye by [the screencast](http://railscasts.com/episodes/260-messaging-with-faye)
-2. Create `messaging.js` in `app/assets/javascripts/` with these lines:
-
-    /*
-    = require inboxes/faye
-    */
+2. Create `messaging.js` in `app/assets/javascripts/` with these line: `= require inboxes/faye`
 
 3. Copy or replace 2 views from Inboxes example app to your application: [app/views/inboxes/messages/_form](https://github.com/kirs/inboxes-app/blob/master/app/views/inboxes/messages/_form.html.haml) and [app/views/inboxes/messages/create](https://github.com/kirs/inboxes-app/blob/master/app/views/inboxes/messages/create.js.erb)
  
 4. Add config parameters to your application config (last 2 are not necessary):
-    
-    config.inboxes.faye_enabled = true
-    config.inboxes.faye_host = "inboxes-app.dev" # localhost by default
-    config.inboxes.faye_port = 9292 # 9292 by default
+   
+`config.inboxes.faye_enabled = true`
+`config.inboxes.faye_host = "inboxes-app.dev" # localhost by default`
+`config.inboxes.faye_port = 9292 # 9292 by default`
 
 5. Faye installation is finished. If you have any troubles, check the [example app](https://github.com/kirs/inboxes-app/)
 

data/app/controllers/inboxes/base_controller.rb

@@ -4,4 +4,10 @@ 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

data/app/controllers/inboxes/discussions_controller.rb

@@ -48,8 +48,8 @@ class Inboxes::DiscussionsController < Inboxes::BaseController
   # end
   
   def load_and_check_discussion_recipient
-    # initializing model fir new and create actions
-    @discussion = Discussion.new((params[:discussion] ? params[:discussion] : {}))
+    # initializing model for new and create actions
+    @discussion = Discussion.new(params[:discussion].presence || {})
     # @discussion.recipient_tokens = params[:recipients] if params[:recipients] # pre-population
     
     # checking if discussion with this user already exists

data/app/models/inboxes/ability.rb

@@ -0,0 +1,38 @@
+# 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

data/inboxes.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   # specify any dependencies here; for example:
   # s.add_development_dependency "ruby-debug"
   s.add_runtime_dependency "haml-rails"
-  s.add_runtime_dependency "cancan"
+  s.add_runtime_dependency "cancan", ['>= 0']
   # s.add_runtime_dependency "inherited_resources"
   
   # s.add_development_dependency 'dm-sqlite-adapter', ['>= 1.1.0']

data/lib/inboxes.rb

@@ -1,8 +1,10 @@
 require "inboxes/version"
 require "inboxes/railtie"
+require "inboxes/ability"
 require "inboxes/engine"
 require "inboxes/active_record_extension"
 
+
 module Inboxes
   
   def self.configure(&block)

data/lib/inboxes/ability.rb

@@ -1,9 +1,13 @@
+require "cancan"
+
 module Inboxes
   class InboxesAbility
-    include CanCan::Ability
+    include ::CanCan::Ability
 
     def initialize(user)
       # Discussion
+      # raise "Registered!"
+      
       can [:index, :create], Discussion
       can :read, Discussion do |discussion|
         discussion.can_participate?(user)

data/lib/inboxes/engine.rb

@@ -2,8 +2,15 @@ require "inboxes/ability"
 
 module Inboxes
   class Engine < ::Rails::Engine
+    # raise "Engine Activated"
     def self.activate
       Ability.register_ability(InboxesAbility)
+      # raise "Activated"
     end
+    
+    def load_tasks
+    end
+    
+    config.to_prepare &method(:activate).to_proc
   end
 end

data/lib/inboxes/railtie.rb

@@ -1,4 +1,5 @@
 require 'rails'
+require "inboxes/ability"
 
 module Inboxes
   class Railtie < ::Rails::Railtie
@@ -14,5 +15,9 @@ module Inboxes
 
       # app.config.middleware.insert_before "::Rails::Rack::Logger", "Inboxes::Middleware"
     end
+    
+    # def self.activate
+    #   Ability.register_ability(InboxesAbility)
+    # end
   end
 end

data/lib/inboxes/version.rb

@@ -1,3 +1,3 @@
 module Inboxes
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: inboxes
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Kir Shatrov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-17 00:00:00 Z
+date: 2011-11-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: haml-rails
@@ -107,6 +107,7 @@ files:
 - app/controllers/inboxes/speakers_controller.rb
 - app/helpers/inboxes_helper.rb
 - app/models/discussion.rb
+- app/models/inboxes/ability.rb
 - app/models/message.rb
 - app/models/speaker.rb
 - app/views/inboxes/discussions/_form.html.haml