cantango-core 0.1.6 → 0.1.7

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/cantango-core.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cantango-core}
-  s.version = "0.1.6"
+  s.version = "0.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Kristian Mandrup}, %q{Stanislaw Pankevich}]

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

@@ -2,9 +2,7 @@ module CanTango::Ability::Executor
   class Modal < Base    
     def initialize candidate, modes, options = {}
       super candidate, options
-      modes = [modes].flatten if modes
-      raise ArgumentError, "Modes must be a list of modes to execute!" if modes.blank?
-      @modes = modes
+      extract_modes modes
       execute
     end
 
@@ -33,6 +31,18 @@ module CanTango::Ability::Executor
 
     protected
 
+    def extract_modes modes
+      raise ArgumentError, "Modes must defined!" if !modes
+      modes = modes.kind_of?(Hash) ? modes_from_option(modes) : modes
+      modes = [modes].flatten
+      raise ArgumentError, "Modes must be a list of modes to execute!" if modes.blank?
+      @modes = modes
+    end
+
+    def modes_from_option options
+      options[:modes] || options[:mode]
+    end
+
     def modal_rules mode
       mode?(mode) ? executor(mode).execute : []
     end

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

@@ -4,6 +4,7 @@ require 'fixtures/models'
 module CanTango::Ability::Mode
   class NoCache
     def calculate_rules
+      # puts "write Post"
       can :write, Post
     end
   end
@@ -15,6 +16,16 @@ describe CanTango::Ability::Executor::Modal do
     @ability = CanTango::Ability::Base.new @user
   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.should respond_to :can? }
+    specify { subject.can?(:write, Post).should be_true }
+  end
+
+
   context 'Set execution mode to :no_cache' do
     subject do 
       CanTango::Ability::Executor::Modal.new @ability, :no_cache
@@ -27,6 +38,7 @@ describe CanTango::Ability::Executor::Modal do
       specify { subject.rules.should_not be_empty }
       specify { subject.rules.size.should == 1 }
       specify { subject.rules.first.should be_a CanCan::Rule }
+      specify { subject.can?(:write, Post).should be_true }
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cantango-core
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2011-12-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70117229526600 !ruby/object:Gem::Requirement
+  requirement: &70309660108700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70117229526600
+  version_requirements: *70309660108700
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &70117229524800 !ruby/object:Gem::Requirement
+  requirement: &70309660107700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70117229524800
+  version_requirements: *70309660107700
 - !ruby/object:Gem::Dependency
   name: sugar-high
-  requirement: &70117229523380 !ruby/object:Gem::Requirement
+  requirement: &70309660106520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70117229523380
+  version_requirements: *70309660106520
 - !ruby/object:Gem::Dependency
   name: sweetloader
-  requirement: &70117229522780 !ruby/object:Gem::Requirement
+  requirement: &70309660104880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 0.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *70117229522780
+  version_requirements: *70309660104880
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70117229521720 !ruby/object:Gem::Requirement
+  requirement: &70309660103240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70117229521720
+  version_requirements: *70309660103240
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70117229520600 !ruby/object:Gem::Requirement
+  requirement: &70309660101840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *70117229520600
+  version_requirements: *70309660101840
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &70117229514900 !ruby/object:Gem::Requirement
+  requirement: &70309660099020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *70117229514900
+  version_requirements: *70309660099020
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70117229508560 !ruby/object:Gem::Requirement
+  requirement: &70309660097400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70117229508560
+  version_requirements: *70309660097400
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70117229503400 !ruby/object:Gem::Requirement
+  requirement: &70309660095700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70117229503400
+  version_requirements: *70309660095700
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70117229502040 !ruby/object:Gem::Requirement
+  requirement: &70309660093560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70117229502040
+  version_requirements: *70309660093560
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70117229501340 !ruby/object:Gem::Requirement
+  requirement: &70309660092580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70117229501340
+  version_requirements: *70309660092580
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70117229500520 !ruby/object:Gem::Requirement
+  requirement: &70309660091240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: 1.1.rc
   type: :development
   prerelease: false
-  version_requirements: *70117229500520
+  version_requirements: *70309660091240
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70117229499740 !ruby/object:Gem::Requirement
+  requirement: &70309660089360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70117229499740
+  version_requirements: *70309660089360
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70117229498680 !ruby/object:Gem::Requirement
+  requirement: &70309660083880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,7 +165,7 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *70117229498680
+  version_requirements: *70309660083880
 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: -4261502692778852496
+      hash: 3251316765084050506
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: