roles_active_record 0.3.4 → 0.3.5

data/VERSION

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

data/lib/generators/active_record/roles_migration/templates/add_many_roles_strategy.erb

@@ -4,11 +4,16 @@ class AddManyRolesStrategy < ActiveRecord::Migration
     def up          
       create_roles
       create_user_roles
+      add_index :roles, :name, :unique => true      
+      
+      # insert_roles
     end
 
     def down      
       drop_roles
       drop_user_roles
+      
+      remove_index :roles, :name      
     end
 
     protected
@@ -36,5 +41,14 @@ class AddManyRolesStrategy < ActiveRecord::Migration
     def drop_roles
       drop_table :roles
     end
+    
+    def insert_roles
+      <%- roles_to_add.each do |role| -%>
+        begin
+          Role.create(:name => '<%= role %>')
+        rescue
+        end
+      <%- end -%>
+    end    
   end
 end

data/lib/generators/active_record/roles_migration/templates/add_one_role_strategy.erb

@@ -3,13 +3,16 @@ class AddOneRoleStrategy < ActiveRecord::Migration
 
     def up          
       create_roles
-      add_user_role
-      insert_roles
+      add_user_role      
+      add_index :roles, :name, :unique => true
+      # insert_roles      
     end
 
     def down      
       drop_roles
       remove_user_role
+      
+      remove_index :roles, :name
     end
 
     protected
@@ -29,7 +32,7 @@ class AddOneRoleStrategy < ActiveRecord::Migration
 
     def create_roles
       create_table :roles do |t|
-        t.string  :name
+        t.string  :name, :null => false
         t.timestamps
       end
     end
@@ -40,7 +43,10 @@ class AddOneRoleStrategy < ActiveRecord::Migration
 
     def insert_roles
       <%- roles_to_add.each do |role| -%>
-      Role.create!(:name => '<%= role %>')
+        begin
+          Role.create(:name => '<%= role %>')
+        rescue
+        end
       <%- end -%>
     end
   end

data/lib/generators/active_record/roles_migration/templates/add_role_string_strategy.erb

@@ -1,13 +1,13 @@
 class AddRoleStringStrategy < ActiveRecord::Migration
   def self.up           
     change_table :<%= table_name %> do |t|
-      t.string :role, :default => 'guest'
+      t.string :role_string, :default => 'guest', :null => false
     end
   end
 
   def self.down
     change_table :<%= table_name %> do |t|
-      t.remove :role
+      t.remove :role_string
     end
   end
 end

data/lib/roles_active_record/role.rb

@@ -2,12 +2,13 @@ module Roles::Base
   def valid_roles_are(*role_list)
     strategy_class.valid_roles = role_list.to_symbols
     if role_class_name
-      "Create Roles: #{role_list}"
       role_list.each do |name|
-        role_class_name.create(:name => name.to_s)        
+        begin
+          role_class_name.create(:name => name.to_s) # if !role_class_name.where(:name => name.to_s).first
+        rescue
+          puts "Role name: #{name} is a duplicate"
+        end
       end
-    else
-      "Using Inline roles"
     end
   end
 end

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

@@ -4,6 +4,7 @@ class Role < ActiveRecord::Base
   scope :named, lambda{|role_names| where(:name.in => role_names.flatten)}
   has_many :users, :through => :user_roles
   has_many :user_roles
+  validates :name, :uniqueness => true
 end
 
 class UserRole < ActiveRecord::Base

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

@@ -3,6 +3,7 @@ require 'roles_active_record/strategy/single'
 class Role < ActiveRecord::Base
   scope :named, lambda{|role_names| where(:name.in => role_names.flatten)}
   has_many :users
+  validates :name, :uniqueness => true  
 end
 
 module RoleStrategy::ActiveRecord

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

@@ -20,7 +20,7 @@ module RoleStrategy::ActiveRecord
       end        
       
       def in_any_role(*role_names)
-        where(:role_attribute.in => role_names)
+        where(role_attribute.in => role_names)
       end      
     end
     

data/roles_active_record.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{roles_active_record}
-  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"]
-  s.date = %q{2010-12-17}
+  s.date = %q{2010-12-19}
   s.description = %q{Makes it easy to set a role strategy on your User model in Active Record}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [
@@ -63,14 +63,15 @@ Gem::Specification.new do |s|
     "sandbox/test.rb",
     "spec/db/database.yml",
     "spec/fixtures/many_roles_setup.rb",
+    "spec/fixtures/many_roles_setup_unique_check.rb",
     "spec/fixtures/one_role_setup.rb",
+    "spec/fixtures/one_role_setup_unique_check.rb",
     "spec/generator_spec_helper.rb",
     "spec/migration_spec_helper.rb",
     "spec/migrations/admin_flag/004_add_admin_flag_to_users.rb",
     "spec/migrations/many_roles/002_create_roles.rb",
     "spec/migrations/many_roles/003_create_user_roles.rb",
-    "spec/migrations/one_role/002_create_roles.rb",
-    "spec/migrations/one_role/003_add_role_to_users.rb",
+    "spec/migrations/one_role/002_add_one_role_strategy.rb",
     "spec/migrations/role_string/002_add_role_string_to_users.rb",
     "spec/migrations/roles_mask/005_add_roles_mask_to_users.rb",
     "spec/migrations/users/001_create_users.rb",
@@ -84,9 +85,11 @@ Gem::Specification.new do |s|
     "spec/roles_active_record/strategy/api.rb",
     "spec/roles_active_record/strategy/api_examples.rb",
     "spec/roles_active_record/strategy/multi/many_roles_spec.rb",
+    "spec/roles_active_record/strategy/multi/many_roles_unique_spec.rb",
     "spec/roles_active_record/strategy/multi/roles_mask_spec.rb",
     "spec/roles_active_record/strategy/single/admin_flag_spec.rb",
     "spec/roles_active_record/strategy/single/one_role_spec.rb",
+    "spec/roles_active_record/strategy/single/one_role_unique_spec.rb",
     "spec/roles_active_record/strategy/single/role_string_spec.rb",
     "spec/roles_active_record/strategy/user_setup.rb",
     "spec/spec_helper.rb",
@@ -105,14 +108,15 @@ Gem::Specification.new do |s|
   s.summary = %q{Implementation of Roles generic API for Active Record}
   s.test_files = [
     "spec/fixtures/many_roles_setup.rb",
+    "spec/fixtures/many_roles_setup_unique_check.rb",
     "spec/fixtures/one_role_setup.rb",
+    "spec/fixtures/one_role_setup_unique_check.rb",
     "spec/generator_spec_helper.rb",
     "spec/migration_spec_helper.rb",
     "spec/migrations/admin_flag/004_add_admin_flag_to_users.rb",
     "spec/migrations/many_roles/002_create_roles.rb",
     "spec/migrations/many_roles/003_create_user_roles.rb",
-    "spec/migrations/one_role/002_create_roles.rb",
-    "spec/migrations/one_role/003_add_role_to_users.rb",
+    "spec/migrations/one_role/002_add_one_role_strategy.rb",
     "spec/migrations/role_string/002_add_role_string_to_users.rb",
     "spec/migrations/roles_mask/005_add_roles_mask_to_users.rb",
     "spec/migrations/users/001_create_users.rb",
@@ -126,9 +130,11 @@ Gem::Specification.new do |s|
     "spec/roles_active_record/strategy/api.rb",
     "spec/roles_active_record/strategy/api_examples.rb",
     "spec/roles_active_record/strategy/multi/many_roles_spec.rb",
+    "spec/roles_active_record/strategy/multi/many_roles_unique_spec.rb",
     "spec/roles_active_record/strategy/multi/roles_mask_spec.rb",
     "spec/roles_active_record/strategy/single/admin_flag_spec.rb",
     "spec/roles_active_record/strategy/single/one_role_spec.rb",
+    "spec/roles_active_record/strategy/single/one_role_unique_spec.rb",
     "spec/roles_active_record/strategy/single/role_string_spec.rb",
     "spec/roles_active_record/strategy/user_setup.rb",
     "spec/spec_helper.rb"

data/spec/fixtures/many_roles_setup_unique_check.rb

@@ -0,0 +1,8 @@
+class User < ActiveRecord::Base    
+  include Roles::ActiveRecord
+  
+  strategy :many_roles, :default
+  role_class :role
+
+  valid_roles_are :admin, :guest, :user, :guest
+end

data/spec/fixtures/one_role_setup_unique_check.rb

@@ -0,0 +1,8 @@
+class User < ActiveRecord::Base
+  include Roles::ActiveRecord 
+  
+  strategy :one_role, :default
+  role_class :role
+
+  valid_roles_are :admin, :guest, :user, :guest
+end

data/spec/migrations/one_role/002_add_one_role_strategy.rb

@@ -0,0 +1,52 @@
+class AddOneRoleStrategy < ActiveRecord::Migration
+  class << self
+
+    def up          
+      create_roles
+      add_user_role      
+      add_index :roles, :name, :unique => true
+      # insert_roles      
+    end
+
+    def down      
+      drop_roles
+      remove_user_role
+      
+      remove_index :roles, :name
+    end
+
+    protected
+
+    def add_user_role
+      change_table :users do |t|
+        t.integer :role_id
+      end
+    end
+
+    def remove_user_role
+      change_table :users do |t|
+        t.remove :role_id
+      end
+    end
+
+    def create_roles
+      create_table :roles do |t|
+        t.string  :name, :null => false
+        t.timestamps
+      end
+    end
+
+    def drop_roles
+      drop_table :roles
+    end
+
+    def insert_roles
+      roles_to_add.each do |role|         
+        begin
+          Role.create(:name => "#{role}") # if !Role.where(:name => name.to_s).first
+        rescue
+        end
+      end
+    end
+  end
+end

data/spec/roles_active_record/strategy/api_examples.rb

@@ -209,5 +209,5 @@ describe "Roles for Active Record: #{api_name}" do
       @guest_user.remove_role :admin
       @guest_user.has_role?(:admin).should_not be_true
     end  
-  end  
+  end
 end

data/spec/roles_active_record/strategy/multi/many_roles_spec.rb

@@ -1,13 +1,6 @@
 require 'spec_helper'
 use_roles_strategy :many_roles
 
-class User < ActiveRecord::Base    
-  include Roles::ActiveRecord
-  
-  strategy :many_roles, :default
-  valid_roles_are :admin, :guest, :user   
-end
-
 def api_migrate
   migrate('many_roles')
 end

data/spec/roles_active_record/strategy/multi/many_roles_unique_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+use_roles_strategy :many_roles
+
+def api_migrate
+  migrate('many_roles')
+end
+
+def api_fixture
+  load 'fixtures/many_roles_setup_unique_check.rb'
+end
+
+def api_name
+  :many_roles
+end
+
+describe "Roles for Active Record: #{api_name}" do   
+  require "roles_active_record/strategy/user_setup.rb"
+
+  before do
+    api_fixture
+    default_user_setup    
+  end
+
+  describe '#valid_roles' do
+    context ':guest role twice in list of valid roles' do
+      it 'roles table should not have duplicate role :guest' do  
+        Role.all.map(&:name).select{|n| n == 'guest'}.size.should == 1
+      end
+    end
+  end
+end
+
+
+
+

data/spec/roles_active_record/strategy/single/one_role_spec.rb

@@ -14,6 +14,3 @@ def api_name
 end
 
 load 'roles_active_record/strategy/api_examples.rb'
-
-
-

data/spec/roles_active_record/strategy/single/one_role_unique_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper' 
+use_roles_strategy :one_role
+
+def api_fixture
+  load 'fixtures/one_role_setup_unique_check.rb'
+end
+
+def api_migrate
+  migrate('one_role')
+end
+
+def api_name
+  :one_role
+end
+
+describe "Roles for Active Record: #{api_name}" do   
+  require "roles_active_record/strategy/user_setup.rb"
+
+  before do
+    api_fixture
+    default_user_setup    
+  end
+
+  describe '#valid_roles' do
+    context ':guest role twice in list of valid roles' do
+      it 'roles table should not have duplicate role :guest' do  
+        Role.all.map(&:name).select{|n| n == 'guest'}.size.should == 1
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -68,7 +68,8 @@ RSpec.configure do |config|
 
   config.before(:each) do
     DatabaseCleaner.start
-    migrate('users')  
+    migrate('users')
+    api_migrate      
   end
 
   config.after(:each) do

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
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-17 00:00:00 +01:00
+date: 2010-12-19 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -385,14 +385,15 @@ files:
 - sandbox/test.rb
 - spec/db/database.yml
 - spec/fixtures/many_roles_setup.rb
+- spec/fixtures/many_roles_setup_unique_check.rb
 - spec/fixtures/one_role_setup.rb
+- spec/fixtures/one_role_setup_unique_check.rb
 - spec/generator_spec_helper.rb
 - spec/migration_spec_helper.rb
 - spec/migrations/admin_flag/004_add_admin_flag_to_users.rb
 - spec/migrations/many_roles/002_create_roles.rb
 - spec/migrations/many_roles/003_create_user_roles.rb
-- spec/migrations/one_role/002_create_roles.rb
-- spec/migrations/one_role/003_add_role_to_users.rb
+- spec/migrations/one_role/002_add_one_role_strategy.rb
 - spec/migrations/role_string/002_add_role_string_to_users.rb
 - spec/migrations/roles_mask/005_add_roles_mask_to_users.rb
 - spec/migrations/users/001_create_users.rb
@@ -406,9 +407,11 @@ files:
 - spec/roles_active_record/strategy/api.rb
 - spec/roles_active_record/strategy/api_examples.rb
 - spec/roles_active_record/strategy/multi/many_roles_spec.rb
+- spec/roles_active_record/strategy/multi/many_roles_unique_spec.rb
 - spec/roles_active_record/strategy/multi/roles_mask_spec.rb
 - spec/roles_active_record/strategy/single/admin_flag_spec.rb
 - spec/roles_active_record/strategy/single/one_role_spec.rb
+- spec/roles_active_record/strategy/single/one_role_unique_spec.rb
 - spec/roles_active_record/strategy/single/role_string_spec.rb
 - spec/roles_active_record/strategy/user_setup.rb
 - spec/spec_helper.rb
@@ -454,14 +457,15 @@ specification_version: 3
 summary: Implementation of Roles generic API for Active Record
 test_files: 
 - spec/fixtures/many_roles_setup.rb
+- spec/fixtures/many_roles_setup_unique_check.rb
 - spec/fixtures/one_role_setup.rb
+- spec/fixtures/one_role_setup_unique_check.rb
 - spec/generator_spec_helper.rb
 - spec/migration_spec_helper.rb
 - spec/migrations/admin_flag/004_add_admin_flag_to_users.rb
 - spec/migrations/many_roles/002_create_roles.rb
 - spec/migrations/many_roles/003_create_user_roles.rb
-- spec/migrations/one_role/002_create_roles.rb
-- spec/migrations/one_role/003_add_role_to_users.rb
+- spec/migrations/one_role/002_add_one_role_strategy.rb
 - spec/migrations/role_string/002_add_role_string_to_users.rb
 - spec/migrations/roles_mask/005_add_roles_mask_to_users.rb
 - spec/migrations/users/001_create_users.rb
@@ -475,9 +479,11 @@ test_files:
 - spec/roles_active_record/strategy/api.rb
 - spec/roles_active_record/strategy/api_examples.rb
 - spec/roles_active_record/strategy/multi/many_roles_spec.rb
+- spec/roles_active_record/strategy/multi/many_roles_unique_spec.rb
 - spec/roles_active_record/strategy/multi/roles_mask_spec.rb
 - spec/roles_active_record/strategy/single/admin_flag_spec.rb
 - spec/roles_active_record/strategy/single/one_role_spec.rb
+- spec/roles_active_record/strategy/single/one_role_unique_spec.rb
 - spec/roles_active_record/strategy/single/role_string_spec.rb
 - spec/roles_active_record/strategy/user_setup.rb
 - spec/spec_helper.rb

data/spec/migrations/one_role/002_create_roles.rb

@@ -1,12 +0,0 @@
-class CreateRoles < ActiveRecord::Migration
-  def self.up
-    create_table :roles do |t|
-      t.string  :name
-      t.timestamps
-    end
-  end
-
-  def self.down
-    drop_table :roles
-  end
-end

data/spec/migrations/one_role/003_add_role_to_users.rb

@@ -1,13 +0,0 @@
-class AddRoleToUsers < ActiveRecord::Migration
-  def self.up           
-    change_table :users do |t|
-      t.integer :role_id
-    end
-  end
-
-  def self.down
-    change_table :users do |t|
-      t.remove :role_id
-    end
-  end
-end