roles_mongo_mapper 0.3.2 → 0.4.0

data/Gemfile

@@ -0,0 +1,17 @@
+source :rubygems
+source 'http://gems.github.com/'
+
+group :default do
+  gem "mongo_mapper",      '>= 0.8.4'
+  gem 'bson',              '>= 1.1.1'
+  gem "activesupport",     '~> 3.0.1'
+  gem "require_all",       '~> 1.2.0' 
+  gem "sugar-high",        '>= 0.3.0'        
+  gem "roles_generic",     '>= 0.3.2'        
+  gem 'logging_assist',    '>= 0.2.0'  
+end
+
+group :test do
+  gem "rspec",            '>= 2.0.1'
+  gem 'generator-spec',   '>= 0.7.0'
+end

data/Rakefile

@@ -8,16 +8,16 @@ begin
     gem.homepage = "http://github.com/kristianmandrup/roles_mongo_mapper"
     gem.authors = ["Kristian Mandrup"]
 
-    gem.add_development_dependency "rspec",           ">= 2.1"
-    gem.add_development_dependency 'generator-spec',  "~> 0.6.5"
+    gem.add_development_dependency "rspec",           ">= 2.0.1"
+    gem.add_development_dependency 'generator-spec',  ">= 0.7.0"
 
     gem.add_dependency "mongo_mapper",      '>= 0.8.4'
-    gem.add_dependency "activesupport",     '~> 3.0'
+    gem.add_dependency "activesupport",     '>= 3.0.1'
     gem.add_dependency "require_all",       '~> 1.2.0'
-    gem.add_dependency "sugar-high",        '~> 0.3.0'
+    gem.add_dependency "sugar-high",        '~> 0.3.1'
     gem.add_dependency "roles_generic",     '~> 0.3.3'
-    gem.add_dependency 'rails3_artifactor', '~> 0.3.0'
-    gem.add_dependency 'logging_assist',    '>= 0.1.5'
+    gem.add_dependency 'rails3_artifactor', '~> 0.3.1'
+    gem.add_dependency 'logging_assist',    '>= 0.2.0'
 
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.4.0

data/lib/generators/mongo_mapper/roles/core_ext.rb

@@ -0,0 +1,11 @@
+class String
+  def as_filename
+    self.underscore  
+  end
+end
+
+class Symbol
+  def as_filename
+    self.to_s.underscore  
+  end
+end

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

@@ -1,5 +1,6 @@
 require 'rails3_artifactor'
 require 'logging_assist'
+require 'generators/mongo_mapper/roles/core_ext'
 
 module MongoMapper 
   module Generators
@@ -17,29 +18,31 @@ module MongoMapper
 
       class_option :logfile,      :type => :string,   :aliases => "-l",   :default => nil,    :desc => "Logfile location"
 
+      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 !valid_strategy?
-          say "Strategy '#{strategy}' is not valid. The valid strategies are: #{valid_strategies.join(', ')}", :red
+          logger.error "Strategy '#{strategy}' is not valid. The valid strategies are: #{valid_strategies.join(', ')}"
           return
         end
 
-        if !has_model_file?(user_class)
-          say "User model #{user_class} not found", :red
+        if !has_model_file?(user_file)
+          logger.error "User model #{user_class} not found"
           return 
         end
 
-        if !is_mongo_mapper_model?(user_class)
-          say "User model #{user_class} is not a Mongo Mapper Document", :red
+        if !is_mongo_mapper_model?(user_file)
+          logger.error "User model #{user_class} is not a Mongo Mapper Document"
           return 
         end
         
         begin 
           logger.debug "Trying to insert roles code into #{user_class}"     
                    
-          insert_into_model user_class, :after => /include MongoMapper::\w+/ do
+          insert_into_model user_file, :after => /include MongoMapper::\w+/ do
             insertion_text
           end     
         rescue Exception => e
@@ -56,8 +59,16 @@ module MongoMapper
 
       use_orm :mongo_mapper
 
+      def user_file
+        user_class.as_filename
+      end
+
+      def role_file
+        role_class.as_filename
+      end
+
       def is_mongo_mapper_model? name
-        read_model(name) =~ /include MongoMapper::\w+/
+        read_model(user_class) =~ /include MongoMapper::\w+/
       end
 
       def role_class_strategy? 
@@ -76,8 +87,8 @@ module MongoMapper
 
 
       def copy_role_class
-        logger.debug "copy_role_class: #{role_class.underscore}"
-        template 'role.rb', "app/models/#{role_class.underscore}.rb"
+        logger.debug "creating role model: #{role_file}"
+        template 'role.rb', "app/models/#{role_file}.rb"
       end
 
       def logfile
@@ -88,6 +99,10 @@ module MongoMapper
         :mongo_mapper
       end
 
+      def orm_class
+        orm.to_s.camelize 
+      end
+
       def default_roles
         [:admin, :guest]        
       end
