cantango 0.8.9.4 → 0.8.9.5

data/README.textile

@@ -35,25 +35,14 @@ Run bundler in a terminal/console from the folder of your Gemfile (root folder o
 
 @$ bundle@
 
-h2. Update Oct 13, 2011
+h2. Update Oct 17, 2011
 
-Version *0.8.9.4* has been released. Contains a few fixes submitted by @stanislaw :) Thanks!
+Version *0.8.9.5* has been released. Contains an important bug fix for permit options!
 
-* You can now disable specific Permits to not be executed by the Permits engine
-
-This is especially useful when you are conerting permits into permissions
-
-<pre>
-CanTango.config.permits.disable_for :user, [:admin, :editor]  # AdminPermit, EditorPermit
-CanTango.config.permits.disable_for :role, :guest # GuestRolePermit
-CanTango.config.permits.disable_for :account, :admin # AdminAccountPermit
-puts CanTango.config.permits.disabled # => {:role => ['guest'], :user ...}
-puts CanTango.config.permits.disabled_for :role # => :guest
-CanTango.config.permits.enable_all_types! # reset types only
-CanTango.config.permits.enable_all! # reset types and specific
-</pre>
-
-Note: You can also disable a permit directly from within the Permit class, using the new @disable!@ method. This can fx be done in a permit initializer.
+Also the user _[user_class]_can?_ and _cannot?_ API methods have been updated to work correctly when _current_[user_class]_ and such methods (fx as generated by _Devise_) return an account and not a user instance. 
+In this case CanTango will attempt to call the #user method on the account to get the user. 
+In many cases for more advanced scenarios, it makes more sense to treat the devise models as accounts and have the user models defined separately and linked to one or more accounts. 
+The accounts would then have the credentials for the user in that partiular context and the user only the user specific details.
 
 h2. Quickstart
 
@@ -98,7 +87,7 @@ Abilities can be defined for the following conceptual entities:
 
 h3. Debugging Abilities and Permits
 
-See [[Debugging permits]]
+See "Debugging permits"::https://github.com/kristianmandrup/cantango/wiki/Debugging-permits
 
 h3. Design overview
 

data/VERSION

@@ -1 +1 @@
-0.8.9.4
+0.8.9.5

data/cantango.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cantango"
-  s.version = "0.8.9.4"
+  s.version = "0.8.9.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup", "Stanislaw Pankevich"]
-  s.date = "2011-10-14"
+  s.date = "2011-10-17"
   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 = [

data/lib/cantango/api/options.rb

@@ -14,10 +14,8 @@ module CanTango
         [:session, :request, :params, :controller, :domain, :cookies]
       end
 
-      private
-
       def options_list
-        self.class.options_list
+        CanTango::Api::Options.options_list
       end
     end
   end

data/lib/cantango/api/user/ability.rb

@@ -19,10 +19,24 @@ module CanTango
           return AbilityUser.guest if !respond_to?(user_meth)
 
           user = send user_meth
+          # test if current_xxx actually returns an account and not a user instance!
+          # if so call the #user method on the account
+          user = AbilityUser.resolve_user(user)
+          # return guest user if user is nil
           user ? user : AbilityUser.guest
         end
 
         module AbilityUser
+          def self.resolve_user obj
+            return obj if AbilityUser.is_a_user?(obj)
+            return obj.send(:user) if obj.respond_to? :user
+            raise "no user object could be resolved via #{obj}. Please define a #user method for #{obj.class}"
+          end
+
+          def self.is_a_user? user
+            ::CanTango.config.users.registered.include?(user.class.to_s.underscore.to_sym)
+          end
+
           def self.guest
             user = CanTango.config.guest.user
 

data/lib/cantango/api/user/session.rb

@@ -6,30 +6,30 @@ module CanTango
         # def admin_can?(*args)
         #   current_ability(:admin).can?(*args)
         # end
-        
-        def self.included(base)      	
+
+        def self.included(base)
           ::CanTango.config.users.registered.each do |user|
             base.class_eval %{
               def session_#{user}
                 current_#{user} if respond_to? :current_#{user}
                 guest_user
               end
-          	}
+            }
           end
