roles_generic 0.2.2 → 0.2.3

data/README.markdown

@@ -3,12 +3,12 @@
 Generic role strategies that share the same API and are easy to insert in any existing User model. 
 Comes with a Rails 3 generator to instantly configure your Rails 3 app with a Role strategy of choice.
 
-I am in the process of developing multiple *roles_xxx* gems in order to support this generic API for various popular ORMs, such as:
+I have developed the following *roles* gems for popular ORMs that all support the same roles generic API.
 
-* Active Record (roles_ar)
-* DataMapper (roles_dm_)
-* Mongoid (roles_mongoid)
-* MongoMapper (roles_mm)
+* Active Record - [roles_active_record](http://github.com/kristianmandrup/roles_active_record)
+* DataMapper - [roles_data_mapper](http://github.com/kristianmandrup/roles_data_mapper)
+* Mongoid - [roles_mongoid](http://github.com/kristianmandrup/roles_mongoid)
+* MongoMapper - [roles_mongo_mapper](http://github.com/kristianmandrup/roles_mongo_mapper))
 
 Feel free to roll your own ORM extension for your favorite ORM!
 
@@ -16,8 +16,9 @@ Feel free to roll your own ORM extension for your favorite ORM!
 
 Roles generic has now been refactored in order to tidy up the code base and make it even more generic, flexible and easy to extend.
 
-Currently I'm not sure if the generator fully works. It has a dependency on *rails3_artifactor*, which should work.
-However my gem to test generators (called *generator-spec*), is currently not functioning as it has dependencies to other gems that have undergone major
+Currently I'm not sure if the generator fully works. It has a dependency on [rails3_artifator](http://github.com/kristianmandrup/rails3_artifator), which should work.
+However my gem to test generators (called [generator-spec](http://github.com/kristianmandrup/generator-spec), is currently not functioning as it has dependencies to other gems that have undergone major
+
 refactorings lately. Let me know if the generator works or if not, see if you can make it work using *rails3_artifactor* and let me know the fix ;) 
 
 ## Install

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/roles_generic/admin.rb

@@ -0,0 +1,13 @@
+module AdminRoleCheck
+  def admin?
+    self.to_s.downcase.to_sym == :admin
+  end
+end  
+
+class String
+  include AdminRoleCheck
+end
+
+class Symbol
+  include AdminRoleCheck
+end

data/lib/roles_generic/base.rb

@@ -20,7 +20,8 @@ module Roles
          
     def include_strategy orm, strategy_name, options=nil 
       begin     
-        constant = "RoleStrategy::#{orm_name.to_s.camelize}::#{strategy_name.to_s.camelize}".constantize
+        module_name = "RoleStrategy::#{orm_name.to_s.camelize}::#{strategy_name.to_s.camelize}"
+        constant = module_name.constantize
 
         strategy_class_method = %Q{
           def strategy_class
@@ -37,7 +38,7 @@ module Roles
           include constant
         end        
       rescue
-        raise "No Role strategy module for ORM #{orm} found for strategy #{strategy_name}"
+        raise "No Role strategy module for ORM #{orm.to_s.camelize} for the strategy #{strategy_name}. Module #{module_name} has not been registered"
       end
       constant.apply_options(options) if constant.respond_to? :apply_options
     end    

data/lib/roles_generic/generic/user/configuration.rb

@@ -7,7 +7,10 @@ module Roles::Generic::User
       class_eval do
         include Roles::Generic::User
         include Roles::Generic::User::SingleRole if numericality == :single
-        include Roles::Generic::Role::InstanceMethods if type == :role_class
+        if type == :role_class
+          include Roles::Generic::Role::InstanceMethods           
+        end
+        
         include self::Implementation
         
         alias_method :role_symbols, :roles

data/lib/roles_generic/strategy/single/admin_flag.rb

@@ -25,16 +25,3 @@ module RoleStrategy::Generic
   end   
 end
 
-module AdminRoleCheck
-  def admin?
-    self.to_s.downcase.to_sym == :admin
-  end
-end  
-
-class String
-  include AdminRoleCheck
-end
-
-class Symbol
-  include AdminRoleCheck
-end

data/lib/roles_generic/strategy.rb

@@ -4,9 +4,17 @@ require 'sugar-high/array'
 module Roles::Strategy
   class << self  
     NON_INLINE_STRATEGIES = [:one_role, :many_roles]
+
+    def role_dir
+      File.dirname(__FILE__)
+    end    
+
+    def gem_name
+      :roles_generic
+    end    
     
     def role_strategies cardinality
-      pattern = File.dirname(__FILE__) + "/strategy/#{cardinality}/*.rb"
+      pattern = role_dir + "/strategy/#{cardinality}/*.rb"
       Dir.glob(pattern).file_names(:rb).to_symbols
     end
 
@@ -30,9 +38,9 @@ end
 def use_roles_strategy strategy
   cardinality = Roles::Strategy.cardinality(strategy)  
   require "roles_generic/strategy/#{cardinality}/#{strategy}"
-  
-  require 'roles_generic/role' if !Roles::Strategy.inline_strategy? strategy  
-  require "roles_generic/strategy/#{cardinality}/#{strategy}"
-end
-
+  require "roles_generic/admin" if strategy =~ /admin/
 
+  gem_name = Roles::Strategy.gem_name
+  require "#{gem_name}/role" if !Roles::Strategy.inline_strategy? strategy  
+  require "#{gem_name}/strategy/#{cardinality}/#{strategy}"
+end

data/roles_generic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{roles_generic}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2010-09-06}
+  s.date = %q{2010-09-11}
   s.description = %q{Generic role strategies sharing the same API. Easy to insert in any model}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
      "VERSION",
      "lib/generators/roles_model/roles/roles_generator.rb",
      "lib/roles_generic.rb",
+     "lib/roles_generic/admin.rb",
      "lib/roles_generic/base.rb",
      "lib/roles_generic/generic.rb",
      "lib/roles_generic/generic/role.rb",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-06 00:00:00 +02:00
+date: 2010-09-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -128,6 +128,7 @@ files:
 - VERSION
 - lib/generators/roles_model/roles/roles_generator.rb
 - lib/roles_generic.rb
+- lib/roles_generic/admin.rb
 - lib/roles_generic/base.rb
 - lib/roles_generic/generic.rb
 - lib/roles_generic/generic/role.rb