roles_active_record 0.3.2 → 0.3.3

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

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

@@ -11,7 +11,6 @@ module ActiveRecord
       class_option :strategy, :type => :string, :aliases => "-s", :default => 'role_string', 
                    :desc => "Role strategy to use (admin_flag, role_string, roles_string, role_strings, one_role, many_roles, roles_mask)"
 
-
       class_option :roles, :type => :array, :aliases => "-r", :default => [], :desc => "Valid roles"
       class_option :default_roles, :type => :boolean, :default => true, :desc => "Use default roles :admin and :base"
       class_option :logfile, :type => :string,   :default => nil,   :desc => "Logfile location"
@@ -72,11 +71,11 @@ module ActiveRecord
       end
 
       def role_class_stmt
-        "  role_class :role" if [:one_role, :many_roles].include? (strategy.to_sym)
+        "  role_class :role" if [:one_role, :many_roles].include?(strategy.to_sym)
       end
     
       def insertion_text
-        %Q{include Roles::#{orm.to_s.camelize} 
+        %Q{include Roles::#{orm.to_s.camelize}
   #{role_strategy_statement}
   #{roles_statement}}
       end

data/lib/generators/active_record/roles_migration/roles_migration_generator.rb

@@ -13,6 +13,8 @@ module ActiveRecord
       class_option :strategy, :type => :string, :aliases => "-s", :default => 'inline_role', 
                    :desc => "Role strategy to use (admin_flag, role_string, one_role, many_roles, roles_mask)"
 
+      class_option :roles, :type => :array, :aliases => "-r", :default => [], :desc => "Valid roles"
+      class_option :default_roles, :type => :boolean, :default => true, :desc => "Use default roles :admin and :base"
       class_option :logfile, :type => :string,   :default => nil,   :desc => "Logfile location"
       class_option :reverse, :type => :boolean, :alias => "-r", :default => false, :desc => "Create a remove migration for reversing a strategy"
 
@@ -35,17 +37,29 @@ module ActiveRecord
         end
       end
 
+      def default_roles
+        options[:default_roles] ? [:admin, :guest] : []
+      end
+
+      def roles_to_add
+        @roles_to_add ||= default_roles.concat(options[:roles]).to_symbols.uniq
+      end
+
       def run_migration            
         logger.debug "Create migration for role_strategy: #{strategy}"
         migration_name = "add_#{strategy}_strategy"
         target_migration_name = reverse? ? reverse_migration_name(migration_name) : migration_name
-        migration_template "#{migration_name}.erb", "db/migrations/#{target_migration_name}" 
+        migration_template "#{migration_name}.erb", "db/migrate/#{target_migration_name}" 
         generated_migration = latest_migration_file(migration_dir, target_migration_name)
         reverse_migration!(generated_migration) if generated_migration && reverse?
-      end   
+      end
 
       include Rails3::Assist::BasicLogger
 
+      def logfile
+        options[:logfile]
+      end
+
       def strategies
         [:admin_flag, :role_string, :one_role, :many_roles, :roles_mask]          
       end

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

@@ -4,6 +4,7 @@ class AddOneRoleStrategy < ActiveRecord::Migration
     def up          
       create_roles
       add_user_role
+      insert_roles
     end
 
     def down      
@@ -36,5 +37,11 @@ class AddOneRoleStrategy < ActiveRecord::Migration
     def drop_roles
       drop_table :roles
     end
+
+    def insert_roles
+      <%- roles_to_add.each do |role| -%>
+      Role.create!(:name => '<%= role %>')
+      <%- end -%>
+    end
   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.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2010-12-01}
+  s.date = %q{2010-12-17}
   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 = [

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-01 00:00:00 +01:00
+date: 2010-12-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency