cantango-core 0.1.7 → 0.1.8

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.8

data/cantango-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cantango-core}
-  s.version = "0.1.7"
+  s.version = "0.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Kristian Mandrup}, %q{Stanislaw Pankevich}]
-  s.date = %q{2011-12-06}
+  s.date = %q{2011-12-07}
   s.description = %q{Define your permission rules as role- or role group specific permits.
 Integrates well with multiple Devise user acounts.
 Includes rules caching.

data/lib/cantango/ability/executor/base.rb

@@ -3,12 +3,37 @@ module CanTango::Ability::Executor
     include CanTango::Ability::Executor
     include CanTango::Ability::Callbacks
 
-    attr_reader :candidate, :modes, :options, :executed
+    attr_reader :ability, :modes, :options, :executed
 
-    def initialize candidate, options = {}
-      raise ArgumentError, "Candidate must be something!" if !candidate
-      @candidate, @options = [candidate, options]
+    delegate :candidate,  :to => :ability
+
+    def initialize ability, options = {}
+      raise ArgumentError, "Ability must be something!" if !ability
+      raise ArgumentError, "Ability must be a kind of CanTango::Ability::Base" if !ability.kind_of?(CanTango::Ability::Base)
+      raise ArgumentError, "Options must be a hash" if !options.kind_of?(Hash)
+      @ability = ability
+      @options ||= options
+    end
+
+    module ClassMethods
+      def build candidate, options = {}
+        self.new build_ability(candidate, options), options
+      end
+
+      def inherited(base)
+        base.send :include, CanTango::Helpers::Debug
+        base.send :include, CanTango::Ability::Executor
+        base.send :include, CanTango::Ability::Rules
+        base.send :include, CanTango::Ability::Callbacks
+      end
+
+      protected
+
+      def build_ability candidate, options = {}
+        CanTango::Ability::Base.new(candidate, options = {})
+      end
     end
+    extend ClassMethods
 
     def executed?
       @executed
@@ -17,12 +42,5 @@ module CanTango::Ability::Executor
     def calculate_rules
       super
     end
-
-    def self.inherited(base)
-      base.send :include, CanTango::Helpers::Debug
-      base.send :include, CanTango::Ability::Executor
-      base.send :include, CanTango::Ability::Rules
-      base.send :include, CanTango::Ability::Callbacks
-    end
   end
 end

data/lib/cantango/ability/executor/modal.rb

@@ -1,11 +1,18 @@
 module CanTango::Ability::Executor
   class Modal < Base    
-    def initialize candidate, modes, options = {}
-      super candidate, options
+    def initialize ability, modes, options = {}
+      super ability, options
       extract_modes modes
       execute
     end
 
+    module ClassMethods
+      def build candidate, modes, options = {}
+        new build_ability(candidate, options), modes, options
+      end
+    end
+    extend ClassMethods
+
     def calculate_rules
       @rules = modes.inject([]) do |result, mode|
         result = result + modal_rules(mode)
@@ -38,8 +45,9 @@ module CanTango::Ability::Executor
       raise ArgumentError, "Modes must be a list of modes to execute!" if modes.blank?
       @modes = modes
     end
-
+    
     def modes_from_option options
+      @options.merge! options
       options[:modes] || options[:mode]
     end
 

data/lib/cantango/ability/mode/finder.rb

@@ -2,14 +2,14 @@ module CanTango::Ability::Mode
   class Finder
     attr_reader :executor
 
-    delegate :candidate, :options, :to => :executor
+    delegate :candidate, :ability, :options, :to => :executor
 
     def initialize executor
       @executor = executor
     end
 
     def executor_for mode
-      class_for(mode).new candidate, options
+      class_for(mode).new ability, options
     end
 
     def class_for mode

data/spec/cantango/ability/executor/modal_spec.rb

@@ -4,7 +4,6 @@ require 'fixtures/models'
 module CanTango::Ability::Mode
   class NoCache
     def calculate_rules
-      # puts "write Post"
       can :write, Post
     end
   end
@@ -16,16 +15,34 @@ describe CanTango::Ability::Executor::Modal do
     @ability = CanTango::Ability::Base.new @user
   end
 
+  context 'Build using build method with candidate' do
+    subject do 
+      CanTango::Ability::Executor::Modal.build @user, :modes => [:no_cache]
+    end
+
+    specify { subject.ability.should be_a CanTango::Ability::Base }
+    specify { subject.candidate.should be_a User }
+    specify { subject.modes.should == [:no_cache] }
+    specify { subject.options[:modes].should == [:no_cache] }
+    specify { subject.should respond_to :can? }
+    specify { subject.can?(:write, Post).should be_true }
+    specify { subject.can?(:publish, Post).should be_false }
+  end
+
   context 'Set execution mode to :no_cache using option' do
     subject do 
       CanTango::Ability::Executor::Modal.new @ability, :modes => [:no_cache]
     end
 
+    specify { subject.ability.should be_a CanTango::Ability::Base }
+    specify { subject.candidate.should be_a User }
+    specify { subject.modes.should == [:no_cache] }
+    specify { subject.options[:modes].should == [:no_cache] }
     specify { subject.should respond_to :can? }
     specify { subject.can?(:write, Post).should be_true }
+    specify { subject.can?(:publish, Post).should be_false }
   end
 
-
   context 'Set execution mode to :no_cache' do
     subject do 
       CanTango::Ability::Executor::Modal.new @ability, :no_cache

data/spec/cantango/ability/mode/base_example.rb

@@ -9,7 +9,7 @@ shared_examples_for CanTango::Ability::Mode::Base do
 
   subject { mode_class.new @ability }
 
-  describe 'Does NOT execute on instantiation' do      
+  describe 'Does NOT execute on instantiation' do
     specify do
       subject.rules.should == []
     end
@@ -23,6 +23,7 @@ shared_examples_for CanTango::Ability::Mode::Base do
     specify { subject.rules.size.should == 1 }
     specify { subject.rules.first.should be_a CanCan::Rule }
     
+    specify { subject.can?(:read, Post).should be_true }
     specify { subject.should be_allowed_to(:read, Post) }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cantango-core
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-06 00:00:00.000000000Z
+date: 2011-12-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70309660108700 !ruby/object:Gem::Requirement
+  requirement: &70364591927940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70309660108700
+  version_requirements: *70364591927940
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &70309660107700 !ruby/object:Gem::Requirement
+  requirement: &70364591926740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70309660107700
+  version_requirements: *70364591926740
 - !ruby/object:Gem::Dependency
   name: sugar-high
-  requirement: &70309660106520 !ruby/object:Gem::Requirement
+  requirement: &70364591923520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70309660106520
+  version_requirements: *70364591923520
 - !ruby/object:Gem::Dependency
   name: sweetloader
-  requirement: &70309660104880 !ruby/object:Gem::Requirement
+  requirement: &70364591922180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 0.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *70309660104880
+  version_requirements: *70364591922180
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70309660103240 !ruby/object:Gem::Requirement
+  requirement: &70364591920600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70309660103240
+  version_requirements: *70364591920600
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70309660101840 !ruby/object:Gem::Requirement
+  requirement: &70364591918580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *70309660101840
+  version_requirements: *70364591918580
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &70309660099020 !ruby/object:Gem::Requirement
+  requirement: &70364591916020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *70309660099020
+  version_requirements: *70364591916020
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70309660097400 !ruby/object:Gem::Requirement
+  requirement: &70364591913720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70309660097400
+  version_requirements: *70364591913720
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70309660095700 !ruby/object:Gem::Requirement
+  requirement: &70364591911240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70309660095700
+  version_requirements: *70364591911240
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70309660093560 !ruby/object:Gem::Requirement
+  requirement: &70364591910060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70309660093560
+  version_requirements: *70364591910060
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70309660092580 !ruby/object:Gem::Requirement
+  requirement: &70364591908900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70309660092580
+  version_requirements: *70364591908900
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70309660091240 !ruby/object:Gem::Requirement
+  requirement: &70364591907880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: 1.1.rc
   type: :development
   prerelease: false
-  version_requirements: *70309660091240
+  version_requirements: *70364591907880
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70309660089360 !ruby/object:Gem::Requirement
+  requirement: &70364591906780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70309660089360
+  version_requirements: *70364591906780
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70309660083880 !ruby/object:Gem::Requirement
+  requirement: &70364591905560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,7 +165,7 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *70309660083880
+  version_requirements: *70364591905560
 description: ! 'Define your permission rules as role- or role group specific permits.
 
   Integrates well with multiple Devise user acounts.
@@ -294,7 +294,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3251316765084050506
+      hash: 1055715730587102781
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: