roles_generic 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/generators/roles_model/roles/roles_generator.rb

@@ -31,36 +31,40 @@ module RolesModel
       
       protected                  
 
-      def strategy
-        options[:strategy]
-      end
-
       def orm
         @orm ||= options[:orm].to_s.to_sym        
       end
 
+      def default_roles
+        [:admin, :guest]        
+      end
+
+      def roles_to_add
+        default_roles.concat(options[:roles]).compact.uniq
+      end
+
       def roles
-        @roles ||= options[:roles].map{|r| ":#{r}" }
+        @roles ||= roles_to_add.map{|r| ":#{r}" }
       end
 
       def role_strategy_statement 
-        "role_strategy :#{strategy}\n"
+        "strategy :#{strategy}\n"
       end
 
       def roles_statement
-        roles ? "roles #{roles.join(',')}" : ''
+        roles ? "valid_roles #{roles.join(',')}" : ''
       end
 
       def insertion_text
         %Q{  
-  include Roles::Generic 
+  include Roles::#{orm.to_s.camelize} 
   #{role_strategy_statement}
   #{roles_statement}
 }
       end
 
-      def role_strategy
-        options[:role_strategy]                
+      def strategy
+        options[:strategy]                
       end
     end
   end

data/lib/roles_generic/base.rb

@@ -2,6 +2,10 @@ module Roles
   module Base
     attr_accessor :orm_name
 
+    def valid_roles_are(*role_list)
+      strategy_class.valid_roles = role_list.to_symbols
+    end
+
     def valid_roles
       strategy_class.valid_roles
     end

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

@@ -25,7 +25,8 @@ module Roles::Generic::User
     #   roles(['role_1', ..., 'role_n'])
     #
     # declare valid roles
-    def roles(*roles)
+    def roles(*roles) 
+      puts "role_class: #{role_class_name}"
       self.valid_roles = Array[*roles].flatten.map { |r| r.to_sym }
     end
   end

data/lib/roles_generic/generic.rb

@@ -3,10 +3,29 @@ require_all File.dirname(__FILE__) + '/generic'
 module Roles
   module Generic  
     def self.included(base) 
-      base.extend Roles::Base       
-      base.orm_name = :generic    
+      base.extend Roles::Base
+      base.extend ClassMethods
+      base.orm_name = :generic
+    end
+
+    module ClassMethods
+      
+      MAP = {
+        :admin_flag   => "attr_accessor :admin_flag",
+        :many_roles   => "attr_accessor :many_roles",
+        :one_role     => "attr_accessor :one_role",
+        :roles_mask   => "attr_accessor :roles_mask",
+        :role_string  => "attr_accessor :role_string",
+        :role_strings => "attr_accessor :role_strings",
+        :roles_string => "attr_accessor :roles_string"
+      }
+      
+      def strategy name, options=nil
+        if options == :default && MAP[name]
+          instance_eval MAP[name] 
+        end
+        role_strategy name, options
+      end    
     end
   end
 end
-
-

data/lib/roles_generic/namespaces.rb

@@ -8,6 +8,5 @@ module Roles
 end   
 
 module RoleStrategy
-  module Generic
-  end
+  modules :generic
 end

data/{spec/model → lib/roles_generic}/role.rb

@@ -1,8 +1,21 @@
+module Roles::Base
+  def valid_roles_are(*role_list)
+    strategy_class.valid_roles = role_list.to_symbols
+    if role_class_name
+      role_list.each do |name| 
+        role_class_name.new(name)
+      end
+    end
+  end
+end
+
 class Role
   attr_accessor :name
   
   def self.find_role role_name    
-    roles.to_a.select{|r| r.name == role_name}.first
+    roles.to_a.select do |r| 
+      r.name == role_name
+    end.first
   end  
 
   def self.find_roles *role_names

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

@@ -1,4 +1,5 @@
 require 'set'
+require 'roles_generic/role'
 
 module RoleStrategy::Generic
   module ManyRoles
@@ -7,20 +8,23 @@ module RoleStrategy::Generic
     end
 
     module Implementation
+      def role_attribute
+        strategy_class.roles_attribute_name
+      end       
+      
       # 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
 
         role_relations = role_class.find_roles(*roles)
-
-        role_relations.each do |role_relation|        
-          self.send("#{strategy_class.roles_attribute_name}=", role_relation) if role_relation.kind_of?(role_class)
+        role_relations.each do |role_relation| 
+          self.send("#{role_attribute}=", role_relation) if role_relation.kind_of?(role_class)
         end      
       end
 
       # query assigned roles
       def roles
-        self.send(strategy_class.roles_attribute_name)
+        self.send(role_attribute)
       end
 
       def roles_list     

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

@@ -4,23 +4,27 @@ module RoleStrategy::Generic
       :admin_flag
     end
 
