cantango-core 0.1.9.1 → 0.1.9.2

data/Gemfile

@@ -5,24 +5,24 @@ group :default do
   gem 'cancan',           '>= 1.4'
   gem 'sugar-high',       '>= 0.6.0'
   gem 'sweetloader',      '~> 0.1.5'
-  gem 'hashie'  
+  gem 'hashie',           '~> 1.2'
 end
 
 group :test do
-  gem 'require_all', '~> 1.2.0'
+  gem 'require_all',    '~> 1.2.0'
 
 
-  gem 'cancan',           '>= 1.4'
+  gem 'cancan',         '>= 1.4'
   
   # Data
   gem 'database_cleaner'
   gem 'factory_girl'
 
   # Adapters
-  gem 'activerecord', '>= 3'
-  gem 'datamapper', '>= 1.1'
-  gem 'mongoid', '>= 2.2'
-  gem 'mongo_mapper', '>= 0.9'
+  gem 'activerecord',   '>= 3'
+  gem 'datamapper',     '>= 1.1'
+  gem 'mongoid',        '>= 2.2'
+  gem 'mongo_mapper',   '>= 0.9'
 
   # Specs
   gem 'spork'
@@ -47,8 +47,8 @@ group :test do
 end
 
 group :development, :test do
-  gem "rspec-rails",  '>= 2.6.1'  # needed in development to expose the rails generators
-  gem 'forgery',      '>= 0.3' # needed in development when using rake db:seed
+  gem "rspec-rails",    '>= 2.6.1'  # needed in development to expose the rails generators
+  gem 'forgery',        '>= 0.3' # needed in development when using rake db:seed
   gem 'factory_girl'
   gem 'sqlite3'
 end

data/Gemfile.lock

@@ -33,7 +33,7 @@ GEM
     arel (2.2.1)
     babosa (0.3.5)
     bcrypt-ruby (3.0.1)
-    bson (1.4.0)
+    bson (1.5.1)
     builder (3.0.0)
     cancan (1.6.7)
     capybara (1.1.2)
@@ -134,8 +134,8 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    json (1.6.2)
-    json_pure (1.6.1)
+    json (1.6.3)
+    json_pure (1.6.3)
     launchy (2.0.5)
       addressable (~> 2.2.6)
     mail (2.3.0)
@@ -151,8 +151,8 @@ GEM
     mime-types (1.17.2)
     mocha (0.10.0)
       metaclass (~> 0.0.1)
-    mongo (1.4.0)
-      bson (= 1.4.0)
+    mongo (1.5.1)
+      bson (= 1.5.1)
     mongo_mapper (0.10.1)
       activemodel (~> 3.0)
       activesupport (~> 3.0)
@@ -222,7 +222,7 @@ GEM
       railties (~> 3.0)
       rspec (~> 2.7.0)
     rubyzip (0.9.5)
-    selenium-webdriver (2.14.0)
+    selenium-webdriver (2.15.0)
       childprocess (>= 0.2.1)
       ffi (~> 1.0.9)
       multi_json (~> 1.0.4)
@@ -232,11 +232,11 @@ GEM
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.4)
+    sqlite3 (1.3.5)
     stringex (1.3.0)
-    sugar-high (0.6.0)
+    sugar-high (0.6.2.1)
       activesupport (>= 3.0.1)
-    sweetloader (0.1.5)
+    sweetloader (0.1.6)
       activesupport (>= 3.0.1)
       i18n
     test-unit (2.4.2)
@@ -270,7 +270,7 @@ DEPENDENCIES
   friendly_id
   generator-spec (>= 0.7.8)
   haml
-  hashie
+  hashie (~> 1.2)
   jeweler (>= 1.6.4)
   launchy
   mocha

data/VERSION

@@ -1 +1 @@
-0.1.9.1
+0.1.9.2

data/cantango-core.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cantango-core}
-  s.version = "0.1.9.1"
+  s.version = "0.1.9.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Kristian Mandrup}, %q{Stanislaw Pankevich}]
@@ -135,7 +135,7 @@ Store permissions in yaml file or key-value store}
       s.add_runtime_dependency(%q<cancan>, [">= 1.4"])
       s.add_runtime_dependency(%q<sugar-high>, [">= 0.6.0"])
       s.add_runtime_dependency(%q<sweetloader>, ["~> 0.1.5"])
-      s.add_runtime_dependency(%q<hashie>, [">= 0"])
+      s.add_runtime_dependency(%q<hashie>, ["~> 1.2"])
       s.add_development_dependency(%q<rspec-rails>, [">= 2.6.1"])
       s.add_development_dependency(%q<forgery>, [">= 0.3"])
       s.add_development_dependency(%q<factory_girl>, [">= 0"])
@@ -150,7 +150,7 @@ Store permissions in yaml file or key-value store}
       s.add_dependency(%q<cancan>, [">= 1.4"])
       s.add_dependency(%q<sugar-high>, [">= 0.6.0"])
       s.add_dependency(%q<sweetloader>, ["~> 0.1.5"])
-      s.add_dependency(%q<hashie>, [">= 0"])
+      s.add_dependency(%q<hashie>, ["~> 1.2"])
       s.add_dependency(%q<rspec-rails>, [">= 2.6.1"])
       s.add_dependency(%q<forgery>, [">= 0.3"])
       s.add_dependency(%q<factory_girl>, [">= 0"])
