roles_active_record 0.3.5 → 0.3.6

data/VERSION

@@ -1 +1 @@
-0.3.5
+0.3.6

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

@@ -6,7 +6,7 @@ class AddManyRolesStrategy < ActiveRecord::Migration
       create_user_roles
       add_index :roles, :name, :unique => true      
       
-      # insert_roles
+      insert_roles
     end
 
     def down      

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

@@ -5,7 +5,7 @@ class AddOneRoleStrategy < ActiveRecord::Migration
       create_roles
       add_user_role      
       add_index :roles, :name, :unique => true
-      # insert_roles      
+      insert_roles      
     end
 
     def down      

data/roles_active_record.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{roles_active_record}
-  s.version = "0.3.5"
+  s.version = "0.3.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2010-12-19}
+  s.date = %q{2010-12-20}
   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 = [
@@ -68,12 +68,11 @@ Gem::Specification.new do |s|
     "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/admin_flag/002_add_admin_flag_strategy.rb",
+    "spec/migrations/many_roles/002_add_many_roles_strategy.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/role_string/002_add_role_string_strategy.rb",
+    "spec/migrations/roles_mask/002_add_roles_mask_strategy.rb",
     "spec/migrations/users/001_create_users.rb",
     "spec/roles_active_record/generators/roles_generator_spec.rb",
     "spec/roles_active_record/generators/roles_migration/admin_flag_spec.rb",
@@ -113,12 +112,11 @@ Gem::Specification.new do |s|
     "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/admin_flag/002_add_admin_flag_strategy.rb",
+    "spec/migrations/many_roles/002_add_many_roles_strategy.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/role_string/002_add_role_string_strategy.rb",
+    "spec/migrations/roles_mask/002_add_roles_mask_strategy.rb",
     "spec/migrations/users/001_create_users.rb",
     "spec/roles_active_record/generators/roles_generator_spec.rb",
     "spec/roles_active_record/generators/roles_migration/admin_flag_spec.rb",

data/spec/migrations/admin_flag/{004_add_admin_flag_to_users.rb → 002_add_admin_flag_strategy.rb}

@@ -1,15 +1,13 @@
-class AddAdminFlagToUsers < ActiveRecord::Migration
+class AddAdminFlagStrategy < ActiveRecord::Migration
   def self.up           
     change_table :users do |t|
       t.boolean :admin_flag, :default => false
     end
-    # add_column :users, :admin_flag, :boolean, :default => false    
   end
 
   def self.down
     change_table :users do |t|
       t.remove :admin_flag
     end
-    # remove_column :users, :admin_flag
   end
 end

data/spec/migrations/many_roles/002_add_many_roles_strategy.rb

@@ -0,0 +1,54 @@
+class AddManyRolesStrategy < ActiveRecord::Migration
+  class << self
+
+    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
+
+    def create_user_roles
+      create_table :user_roles do |t|
+        t.integer :user_id
+        t.integer :role_id
+        t.timestamps
+      end
+    end
+
+    def drop_user_roles
+      drop_table :user_roles
+    end
+
+
+    def create_roles
+      create_table :roles do |t|
+        t.string  :name
+        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}")
+        rescue
+        end
+      end
+    end    
+  end
+end

data/spec/migrations/role_string/{002_add_role_string_to_users.rb → 002_add_role_string_strategy.rb}

@@ -1,4 +1,4 @@
-class AddRoleStringToUsers < ActiveRecord::Migration
+class AddRoleStringStrategy < ActiveRecord::Migration
   def self.up           
     change_table :users do |t|
       t.string :role_string, :default => 'guest'

data/spec/migrations/roles_mask/{005_add_roles_mask_to_users.rb → 002_add_roles_mask_strategy.rb}

@@ -1,4 +1,4 @@
-class AddRolesMaskToUsers < ActiveRecord::Migration
+class AddRolesMaskStrategy < ActiveRecord::Migration
   def self.up           
     change_table :users do |t|
       t.integer :roles_mask, :default => 0

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 5
-  version: 0.3.5
+  - 6
+  version: 0.3.6
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-19 00:00:00 +01:00
+date: 2010-12-20 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -390,12 +390,11 @@ files:
 - 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/admin_flag/002_add_admin_flag_strategy.rb
+- spec/migrations/many_roles/002_add_many_roles_strategy.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/role_string/002_add_role_string_strategy.rb
+- spec/migrations/roles_mask/002_add_roles_mask_strategy.rb
 - spec/migrations/users/001_create_users.rb
 - spec/roles_active_record/generators/roles_generator_spec.rb
 - spec/roles_active_record/generators/roles_migration/admin_flag_spec.rb
@@ -462,12 +461,11 @@ test_files:
 - 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/admin_flag/002_add_admin_flag_strategy.rb
+- spec/migrations/many_roles/002_add_many_roles_strategy.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/role_string/002_add_role_string_strategy.rb
+- spec/migrations/roles_mask/002_add_roles_mask_strategy.rb
 - spec/migrations/users/001_create_users.rb
 - spec/roles_active_record/generators/roles_generator_spec.rb
 - spec/roles_active_record/generators/roles_migration/admin_flag_spec.rb

data/spec/migrations/many_roles/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/many_roles/003_create_user_roles.rb

@@ -1,13 +0,0 @@
-class CreateUserRoles < ActiveRecord::Migration
-  def self.up
-    create_table :user_roles do |t|
-      t.integer :user_id
-      t.integer :role_id
-      t.timestamps
-    end
-  end
-
-  def self.down
-    drop_table :user_roles
-  end
-end