roles_active_record 0.4.5 → 0.4.6

data/Gemfile

@@ -9,7 +9,7 @@ gem "require_all",        '~> 1.2.0'
 gem "roles_generic",      '~> 0.3.2'  
 
 gem 'rails3_artifactor',  '>= 0.3.1'
-gem 'logging_assist',     '>= 0.1.6'
+gem 'logging_assist',     '>= 0.2.0'
 
 group :test do
   gem "rspec",            ">= 2.0.1" 

data/Rakefile

@@ -20,7 +20,7 @@ begin
     gem.add_dependency "roles_generic",   '>= 0.3.2'  
     
     gem.add_dependency 'rails3_artifactor', '>= 0.3.1'
-    gem.add_dependency 'logging_assist',    '>= 0.1.6'
+    gem.add_dependency 'logging_assist',    '>= 0.2.0'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.4.5
+0.4.6

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

@@ -26,25 +26,25 @@ module ActiveRecord
         logger.debug "apply_role_strategy for : #{strategy} in model #{user_class}"
 
         if !valid_strategy?
-          say "Strategy '#{strategy}' is not valid, at least not for Active Record", :red
+          logger.error "Strategy '#{strategy}' is not valid, at least not for Active Record"
           return 
         end
 
-        if !has_model? user_class                
-          say "Could not apply roles strategy to #{user_class} model since the model file was not found", :red
+        if !has_model? user_file                
+          logger.error "Could not apply roles strategy to #{user_class} model since the model file was not found"
           return 
         end
 
         begin                    
           logger.debug "Trying to insert roles code into #{user_class}"
-          insert_into_model name.as_filename do
+          insert_into_model user_file do
             insertion_text
           end
       
           copy_role_models if roles_model_strategy?
         rescue
           # logger.debug "Error applying roles strategy to #{name}"
-          say "Error applying roles strategy to #{user_class}"
+          logger.error "Error applying roles strategy to #{user_class}"
         end
       end 
             
@@ -56,6 +56,18 @@ module ActiveRecord
       
       include Rails3::Assist::BasicLogger
 
+      def user_file
+        user_class.as_filename
+      end
+
+      def role_file
+        role_class.as_filename
+      end
+
+      def user_role_file
+        role_class.as_filename
+      end
+
       def copy_role_models
         logger.debug 'copy_role_models'
         case strategy.to_sym  
@@ -67,16 +79,15 @@ module ActiveRecord
       end
 
       def copy_one_role_model
-        logger.debug "copy_one_role_model: #{role_class.underscore}"
-
-        template 'one_role/role.rb', "app/models/#{role_class.underscore}.rb"
+        logger.debug "copying role model for one_role strategy: #{role_file}"
+        template 'one_role/role.rb', "app/models/#{role_file}.rb"
       end
 
       def copy_many_roles_models        
-        logger.debug "copy_many_roles_models: #{role_class.underscore} and #{user_role_class.underscore}"
+        logger.debug "copying role models for many_roles strategy: #{role_file} and #{user_file}"
 
-        template 'many_roles/role.rb', "app/models/#{role_class.underscore}.rb"        
-        template 'many_roles/user_role.rb', "app/models/#{user_role_class.underscore}.rb"
+        template 'many_roles/role.rb', "app/models/#{role_file}.rb"        
+        template 'many_roles/user_role.rb', "app/models/#{user_role_file}.rb"
       end
 
       def valid_strategy?
@@ -134,7 +145,7 @@ module ActiveRecord
 
       def strategy_options
         if role_class != 'Role' || user_role_class != 'UserRole' && role_ref_strategy?
-          return ", :role_class => :#{options[:role_class] || 'role'}, :user_role_class => :#{options[:user_role_class] || 'user_role'}"
+          return ", :role_class => '#{role_class}', :user_role_class => '#{user_role_class}'"
         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.4.5"
+  s.version = "0.4.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2011-01-09}
+  s.date = %q{2011-01-10}
   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 = [
@@ -142,7 +142,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<require_all>, ["~> 1.2.0"])
       s.add_runtime_dependency(%q<roles_generic>, ["~> 0.3.2"])
       s.add_runtime_dependency(%q<rails3_artifactor>, [">= 0.3.1"])
-      s.add_runtime_dependency(%q<logging_assist>, [">= 0.1.6"])
+      s.add_runtime_dependency(%q<logging_assist>, [">= 0.2.0"])
       s.add_development_dependency(%q<rspec>, [">= 2.0.1"])
       s.add_development_dependency(%q<database_cleaner>, [">= 0.5"])
       s.add_development_dependency(%q<generator-spec>, [">= 0.7.0"])
@@ -154,7 +154,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<require_all>, ["~> 1.2.0"])
       s.add_runtime_dependency(%q<roles_generic>, [">= 0.3.2"])
       s.add_runtime_dependency(%q<rails3_artifactor>, [">= 0.3.1"])
-      s.add_runtime_dependency(%q<logging_assist>, [">= 0.1.6"])
+      s.add_runtime_dependency(%q<logging_assist>, [">= 0.2.0"])
     else
       s.add_dependency(%q<activerecord>, [">= 3.0.1"])
       s.add_dependency(%q<activesupport>, [">= 3.0.1"])
@@ -164,7 +164,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<require_all>, ["~> 1.2.0"])
       s.add_dependency(%q<roles_generic>, ["~> 0.3.2"])
       s.add_dependency(%q<rails3_artifactor>, [">= 0.3.1"])
-      s.add_dependency(%q<logging_assist>, [">= 0.1.6"])
+      s.add_dependency(%q<logging_assist>, [">= 0.2.0"])
       s.add_dependency(%q<rspec>, [">= 2.0.1"])
       s.add_dependency(%q<database_cleaner>, [">= 0.5"])
       s.add_dependency(%q<generator-spec>, [">= 0.7.0"])
@@ -176,7 +176,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<require_all>, ["~> 1.2.0"])
       s.add_dependency(%q<roles_generic>, [">= 0.3.2"])
       s.add_dependency(%q<rails3_artifactor>, [">= 0.3.1"])
-      s.add_dependency(%q<logging_assist>, [">= 0.1.6"])
+      s.add_dependency(%q<logging_assist>, [">= 0.2.0"])
     end
   else
     s.add_dependency(%q<activerecord>, [">= 3.0.1"])
@@ -187,7 +187,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<require_all>, ["~> 1.2.0"])
     s.add_dependency(%q<roles_generic>, ["~> 0.3.2"])
     s.add_dependency(%q<rails3_artifactor>, [">= 0.3.1"])
-    s.add_dependency(%q<logging_assist>, [">= 0.1.6"])
+    s.add_dependency(%q<logging_assist>, [">= 0.2.0"])
     s.add_dependency(%q<rspec>, [">= 2.0.1"])
     s.add_dependency(%q<database_cleaner>, [">= 0.5"])
     s.add_dependency(%q<generator-spec>, [">= 0.7.0"])
@@ -199,7 +199,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<require_all>, ["~> 1.2.0"])
     s.add_dependency(%q<roles_generic>, [">= 0.3.2"])
     s.add_dependency(%q<rails3_artifactor>, [">= 0.3.1"])
-    s.add_dependency(%q<logging_assist>, [">= 0.1.6"])
+    s.add_dependency(%q<logging_assist>, [">= 0.2.0"])
   end
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 5
-  version: 0.4.5
+  - 6
+  version: 0.4.6
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-09 00:00:00 +01:00
+date: 2011-01-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -145,9 +145,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 1
-        - 6
-        version: 0.1.6
+        - 2
+        - 0
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: *id009
@@ -323,9 +323,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 1
-        - 6
-        version: 0.1.6
+        - 2
+        - 0
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: *id021