cantango 0.9.4.5 → 0.9.4.6

data/README.textile

@@ -38,10 +38,19 @@ Run bundler in a terminal/console from the folder of your Gemfile (root folder o
 
 h2. Update Nov 21, 2011
 
-Version 0.9.4.5 has been released. Fixes bug in configuration/permit_registry.
+Version 0.9.4.6 has been released. Fixes bug in configuration/permit_registry.
 
 The "wiki":https://github.com/kristianmandrup/cantango/wiki has been rewritten and updated to reflect all latest design changes and feature additions.
 
+I am now in the process of a major refactoring effort in the *major-refactor* branch. 
+I've split up cantango into separate gems which will be developed independently in the future (towards a 1.0 release), notably one gem for each engine. I might rename the "engine" concept into "component" so that developers don't confuse it with Rails engines ;)
+
+* "cantango-cache":https://github.com/kristianmandrup/cantango-cache
+* "permits":https://github.com/kristianmandrup/permits
+* "permit_store":https://github.com/kristianmandrup/permit_store
+
+I might also extract the _permission_ engine (currently known as _user_ac_). Lot's of changes coming doewn the pipeline. Please help make CanTango much better and more stable! Thanks! 
+
 h2. Quickstart
 
 See the "Quickstart guide":https://github.com/kristianmandrup/cantango/wiki/Quickstart in the wiki.

data/VERSION

@@ -1 +1 @@
-0.9.4.5
+0.9.4.6

data/cantango.gemspec

@@ -4,17 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{cantango}
-  s.version = "0.9.4.5"
+  s.name = "cantango"
+  s.version = "0.9.4.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Kristian Mandrup}, %q{Stanislaw Pankevich}]
-  s.date = %q{2011-11-21}
-  s.description = %q{Define your permission rules as role- or role group specific permits.
-Integrates well with multiple Devise user acounts.
-Includes rules caching.
-Store permissions in yaml file or key-value store}
-  s.email = %q{kmandrup@gmail.com, s.pankevich@gmail.com}
+  s.authors = ["Kristian Mandrup", "Stanislaw Pankevich"]
+  s.date = "2011-11-24"
+  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 = [
     "LICENSE.txt",
     "README.textile"
@@ -688,11 +685,11 @@ Store permissions in yaml file or key-value store}
     "wiki/when_to_use.markdown",
     "wiki/why_to_use.markdown"
   ]
-  s.homepage = %q{http://github.com/kristianmandrup/cantango}
-  s.licenses = [%q{MIT}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.6}
-  s.summary = %q{CanCan extension with role oriented permission management and more}
+  s.homepage = "http://github.com/kristianmandrup/cantango"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.10"
+  s.summary = "CanCan extension with role oriented permission management and more"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/cantango/configuration/permit_registry.rb

@@ -1,9 +1,9 @@
 module CanTango
   class Configuration
     class PermitRegistry
-      def get_permit label
-        raise ArgumentError, "Not an available permit" if !CanTango.config.permits.available_types.include? label
-        inst_var_name = "@#{label}"
+      def permits_for type        
+        raise ArgumentError, "Not an available permit type: #{type}, available are: #{available_types}" if !available_types.include? type
+        inst_var_name = "@#{type}"
         instance_variable_set(inst_var_name, HashRegistry.new) if !instance_variable_get(inst_var_name)
         instance_variable_get(inst_var_name)
       end
@@ -13,16 +13,20 @@ module CanTango
       end
 
       def registered_by type
-        get(type).registered
+        permits_for(type).registered
       end
 
       def all
-        (CanTango.config.permits.available_types - [:special]).map{|label| get_permit(label) }
+        (available_types - [:special]).map{|type| permits_for(type)}
       end
 
       def show_all
         all.map(&:registered)
       end
+      
+      def available_types
+        CanTango.config.permits.available_types
+      end
     end
   end
 end

data/lib/cantango/configuration/permits.rb

@@ -80,9 +80,8 @@ module CanTango
       def register_permit_class(permit_name, permit_clazz, permit_type, account_name)
         registry = account_name ? get_permit(account_name.to_sym) : self
         debug "Registering #{permit_type} permit: #{permit_name} of class #{permit_clazz}"
-
-        registry.get(permit_type)[permit_name] = permit_clazz
-        debug registry.get_permit(permit_type).inspect
+        registry.permits_for(permit_type)[permit_name] = permit_clazz
+        debug registry.permits_for(permit_type).inspect
       end
 
       def allowed candidate, actions, subjects, *extra_args

data/lib/cantango/configuration/role_groups.rb

@@ -3,12 +3,24 @@ module CanTango
     class RoleGroups < RoleRegistry
       include Singleton
 
+      attr_writer :role_groups_system
+
+      def role_groups_system
+        @role_groups_system ||= :troles
+      end
+
       def default_has_method
         :in_role_group?
       end
 
       def default_list_method
-        :role_groups_list
+        role_groups_list_map[role_groups_system] || :role_groups_list
+      end
+      
+      def role_groups_list_map
+        @role_groups_list_map ||= {
+          :troles => :role_group_list
+        }
       end
     end
   end

data/lib/cantango/configuration/roles.rb

@@ -3,12 +3,24 @@ module CanTango
     class Roles < RoleRegistry
       include Singleton
 
+      attr_writer :roles_system
+
+      def roles_system
+        @roles_system ||= :troles
+      end
+
       def default_has_method
         :has_role?
       end
 
       def default_list_method
-        :roles_list
+        role_list_map[roles_system] || :roles_list
+      end
+      
+      def role_list_map
+        @role_list_map ||= {
+          :troles => :role_list
+        }
       end
     end
   end

data/lib/cantango/permission_engine.rb

@@ -23,7 +23,6 @@ module CanTango
     end
 
     def valid?
-      puts "valid_mode? #{valid_mode?} #{modes} #{cached?}"
       return false if !valid_mode?
       permissions.empty? ? invalid : true
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cantango
 version: !ruby/object:Gem::Version
-  version: 0.9.4.5
+  version: 0.9.4.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-21 00:00:00.000000000Z
+date: 2011-11-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70220124631000 !ruby/object:Gem::Requirement
+  requirement: &760593560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70220124631000
+  version_requirements: *760593560
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &70220124630520 !ruby/object:Gem::Requirement
+  requirement: &760570980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70220124630520
+  version_requirements: *760570980
 - !ruby/object:Gem::Dependency
   name: sugar-high
-  requirement: &70220124630020 !ruby/object:Gem::Requirement
+  requirement: &760567230 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70220124630020
+  version_requirements: *760567230
 - !ruby/object:Gem::Dependency
   name: sweetloader
-  requirement: &70220124629400 !ruby/object:Gem::Requirement
+  requirement: &760562470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70220124629400
+  version_requirements: *760562470
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70220124628760 !ruby/object:Gem::Requirement
+  requirement: &760559870 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70220124628760
+  version_requirements: *760559870
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70220124628100 !ruby/object:Gem::Requirement
+  requirement: &760553610 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *70220124628100
+  version_requirements: *760553610
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &70220124627420 !ruby/object:Gem::Requirement
+  requirement: &760551830 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *70220124627420
+  version_requirements: *760551830
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70220124626940 !ruby/object:Gem::Requirement
+  requirement: &760549670 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70220124626940
+  version_requirements: *760549670
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70220124620920 !ruby/object:Gem::Requirement
+  requirement: &760536730 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70220124620920
+  version_requirements: *760536730
 - !ruby/object:Gem::Dependency
   name: sourcify
-  requirement: &70220124620260 !ruby/object:Gem::Requirement
+  requirement: &760536290 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70220124620260
+  version_requirements: *760536290
 - !ruby/object:Gem::Dependency
   name: dkastner-moneta
-  requirement: &70220124619620 !ruby/object:Gem::Requirement
+  requirement: &760535520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70220124619620
+  version_requirements: *760535520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70220124618860 !ruby/object:Gem::Requirement
+  requirement: &760535020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: 2.4.0
   type: :development
   prerelease: false
-  version_requirements: *70220124618860
+  version_requirements: *760535020
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70220124618380 !ruby/object:Gem::Requirement
+  requirement: &760534760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70220124618380
+  version_requirements: *760534760
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70220124617720 !ruby/object:Gem::Requirement
+  requirement: &760534360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,10 +165,10 @@ dependencies:
         version: 1.0.1
   type: :development
   prerelease: false
-  version_requirements: *70220124617720
+  version_requirements: *760534360
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70220124617020 !ruby/object:Gem::Requirement
+  requirement: &760533950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -176,7 +176,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70220124617020
+  version_requirements: *760533950
 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: -477019430598223523
+      hash: 967356769
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -882,7 +882,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: CanCan extension with role oriented permission management and more