cantango 0.8.8 → 0.8.8.1

data/README.textile

@@ -37,10 +37,14 @@ Run bundler in a terminal/console from the folder of your Gemfile (root folder o
 
 h2. Update Oct 6, 2011
 
-Version *0.8.8* has been released.
+Version *0.8.8.1* has been released.
 
 * Fixed some bugs when using :user and :account permits
 * Enhanced Permits debugging so you can now track the execution flow of the Permits engine. 
+* You can now disable specific types of Permits to be used for the Permits engine
+  * CanTango.config.permits.disable :role_groups, :special
+  * CanTango.config.permits.enabled
+  * CanTango.config.permits.available 
 
 h2. Quickstart
 

data/VERSION

@@ -1 +1 @@
-0.8.8
+0.8.8.1

data/cantango.gemspec

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

data/lib/cantango/ability/role_helpers.rb

@@ -6,18 +6,24 @@ module CanTango
 
       # return list roles the user has
       def roles
-        raise "#{subject.inspect} should have a #{roles_list_meth} method" if !subject.respond_to?(roles_list_meth)
-        subj_roles = subject.send(roles_list_meth)
-        return [] if subj_roles.blank?
-        subj_roles.flatten
+        return [] if !subject.respond_to?(roles_list_meth) || roles_of(subject).blank?
+        roles_of(subject).flatten
       end
 
       # return list of symbols for role groups the user belongs to
       def role_groups
-        raise "#{subject.inspect} should have a #{role_groups_list_meth} method" if !subject.respond_to?(role_groups_list_meth)
-        subj_role_groups = subject.send(role_groups_list_meth)
-       return [] if subj_role_groups.blank?
-        subj_role_groups.flatten
+        return [] if !subject.respond_to?(role_groups_list_meth) || role_groups_of(subject).blank?
+        role_groups_of(subject).flatten
+      end
+
+      protected
+
+      def role_groups_of subject
+        @subj_role_groups ||= subject.send(role_groups_list_meth)
+      end
+
+      def roles_of subject
+        @subj_roles ||= subject.send(roles_list_meth)
       end
     end
   end

data/lib/cantango/configuration/permits.rb

@@ -5,6 +5,18 @@ module CanTango
 
       attr_reader :accounts
 
+      def enabled
+        @enabled || available
+      end
+
+      def available
+        [:user, :account, :role, :role_group, :special]
+      end
+
+      def disable *types
+        @enabled = available - types.flatten
+      end
+
       def accounts
         @accounts ||= Hash.new
       end

data/lib/cantango/permit_engine/factory.rb

@@ -39,7 +39,7 @@ module CanTango
       end
 
       def builders
-        [:role_group, :role, :user, :account, :special]
+        CanTango.config.permits.enabled
       end
 
       def options

data/lib/cantango/permits/role_group_permit.rb

@@ -53,10 +53,16 @@ module CanTango
       include CanTango::Helpers::RoleMethods
 
       def in_role_group? subject
-        return subject.send(has_role_group_meth, role) if subject.respond_to? has_role_group_meth
-        return subject.send(role_groups_list_meth).include? role if subject.respond_to? role_groups_list_meth
-        false
-      end 
+        has_role_group?(subject) || role_groups_of(subject).include?(role) 
+      end
+
+      def has_role_group? subject
+        subject.send(has_role_group_meth, role) if subject.respond_to?(has_role_group_meth) 
+      end
+
+      def role_groups_of subject
+        subject.respond_to?(role_groups_list_meth) ? subject.send(role_groups_list_meth) : []
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cantango
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.8.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2011-10-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2155232980 !ruby/object:Gem::Requirement
+  requirement: &2155846940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2155232980
+  version_requirements: *2155846940
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &2155230180 !ruby/object:Gem::Requirement
+  requirement: &2155846160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *2155230180
+  version_requirements: *2155846160
 - !ruby/object:Gem::Dependency
   name: sugar-high
-  requirement: &2155228180 !ruby/object:Gem::Requirement
+  requirement: &2155845200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2155228180
+  version_requirements: *2155845200
 - !ruby/object:Gem::Dependency
   name: sweetloader
-  requirement: &2155225700 !ruby/object:Gem::Requirement
+  requirement: &2155844260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2155225700
+  version_requirements: *2155844260
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &2155224820 !ruby/object:Gem::Requirement
+  requirement: &2155843720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *2155224820
+  version_requirements: *2155843720
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2155223860 !ruby/object:Gem::Requirement
+  requirement: &2155837120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *2155223860
+  version_requirements: *2155837120
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &2155222500 !ruby/object:Gem::Requirement
+  requirement: &2155836320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *2155222500
+  version_requirements: *2155836320
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &2155220720 !ruby/object:Gem::Requirement
+  requirement: &2155834940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155220720
+  version_requirements: *2155834940
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2155219360 !ruby/object:Gem::Requirement
+  requirement: &2155834260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155219360
+  version_requirements: *2155834260
 - !ruby/object:Gem::Dependency
   name: sourcify
-  requirement: &2155217480 !ruby/object:Gem::Requirement
+  requirement: &2155833280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155217480
+  version_requirements: *2155833280
 - !ruby/object:Gem::Dependency
   name: dkastner-moneta
-  requirement: &2155216560 !ruby/object:Gem::Requirement
+  requirement: &2155831600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *2155216560
+  version_requirements: *2155831600
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2155215080 !ruby/object:Gem::Requirement
+  requirement: &2155829460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: 2.4.0
   type: :development
   prerelease: false
-  version_requirements: *2155215080
+  version_requirements: *2155829460
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2155213680 !ruby/object:Gem::Requirement
+  requirement: &2155822220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2155213680
+  version_requirements: *2155822220
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2155211640 !ruby/object:Gem::Requirement
+  requirement: &2155821060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,10 +165,10 @@ dependencies:
         version: 1.0.1
   type: :development
   prerelease: false
-  version_requirements: *2155211640
+  version_requirements: *2155821060
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2155209840 !ruby/object:Gem::Requirement
+  requirement: &2155820440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -176,7 +176,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155209840
+  version_requirements: *2155820440
 description: ! 'Define your permission rules as role- or role group specific permits.
 
   Integrates well with multiple Devise user acounts.
@@ -822,7 +822,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4099714977896474782
+      hash: -3348262799499856729
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: