cantango 0.8.6.1 → 0.8.6.2

data/VERSION

@@ -1 +1 @@
-0.8.6.1
+0.8.6.2

data/cantango.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cantango"
-  s.version = "0.8.6.1"
+  s.version = "0.8.6.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup", "Stanislaw Pankevich"]
-  s.date = "2011-09-27"
+  s.date = "2011-10-04"
   s.description = "Define your permission rules as role- or role group specific permits.\nIntegrates well with multiple Devise user acounts.\nIncludes rules caching.\nStore permissions in yaml file or key-value store"
   s.email = "kmandrup@gmail.com, s.pankevich@gmail.com"
   s.extra_rdoc_files = [
@@ -346,6 +346,7 @@ Gem::Specification.new do |s|
     "spec/cantango/permit_engine/builder/role_group_permits_spec.rb",
     "spec/cantango/permit_engine/builder/role_permits_spec.rb",
     "spec/cantango/permit_engine/builder/special_permits_spec.rb",
+    "spec/cantango/permit_engine/executor/base_spec.rb",
     "spec/cantango/permit_engine/executor/system_spec.rb",
     "spec/cantango/permit_engine/factory_spec.rb",
     "spec/cantango/permit_engine/finder_spec.rb",

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

@@ -30,13 +30,13 @@ module CanTango
 
         def subject_in_role?
           return subject.send(has_role_meth, role) if subject.respond_to? has_role_meth
-          return subject.send(list_role_meth, role).include? role if subject.respond_to? has_role_meth
+          return subject.send(roles_list_meth).include? role if subject.respond_to? roles_list_meth
           false
         end
 
         def subject_in_role_group?
           return subject.send(has_role_group_meth, role) if subject.respond_to? has_role_group_meth
-          return subject.send(list_role_group_meth).include? role if subject.respond_to? list_role_group_meth
+          return subject.send(role_groups_list_meth).include? role if subject.respond_to? role_groups_list_meth
           false
         end
 

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

@@ -0,0 +1,68 @@
+require 'spec_helper'
+
+require 'cantango/rspec/matchers'
+require 'fixtures/models'
+require 'cantango/rspec/matchers'
+
+class CustomerRolePermit < CanTango::RolePermit
+  def initialize ability
+    super
+  end
+
+  protected
+
+  def permit_rules
+    can :read, Article
+  end
+end
+
+class SimpleUser
+  attr_accessor :roles_list
+
+  def initialize
+    @roles_list = [:customer]
+  end
+
+  def role_groups_list
+    []
+  end
+end
+
+describe CanTango::PermitEngine::Executor::Base do
+  let (:user) do
+    SimpleUser.new
+  end
+
+  let (:ability) do
+    @ability ||= CanTango::Ability.new user
+  end
+
+  let (:permit) do
+    CustomerRolePermit.new ability
+  end
+
+  let (:executor) do
+    CanTango::PermitEngine::Executor::Base.new permit
+  end
+
+  before(:each) do
+    CanTango.config.permits.set :on
+  end
+
+  describe '#execute!' do
+    before:each do
+      CanTango.config.permits.set :on
+    end
+
+    describe 'should find permit based on #roles_list' do
+      specify { lambda{ executor.execute! }.should_not raise_error }
+    end
+
+    describe 'should search permit based on #role_groups_list' do
+      before do
+        user.roles_list.clear
+      end
+      specify { lambda{ executor.execute! }.should_not raise_error }
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cantango
 version: !ruby/object:Gem::Version
-  version: 0.8.6.1
+  version: 0.8.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-27 00:00:00.000000000Z
+date: 2011-10-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2159452280 !ruby/object:Gem::Requirement
+  requirement: &2158459740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2159452280
+  version_requirements: *2158459740
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &2159451800 !ruby/object:Gem::Requirement
+  requirement: &2158459260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *2159451800
+  version_requirements: *2158459260
 - !ruby/object:Gem::Dependency
   name: sugar-high
-  requirement: &2159451320 !ruby/object:Gem::Requirement
+  requirement: &2158458780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2159451320
+  version_requirements: *2158458780
 - !ruby/object:Gem::Dependency
   name: sweetloader
-  requirement: &2159450840 !ruby/object:Gem::Requirement
+  requirement: &2158458300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2159450840
+  version_requirements: *2158458300
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &2159450360 !ruby/object:Gem::Requirement
+  requirement: &2158457820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *2159450360
+  version_requirements: *2158457820
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2159449880 !ruby/object:Gem::Requirement
+  requirement: &2158457320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *2159449880
+  version_requirements: *2158457320
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &2159449400 !ruby/object:Gem::Requirement
+  requirement: &2158456780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *2159449400
+  version_requirements: *2158456780
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &2159448920 !ruby/object:Gem::Requirement
+  requirement: &2158456300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2159448920
+  version_requirements: *2158456300
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2159448440 !ruby/object:Gem::Requirement
+  requirement: &2158455640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2159448440
+  version_requirements: *2158455640
 - !ruby/object:Gem::Dependency
   name: sourcify
-  requirement: &2159447960 !ruby/object:Gem::Requirement
+  requirement: &2158454880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2159447960
+  version_requirements: *2158454880
 - !ruby/object:Gem::Dependency
   name: dkastner-moneta
-  requirement: &2159447480 !ruby/object:Gem::Requirement
+  requirement: &2158454380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *2159447480
+  version_requirements: *2158454380
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2159447000 !ruby/object:Gem::Requirement
+  requirement: &2158453900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: 2.4.0
   type: :development
   prerelease: false
-  version_requirements: *2159447000
+  version_requirements: *2158453900
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2159446520 !ruby/object:Gem::Requirement
+  requirement: &2158453420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2159446520
+  version_requirements: *2158453420
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2159446040 !ruby/object:Gem::Requirement
+  requirement: &2158452920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,10 +165,10 @@ dependencies:
         version: 1.0.1
   type: :development
   prerelease: false
-  version_requirements: *2159446040
+  version_requirements: *2158452920
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2159445560 !ruby/object:Gem::Requirement
+  requirement: &2158452360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -176,7 +176,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2159445560
+  version_requirements: *2158452360
 description: ! 'Define your permission rules as role- or role group specific permits.
 
   Integrates well with multiple Devise user acounts.
@@ -520,6 +520,7 @@ files:
 - spec/cantango/permit_engine/builder/role_group_permits_spec.rb
 - spec/cantango/permit_engine/builder/role_permits_spec.rb
 - spec/cantango/permit_engine/builder/special_permits_spec.rb
+- spec/cantango/permit_engine/executor/base_spec.rb
 - spec/cantango/permit_engine/executor/system_spec.rb
 - spec/cantango/permit_engine/factory_spec.rb
 - spec/cantango/permit_engine/finder_spec.rb
@@ -821,7 +822,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2761645409637514242
+      hash: 60688448483309074
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: