roles_generic 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

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

@@ -1,5 +1,8 @@
 module Roles::Generic::User
   module Implementation
+    def role_attribute
+      strategy_class.roles_attribute_name
+    end       
 
     # check if a given role has been assigned 
     # if a list of roles: check if ALL of the given roles have been assigned 

data/lib/roles_generic/strategy/multi/many_roles.rb

@@ -1,17 +1,10 @@
-require 'set'
-require 'roles_generic/role'
-
 module RoleStrategy::Generic
   module ManyRoles
     def self.default_role_attribute
       :many_roles
     end
 
-    module Implementation
-      def role_attribute
-        strategy_class.roles_attribute_name
-      end       
-      
+    module Implementation      
       # assign roles
       def roles=(*roles)  
         raise "Role class #{role_class} does not have a #find_role(role) method" if !role_class.respond_to? :find_role

data/lib/roles_generic/strategy/multi/role_strings.rb

@@ -1,21 +1,19 @@
-require 'set'
-
 module RoleStrategy::Generic
   module RoleStrings    
     def self.default_role_attribute
       :role_strings
     end    
     
-    module Implementation
+    module Implementation      
       # assign roles
       def roles=(*roles)
         new_roles = roles.flatten.map{|r| r.to_s if valid_role?(r)}.compact
-        self.send("#{strategy_class.roles_attribute_name}=", ::Set.new(new_roles)) if new_roles && new_roles.not.empty?
+        self.send("#{role_attribute}=", ::Set.new(new_roles)) if new_roles && new_roles.not.empty?
       end
 
       # query assigned roles
       def roles
-        self.send(strategy_class.roles_attribute_name).map{|r| r.to_sym}
+        self.send(role_attribute).map{|r| r.to_sym}
       end
       
       def roles_list     

data/lib/roles_generic/strategy/multi/roles_mask.rb

@@ -1,5 +1,3 @@
-require 'set'
-
 module RoleStrategy::Generic
   module RolesMask
     def self.default_role_attribute
@@ -23,12 +21,13 @@ module RoleStrategy::Generic
 
       # assign roles
       def roles=(*roles)
-        self.send("#{strategy_class.roles_attribute_name}=", (roles.flatten.map { |r| r.to_sym } & strategy_class.valid_roles).map { |r| calc_index(r) }.inject { |sum, bitvalue| sum + bitvalue })
+        self.send("#{role_attribute}=", (roles.flatten.map { |r| r.to_sym } & strategy_class.valid_roles).map { |r| calc_index(r) }.inject { |sum, bitvalue| sum + bitvalue })
       end
+      alias_method :role=, :roles=
 
       # query assigned roles
       def roles
-        strategy_class::Roles.new(self, strategy_class.valid_roles.reject { |r| ((self.send(strategy_class.roles_attribute_name) || 0) & calc_index(r)).zero? })
+        strategy_class::Roles.new(self, strategy_class.valid_roles.reject { |r| ((self.send(role_attribute) || 0) & calc_index(r)).zero? })
       end
 
       def roles_list

data/lib/roles_generic/strategy/multi/roles_string.rb

@@ -4,16 +4,17 @@ module RoleStrategy::Generic
       :roles_string
     end
 
-    module Implementation     
+    module Implementation           
       # assign roles
       def roles=(*roles)
         roles_str = roles.flatten.map{|r| r.to_s if valid_role?(r)}.compact.uniq.join(',')
-        self.send("#{strategy_class.roles_attribute_name}=", roles_str) if roles_str && roles_str.not.empty?
-      end
+        self.send("#{role_attribute}=", roles_str) if roles_str && roles_str.not.empty?
+      end 
+      alias_method :role=, :roles=
 
       # query assigned roles
       def roles
-        self.send(strategy_class.roles_attribute_name).split(',').uniq.map{|r| r.to_sym}
+        self.send(role_attribute).split(',').uniq.map{|r| r.to_sym}
       end
       alias_method :roles_list, :roles
     end

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

@@ -4,11 +4,7 @@ module RoleStrategy::Generic
       :admin_flag
     end
 
-    module Implementation
-      def role_attribute
-        strategy_class.roles_attribute_name
-      end 
-        
+    module Implementation        
       # assign roles
       def roles=(*new_roles)                                 
         first_role = new_roles.flatten.first

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

@@ -1,13 +1,10 @@
-require 'set'
-require 'roles_generic/role'
-
 module RoleStrategy::Generic
   module OneRole
     def self.default_role_attribute
       :one_role
     end
 
-    module Implementation
+    module Implementation       
       # assign roles
       def roles=(*roles)      
         raise "Role class #{role_class} does not have a #find_role(role) method" if !role_class.respond_to? :find_role
@@ -15,14 +12,13 @@ module RoleStrategy::Generic
         first_role = roles.flatten.first
         role_relation = role_class.find_role(first_role)
         if role_relation && role_relation.kind_of?(role_class)
-          self.send("#{strategy_class.roles_attribute_name}=", role_relation)
+          self.send("#{role_attribute}=", role_relation)
         end        
       end
       
       # query assigned roles
       def roles
-        role = self.send(strategy_class.roles_attribute_name).name.to_sym
-        [role]
+        [self.send(role_attribute).name.to_sym]
       end
       
       def roles_list

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

@@ -1,24 +1,22 @@
-require 'set'
-
 module RoleStrategy::Generic
   module RoleString    
     def self.default_role_attribute
       :role_string
     end
     
-    module Implementation             
+    module Implementation
       # assign roles
       def roles=(*roles)
         first_role = roles.flatten.first.to_s                                    
         if valid_role? first_role
-          self.send("#{strategy_class.roles_attribute_name}=", first_role) 
+          self.send("#{role_attribute}=", first_role) 
         end
       end
+      alias_method :role=, :roles=
 
       # query assigned roles
       def roles
-        role = self.send(strategy_class.roles_attribute_name)
-        [role.to_sym]
+        [self.send(role_attribute).to_sym]
       end
       alias_method :roles_list, :roles
     end

data/lib/roles_generic/strategy.rb

@@ -2,25 +2,37 @@ require 'sugar-high/file'
 require 'sugar-high/array'
 
 module Roles::Strategy
-  def self.role_strategies cardinality
-    pattern = File.dirname(__FILE__) + "/strategy/#{cardinality}/*.rb"
-    Dir.glob(pattern).file_names(:rb).to_symbols
-  end
+  class << self  
+    NON_INLINE_STRATEGIES = [:one_role, :many_roles]
+    
+    def role_strategies cardinality
+      pattern = File.dirname(__FILE__) + "/strategy/#{cardinality}/*.rb"
+      Dir.glob(pattern).file_names(:rb).to_symbols
+    end
 
-  def self.has_strategy? cardinality, strategy
-    role_strategies(cardinality).include?(strategy)
-  end
+    def has_strategy? cardinality, strategy
+      role_strategies(cardinality).include?(strategy)
+    end
+
+    def inline_strategy? strategy
+      !NON_INLINE_STRATEGIES.include? strategy.to_sym      
+    end
   
-  def self.cardinality strategy
-    [:single, :multi].each do |cardinality|             
-      return cardinality if has_strategy?(cardinality, strategy)
+    def cardinality strategy
+      [:single, :multi].each do |cardinality|             
+        return cardinality if has_strategy?(cardinality, strategy)
+      end
+      raise ArgumentError, "Strategy #{strategy}  is not registered as either a single or multi cardinality role strategy"
     end
-    raise ArgumentError, "Strategy #{strategy}  is not registered as either a single or multi cardinality role strategy"
   end
 end           
 
 def use_roles_strategy strategy
-  cardinality = Roles::Strategy.cardinality(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
 
+

data/lib/roles_generic.rb

@@ -1,7 +1,7 @@
 require 'require_all'
 require 'active_support/inflector'
 require 'sugar-high/not'
-
+require 'set'
 require 'roles_generic/namespaces'
 require 'roles_generic/base'
 require 'roles_generic/generic'

data/roles_generic.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{roles_generic}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Kristian Mandrup