roles_generic 0.3.4 → 0.3.5

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.3.5

data/lib/roles_generic/base.rb

@@ -34,7 +34,7 @@ module Roles
       attr_accessor :name
 
       def initialize strategy_name
-        @name = strategy_name.to_s.underscore.to_sym        
+        @name = strategy_name.to_s.underscore.to_sym
       end
 
       def type

data/lib/roles_generic/generic/user.rb

@@ -13,6 +13,12 @@ module Roles::Generic
           attr_accessor(*::Roles::Generic::User::INHERITABLE_CLASS_ATTRIBUTES)
           
           def apply_options options = {}
+            if options.kind_of?(Hash) && options[:attribute]
+              roles_attribute options[:attribute] 
+              return
+            end
+
+            puts "default: #{default_options? options}, att: #{default_role_attribute}"
             roles_attribute default_role_attribute if default_options? options
           end
           
@@ -21,7 +27,7 @@ module Roles::Generic
           def default_options? options
             return true if options == :default                           
             if options.kind_of? Hash
-              return true if options[:config] == :default || options == {} 
+              return true # if options[:config] == :default || options == {} 
             end
             false
           end

data/lib/roles_generic/generic.rb

@@ -50,7 +50,7 @@ module Roles
       def default_options? options = {}
         return true if options == :default                           
         if options.kind_of? Hash
-          return true if options[:config] == :default || options == {} 
+          return true # if options[:config] == :default || options == {} 
         end
         false
       end

data/roles_generic.gemspec

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

data/spec/roles_generic/strategy/single/admin_flag_spec.rb

@@ -4,7 +4,7 @@ class User
 
   attr_accessor :name 
   
-  strategy :admin_flag
+  strategy :admin_flag, :role_class => :role
   valid_roles_are :admin, :user, :guest
   
   def initialize name, *new_roles

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Kristian Mandrup