@@ -166,7 +166,7 @@ Store permissions in yaml file or key-value store}
     s.add_dependency(%q<cancan>, [">= 1.4"])
     s.add_dependency(%q<sugar-high>, [">= 0.6.0"])
     s.add_dependency(%q<sweetloader>, ["~> 0.1.5"])
-    s.add_dependency(%q<hashie>, [">= 0"])
+    s.add_dependency(%q<hashie>, ["~> 1.2"])
     s.add_dependency(%q<rspec-rails>, [">= 2.6.1"])
     s.add_dependency(%q<forgery>, [">= 0.3"])
     s.add_dependency(%q<factory_girl>, [">= 0"])

data/spec/cantango/ability/base_spec.rb

@@ -18,6 +18,8 @@ describe CanTango::Ability::Base do
 
   subject { CanTango::Ability::Base.new @user }
 
+  specify { subject.candidate.should == @user }
+
   specify { subject.can?(:edit, Project).should be_true }
   specify { subject.cannot?(:publish, Project).should be_true }
 

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

@@ -21,7 +21,21 @@ describe CanTango::Ability::Executor::Modal do
     end
 
     specify { subject.ability.should be_a CanTango::Ability::Base }
+
     specify { subject.candidate.should be_a User }
+
+    describe 'candidate' do
+      it 'should be the user' do
+        subject.candidate.should == @user
+      end
+    end
+
+    describe 'ability candidate' do
+      it 'should be the user' do
+        subject.ability.candidate.should == @user
+      end
+    end
+
     specify { subject.modes.should == [:no_cache] }
     specify { subject.options[:modes].should == [:no_cache] }
     specify { subject.should respond_to :can? }
@@ -35,7 +49,28 @@ describe CanTango::Ability::Executor::Modal do
     end
 
     specify { subject.ability.should be_a CanTango::Ability::Base }
+
+    describe 'ability' do
+      it 'should be the ability passed in' do
+        subject.ability.should == @ability
+      end
+    end
+
     specify { subject.candidate.should be_a User }
+
+    describe 'candidate' do
+      it 'should be the user' do
+        subject.candidate.should == @user
+      end
+    end
+
+    describe 'ability candidate' do
+      it 'should be the user' do
+        subject.ability.candidate.should == @user
+      end
+    end
+
+    
     specify { subject.modes.should == [:no_cache] }
     specify { subject.options[:modes].should == [:no_cache] }
     specify { subject.should respond_to :can? }
@@ -51,7 +86,21 @@ describe CanTango::Ability::Executor::Modal do
     specify { subject.should respond_to :can? }
     specify { subject.should respond_to :cannot? }
 
-    describe 'rules should have been calculated' do      
+    describe 'ability' do
+      it 'should be the ability passed in' do
+        subject.ability.should == @ability
+      end
+    end
+
+    describe 'candidate' do
+      it 'should be the user' do
+        subject.candidate.should == @user
+      end
+    end
+
+    specify { subject.modes.should include(:no_cache) }
+
+    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.9.1
+  version: 0.1.9.2
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2011-12-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70316354149600 !ruby/object:Gem::Requirement
+  requirement: &70297625071360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70316354149600
+  version_requirements: *70297625071360
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &70316354147840 !ruby/object:Gem::Requirement
+  requirement: &70297625070560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70316354147840
+  version_requirements: *70297625070560
 - !ruby/object:Gem::Dependency
   name: sugar-high
-  requirement: &70316354145320 !ruby/object:Gem::Requirement
+  requirement: &70297625069680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70316354145320
+  version_requirements: *70297625069680
 - !ruby/object:Gem::Dependency
   name: sweetloader
-  requirement: &70316354143880 !ruby/object:Gem::Requirement
+  requirement: &70297625068300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,21 +55,21 @@ dependencies:
         version: 0.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *70316354143880
+  version_requirements: *70297625068300
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70316354142600 !ruby/object:Gem::Requirement
+  requirement: &70297625067480 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70316354142600
+  version_requirements: *70297625067480
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70316354141360 !ruby/object:Gem::Requirement
+  requirement: &70297625066020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *70316354141360
+  version_requirements: *70297625066020
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &70316354139620 !ruby/object:Gem::Requirement
+  requirement: &70297625063380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *70316354139620
+  version_requirements: *70297625063380
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70316354138100 !ruby/object:Gem::Requirement
+  requirement: &70297625061920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70316354138100
+  version_requirements: *70297625061920
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70316354136420 !ruby/object:Gem::Requirement
+  requirement: &70297625046360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70316354136420
+  version_requirements: *70297625046360
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70316354134360 !ruby/object:Gem::Requirement
+  requirement: &70297625045440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70316354134360
+  version_requirements: *70297625045440
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70316354133260 !ruby/object:Gem::Requirement
+  requirement: &70297625044600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70316354133260
+  version_requirements: *70297625044600
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70316354132300 !ruby/object:Gem::Requirement
+  requirement: &70297625043700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: 1.1.rc
   type: :development
   prerelease: false
-  version_requirements: *70316354132300
+  version_requirements: *70297625043700
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70316354131040 !ruby/object:Gem::Requirement
+  requirement: &70297625042260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70316354131040
+  version_requirements: *70297625042260
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70316354129460 !ruby/object:Gem::Requirement
+  requirement: &70297625040440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,7 +165,7 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *70316354129460
+  version_requirements: *70297625040440
 description: ! 'Define your permission rules as role- or role group specific permits.
 
   Integrates well with multiple Devise user acounts.
@@ -295,7 +295,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4320336098433723344
+      hash: 3380786207970925537
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: