roles_active_record 0.4.7 → 0.4.8

data/Rakefile

@@ -18,6 +18,7 @@ begin
     gem.add_development_dependency 'database_cleaner',  '>= 0.6'
     gem.add_development_dependency "rspec",             '>= 2.4.1'
     gem.add_development_dependency "generator-spec",    '>= 0.7.3'
+    gem.add_development_dependency 'migration_assist',  '~> 0.2.0'
 
     gem.add_dependency 'roles_generic', '>= 0.3.8'
     gem.add_dependency 'require_all',   '~> 1.2.0'

data/VERSION

@@ -1 +1 @@
-0.4.7
+0.4.8

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

@@ -1,5 +1,4 @@
-require 'rails3_artifactor'
-require 'logging_assist'
+require 'rails_artifactor'
 require 'generators/active_record/roles/core_ext'
 
 module ActiveRecord 
@@ -17,26 +16,32 @@ module ActiveRecord
       class_option :user_role_class,    :type => :string,   :aliases => "-urc", :default => 'UserRole', :desc => "User Role join class"
       
       class_option :default_roles,      :type => :boolean,  :aliases => "-dr",  :default => true,       :desc => "Use default roles :admin and :base"
-      class_option :logfile,            :type => :string,   :aliases => "-l",   :default => nil,        :desc => "Logfile location"
+      class_option :logfile,            :type => :string,   :aliases => "-lf",  :default => nil,       :desc => "Logfile location"
+      class_option :logging,            :type => :boolean,  :aliases => "-l",   :default => false,      :desc => "Logging on?"
 
       source_root File.dirname(__FILE__) + '/templates'
 
       def apply_role_strategy
-        logger.add_logfile :logfile => logfile if logfile
-        logger.debug "apply_role_strategy for : #{strategy} in model #{user_class}"
+        if logging?
+          require 'logging_assist'          
+          self.class.send :include, Rails3::Assist::BasicLogger          
+          logger.add_logfile :logfile => logfile if logfile
+        end
+
+        logger.debug "apply_role_strategy for : #{strategy} in model #{user_class}" if logging?
 
         if !valid_strategy?
-          logger.error "Strategy '#{strategy}' is not valid, at least not for Active Record"
+          logger.error "Strategy '#{strategy}' is not valid, at least not for Active Record" if logging?
           return 
         end
 
         if !has_model? user_file                
-          logger.error "Could not apply roles strategy to #{user_class} model since the model file was not found"
+          logger.error "Could not apply roles strategy to #{user_class} model since the model file was not found" if logging?
           return 
         end
 
         begin                    
-          logger.debug "Trying to insert roles code into #{user_class}"
+          logger.debug "Trying to insert roles code into #{user_class}" if logging?
           insert_into_model user_file do
             insertion_text
           end
@@ -44,17 +49,19 @@ module ActiveRecord
           copy_role_models if roles_model_strategy?
         rescue
           # logger.debug "Error applying roles strategy to #{name}"
-          logger.error "Error applying roles strategy to #{user_class}"
+          logger.error "Error applying roles strategy to #{user_class}" if logging?
         end
       end 
             
       protected                  
 
-      extend Rails3::Assist::UseMacro
-      
-      use_orm :active_record
+      extend RailsAssist::UseMacro
       
-      include Rails3::Assist::BasicLogger
+      use_orm :active_record      
+
+      def logging?
+        options[:logging]         
+      end        
 
       def user_file
         user_class.as_filename
@@ -79,12 +86,12 @@ module ActiveRecord
       end
 
       def copy_one_role_model
-        logger.debug "generating role model for one_role strategy: #{role_file}"
+        logger.debug "generating role model for one_role strategy: #{role_file}" if logging?
         template 'one_role/role.rb', "app/models/#{role_file}.rb"
       end
 
       def copy_many_roles_models        
-        logger.debug "generating role models for many_roles strategy: #{role_file} and #{user_file}"
+        logger.debug "generating role models for many_roles strategy: #{role_file} and #{user_file}" if logging?
 
         template 'many_roles/role.rb', "app/models/#{role_file}.rb"        
         template 'many_roles/user_role.rb', "app/models/#{user_role_file}.rb"

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

@@ -1,10 +1,9 @@
 require 'migration_assist'
-require 'logging_assist'
 
 module ActiveRecord 
   module Generators
     class RolesMigrationGenerator < Rails::Generators::NamedBase 
-      include Rails3::Migration::Assist
+      include RailsAssist::Migration
       
       desc "Generates user role migrations" 
 
@@ -16,6 +15,7 @@ module ActiveRecord
       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 :logging,            :type => :boolean,  :aliases => "-l",   :default => false,      :desc => "Logging on?"
       class_option :reverse, :type => :boolean, :alias => "-r", :default => false, :desc => "Create a remove migration for reversing a strategy"
 
       def self.source_root
@@ -23,7 +23,12 @@ module ActiveRecord
       end
 
       def main
-        logger.add_logfile :logfile => logfile if logfile
+        if logging?
+          require 'logging_assist'
+          self.class.send :include, Rails3::Assist::BasicLogger
+          logger.add_logfile :logfile => logfile if logfile
+        end
+
         valid_strategy?
         run_migration
       end
@@ -32,7 +37,7 @@ module ActiveRecord
 
       def valid_strategy?
         if !strategies.include?(strategy.to_sym)
-          logger.info "Unknown role strategy #{strategy}"
+          logger.info "Unknown role strategy #{strategy}"  if logging?
           raise ArgumentError, "Unknown role strategy #{strategy}"
         end
       end
@@ -46,7 +51,7 @@ module ActiveRecord
       end
 
       def run_migration            
-        logger.debug "Create migration for role_strategy: #{strategy}"
+        logger.debug "Create migration for role_strategy: #{strategy}" if logging?
         migration_name = "add_#{strategy}_strategy"
         target_migration_name = reverse? ? reverse_migration_name(migration_name) : migration_name
         migration_template "#{migration_name}.erb", "db/migrate/#{target_migration_name}" 
@@ -54,12 +59,14 @@ module ActiveRecord
         reverse_migration!(generated_migration) if generated_migration && reverse?
       end
 
-      include Rails3::Assist::BasicLogger
-
       def logfile
         options[:logfile]
       end
 
+      def logging?
+        options[:logging]
+      end
+
       def strategies
         [:admin_flag, :role_string, :one_role, :many_roles, :roles_mask]
       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.7"
+  s.version = "0.4.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Kristian Mandrup"]
-  s.date = %q{2011-03-04}
+  s.authors = [%q{Kristian Mandrup}]
+  s.date = %q{2011-05-08}
   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 = [
@@ -91,8 +91,8 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/kristianmandrup/roles_active_record}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.1}
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.0}
   s.summary = %q{Implementation of Roles generic API for Active Record}
   s.test_files = [
     "spec/fixtures/many_roles_setup.rb",
@@ -136,6 +136,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<database_cleaner>, [">= 0.6"])
       s.add_development_dependency(%q<rspec>, [">= 2.4.1"])
       s.add_development_dependency(%q<generator-spec>, [">= 0.7.3"])
+      s.add_development_dependency(%q<migration_assist>, ["~> 0.2.0"])
       s.add_runtime_dependency(%q<roles_generic>, [">= 0.3.8"])
       s.add_runtime_dependency(%q<require_all>, ["~> 1.2.0"])
       s.add_runtime_dependency(%q<sugar-high>, ["~> 0.4.0"])
@@ -144,6 +145,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<database_cleaner>, [">= 0.6"])
       s.add_dependency(%q<rspec>, [">= 2.4.1"])
       s.add_dependency(%q<generator-spec>, [">= 0.7.3"])
+      s.add_dependency(%q<migration_assist>, ["~> 0.2.0"])
       s.add_dependency(%q<roles_generic>, [">= 0.3.8"])
       s.add_dependency(%q<require_all>, ["~> 1.2.0"])
       s.add_dependency(%q<sugar-high>, ["~> 0.4.0"])
@@ -153,6 +155,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<database_cleaner>, [">= 0.6"])
     s.add_dependency(%q<rspec>, [">= 2.4.1"])
     s.add_dependency(%q<generator-spec>, [">= 0.7.3"])
+    s.add_dependency(%q<migration_assist>, ["~> 0.2.0"])
     s.add_dependency(%q<roles_generic>, [">= 0.3.8"])
     s.add_dependency(%q<require_all>, ["~> 1.2.0"])
     s.add_dependency(%q<sugar-high>, ["~> 0.4.0"])

data/spec/generator_spec_helper.rb

@@ -1,6 +1,6 @@
 require 'rspec'
 require 'rspec/autorun'     
-require 'rails3_artifactor'
+require 'rails_artifactor'
 require 'generator-spec'
 require 'roles_generic'
 

data/spec/roles_active_record/generators/one_role_gen_spec.rb

@@ -5,7 +5,7 @@ require 'generators/active_record/roles/roles_generator'
 
 # root_dir = Rails3::Assist::Directory.rails_root
 # root_dir = File.join(Rails.application.config.root_dir, 'rails')
-root_dir = Rails.root
+root_dir = Rails.root.to_s
 
 describe 'roles generator' do
   describe 'ORM: active_record' do  

data/spec/roles_active_record/generators/roles_migration/admin_flag_spec.rb

@@ -2,11 +2,12 @@ require 'migration_spec_helper'
 
 require_generator :active_record => :roles_migration
 
-root_dir = Rails::Migration::Assist.rails_root_dir
-Rails3::Assist::Directory.rails_root = root_dir
-Rails::Migration::Assist.orm = :active_record
-
-puts "root_dir: #{root_dir}"
+# root_dir = Rails::Migration::Assist.rails_root_dir
+# RailsAssist::Directory.rails_root = root_dir
+# 
+# Rails::Migration::Assist.orm = :active_record
+# 
+# puts "root_dir: #{root_dir}"
 
 describe 'roles_migration_generator' do
   use_orm     :active_record

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roles_active_record
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-03-04 00:00:00.000000000 +01:00
-default_executable: 
+date: 2011-05-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &2156732560 !ruby/object:Gem::Requirement
+  requirement: &2156655440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,10 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *2156732560
+  version_requirements: *2156655440
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156732080 !ruby/object:Gem::Requirement
+  requirement: &2156654800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +32,10 @@ dependencies:
         version: 2.4.1
   type: :development
   prerelease: false
-  version_requirements: *2156732080
+  version_requirements: *2156654800
 - !ruby/object:Gem::Dependency
   name: generator-spec
-  requirement: &2156731600 !ruby/object:Gem::Requirement
+  requirement: &2156654120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +43,21 @@ dependencies:
         version: 0.7.3
   type: :development
   prerelease: false
-  version_requirements: *2156731600
+  version_requirements: *2156654120
+- !ruby/object:Gem::Dependency
+  name: migration_assist
+  requirement: &2156653540 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :development
+  prerelease: false
+  version_requirements: *2156653540
 - !ruby/object:Gem::Dependency
   name: roles_generic
-  requirement: &2156731060 !ruby/object:Gem::Requirement
+  requirement: &2156652700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +65,10 @@ dependencies:
         version: 0.3.8
   type: :runtime
   prerelease: false
-  version_requirements: *2156731060
+  version_requirements: *2156652700
 - !ruby/object:Gem::Dependency
   name: require_all
-  requirement: &2156730500 !ruby/object:Gem::Requirement
+  requirement: &2156652100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +76,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156730500
+  version_requirements: *2156652100
 - !ruby/object:Gem::Dependency
   name: sugar-high
-  requirement: &2156730000 !ruby/object:Gem::Requirement
+  requirement: &2156651460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +87,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156730000
+  version_requirements: *2156651460
 - !ruby/object:Gem::Dependency
   name: meta_where
-  requirement: &2156729440 !ruby/object:Gem::Requirement
+  requirement: &2156650660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,7 +98,7 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2156729440
+  version_requirements: *2156650660
 description: Makes it easy to set a role strategy on your User model in Active Record
 email: kmandrup@gmail.com
 executables: []
@@ -169,7 +179,6 @@ files:
 - spec/roles_active_record/strategy/single/role_string_spec.rb
 - spec/roles_active_record/strategy/user_setup.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/kristianmandrup/roles_active_record
 licenses: []
 post_install_message: 
@@ -190,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.8.0
 signing_key: 
 specification_version: 3
 summary: Implementation of Roles generic API for Active Record