@@ -114,7 +129,7 @@ module MongoMapper
       end
 
       def strategy_options
-        return ", :role_class => :#{role_class.to_s.underscore}" if role_class_strategy? && role_class.to_s != 'Role'
+        return ", :role_class => '#{role_class}'" if role_class_strategy? && role_class.to_s != 'Role'
         ''
       end
 
@@ -123,7 +138,7 @@ module MongoMapper
       end
 
       def insertion_text
-        %Q{include Roles::#{orm.to_s.camelize} 
+        %Q{include Roles::#{orm_class} 
   #{role_strategy_statement}
   #{valid_roles_statement}}
       end

data/roles_mongo_mapper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{roles_mongo_mapper}
-  s.version = "0.3.2"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2011-01-06}
+  s.date = %q{2011-01-10}
   s.description = %q{Makes it easy to set a role strategy on your User model in MongoMapper}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [
@@ -19,10 +19,12 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".rspec",
+    "Gemfile",
     "LICENSE",
     "README.markdown",
     "Rakefile",
     "VERSION",
+    "lib/generators/mongo_mapper/roles/core_ext.rb",
     "lib/generators/mongo_mapper/roles/roles_generator.rb",
     "lib/generators/mongo_mapper/roles/templates/role.rb",
     "lib/roles_mongo_mapper.rb",
@@ -86,36 +88,57 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 2.1"])
-      s.add_development_dependency(%q<generator-spec>, ["~> 0.6.5"])
       s.add_runtime_dependency(%q<mongo_mapper>, [">= 0.8.4"])
-      s.add_runtime_dependency(%q<activesupport>, ["~> 3.0"])
+      s.add_runtime_dependency(%q<bson>, [">= 1.1.1"])
+      s.add_runtime_dependency(%q<activesupport>, ["~> 3.0.1"])
       s.add_runtime_dependency(%q<require_all>, ["~> 1.2.0"])
-      s.add_runtime_dependency(%q<sugar-high>, ["~> 0.3.0"])
+      s.add_runtime_dependency(%q<sugar-high>, [">= 0.3.0"])
+      s.add_runtime_dependency(%q<roles_generic>, [">= 0.3.2"])
+      s.add_runtime_dependency(%q<logging_assist>, [">= 0.2.0"])
+      s.add_development_dependency(%q<rspec>, [">= 2.0.1"])
+      s.add_development_dependency(%q<generator-spec>, [">= 0.7.0"])
+      s.add_runtime_dependency(%q<mongo_mapper>, [">= 0.8.4"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 3.0.1"])
+      s.add_runtime_dependency(%q<require_all>, ["~> 1.2.0"])
+      s.add_runtime_dependency(%q<sugar-high>, ["~> 0.3.1"])
       s.add_runtime_dependency(%q<roles_generic>, ["~> 0.3.3"])
-      s.add_runtime_dependency(%q<rails3_artifactor>, ["~> 0.3.0"])
-      s.add_runtime_dependency(%q<logging_assist>, [">= 0.1.5"])
+      s.add_runtime_dependency(%q<rails3_artifactor>, ["~> 0.3.1"])
+      s.add_runtime_dependency(%q<logging_assist>, [">= 0.2.0"])
     else
-      s.add_dependency(%q<rspec>, [">= 2.1"])
-      s.add_dependency(%q<generator-spec>, ["~> 0.6.5"])
       s.add_dependency(%q<mongo_mapper>, [">= 0.8.4"])
-      s.add_dependency(%q<activesupport>, ["~> 3.0"])
+      s.add_dependency(%q<bson>, [">= 1.1.1"])
+      s.add_dependency(%q<activesupport>, ["~> 3.0.1"])
+      s.add_dependency(%q<require_all>, ["~> 1.2.0"])
+      s.add_dependency(%q<sugar-high>, [">= 0.3.0"])
+      s.add_dependency(%q<roles_generic>, [">= 0.3.2"])
+      s.add_dependency(%q<logging_assist>, [">= 0.2.0"])
+      s.add_dependency(%q<rspec>, [">= 2.0.1"])
+      s.add_dependency(%q<generator-spec>, [">= 0.7.0"])
+      s.add_dependency(%q<mongo_mapper>, [">= 0.8.4"])
+      s.add_dependency(%q<activesupport>, [">= 3.0.1"])
       s.add_dependency(%q<require_all>, ["~> 1.2.0"])
-      s.add_dependency(%q<sugar-high>, ["~> 0.3.0"])
+      s.add_dependency(%q<sugar-high>, ["~> 0.3.1"])
       s.add_dependency(%q<roles_generic>, ["~> 0.3.3"])
-      s.add_dependency(%q<rails3_artifactor>, ["~> 0.3.0"])
-      s.add_dependency(%q<logging_assist>, [">= 0.1.5"])
+      s.add_dependency(%q<rails3_artifactor>, ["~> 0.3.1"])
+      s.add_dependency(%q<logging_assist>, [">= 0.2.0"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 2.1"])
-    s.add_dependency(%q<generator-spec>, ["~> 0.6.5"])
     s.add_dependency(%q<mongo_mapper>, [">= 0.8.4"])
-    s.add_dependency(%q<activesupport>, ["~> 3.0"])
+    s.add_dependency(%q<bson>, [">= 1.1.1"])
+    s.add_dependency(%q<activesupport>, ["~> 3.0.1"])
+    s.add_dependency(%q<require_all>, ["~> 1.2.0"])
+    s.add_dependency(%q<sugar-high>, [">= 0.3.0"])
+    s.add_dependency(%q<roles_generic>, [">= 0.3.2"])
+    s.add_dependency(%q<logging_assist>, [">= 0.2.0"])
+    s.add_dependency(%q<rspec>, [">= 2.0.1"])
+    s.add_dependency(%q<generator-spec>, [">= 0.7.0"])
+    s.add_dependency(%q<mongo_mapper>, [">= 0.8.4"])
+    s.add_dependency(%q<activesupport>, [">= 3.0.1"])
     s.add_dependency(%q<require_all>, ["~> 1.2.0"])
-    s.add_dependency(%q<sugar-high>, ["~> 0.3.0"])
+    s.add_dependency(%q<sugar-high>, ["~> 0.3.1"])
     s.add_dependency(%q<roles_generic>, ["~> 0.3.3"])
-    s.add_dependency(%q<rails3_artifactor>, ["~> 0.3.0"])
-    s.add_dependency(%q<logging_assist>, [">= 0.1.5"])
+    s.add_dependency(%q<rails3_artifactor>, ["~> 0.3.1"])
+    s.add_dependency(%q<logging_assist>, [">= 0.2.0"])
   end
 end
 

data/spec/roles_mongo_mapper/generators/roles_generator_spec.rb

@@ -1,5 +1,6 @@
 require 'generator_spec_helper'
-require_generator :mongo_mapper => :roles
+require 'generators/mongo_mapper/roles/roles_generator'
+# require_generator :mongo_mapper => :roles
 
 # root_dir = Rails3::Assist::Directory.rails_root
 root_dir = File.join(Rails.application.config.root_dir, 'rails')

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 2
-  version: 0.3.2
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,42 +14,147 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-06 00:00:00 +01:00
+date: 2011-01-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
+  name: mongo_mapper
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
+        - 0
+        - 8
+        - 4
+        version: 0.8.4
+  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
+        - 1
+        version: 1.1.1
+  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
+        - 1
+        version: 3.0.1
+  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
+        - 0
+        version: 0.3.0
+  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
+        - 2
+        version: 0.3.2
+  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
+        - 0
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
         - 1
-        version: "2.1"
+        version: 2.0.1
   type: :development
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: generator-spec
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 6
-        - 5
-        version: 0.6.5
+        - 7
+        - 0
+        version: 0.7.0
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: mongo_mapper
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -60,25 +165,26 @@ dependencies:
         - 4
         version: 0.8.4
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 3
         - 0
-        version: "3.0"
+        - 1
+        version: 3.0.1
   type: :runtime
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: require_all
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -89,11 +195,11 @@ dependencies:
         - 0
         version: 1.2.0
   type: :runtime
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: sugar-high
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -101,14 +207,14 @@ dependencies:
         segments: 
         - 0
         - 3
-        - 0
-        version: 0.3.0
+        - 1
+        version: 0.3.1
   type: :runtime
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: roles_generic
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -119,11 +225,11 @@ dependencies:
         - 3
         version: 0.3.3
   type: :runtime
-  version_requirements: *id007
+  prerelease: false
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: rails3_artifactor
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -131,25 +237,26 @@ dependencies:
         segments: 
         - 0
         - 3
-        - 0
-        version: 0.3.0
+        - 1
+        version: 0.3.1
   type: :runtime
-  version_requirements: *id008
+  prerelease: false
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: logging_assist
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 1
-        - 5
-        version: 0.1.5
+        - 2
+        - 0
+        version: 0.2.0
   type: :runtime
-  version_requirements: *id009
+  prerelease: false
+  version_requirements: *id016
 description: Makes it easy to set a role strategy on your User model in MongoMapper
 email: kmandrup@gmail.com
 executables: []
@@ -162,10 +269,12 @@ extra_rdoc_files:
 files: 
 - .document
 - .rspec
+- Gemfile
 - LICENSE
 - README.markdown
 - Rakefile
 - VERSION
+- lib/generators/mongo_mapper/roles/core_ext.rb
 - lib/generators/mongo_mapper/roles/roles_generator.rb
 - lib/generators/mongo_mapper/roles/templates/role.rb
 - lib/roles_mongo_mapper.rb