-      	end
-      	
+        end
+
         # give me any logged in user or the guest user
-      	def any_user *types
-      		types = types.flatten.select_labels.map(&:to_sym)
+        def any_user *types
+          types = types.flatten.select_labels.map(&:to_sym)
           c_user = ::CanTango.config.users.registered.each do |user|
-          	send(:"current_#{user}") if respond_to?(:"current_#{user}") && (types.empty? || types.include?(user))
+          send(:"current_#{user}") if respond_to?(:"current_#{user}") && (types.empty? || types.include?(user))
           end.compact.first
           c_user || guest_user
-      	end
+        end
 
         def guest_user
-       	  CanTango.config.guest.user
-        end      	
+          CanTango.config.guest.user
+        end
       end
     end
   end

data/lib/cantango/permit_engine/builder/special_permits.rb

@@ -3,7 +3,6 @@ module CanTango
     module Builder
       class SpecialPermits < Base
         def build
-          puts "Building special permits"
           special_permits.map{|role| create_permit(role)}.compact
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cantango
 version: !ruby/object:Gem::Version
-  version: 0.8.9.4
+  version: 0.8.9.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-14 00:00:00.000000000Z
+date: 2011-10-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2165224580 !ruby/object:Gem::Requirement
+  requirement: &2158013060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2165224580
+  version_requirements: *2158013060
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &2165224100 !ruby/object:Gem::Requirement
+  requirement: &2158012580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *2165224100
+  version_requirements: *2158012580
 - !ruby/object:Gem::Dependency
   name: sugar-high
-  requirement: &2165223600 !ruby/object:Gem::Requirement
+  requirement: &2158012100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2165223600
+  version_requirements: *2158012100
 - !ruby/object:Gem::Dependency
   name: sweetloader
-  requirement: &2165223100 !ruby/object:Gem::Requirement
+  requirement: &2158011620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2165223100
+  version_requirements: *2158011620
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &2165222600 !ruby/object:Gem::Requirement
+  requirement: &2158011140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *2165222600
+  version_requirements: *2158011140
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2165222100 !ruby/object:Gem::Requirement
+  requirement: &2158010640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *2165222100
+  version_requirements: *2158010640
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &2165221600 !ruby/object:Gem::Requirement
+  requirement: &2158006000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *2165221600
+  version_requirements: *2158006000
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &2165221120 !ruby/object:Gem::Requirement
+  requirement: &2158005420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165221120
+  version_requirements: *2158005420
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2165220640 !ruby/object:Gem::Requirement
+  requirement: &2158004820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165220640
+  version_requirements: *2158004820
 - !ruby/object:Gem::Dependency
   name: sourcify
-  requirement: &2165220160 !ruby/object:Gem::Requirement
+  requirement: &2158004240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165220160
+  version_requirements: *2158004240
 - !ruby/object:Gem::Dependency
   name: dkastner-moneta
-  requirement: &2165219660 !ruby/object:Gem::Requirement
+  requirement: &2158003640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *2165219660
+  version_requirements: *2158003640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2165218980 !ruby/object:Gem::Requirement
+  requirement: &2158003060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: 2.4.0
   type: :development
   prerelease: false
-  version_requirements: *2165218980
+  version_requirements: *2158003060
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2165218500 !ruby/object:Gem::Requirement
+  requirement: &2158002480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2165218500
+  version_requirements: *2158002480
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2165217940 !ruby/object:Gem::Requirement
+  requirement: &2158001940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,10 +165,10 @@ dependencies:
         version: 1.0.1
   type: :development
   prerelease: false
-  version_requirements: *2165217940
+  version_requirements: *2158001940
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2165217340 !ruby/object:Gem::Requirement
+  requirement: &2158001460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -176,7 +176,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165217340
+  version_requirements: *2158001460
 description: ! 'Define your permission rules as role- or role group specific permits.
 
   Integrates well with multiple Devise user acounts.
@@ -823,7 +823,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4582339943183019493
+      hash: 3473046494406271623
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: