cantango-core 0.1.5 → 0.1.6

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/cantango-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cantango-core}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   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-04}
+  s.date = %q{2011-12-06}
   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.rb

@@ -1,5 +1,5 @@
 module CanTango
   module Ability
-    autoload_modules :Rules, :Callbacks, :Executor, :Base, :Cache, :Helper, :Mode
+    autoload_modules :Rules, :Callbacks, :Base, :Executor, :Cache, :Helper, :Mode
   end
 end

data/lib/cantango/ability/base.rb

@@ -11,6 +11,7 @@ module CanTango
       def initialize candidate, options = {}
         raise "Candidate must be something!" if !candidate
         @candidate, @options = candidate, options
+        execute
       end
       
       def execute

data/lib/cantango/ability/executor.rb

@@ -20,9 +20,10 @@ module CanTango
           clear_rules!
           calculate_rules
         end
-        return rules
       rescue Exception => e
         debug e.message
+      ensure
+        @executed = true
         rules
       end
     end

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

@@ -1,21 +1,21 @@
 module CanTango::Ability::Executor
-  class Base
+  class Base < CanTango::Ability::Base
     include CanTango::Ability::Executor
     include CanTango::Ability::Callbacks
 
-    attr_reader :candidate, :modes, :options
+    attr_reader :candidate, :modes, :options, :executed
 
     def initialize candidate, options = {}
       raise ArgumentError, "Candidate must be something!" if !candidate
       @candidate, @options = [candidate, options]
     end
 
-    def rules
-      raise NotImplementedError
+    def executed?
+      @executed
     end
     
     def calculate_rules
-      raise NotImplementedError
+      super
     end
 
     def self.inherited(base)

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

@@ -5,6 +5,7 @@ module CanTango::Ability::Executor
       modes = [modes].flatten if modes
       raise ArgumentError, "Modes must be a list of modes to execute!" if modes.blank?
       @modes = modes
+      execute
     end
 
     def calculate_rules
@@ -16,11 +17,13 @@ module CanTango::Ability::Executor
     end
 
     def execute
+      return if executed?
       clear_rules!
       calculate_rules
-      return rules
     rescue Exception => e
-      debug e.message
+      debug e.message      
+    ensure
+      @executed = true
       rules
     end
 
@@ -31,7 +34,6 @@ module CanTango::Ability::Executor
     protected
 
     def modal_rules mode
-      puts "modal rules: #{mode}"
       mode?(mode) ? executor(mode).execute : []
     end
 

data/spec/cantango/ability/base_spec.rb

@@ -4,7 +4,9 @@ require 'fixtures/models'
 module CanTango::Ability
   class Base
     def calculate_rules
+      puts "calc"
       can :edit, Project
+      cannot :publish, Project
     end
   end
 end
@@ -16,5 +18,8 @@ describe CanTango::Ability::Base do
 
   subject { CanTango::Ability::Base.new @user }
 
+  specify { subject.can?(:edit, Project).should be_true }
+  specify { subject.cannot?(:publish, Project).should be_true }
+
   specify { subject.should be_allowed_to(:edit, Project) }
 end

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

@@ -25,4 +25,10 @@ describe CanTango::Ability::Executor::Base do
       lambda { subject.execute }.should raise_error
     end
   end
+
+  describe 'should not have ability' do
+    specify do
+      lambda { subject.ability }.should raise_error
+    end
+  end
 end

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

@@ -20,13 +20,10 @@ describe CanTango::Ability::Executor::Modal do
       CanTango::Ability::Executor::Modal.new @ability, :no_cache
     end
 
-    its(:rules)  { should be_empty }
+    specify { subject.should respond_to :can? }
+    specify { subject.should respond_to :cannot? }
 
-    describe 'rules should be calculated on execute' do
-      before do
-        subject.execute
-      end
-      
+    describe 'rules should have been calculated' do      
       specify { subject.rules.should_not be_empty }
       specify { subject.rules.size.should == 1 }
       specify { subject.rules.first.should be_a CanCan::Rule }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cantango-core
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-04 00:00:00.000000000Z
+date: 2011-12-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70246704091920 !ruby/object:Gem::Requirement
+  requirement: &70117229526600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70246704091920
+  version_requirements: *70117229526600
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &70246704089120 !ruby/object:Gem::Requirement
+  requirement: &70117229524800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70246704089120
+  version_requirements: *70117229524800
 - !ruby/object:Gem::Dependency
   name: sugar-high
-  requirement: &70246704087260 !ruby/object:Gem::Requirement
+  requirement: &70117229523380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70246704087260
+  version_requirements: *70117229523380
 - !ruby/object:Gem::Dependency
   name: sweetloader
-  requirement: &70246704086340 !ruby/object:Gem::Requirement
+  requirement: &70117229522780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 0.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *70246704086340
+  version_requirements: *70117229522780
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70246704079420 !ruby/object:Gem::Requirement
+  requirement: &70117229521720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70246704079420
+  version_requirements: *70117229521720
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70246704078320 !ruby/object:Gem::Requirement
+  requirement: &70117229520600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *70246704078320
+  version_requirements: *70117229520600
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &70246704077240 !ruby/object:Gem::Requirement
+  requirement: &70117229514900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *70246704077240
+  version_requirements: *70117229514900
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70246704076140 !ruby/object:Gem::Requirement
+  requirement: &70117229508560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70246704076140
+  version_requirements: *70117229508560
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70246704074560 !ruby/object:Gem::Requirement
+  requirement: &70117229503400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70246704074560
+  version_requirements: *70117229503400
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70246704057660 !ruby/object:Gem::Requirement
+  requirement: &70117229502040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70246704057660
+  version_requirements: *70117229502040
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70246704050840 !ruby/object:Gem::Requirement
+  requirement: &70117229501340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70246704050840
+  version_requirements: *70117229501340
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70246704049820 !ruby/object:Gem::Requirement
+  requirement: &70117229500520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: 1.1.rc
   type: :development
   prerelease: false
-  version_requirements: *70246704049820
+  version_requirements: *70117229500520
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70246704048780 !ruby/object:Gem::Requirement
+  requirement: &70117229499740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70246704048780
+  version_requirements: *70117229499740
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70246704047900 !ruby/object:Gem::Requirement
+  requirement: &70117229498680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,7 +165,7 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *70246704047900
+  version_requirements: *70117229498680
 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: 2028541459112874735
+      hash: -4261502692778852496
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: