cantango 0.8.9.2 → 0.8.9.3

data/VERSION

@@ -1 +1 @@
-0.8.9.2
+0.8.9.3

data/cantango.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cantango"
-  s.version = "0.8.9.2"
+  s.version = "0.8.9.3"
 
   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-11"
+  s.date = "2011-10-14"
   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 = [
@@ -55,6 +55,7 @@ Gem::Specification.new do |s|
     "lib/cantango/api/user/ability.rb",
     "lib/cantango/api/user/can.rb",
     "lib/cantango/api/user/scope.rb",
+    "lib/cantango/api/user/session.rb",
     "lib/cantango/api/user_account.rb",
     "lib/cantango/api/user_account/ability.rb",
     "lib/cantango/api/user_account/can.rb",

data/lib/cantango.rb

@@ -38,6 +38,7 @@ module CanTango
     end
 
     def debug_ability candidate, actions, subjects, *extra_args
+      puts "Ability: #{actions} on #{subjects}"
       puts "permits allowed:" << permits_allowed(candidate, actions, subjects, *extra_args).inspect
       puts "permits denied:"  << permits_denied(candidate, actions, subjects, *extra_args).inspect
     end

data/lib/cantango/api/options.rb

@@ -10,10 +10,15 @@ module CanTango
         opts
       end
 
+      def self.options_list
+        [:session, :request, :params, :controller, :domain, :cookies]
+      end
+
       private
 
+      # [:session, :request, :params, :controller, :domain, :cookies]
       def options_list
-        [:session, :request, :params, :controller, :domain]
+        self.class.options_list
       end
     end
   end

data/lib/cantango/api/user.rb

@@ -1,11 +1,11 @@
 module CanTango
   module Api
     module User
-      autoload_modules :Ability, :Can, :Scope
+      autoload_modules :Ability, :Can, :Scope, :Session
 
       module All
         def self.included base
-          [:Ability, :Can, :Scope].each do |api|
+          [:Ability, :Can, :Scope, :Session].each do |api|
             base.send :include, clazz(api)
           end
         end

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

@@ -0,0 +1,34 @@
+module CanTango
+  module Api
+    module User
+      module Session
+        # Example: generated from types of accounts! (see below)
+        # def admin_can?(*args)
+        #   current_ability(:admin).can?(*args)
+        # end
+        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
+
+      	# give me any logged in user or the guest user
+      	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))
+          end.compact.first
+          c_user || guest_user
+      	end
+
+        def guest_user
+       	  CanTango.config.guest.user
+        end      	
+      end
+    end
+  end
+end

data/lib/cantango/permits/permit.rb

@@ -66,7 +66,8 @@ module CanTango
         ability.options
       end
 
-      [:session, :controller, :request, :params].each do |obj|
+      # [:session, :controller, :request, :params, :domain, :cookies].each do |obj|
+      CanTango::Api::Options.options_list.each do |obj|
         class_eval %{
           def #{obj}
             options[:#{obj}]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cantango
 version: !ruby/object:Gem::Version
-  version: 0.8.9.2
+  version: 0.8.9.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-11 00:00:00.000000000Z
+date: 2011-10-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2158162380 !ruby/object:Gem::Requirement
+  requirement: &2164545660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2158162380
+  version_requirements: *2164545660
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &2158161880 !ruby/object:Gem::Requirement
+  requirement: &2164544920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *2158161880
+  version_requirements: *2164544920
 - !ruby/object:Gem::Dependency
   name: sugar-high
-  requirement: &2158161400 !ruby/object:Gem::Requirement
+  requirement: &2164544400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2158161400
+  version_requirements: *2164544400
 - !ruby/object:Gem::Dependency
   name: sweetloader
-  requirement: &2158160900 !ruby/object:Gem::Requirement
+  requirement: &2164537260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2158160900
+  version_requirements: *2164537260
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &2158160400 !ruby/object:Gem::Requirement
+  requirement: &2164536780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *2158160400
+  version_requirements: *2164536780
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2158159920 !ruby/object:Gem::Requirement
+  requirement: &2164536240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *2158159920
+  version_requirements: *2164536240
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &2158159340 !ruby/object:Gem::Requirement
+  requirement: &2164535660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *2158159340
+  version_requirements: *2164535660
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &2158158780 !ruby/object:Gem::Requirement
+  requirement: &2164535180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158158780
+  version_requirements: *2164535180
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2158158300 !ruby/object:Gem::Requirement
+  requirement: &2164534680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158158300
+  version_requirements: *2164534680
 - !ruby/object:Gem::Dependency
   name: sourcify
-  requirement: &2158157820 !ruby/object:Gem::Requirement
+  requirement: &2164534060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158157820
+  version_requirements: *2164534060
 - !ruby/object:Gem::Dependency
   name: dkastner-moneta
-  requirement: &2158157320 !ruby/object:Gem::Requirement
+  requirement: &2164533580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *2158157320
+  version_requirements: *2164533580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2158156740 !ruby/object:Gem::Requirement
+  requirement: &2164533100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: 2.4.0
   type: :development
   prerelease: false
-  version_requirements: *2158156740
+  version_requirements: *2164533100
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2158156240 !ruby/object:Gem::Requirement
+  requirement: &2164532460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2158156240
+  version_requirements: *2164532460
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2158155760 !ruby/object:Gem::Requirement
+  requirement: &2164531980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,10 +165,10 @@ dependencies:
         version: 1.0.1
   type: :development
   prerelease: false
-  version_requirements: *2158155760
+  version_requirements: *2164531980
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2158155260 !ruby/object:Gem::Requirement
+  requirement: &2164531440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -176,7 +176,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158155260
+  version_requirements: *2164531440
 description: ! 'Define your permission rules as role- or role group specific permits.
 
   Integrates well with multiple Devise user acounts.
@@ -229,6 +229,7 @@ files:
 - lib/cantango/api/user/ability.rb
 - lib/cantango/api/user/can.rb
 - lib/cantango/api/user/scope.rb
+- lib/cantango/api/user/session.rb
 - lib/cantango/api/user_account.rb
 - lib/cantango/api/user_account/ability.rb
 - lib/cantango/api/user_account/can.rb
@@ -822,7 +823,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -112989363302876815
+      hash: -1258033149394138173
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: