roles_active_record 0.2.3 → 0.2.4

data/Rakefile

@@ -11,13 +11,16 @@ begin
     gem.add_development_dependency 'database_cleaner',  '~> 0.5.2'
     gem.add_development_dependency "generator-spec",    '~> 0.6.5'
 
-    gem.add_dependency "activerecord",    "~> 3.0.0"
-    gem.add_dependency "activesupport",   "~> 3.0.0"
-    gem.add_dependency "arel",            "~> 1.0.0"    
-    gem.add_dependency "meta_where",      "~> 0.9.3"
-    gem.add_dependency "sugar-high",      "~> 0.2.11"
-    gem.add_dependency "require_all",     '~> 1.2.0' 
-    gem.add_dependency "roles_generic",   '~> 0.2.5'            
+    gem.add_dependency "activerecord",      "~> 3.0.0"
+    gem.add_dependency "activesupport",     "~> 3.0.0"
+    gem.add_dependency "arel",              "~> 1.0.0"    
+    gem.add_dependency "meta_where",        "~> 0.9.3"
+    gem.add_dependency "sugar-high",        "~> 0.2.11"
+    gem.add_dependency "require_all",       '~> 1.2.0' 
+    gem.add_dependency "roles_generic",     '~> 0.2.5'
+    gem.add_dependency 'rails3_artifactor', '>= 0.2.6'
+    gem.add_dependency 'logging_assist',    '>= 0.1.5'
+    gem.add_dependency 'migration_assist',  '>= 0.1.5'
 
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

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

@@ -16,8 +16,8 @@ module ActiveRecord
 
 
       def apply_role_strategy
-        log.add_logfile
-        log.debug "apply_role_strategy for : #{strategy} in model #{name}"
+        # logger.add_logfile
+        # logger.debug "apply_role_strategy for : #{strategy} in model #{name}"
         begin
           insert_into_model name do
             insertion_text

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

@@ -1,9 +1,10 @@
 require 'migration_assist'
+require 'logging_assist'
 
 module ActiveRecord 
   module Generators
     class RolesMigrationGenerator < Rails::Generators::NamedBase 
-      include Rails::Migration::Assist
+      include Rails3::Migration::Assist
       
       desc "Generates user role migrations" 
 
@@ -20,7 +21,7 @@ module ActiveRecord
 
       def valid_strategy?
         if !strategies.include?(strategy.to_sym)
-          info "Unknown role strategy #{strategy}"
+          logger.info "Unknown role strategy #{strategy}"
           raise ArgumentError, "Unknown role strategy #{strategy}"
         end
       end
@@ -35,6 +36,8 @@ module ActiveRecord
       
       protected                  
 
+      include Rails::Assist::BasicLogging
+
       def strategies
         [:admin_flag, :role_string, :one_role, :many_roles, :roles_mask]          
       end

data/lib/roles_active_record/base.rb

@@ -13,7 +13,7 @@ module Roles::ActiveRecord
 
   module ClassMethods      
     def strategy name, options=nil
-      role_strategy name, options
+      set_role_strategy name, options
     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.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2010-10-07}
+  s.date = %q{2010-10-11}
   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 = [
@@ -33,7 +33,6 @@ Gem::Specification.new do |s|
      "lib/generators/active_record/roles_migration/templates/add_one_role_strategy.erb",
      "lib/generators/active_record/roles_migration/templates/add_role_string_strategy.erb",
      "lib/generators/active_record/roles_migration/templates/add_roles_mask_strategy.erb",
-     "lib/generators/active_record/setup/setup_generator.rb",
      "lib/roles_active_record.rb",
      "lib/roles_active_record/base.rb",
      "lib/roles_active_record/namespaces.rb",
@@ -143,6 +142,9 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<sugar-high>, ["~> 0.2.11"])
       s.add_runtime_dependency(%q<require_all>, ["~> 1.2.0"])
       s.add_runtime_dependency(%q<roles_generic>, ["~> 0.2.5"])
+      s.add_runtime_dependency(%q<rails3_artifactor>, [">= 0.2.6"])
+      s.add_runtime_dependency(%q<logging_assist>, [">= 0.1.5"])
+      s.add_runtime_dependency(%q<migration_assist>, [">= 0.1.5"])
     else
       s.add_dependency(%q<rspec>, [">= 2.0.0.rc"])
       s.add_dependency(%q<database_cleaner>, ["~> 0.5.2"])
@@ -154,6 +156,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<sugar-high>, ["~> 0.2.11"])
       s.add_dependency(%q<require_all>, ["~> 1.2.0"])
       s.add_dependency(%q<roles_generic>, ["~> 0.2.5"])
+      s.add_dependency(%q<rails3_artifactor>, [">= 0.2.6"])
+      s.add_dependency(%q<logging_assist>, [">= 0.1.5"])
+      s.add_dependency(%q<migration_assist>, [">= 0.1.5"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 2.0.0.rc"])
@@ -166,6 +171,9 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<sugar-high>, ["~> 0.2.11"])
     s.add_dependency(%q<require_all>, ["~> 1.2.0"])
     s.add_dependency(%q<roles_generic>, ["~> 0.2.5"])
+    s.add_dependency(%q<rails3_artifactor>, [">= 0.2.6"])
+    s.add_dependency(%q<logging_assist>, [">= 0.1.5"])
+    s.add_dependency(%q<migration_assist>, [">= 0.1.5"])
   end
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-07 00:00:00 +02:00
+date: 2010-10-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -168,6 +168,51 @@ dependencies:
         version: 0.2.5
   type: :runtime
   version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: rails3_artifactor
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 2
+        - 6
+        version: 0.2.6
+  type: :runtime
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: logging_assist
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        - 5
+        version: 0.1.5
+  type: :runtime
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  name: migration_assist
+  prerelease: false
+  requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        - 5
+        version: 0.1.5
+  type: :runtime
+  version_requirements: *id013
 description: Makes it easy to set a role strategy on your User model in Active Record
 email: kmandrup@gmail.com
 executables: []
@@ -194,7 +239,6 @@ files:
 - lib/generators/active_record/roles_migration/templates/add_one_role_strategy.erb
 - lib/generators/active_record/roles_migration/templates/add_role_string_strategy.erb
 - lib/generators/active_record/roles_migration/templates/add_roles_mask_strategy.erb
-- lib/generators/active_record/setup/setup_generator.rb
 - lib/roles_active_record.rb
 - lib/roles_active_record/base.rb
 - lib/roles_active_record/namespaces.rb

data/lib/generators/active_record/setup/setup_generator.rb

@@ -1,40 +0,0 @@
-require 'generators/migration_helper'
-require 'generators/role_migrations'
-require 'auth_assistant/model/user_config'
-
-module AuthAssistant 
-  module Generators
-    class SetupGenerator < Rails::Generators::NamedBase
-      desc "Sets up Devise Users and creates Role migrations" 
-
-      class_option :devise, :type => :boolean, :aliases => "-d", :default => false,
-                                     :desc => "Initialize devise."
-
-      class_option :admin, :type => :boolean, :aliases => "-a", :default => false,
-                                    :desc => "Create admin user."
-
-
-      class_option :migration, :type => :boolean, :aliases => "-m", :default => true,
-                                     :desc => "To generate a user role migration."
-           
-      hook_for :orm
-            
-      def self.source_root
-        @source_root ||= File.expand_path("../../templates", __FILE__)
-      end
-
-      def run_migration
-        clear_relations :user        
-        return nil if !options[:migration]                 
-        clazz = AuthAssist::RoleMigrations.clazz(name)
-        mig_obj = clazz.new(self)
-        mig_obj.run_migration if mig_obj.respond_to? :run_migration
-        mig_obj.configure if mig_obj.respond_to? :configure
-      end   
-      
-      protected                  
-        include ::AuthAssist::MigrationHelper
-        include ::AuthAssist::RoleMigrations      
-    end
-  end
-end