roles_mongoid 0.4.5 → 0.4.6

data/Gemfile

@@ -1,17 +1,17 @@
 source :rubygems
 source 'http://gems.github.com/'
 
-group :default do
-  gem "mongoid",           '~> 2.0.0.rc.5'
-  gem 'bson',              '>= 1.1.5'
-  gem "activesupport",     '~> 3.0.3'
-  gem "require_all",       '~> 1.2.0' 
-  gem "sugar-high",        '>= 0.3.5'        
-  gem "roles_generic",     '>= 0.3.6'        
-  gem 'logging_assist',    '>= 0.2.1'  
-end
-
-group :test do
-  gem 'rspec',            '>= 2.4.0'
-  gem 'generator-spec',   '>= 0.7.0'
-end
+# group :default do
+#   gem "mongoid",           '~> 2.0.0.rc.5'
+#   gem 'bson',              '>= 1.1.5'
+#   gem "activesupport",     '~> 3.0.3'
+#   gem "require_all",       '~> 1.2.0' 
+#   gem "sugar-high",        '>= 0.3.5'        
+#   gem "roles_generic",     '>= 0.3.8'        
+#   # gem 'logging_assist',    '>= 0.2.1'  
+# end
+# 
+# group :test do
+#   gem 'rspec',            '>= 2.4.0'
+#   gem 'generator-spec',   '>= 0.7.0'
+# end

data/Rakefile

@@ -7,18 +7,18 @@ begin
     gem.email = "kmandrup@gmail.com"
     gem.homepage = "http://github.com/kristianmandrup/roles_mongoid"
     gem.authors = ["Kristian Mandrup"]
-    gem.add_development_dependency 'rspec',             '>= 2.4.0'
-    gem.add_development_dependency 'generator-spec',    '>= 0.7.0'
+    gem.add_development_dependency 'rspec',             '>= 2.4.1'
+    gem.add_development_dependency 'generator-spec',    '>= 0.7.3'
 
-    gem.add_dependency 'mongoid',           '~> 2.0.0.rc.5'
-    gem.add_dependency 'bson',              '>= 1.1.5'
+    gem.add_dependency 'mongoid',           '~> 2.0.0.rc.6'
+    gem.add_dependency 'bson',              '>= 1.1.6'
 
-    gem.add_dependency 'sugar-high',        '~> 0.3.5'
+    gem.add_dependency 'sugar-high',        '~> 0.4.0'
     gem.add_dependency 'require_all',       '~> 1.2.0'
-    gem.add_dependency "roles_generic",     '>= 0.3.6'
+    gem.add_dependency "roles_generic",     '~> 0.3.8'
     
-    gem.add_dependency 'rails3_artifactor', '>= 0.3.1'
-    gem.add_dependency 'logging_assist',    '>= 0.2.1'
+    gem.add_dependency 'rails_artifactor',  '>= 0.3.3'
+    # gem.add_dependency 'logging_assist',    '>= 0.2.1'
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

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

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

@@ -1,5 +1,5 @@
-require 'rails3_artifactor'
-require 'logging_assist'
+require 'rails_artifactor'
+# require 'logging_assist'
 require 'generators/mongoid/roles/core_ext'
 
 module Mongoid 
@@ -20,31 +20,40 @@ module Mongoid
       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_file}"
+        if logfile?
+          require 'logging_assist'
+          
+          class_eval do
+            puts "self: #{self}"
+            send :include, RailsAssist::BasicLogger
+          end
+          
+          logger.add_logfile :logfile => logfile if logfile
+          debug "apply_role_strategy for : #{strategy} in model #{user_file}"
+        end
 
         if !valid_strategy?
-          logger.error "Strategy #{strategy} is not currently supported, please try one of #{valid_strategies.join(', ')}"
+          error "Strategy #{strategy} is not currently supported, please try one of #{valid_strategies.join(', ')}"
         end
 
         if !has_model_file?(user_file)
-          logger.error "User model #{user_file} not found"
+          error "User model #{user_file} not found"
           return 
         end
 
         if !is_mongoid_model?(user_file)
-          logger.error "User model #{user_file} is not a Mongoid Document"
+          error "User model #{user_file} is not a Mongoid Document"
           return 
         end
         
         begin 
-          logger.debug "Trying to insert roles code into #{user_file}"     
+          debug "Trying to insert roles code into #{user_file}"
 
           insert_into_model user_file, :after => /include Mongoid::\w+/ do
             insertion_text
           end     
         rescue Exception => e
-          logger.error "Error: #{e.message}"
+          error "Error: #{e.message}" if logger
         end
         
         copy_role_class if role_class_strategy?
@@ -52,8 +61,24 @@ module Mongoid
       
       protected                  
 
-      include Rails3::Assist::BasicLogger
-      extend Rails3::Assist::UseMacro
+      def logger
+        nil
+      end
+
+      def debug msg
+        logger.debug msg if logger
+      end
+
+      def info msg
+        logger.info msg if logger
+      end
+
+      def error msg
+        logger.error msg if logger
+      end
+
+      
+      extend RailsAssist::UseMacro
 
       use_orm :mongoid
 
@@ -77,6 +102,10 @@ module Mongoid
         [:admin_flag, :one_role, :embed_one_role, :role_string, :embed_many_roles, :many_roles, :role_strings, :roles_mask]
       end
 
+      def logfile?
+        logfile
+      end
+
       def logfile
         options[:logfile]
       end
@@ -94,7 +123,7 @@ module Mongoid
       end
 
       def copy_role_class
-        logger.debug "generating role model: #{role_file}"
+        debug "generating role model: #{role_file}"
         template 'role.rb', "app/models/#{role_file}.rb"
       end
 

data/roles_mongoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{roles_mongoid}
-  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-19}
+  s.date = %q{2011-03-18}
   s.description = %q{Makes it easy to set a role strategy on your User model in Mongoid}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [
@@ -70,7 +70,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/kristianmandrup/roles_mongoid}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.1}
   s.summary = %q{Implementation of Roles generic API for Mongoid}
   s.test_files = [
     "spec/generator_spec_helper.rb",
@@ -90,61 +90,36 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mongoid>, ["~> 2.0.0.rc.5"])
-      s.add_runtime_dependency(%q<bson>, [">= 1.1.5"])
-      s.add_runtime_dependency(%q<activesupport>, ["~> 3.0.3"])
+      s.add_development_dependency(%q<rspec>, [">= 2.4.1"])
+      s.add_development_dependency(%q<generator-spec>, [">= 0.7.3"])
+      s.add_runtime_dependency(%q<mongoid>, ["~> 2.0.0.rc.6"])
+      s.add_runtime_dependency(%q<bson>, [">= 1.1.6"])
+      s.add_runtime_dependency(%q<sugar-high>, ["~> 0.4.0"])
       s.add_runtime_dependency(%q<require_all>, ["~> 1.2.0"])
-      s.add_runtime_dependency(%q<sugar-high>, [">= 0.3.5"])
-      s.add_runtime_dependency(%q<roles_generic>, [">= 0.3.6"])
-      s.add_runtime_dependency(%q<logging_assist>, [">= 0.2.1"])
-      s.add_development_dependency(%q<rspec>, [">= 2.4.0"])
-      s.add_development_dependency(%q<generator-spec>, [">= 0.7.0"])
-      s.add_runtime_dependency(%q<mongoid>, ["~> 2.0.0.rc.5"])
-      s.add_runtime_dependency(%q<bson>, [">= 1.1.5"])
-      s.add_runtime_dependency(%q<sugar-high>, ["~> 0.3.5"])
-      s.add_runtime_dependency(%q<require_all>, ["~> 1.2.0"])
-      s.add_runtime_dependency(%q<roles_generic>, [">= 0.3.6"])
-      s.add_runtime_dependency(%q<rails3_artifactor>, [">= 0.3.1"])
-      s.add_runtime_dependency(%q<logging_assist>, [">= 0.2.1"])
+      s.add_runtime_dependency(%q<roles_generic>, ["~> 0.3.8"])
+      s.add_runtime_dependency(%q<rails_artifactor>, [">= 0.3.3"])
     else
-      s.add_dependency(%q<mongoid>, ["~> 2.0.0.rc.5"])
-      s.add_dependency(%q<bson>, [">= 1.1.5"])
-      s.add_dependency(%q<activesupport>, ["~> 3.0.3"])
-      s.add_dependency(%q<require_all>, ["~> 1.2.0"])
-      s.add_dependency(%q<sugar-high>, [">= 0.3.5"])
-      s.add_dependency(%q<roles_generic>, [">= 0.3.6"])
-      s.add_dependency(%q<logging_assist>, [">= 0.2.1"])
-      s.add_dependency(%q<rspec>, [">= 2.4.0"])
-      s.add_dependency(%q<generator-spec>, [">= 0.7.0"])
-      s.add_dependency(%q<mongoid>, ["~> 2.0.0.rc.5"])
-      s.add_dependency(%q<bson>, [">= 1.1.5"])
-      s.add_dependency(%q<sugar-high>, ["~> 0.3.5"])
+      s.add_dependency(%q<rspec>, [">= 2.4.1"])
+      s.add_dependency(%q<generator-spec>, [">= 0.7.3"])
+      s.add_dependency(%q<mongoid>, ["~> 2.0.0.rc.6"])
+      s.add_dependency(%q<bson>, [">= 1.1.6"])
+      s.add_dependency(%q<sugar-high>, ["~> 0.4.0"])
       s.add_dependency(%q<require_all>, ["~> 1.2.0"])
-      s.add_dependency(%q<roles_generic>, [">= 0.3.6"])
-      s.add_dependency(%q<rails3_artifactor>, [">= 0.3.1"])
-      s.add_dependency(%q<logging_assist>, [">= 0.2.1"])
+      s.add_dependency(%q<roles_generic>, ["~> 0.3.8"])
+      s.add_dependency(%q<rails_artifactor>, [">= 0.3.3"])
     end
   else
-    s.add_dependency(%q<mongoid>, ["~> 2.0.0.rc.5"])
-    s.add_dependency(%q<bson>, [">= 1.1.5"])
-    s.add_dependency(%q<activesupport>, ["~> 3.0.3"])
-    s.add_dependency(%q<require_all>, ["~> 1.2.0"])
-    s.add_dependency(%q<sugar-high>, [">= 0.3.5"])
-    s.add_dependency(%q<roles_generic>, [">= 0.3.6"])
-    s.add_dependency(%q<logging_assist>, [">= 0.2.1"])
-    s.add_dependency(%q<rspec>, [">= 2.4.0"])
-    s.add_dependency(%q<generator-spec>, [">= 0.7.0"])
-    s.add_dependency(%q<mongoid>, ["~> 2.0.0.rc.5"])
-    s.add_dependency(%q<bson>, [">= 1.1.5"])
-    s.add_dependency(%q<sugar-high>, ["~> 0.3.5"])
+    s.add_dependency(%q<rspec>, [">= 2.4.1"])
+    s.add_dependency(%q<generator-spec>, [">= 0.7.3"])
+    s.add_dependency(%q<mongoid>, ["~> 2.0.0.rc.6"])
+    s.add_dependency(%q<bson>, [">= 1.1.6"])
+    s.add_dependency(%q<sugar-high>, ["~> 0.4.0"])
     s.add_dependency(%q<require_all>, ["~> 1.2.0"])
-    s.add_dependency(%q<roles_generic>, [">= 0.3.6"])
-    s.add_dependency(%q<rails3_artifactor>, [">= 0.3.1"])
-    s.add_dependency(%q<logging_assist>, [">= 0.2.1"])
+    s.add_dependency(%q<roles_generic>, ["~> 0.3.8"])
+    s.add_dependency(%q<rails_artifactor>, [">= 0.3.3"])
   end
 end
 

data/spec/generator_spec_helper.rb

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

data/spec/roles_mongoid/generators/roles_generator_spec.rb

@@ -3,7 +3,7 @@ require 'generator_spec_helper'
 
 require 'generators/mongoid/roles/roles_generator'
 
-# root_dir = Rails3::Assist::Directory.rails_root
+# root_dir = RailsAssist::Directory.rails_root
 root_dir = File.join(Rails.application.config.root_dir, 'rails')
 
 describe 'role strategy generator: admin_flag' do

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-require 'rspec/core'
+require 'rspec'
 require 'mongoid'
 require 'roles_mongoid'
                  

metadata

@@ -1,276 +1,113 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: roles_mongoid
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 5
-  version: 0.4.5
+version: !ruby/object:Gem::Version
+  version: 0.4.6
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Kristian Mandrup
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-01-19 00:00:00 +01:00
+date: 2011-03-18 00:00:00.000000000 +01:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: mongoid
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 0
-        - rc
-        - 5
-        version: 2.0.0.rc.5
-  type: :runtime
-  prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bson
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
-        - 5
-        version: 1.1.5
-  type: :runtime
-  prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: activesupport
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 3
-        version: 3.0.3
-  type: :runtime
-  prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: require_all
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 0
-        version: 1.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: sugar-high
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 5
-        version: 0.3.5
-  type: :runtime
-  prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: roles_generic
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 6
-        version: 0.3.6
-  type: :runtime
-  prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: logging_assist
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 2
-        - 1
-        version: 0.2.1
-  type: :runtime
-  prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &2155516280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 4
-        - 0
-        version: 2.4.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.4.1
   type: :development
   prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2155516280
+- !ruby/object:Gem::Dependency
   name: generator-spec
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &2155515780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 7
-        - 0
-        version: 0.7.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.3
   type: :development
   prerelease: false
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2155515780
+- !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &2155515280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 0
-        - rc
-        - 5
-        version: 2.0.0.rc.5
+      - !ruby/object:Gem::Version
+        version: 2.0.0.rc.6
   type: :runtime
   prerelease: false
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2155515280
+- !ruby/object:Gem::Dependency
   name: bson
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &2155514640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
-        - 5
-        version: 1.1.5
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.6
   type: :runtime
   prerelease: false
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2155514640
+- !ruby/object:Gem::Dependency
   name: sugar-high
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &2155514000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 5
-        version: 0.3.5
+      - !ruby/object:Gem::Version
+        version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2155514000
+- !ruby/object:Gem::Dependency
   name: require_all
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &2155513480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2155513480
+- !ruby/object:Gem::Dependency
   name: roles_generic
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &2155512880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 6
-        version: 0.3.6
-  type: :runtime
-  prerelease: false
-  version_requirements: *id014
-- !ruby/object:Gem::Dependency 
-  name: rails3_artifactor
-  requirement: &id015 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 1
-        version: 0.3.1
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.8
   type: :runtime
   prerelease: false
-  version_requirements: *id015
-- !ruby/object:Gem::Dependency 
-  name: logging_assist
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  version_requirements: *2155512880
+- !ruby/object:Gem::Dependency
+  name: rails_artifactor
+  requirement: &2155512380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 2
-        - 1
-        version: 0.2.1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *id016
+  version_requirements: *2155512380
 description: Makes it easy to set a role strategy on your User model in Mongoid
 email: kmandrup@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.textile
-files: 
+files:
 - .bundle/config
 - .document
 - .rspec
@@ -324,36 +161,29 @@ files:
 has_rdoc: true
 homepage: http://github.com/kristianmandrup/roles_mongoid
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: Implementation of Roles generic API for Mongoid
-test_files: 
+test_files:
 - spec/generator_spec_helper.rb
 - spec/roles_mongoid/generators/roles_generator_spec.rb
 - spec/roles_mongoid/strategy/api_examples.rb