cantango 0.8.9.3 → 0.8.9.4

data/README.textile

@@ -35,9 +35,9 @@ Run bundler in a terminal/console from the folder of your Gemfile (root folder o
 
 @$ bundle@
 
-h2. Update Oct 8, 2011
+h2. Update Oct 13, 2011
 
-Version *0.8.9* has been released.
+Version *0.8.9.4* has been released. Contains a few fixes submitted by @stanislaw :) Thanks!
 
 * You can now disable specific Permits to not be executed by the Permits engine
 

data/VERSION

@@ -1 +1 @@
-0.8.9.3
+0.8.9.4

data/cantango.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "cantango"
-  s.version = "0.8.9.3"
+  s.version = "0.8.9.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup", "Stanislaw Pankevich"]

data/lib/cantango/api/options.rb

@@ -5,7 +5,7 @@ module CanTango
       def ability_options
         opts = {}
         options_list.each do |option|
-          opts.merge!(option => send(option)) if respond_to? option
+          opts.merge!(option => send(option)) if respond_to? option, true
         end
         opts
       end
@@ -16,7 +16,6 @@ module CanTango
 
       private
 
-      # [:session, :request, :params, :controller, :domain, :cookies]
       def options_list
         self.class.options_list
       end

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

@@ -6,6 +6,7 @@ module CanTango
         # def admin_can?(*args)
         #   current_ability(:admin).can?(*args)
         # end
+        
         def self.included(base)      	
           ::CanTango.config.users.registered.each do |user|
             base.class_eval %{
@@ -14,9 +15,10 @@ module CanTango
                 guest_user
               end
           	}
+          end
       	end
-
-      	# give me any logged in user or the guest user
+      	
+        # 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|

data/lib/cantango/permit_engine/util.rb

@@ -6,9 +6,10 @@ module CanTango
       def permit_name clazz
         @name ||= clazz.to_s.demodulize.gsub(/Role/,'').gsub(/Permit$/, '').gsub(/Group/,'').underscore.to_sym
       end
-
+      
+      # TODO:
       def role
-        @role ||= permit_name(self.class)
+        @role ||= permit_name
       end
 
       def localhost_manager?

data/lib/cantango/permits/permit.rb

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

data/lib/cantango/permits/role_group_permit.rb

@@ -19,6 +19,7 @@ module CanTango
       def permit_name
         self.class.role_group_name self.class
       end
+      
       alias_method :role_group, :permit_name
 
       # creates the permit

data/lib/cantango/permits/user_permit.rb

@@ -61,8 +61,9 @@ module CanTango
         subject.class.name.underscore.to_sym
       end
 
+      # TODO
       def permit_user
-        permit_name(self.class)
+        permit_name 
       end
     end
   end

data/lib/cantango/rails/engine.rb

@@ -25,8 +25,10 @@ module CanTango
 
       # load all models
       # this is needed in order to register all users and accounts with CanTango using the user/account macros!
+    end
 
-      # load all permits
+    config.to_prepare do
+      # load all permits (development mode: EVERY request!)
       RailsAutoLoader.load_permits! if CanTango.config.autoload.permits?
     end
   end
@@ -44,7 +46,7 @@ module CanTango
 
     def self.load_files! path
       Dir[::Rails.root + "app/#{path}/**/*.rb"].each do |path|
-        require path
+        require_dependency path
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cantango
 version: !ruby/object:Gem::Version
-  version: 0.8.9.3
+  version: 0.8.9.4
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2011-10-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2164545660 !ruby/object:Gem::Requirement
+  requirement: &2165224580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2164545660
+  version_requirements: *2165224580
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &2164544920 !ruby/object:Gem::Requirement
+  requirement: &2165224100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *2164544920
+  version_requirements: *2165224100
 - !ruby/object:Gem::Dependency
   name: sugar-high
-  requirement: &2164544400 !ruby/object:Gem::Requirement
+  requirement: &2165223600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2164544400
+  version_requirements: *2165223600
 - !ruby/object:Gem::Dependency
   name: sweetloader
-  requirement: &2164537260 !ruby/object:Gem::Requirement
+  requirement: &2165223100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2164537260
+  version_requirements: *2165223100
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &2164536780 !ruby/object:Gem::Requirement
+  requirement: &2165222600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *2164536780
+  version_requirements: *2165222600
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2164536240 !ruby/object:Gem::Requirement
+  requirement: &2165222100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *2164536240
+  version_requirements: *2165222100
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &2164535660 !ruby/object:Gem::Requirement
+  requirement: &2165221600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *2164535660
+  version_requirements: *2165221600
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &2164535180 !ruby/object:Gem::Requirement
+  requirement: &2165221120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164535180
+  version_requirements: *2165221120
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2164534680 !ruby/object:Gem::Requirement
+  requirement: &2165220640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164534680
+  version_requirements: *2165220640
 - !ruby/object:Gem::Dependency
   name: sourcify
-  requirement: &2164534060 !ruby/object:Gem::Requirement
+  requirement: &2165220160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164534060
+  version_requirements: *2165220160
 - !ruby/object:Gem::Dependency
   name: dkastner-moneta
-  requirement: &2164533580 !ruby/object:Gem::Requirement
+  requirement: &2165219660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *2164533580
+  version_requirements: *2165219660
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2164533100 !ruby/object:Gem::Requirement
+  requirement: &2165218980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: 2.4.0
   type: :development
   prerelease: false
-  version_requirements: *2164533100
+  version_requirements: *2165218980
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2164532460 !ruby/object:Gem::Requirement
+  requirement: &2165218500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2164532460
+  version_requirements: *2165218500
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2164531980 !ruby/object:Gem::Requirement
+  requirement: &2165217940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,10 +165,10 @@ dependencies:
         version: 1.0.1
   type: :development
   prerelease: false
-  version_requirements: *2164531980
+  version_requirements: *2165217940
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2164531440 !ruby/object:Gem::Requirement
+  requirement: &2165217340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -176,7 +176,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164531440
+  version_requirements: *2165217340
 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: -1258033149394138173
+      hash: 4582339943183019493
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: