cantango 0.9.4.6 → 0.9.4.7

data/README.textile

@@ -36,9 +36,32 @@ Run bundler in a terminal/console from the folder of your Gemfile (root folder o
 
 @$ bundle@
 
-h2. Update Nov 21, 2011
+h2. Update Nov 24, 2011
 
-Version 0.9.4.6 has been released. Fixes bug in configuration/permit_registry.
+Version 0.9.4.7 has been released. 
+
+* Now enables configuration of role and role group systems directly:
+
+Defaults:
+
+* Role system - "simple_roles":https://github.com/stanislaw/simple_roles
+* Role group system - "troles":https://github.com/kristianmandrup/troles
+
+You can override the defaults like this:
+
+<pre>
+CanTango.config do |c|
+  c.roles.role_system = :troles
+end
+</pre>
+
+Then CanTango should auto-configure to use the correct list methods of that system. You can even add your own role system with custom mappings. Here I tell CanTango that I'm using a system I call _MyRoles_ and that the method added to role candidates (fx User) to return the list of roles, will be @#list_of_roles@ and the method to check if he is in (or has) a specific role will be @is_in_role?@. Same goes for role groups, using @role_groups.add_role_group_system@.
+
+<pre>
+CanTango.config do |c|
+  c.roles.add_role_system :my_roles => {:list => :list_of_roles, :has => :is_in_role?}
+end
+</pre>
 
 The "wiki":https://github.com/kristianmandrup/cantango/wiki has been rewritten and updated to reflect all latest design changes and feature additions.
 

data/VERSION

@@ -1 +1 @@
-0.9.4.6
+0.9.4.7

data/cantango.gemspec

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

data/lib/cantango/configuration/role_groups.rb

@@ -3,23 +3,40 @@ module CanTango
     class RoleGroups < RoleRegistry
       include Singleton
 
-      attr_writer :role_groups_system
+      def role_group_system= name
+        raise ArgumentError, "Must be a label" if !name.kind_of_label?
+        @role_group_system = name.to_sym
+      end
+
+      def role_groups_list_map= role_systems_hash
+        raise ArgumentError, "Must be a hash fx :troles => :role_list, was: #{role_systems_hash}" if !role_systems_hash.kind_of?(Hash)
+        @role_groups_list_map = role_systems_hash
+      end
 
-      def role_groups_system
-        @role_groups_system ||= :troles
+      def role_group_system
+        @role_group_system ||= :troles
+      end
+
+      def add_role_group_system role_system_hash
+        raise ArgumentError, "Must be a hash fx :troles => :role_list, was: #{role_system_hash}" if !role_system_hash.kind_of?(Hash)
+        role_groups_list_map.merge! role_system
       end
 
       def default_has_method
-        :in_role_group?
+        role_group_methods[:has] || :in_role_group?
       end
 
       def default_list_method
-        role_groups_list_map[role_groups_system] || :role_groups_list
+         role_group_methods[:list] || :role_groups_list
+      end
+      
+      def role_group_methods
+        role_groups_list_map[role_group_system] || {}
       end
       
       def role_groups_list_map
         @role_groups_list_map ||= {
-          :troles => :role_group_list
+          :troles => {:list => :role_group_list}
         }
       end
     end

data/lib/cantango/configuration/roles.rb

@@ -3,28 +3,43 @@ module CanTango
     class Roles < RoleRegistry
       include Singleton
 
-      attr_writer :roles_system
+      def role_system= name
+        raise ArgumentError, "Must be a label" if !name.kind_of_label?
+        @role_system = name.to_sym
+      end
+
+      def roles_list_map= role_systems_hash
+        raise ArgumentError, "Must be a hash fx :troles => :role_list, was: #{role_systems_hash}" if !role_systems_hash.kind_of?(Hash)
+        @roles_list_map = role_systems_hash
+      end
+
+      def role_system
+        @role_system ||= :simple_roles
+      end
 
-      def roles_system
-        @roles_system ||= :troles
+      def add_role_system role_system_hash
+        raise ArgumentError, "Must be a hash fx :troles => :role_list, was: #{role_system_hash}" if !role_system_hash.kind_of?(Hash)
+        roles_list_map.merge! role_system
       end
 
       def default_has_method
-        :has_role?
+        role_system_methods[:list] || :has_role?
       end
 
       def default_list_method
-        role_list_map[roles_system] || :roles_list
+        role_system_methods[:list] || :roles_list
       end
       
-      def role_list_map
-        @role_list_map ||= {
-          :troles => :role_list
+      def role_system_methods
+        roles_list_map[role_system] || {}
+      end
+      
+      def roles_list_map
+        @roles_list_map ||= {
+          :troles       => {:list => :role_list},
+          :simple_roles => {:list => :roles_list}
         }
       end
     end
   end
 end
-
-
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cantango
 version: !ruby/object:Gem::Version
-  version: 0.9.4.6
+  version: 0.9.4.7
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2011-11-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &760593560 !ruby/object:Gem::Requirement
+  requirement: &903784170 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *760593560
+  version_requirements: *903784170
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &760570980 !ruby/object:Gem::Requirement
+  requirement: &903783700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *760570980
+  version_requirements: *903783700
 - !ruby/object:Gem::Dependency
   name: sugar-high
-  requirement: &760567230 !ruby/object:Gem::Requirement
+  requirement: &903783080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *760567230
+  version_requirements: *903783080
 - !ruby/object:Gem::Dependency
   name: sweetloader
-  requirement: &760562470 !ruby/object:Gem::Requirement
+  requirement: &903782120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *760562470
+  version_requirements: *903782120
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &760559870 !ruby/object:Gem::Requirement
+  requirement: &903781490 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *760559870
+  version_requirements: *903781490
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &760553610 !ruby/object:Gem::Requirement
+  requirement: &903780620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *760553610
+  version_requirements: *903780620
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &760551830 !ruby/object:Gem::Requirement
+  requirement: &903780130 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *760551830
+  version_requirements: *903780130
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &760549670 !ruby/object:Gem::Requirement
+  requirement: &903778990 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *760549670
+  version_requirements: *903778990
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &760536730 !ruby/object:Gem::Requirement
+  requirement: &903778330 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *760536730
+  version_requirements: *903778330
 - !ruby/object:Gem::Dependency
   name: sourcify
-  requirement: &760536290 !ruby/object:Gem::Requirement
+  requirement: &903777880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *760536290
+  version_requirements: *903777880
 - !ruby/object:Gem::Dependency
   name: dkastner-moneta
-  requirement: &760535520 !ruby/object:Gem::Requirement
+  requirement: &903777250 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *760535520
+  version_requirements: *903777250
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &760535020 !ruby/object:Gem::Requirement
+  requirement: &903776620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: 2.4.0
   type: :development
   prerelease: false
-  version_requirements: *760535020
+  version_requirements: *903776620
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &760534760 !ruby/object:Gem::Requirement
+  requirement: &903775990 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *760534760
+  version_requirements: *903775990
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &760534360 !ruby/object:Gem::Requirement
+  requirement: &903775040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,10 +165,10 @@ dependencies:
         version: 1.0.1
   type: :development
   prerelease: false
-  version_requirements: *760534360
+  version_requirements: *903775040
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &760533950 !ruby/object:Gem::Requirement
+  requirement: &903774590 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -176,7 +176,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *760533950
+  version_requirements: *903774590
 description: ! 'Define your permission rules as role- or role group specific permits.
 
   Integrates well with multiple Devise user acounts.
@@ -873,7 +873,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 967356769
+      hash: -1049245295
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: