roles_data_mapper 0.1.2 → 0.1.3

data/README.markdown

@@ -2,10 +2,7 @@
 
 A Data Mapper implementation of [roles generic](http://github.com/kristianmandrup/roles_generic)
 
-## Update!
-
-Now implements the [roles generic](http://github.com/kristianmandrup/roles_generic) Roles API
-It also implements the following Role strategies:
+The following role strategies from Roles Generic are currently supported
 
 * admin_flag
 * many_roles
@@ -25,7 +22,7 @@ This gem is based on Jeweler, so simply:
 
 <code>rake install</code>
 
-## Rails generator
+## Roles Generator
 
 The library comes with a Rails 3 generator that lets you populate a user model with a given role strategy 
 The following role strategies are included by default. Add your own by adding extra files inside the strategy folder, one file for each role strategy is recommended.
@@ -36,7 +33,11 @@ The following role strategies are included by default. Add your own by adding ex
 * roles_mask
 * role_string
 
-*Roles generator*
+### Update Oct 10.
+
+Bugfix: Added dependencies to Rakefile for role generator so they should work out-of-the-box after gem is installed ;)
+
+## Usage examples
 
 Apply :admin_flag Role strategy to User model using default roles :admin and :guest (default)
 

data/Rakefile

@@ -17,6 +17,9 @@ begin
     gem.add_dependency "require_all",       '~> 1.2.0' 
     gem.add_dependency "sugar-high",        '~> 0.2.11'
     gem.add_dependency "roles_generic",     '~> 0.2.7'
+
+    gem.add_dependency 'rails3_artifactor', '>= 0.2.6'
+    gem.add_dependency 'logging_assist',    '>= 0.1.5'
     
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

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

@@ -1,8 +1,6 @@
 require 'rails3_artifactor'
 require 'logging_assist'
 
-puts "Included!"
-
 module DataMapper 
   module Generators
     class RolesGenerator < Rails::Generators::NamedBase      
@@ -15,8 +13,7 @@ module DataMapper
       class_option :roles, :type => :array, :aliases => "-r", :default => [], :desc => "Valid roles"
 
       def apply_role_strategy
-        log.add_logfile
-        log.debug "apply_role_strategy for : #{strategy} in model #{name}"
+        logger.debug "apply_role_strategy for : #{strategy} in model #{name}"
         begin
           insert_into_model name do
             insertion_text

data/roles_data_mapper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{roles_data_mapper}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2010-10-07}
+  s.date = %q{2010-10-11}
   s.description = %q{Makes it easy to set a role strategy on your User model in DataMapper}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [
@@ -43,6 +43,7 @@ Gem::Specification.new do |s|
      "spec/roles_data_mapper/strategy/one_role_spec.rb",
      "spec/roles_data_mapper/strategy/role_string_spec.rb",
      "spec/roles_data_mapper/strategy/roles_mask_spec.rb",
+     "spec/roles_data_mapper/strategy/user_setup.rb",
      "spec/spec_helper.rb",
      "tmp/rails/config/routes.rb"
   ]
@@ -59,6 +60,7 @@ Gem::Specification.new do |s|
      "spec/roles_data_mapper/strategy/one_role_spec.rb",
      "spec/roles_data_mapper/strategy/role_string_spec.rb",
      "spec/roles_data_mapper/strategy/roles_mask_spec.rb",
+     "spec/roles_data_mapper/strategy/user_setup.rb",
      "spec/spec_helper.rb"
   ]
 
@@ -75,6 +77,8 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<require_all>, ["~> 1.2.0"])
       s.add_runtime_dependency(%q<sugar-high>, ["~> 0.2.11"])
       s.add_runtime_dependency(%q<roles_generic>, ["~> 0.2.7"])
+      s.add_runtime_dependency(%q<rails3_artifactor>, [">= 0.2.6"])
+      s.add_runtime_dependency(%q<logging_assist>, [">= 0.1.5"])
     else
       s.add_dependency(%q<rspec>, [">= 2.0.0.rc"])
       s.add_dependency(%q<dm-core>, ["~> 1.0"])
@@ -84,6 +88,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<require_all>, ["~> 1.2.0"])
       s.add_dependency(%q<sugar-high>, ["~> 0.2.11"])
       s.add_dependency(%q<roles_generic>, ["~> 0.2.7"])
+      s.add_dependency(%q<rails3_artifactor>, [">= 0.2.6"])
+      s.add_dependency(%q<logging_assist>, [">= 0.1.5"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 2.0.0.rc"])
@@ -94,6 +100,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<require_all>, ["~> 1.2.0"])
     s.add_dependency(%q<sugar-high>, ["~> 0.2.11"])
     s.add_dependency(%q<roles_generic>, ["~> 0.2.7"])
+    s.add_dependency(%q<rails3_artifactor>, [">= 0.2.6"])
+    s.add_dependency(%q<logging_assist>, [">= 0.1.5"])
   end
 end
 

data/spec/roles_data_mapper/strategy/admin_flag_spec.rb

@@ -16,64 +16,7 @@ DataMapper.auto_migrate!
 
 User.valid_roles_are :admin, :guest  
 
-describe "Roles for Mongoid" do
-  before :each do  
-    
-    @user = User.create(:name => 'Kristian')
-    @user.roles = :guest
-    @user.save     
-
-    @admin_user = User.create(:name => 'Admin user')
-    @admin_user.roles = :admin    
-    @admin_user.save
-    
-    puts "user: #{@user.inspect}"
-    puts "admin: #{@admin_user.inspect}"    
-  end
-
-  describe "Admin flag strategy " do
-
-    describe '#in_role' do
-      it "should return first user maching role" do
-        User.in_role(:guest).first.name.should == 'Kristian'
-        User.in_role(:admin).first.name.should == 'Admin user'
-      end
-    end
-
-    describe 'roles API' do
-      it "should have admin user role to :admin" do
-        @admin_user.role.should == :admin
-        @admin_user.roles.should == [:admin]      
-        @admin_user.admin?.should be_true
-         
-        @admin_user.class.valid_roles.should == [:admin, :guest]
-        
-        @admin_user.has_role?(:guest).should be_false
-        
-        @admin_user.has_role?(:admin).should be_true
-        @admin_user.is?(:admin).should be_true
-        @admin_user.has_roles?(:admin).should be_true
-        @admin_user.has?(:admin).should be_true      
-      end
-
-      it "should have user role to :guest" do
-        @user.roles.should == [:guest]
-        # @user.admin?.should be_false
-      
-        # @user.has_role?(:guest).should be_true    
-        # @user.has_role?(:admin).should be_false
-        # @user.is?(:admin).should be_false
-        # 
-        # @user.has_roles?(:guest).should be_true
-        # @user.has?(:admin).should be_false
-      end
-      
-      it "should set user role to :admin using =" do
-        @user.roles = :admin      
-        @user.role.should == :admin           
-        @user.has_role?(:admin).should be_true      
-      end    
-    end
-  end
+describe "Roles for DataMapper: :admin_flag strategy" do
+  require "roles_data_mapper/user_setup"
+  require "roles_generic/rspec/api"
 end
-

data/spec/roles_data_mapper/strategy/many_roles_spec.rb

@@ -17,60 +17,7 @@ DataMapper.auto_migrate!
 
 User.valid_roles_are :admin, :guest  
 
-describe "Roles for Mongoid" do    
-  context "default setup" do
-
-    before :each do  
-      # DataMapper.finalize
-      # DataMapper.auto_migrate!
-
-      @user = User.create(:name => 'Kristian')
-      @user.add_roles :guest      
-      @user.save     
-
-      @admin_user = User.create(:name => 'Admin user')
-      @admin_user.roles = :admin            
-      @admin_user.save
-    end
-    
-    describe '#in_role' do
-      it "should return first user matching role" do        
-        User.in_roles(:guest).first.name.should == 'Kristian'      
-        User.in_role(:admin).first.name.should == 'Admin user'
-      end
-    end
-
-    describe "Role API" do
-      it "should have admin user role to :admin" do      
-        @admin_user.roles_list.first.should == :admin      
-        @admin_user.admin?.should be_true
-    
-        @admin_user.has_role?(:guest).should be_false
-        
-        @admin_user.has_role?(:admin).should be_true
-        @admin_user.is?(:admin).should be_true
-        @admin_user.has_roles?(:admin).should be_true
-        @admin_user.has?(:admin).should be_true      
-      end
-    
-      it "should have user role to :guest" do
-        @user.roles_list.first.should == :guest
-        @user.admin?.should be_false
-      
-        @user.has_role?(:guest).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.roles_list.first.should == :admin           
-        @user.has_role?(:admin).should be_true      
-      end  
-    end  
-  end
+describe "Roles for DataMapper: :many_roles strategy" do
+  require "roles_data_mapper/user_setup"
+  require "roles_generic/rspec/api"
 end
-

data/spec/roles_data_mapper/strategy/one_role_spec.rb

@@ -17,65 +17,7 @@ DataMapper.auto_migrate!
 
 User.valid_roles_are :admin, :guest  
 
-describe "Roles for Mongoid" do  
-
-  context "default setup" do
-
-    before :each do  
-      # DataMapper.finalize
-      # DataMapper.auto_migrate!
-
-      @user = User.create(:name => 'Kristian')
-      @user.role = :guest      
-      @user.save     
-
-      @admin_user = User.create(:name => 'Admin user')
-      @admin_user.role = :admin            
-      @admin_user.save
-      
-      puts "user: #{@user.inspect}"
-      puts "admin: #{@admin_user.inspect}"
-      puts "role: #{Role.first.inspect}"       
-    end
-    
-    describe '#in_role' do
-      it "should return first user matching role" do        
-        User.in_role(:guest).first.name.should == 'Kristian'      
-        User.in_role(:admin).first.name.should == 'Admin user'
-      end
-    end
-
-    describe "Role API" do
-      it "should have admin user role to :admin" do      
-        @admin_user.roles_list.first.should == :admin      
-        @admin_user.admin?.should be_true
-        
-        @admin_user.has_role?(:guest).should be_false
-        
-        @admin_user.has_role?(:admin).should be_true
-        @admin_user.is?(:admin).should be_true
-        @admin_user.has_roles?(:admin).should be_true
-        @admin_user.has?(:admin).should be_true      
-      end
-    
-      it "should have user role to :guest" do
-        @user.roles_list.first.should == :guest
-        @user.admin?.should be_false
-      
-        @user.has_role?(:guest).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.roles_list.first.should == :admin           
-        @user.has_role?(:admin).should be_true      
-      end  
-    end  
-  end
+describe "Roles for DataMapper: :one_role strategy" do
+  require "roles_data_mapper/user_setup"
+  require "roles_generic/rspec/api"
 end
-

data/spec/roles_data_mapper/strategy/role_string_spec.rb

@@ -16,58 +16,7 @@ DataMapper.auto_migrate!
 
 User.valid_roles_are :admin, :guest
 
-describe "Roles for Mongoid" do  
-  
-  context "default setup" do
-    before :each do  
-
-      @user = User.create(:name => 'Kristian')
-      @user.role = :guest      
-      @user.save     
-
-      @admin_user = User.create(:name => 'Admin user')
-      @admin_user.roles = :admin            
-      @admin_user.save
-    end
-    
-    describe '#in_role' do
-      it "should return first user matching role" do        
-        User.in_role(:guest).first.name.should == 'Kristian'      
-        User.in_role(:admin).first.name.should == 'Admin user'
-      end
-    end
-
-    describe "Role API" do
-      it "should have admin user role to :admin" do      
-        @admin_user.roles_list.first.should == :admin      
-        @admin_user.admin?.should be_true
-        
-        @admin_user.has_role?(:guest).should be_false
-        
-        @admin_user.has_role?(:admin).should be_true
-        @admin_user.is?(:admin).should be_true
-        @admin_user.has_roles?(:admin).should be_true
-        @admin_user.has?(:admin).should be_true      
-      end
-          
-      it "should have user role to :guest" do
-        @user.roles_list.first.should == :guest
-        @user.admin?.should be_false
-      
-        @user.has_role?(:guest).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.roles_list.first.should == :admin           
-        @user.has_role?(:admin).should be_true      
-      end  
-    end  
-  end
+describe "Roles for DataMapper: :role_string strategy" do
+  require "roles_data_mapper/user_setup"
+  require "roles_generic/rspec/api"
 end
-

data/spec/roles_data_mapper/strategy/roles_mask_spec.rb

@@ -16,58 +16,7 @@ DataMapper.auto_migrate!
 
 User.valid_roles_are :admin, :guest   
 
-describe "Roles for Mongoid" do  
-  
-  context "default setup" do
-
-    before :each do  
-      @user = User.create(:name => 'Kristian')
-      @user.role = :guest      
-      @user.save     
-
-      @admin_user = User.create(:name => 'Admin user')
-      @admin_user.roles = :admin            
-      @admin_user.save
-    end
-    
-    describe '#in_role' do
-      it "should return first user matching role" do        
-        User.in_role(:guest).first.name.should == 'Kristian'      
-        User.in_role(:admin).first.name.should == 'Admin user'
-      end
-    end
-
-    describe "Role API" do
-      it "should have admin user role to :admin" do      
-        @admin_user.roles_list.first.should == :admin      
-        @admin_user.admin?.should be_true
-        
-        @admin_user.has_role?(:guest).should be_false
-        
-        @admin_user.has_role?(:admin).should be_true
-        @admin_user.is?(:admin).should be_true
-        @admin_user.has_roles?(:admin).should be_true
-        @admin_user.has?(:admin).should be_true      
-      end
-          
-      it "should have user role to :guest" do
-        @user.roles_list.first.should == :guest
-        @user.admin?.should be_false
-      
-        @user.has_role?(:guest).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.roles_list.first.should == :admin           
-        @user.has_role?(:admin).should be_true      
-      end  
-    end  
-  end
+describe "Roles for DataMapper: :roles_mask strategy" do
+  require "roles_data_mapper/user_setup"
+  require "roles_generic/rspec/api"
 end
-

data/spec/roles_data_mapper/strategy/user_setup.rb

@@ -0,0 +1,13 @@
+def default_user_setup
+  @guest_user = User.create(:name => 'Guest User')
+  @guest_user.add_roles :guest      
+  @guest_user.save     
+
+  @normal_user = User.create(:name => 'Normal User')
+  @normal_user.roles = :guest, :user      
+  @normal_user.save     
+
+  @admin_user = User.create(:name => 'Admin user')
+  @admin_user.roles = :admin            
+  @admin_user.save
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-07 00:00:00 +02:00
+date: 2010-10-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -135,6 +135,36 @@ dependencies:
         version: 0.2.7
   type: :runtime
   version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: rails3_artifactor
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 2
+        - 6
+        version: 0.2.6
+  type: :runtime
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: logging_assist
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        - 5
+        version: 0.1.5
+  type: :runtime
+  version_requirements: *id010
 description: Makes it easy to set a role strategy on your User model in DataMapper
 email: kmandrup@gmail.com
 executables: []
@@ -171,6 +201,7 @@ files:
 - spec/roles_data_mapper/strategy/one_role_spec.rb
 - spec/roles_data_mapper/strategy/role_string_spec.rb
 - spec/roles_data_mapper/strategy/roles_mask_spec.rb
+- spec/roles_data_mapper/strategy/user_setup.rb
 - spec/spec_helper.rb
 - tmp/rails/config/routes.rb
 has_rdoc: true
@@ -213,4 +244,5 @@ test_files:
 - spec/roles_data_mapper/strategy/one_role_spec.rb
 - spec/roles_data_mapper/strategy/role_string_spec.rb
 - spec/roles_data_mapper/strategy/roles_mask_spec.rb
+- spec/roles_data_mapper/strategy/user_setup.rb
 - spec/spec_helper.rb