-    module Implementation  
+    module Implementation
+      def role_attribute
+        strategy_class.roles_attribute_name
+      end 
+        
       # assign roles
       def roles=(*new_roles)                                 
         first_role = new_roles.flatten.first
-        self.send("#{strategy_class.roles_attribute_name}=", new_roles.flatten.first.admin?) if valid_role? first_role
+        self.send("#{role_attribute}=", new_roles.flatten.first.admin?) if valid_role? first_role
       end
 
       # query assigned roles
       def roles
-        role = self.send(strategy_class.roles_attribute_name) ? strategy_class.admin_role_key : strategy_class.default_role_key
+        role = self.send(role_attribute) ? strategy_class.admin_role_key : strategy_class.default_role_key
         [role]
       end
       alias_method :roles_list, :roles
 
     end # Implementation
     
-    extend extend Roles::Generic::User::Configuration
+    extend Roles::Generic::User::Configuration
     configure :num => :single
   end   
 end

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

@@ -1,4 +1,5 @@
 require 'set'
+require 'roles_generic/role'
 
 module RoleStrategy::Generic
   module OneRole

data/roles_generic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{roles_generic}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2010-09-04}
+  s.date = %q{2010-09-06}
   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 = [
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
      "lib/roles_generic/generic/user/configuration.rb",
      "lib/roles_generic/generic/user/implementation.rb",
      "lib/roles_generic/namespaces.rb",
+     "lib/roles_generic/role.rb",
      "lib/roles_generic/strategy.rb",
      "lib/roles_generic/strategy/multi/many_roles.rb",
      "lib/roles_generic/strategy/multi/role_strings.rb",
@@ -51,7 +52,6 @@ Gem::Specification.new do |s|
      "spec/generators/role_strings_generator_spec.rb",
      "spec/generators/roles_mask_generator_spec.rb",
      "spec/generators/roles_string_generator_spec.rb",
-     "spec/model/role.rb",
      "spec/roles_generic/admin_flag_spec.rb",
      "spec/roles_generic/many_roles_spec.rb",
      "spec/roles_generic/one_role_spec.rb",
@@ -82,7 +82,6 @@ Gem::Specification.new do |s|
      "spec/generators/role_strings_generator_spec.rb",
      "spec/generators/roles_mask_generator_spec.rb",
      "spec/generators/roles_string_generator_spec.rb",
-     "spec/model/role.rb",
      "spec/roles_generic/admin_flag_spec.rb",
      "spec/roles_generic/many_roles_spec.rb",
      "spec/roles_generic/one_role_spec.rb",

data/spec/roles_generic/admin_flag_spec.rb

@@ -4,11 +4,11 @@ use_roles_strategy :admin_flag
 class User
   include Roles::Generic 
 
-  attr_accessor :name, :admin_flag 
+  attr_accessor :name 
   
-  role_strategy :admin_flag, :default
+  strategy :admin_flag, :default
   
-  roles :admin, :user
+  valid_roles_are :admin, :user
   
   def initialize name, *new_roles
     self.name = name

data/spec/roles_generic/many_roles_spec.rb

@@ -1,35 +1,30 @@
 require 'spec_helper'
 use_roles_strategy :many_roles
 
-require 'model/role'
-
 class User
   include Roles::Generic 
-  role_strategy :many_roles, :default
+  strategy :many_roles, :default
 
   role_class :role   
     
-  attr_accessor :name, :many_roles
+  attr_accessor :name
 
-  roles :admin, :user 
+  valid_roles_are :admin, :user 
   
   def initialize name, *new_roles
     self.name = name
     self.roles = new_roles
   end 
-end
+end  
 
 
 describe "Generic ManyRoles role strategy" do
   context "default setup" do
 
-    before :each do          
-      Role.new :user
-      Role.new :admin    
-    
+    before :each do    
       @admin_user = User.new 'Admin user', :admin
-      @user = User.new 'User', :user
-    end
+      @user = User.new 'User', :user      
+    end 
 
     it "should have admin user role to :admin" do      
       @admin_user.roles_list.first.should == :admin      

data/spec/roles_generic/one_role_spec.rb

@@ -1,17 +1,15 @@
 require 'spec_helper'
 use_roles_strategy :one_role
 
-require 'model/role'
-
 class User
   include Roles::Generic 
-  role_strategy :one_role, :default
+  strategy :one_role, :default
 
   role_class :role   
     
-  attr_accessor :name, :one_role
+  attr_accessor :name
 
-  roles :admin, :user 
+  valid_roles_are :admin, :user 
   
   def initialize name, *new_roles
     self.name = name
@@ -23,10 +21,7 @@ end
 describe "Generic OneRole role strategy" do
   context "default setup" do
   
-    before :each do
-      Role.new :user
-      Role.new :admin    
-    
+    before :each do    
       @admin_user = User.new 'Admin user', :admin
       @user = User.new 'User', :user
     end
@@ -44,28 +39,28 @@ describe "Generic OneRole role strategy" do
       @admin_user.has?(:admin).should be_true      
     end
 
-    # it "should have user role to :user" do
-    #   @user.roles.should == [:user]
-    #   @user.admin?.should be_false
-    #   
-    #   @user.has_role?(:user).should be_true    
-    #   @user.has_role?(:admin).should be_false
-    #   @user.is?(:admin).should be_false
-    #   
-    #   @user.has_roles?(:admin).should be_false
-    #   @user.has?(:admin).should be_false
-    # end
-    #   
-    # it "should set user role to :admin using roles=" do
-    #   @user.roles = :admin      
-    #   @user.role.should == :admin           
-    #   @user.has_role?(:admin).should be_true      
-    # end
-    #   
-    # it "should set user role to :admin using role=" do
-    #   @user.roles = :admin      
-    #   @user.role.should == :admin
-    #   @user.has_role?(:admin).should be_true      
-    # end
+    it "should have user role to :user" do
+      @user.roles.should == [:user]
+      @user.admin?.should be_false
+      
+      @user.has_role?(:user).should be_true    
+      @user.has_role?(:admin).should be_false
+      @user.is?(:admin).should be_false
+      
+      @user.has_roles?(:admin).should be_false
+      @user.has?(:admin).should be_false
+    end
+      
+    it "should set user role to :admin using roles=" do
+      @user.roles = :admin      
+      @user.role.should == :admin           
+      @user.has_role?(:admin).should be_true      
+    end
+      
+    it "should set user role to :admin using role=" do
+      @user.roles = :admin      
+      @user.role.should == :admin
+      @user.has_role?(:admin).should be_true      
+    end
   end
 end

data/spec/roles_generic/role_string_spec.rb

@@ -4,9 +4,9 @@ use_roles_strategy :role_string
 class User
   include Roles::Generic 
 
-  attr_accessor :name, :role_string
+  attr_accessor :name
    
-  role_strategy :role_string, :default
+  strategy :role_string, :default
 
   roles :admin, :user
   

data/spec/roles_generic/role_strings_spec.rb

@@ -4,11 +4,11 @@ use_roles_strategy :role_strings
 class User
   include Roles::Generic 
    
-  attr_accessor :name, :role_strings
+  attr_accessor :name
    
-  role_strategy :role_strings, :default
+  strategy :role_strings, :default
 
-  roles :admin, :user
+  valid_roles_are :admin, :user
   
   def initialize name, *new_roles
     self.name = name

data/spec/roles_generic/roles_mask_spec.rb

@@ -4,11 +4,11 @@ use_roles_strategy :roles_mask
 class User
   include Roles::Generic 
 
-  attr_accessor :name, :roles_mask
+  attr_accessor :name
    
-  role_strategy :roles_mask, :default
+  strategy :roles_mask, :default
 
-  roles :admin, :user
+  valid_roles_are :admin, :user
   
   def initialize name, *new_roles
     self.name = name

data/spec/roles_generic/roles_string_spec.rb

@@ -4,11 +4,11 @@ use_roles_strategy :roles_string
 class User
   include Roles::Generic 
    
-  attr_accessor :name, :roles_string
+  attr_accessor :name
    
-  role_strategy :roles_string, :default
+  strategy :roles_string, :default
 
-  roles :admin, :user
+  valid_roles_are :admin, :user
   
   def initialize name, *new_roles
     self.name = name

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-04 00:00:00 +02:00
+date: 2010-09-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -136,6 +136,7 @@ files:
 - lib/roles_generic/generic/user/configuration.rb
 - lib/roles_generic/generic/user/implementation.rb
 - lib/roles_generic/namespaces.rb
+- lib/roles_generic/role.rb
 - lib/roles_generic/strategy.rb
 - lib/roles_generic/strategy/multi/many_roles.rb
 - lib/roles_generic/strategy/multi/role_strings.rb
@@ -153,7 +154,6 @@ files:
 - spec/generators/role_strings_generator_spec.rb
 - spec/generators/roles_mask_generator_spec.rb
 - spec/generators/roles_string_generator_spec.rb
-- spec/model/role.rb
 - spec/roles_generic/admin_flag_spec.rb
 - spec/roles_generic/many_roles_spec.rb
 - spec/roles_generic/one_role_spec.rb
@@ -210,7 +210,6 @@ test_files:
 - spec/generators/role_strings_generator_spec.rb
 - spec/generators/roles_mask_generator_spec.rb
 - spec/generators/roles_string_generator_spec.rb
-- spec/model/role.rb
 - spec/roles_generic/admin_flag_spec.rb
 - spec/roles_generic/many_roles_spec.rb
 - spec/roles_generic/one_role_spec.rb