roles_mongoid 0.4.1 → 0.4.2

data/Gemfile

@@ -8,6 +8,7 @@ group :default do
   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

data/Rakefile

@@ -17,7 +17,7 @@ begin
     gem.add_dependency "roles_generic",   '>= 0.3.3'
     
     gem.add_dependency 'rails3_artifactor', '>= 0.3.1'
-    gem.add_dependency 'logging_assist',    '~> 0.1.6'
+    gem.add_dependency 'logging_assist',    '>= 0.2.0'
 
 
   end

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

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

@@ -3,33 +3,43 @@ require 'logging_assist'
 
 module Mongoid 
   module Generators
-    class RolesGenerator < Rails::Generators::NamedBase      
-      desc "Add role strategy to a model" 
+    class RolesGenerator < Rails::Generators::Base      
+      desc "Add role strategy to a Mongoid User model" 
 
-      # argument name
+      argument     :user_class,   :type => :string,   :default => 'User',                     :desc => "User class name"
       
-      class_option :strategy, :type => :string, :aliases => "-s", :default => 'role_string', 
+      class_option :strategy,     :type => :string,   :aliases => "-s",   :default => 'role_string', 
                    :desc => "Role strategy to use (admin_flag, role_string, roles_string, role_strings, roles_mask, one_role, many_roles, embed_one_role, embed_many_roles)"
 
-      class_option :logfile, :type => :string,   :default => nil,   :desc => "Logfile location"
-      class_option :roles, :type => :array, :aliases => "-r", :default => [], :desc => "Valid roles"
-      class_option :role_class,   :type => :string,   :aliases => "-rc", :default => 'Role', :desc => "Role class"
+      class_option :roles,        :type => :array,    :aliases => "-r",   :default => [],     :desc => "Valid roles"
+      class_option :role_class,   :type => :string,   :aliases => "-rc",  :default => 'Role', :desc => "Role class name"
+
+      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 #{name}"
+        logger.debug "apply_role_strategy for : #{strategy} in model #{user_class}"
 
         if !valid_strategy?
           say "Strategy #{strategy} is not currently supported, please try one of #{valid_strategies.join(', ')}", :red
         end
 
-        if !has_model_file?(user_model_name)
-          say "User model #{user_model_name} not found", :red
+        if !has_model_file?(user_class_file)
+          say "User model #{user_class_file} not found", :red
           return 
         end
 
+        if !is_mongoid_model?(user_class_file)
+          say "User model #{user_class_file} is not a Mongoid Document", :red
+          return 
+        end
+        
         begin 
-          insert_into_model user_model_name, :after => /include Mongoid::\w+/ do
+          logger.debug "Trying to insert roles code into #{user_class_file}"     
+
+          insert_into_model user_class_file, :after => /include Mongoid::\w+/ do
             insertion_text
           end     
         rescue Exception => e
@@ -46,6 +56,14 @@ module Mongoid
 
       use_orm :mongoid
 
+      def user_class_file
+        user_class.to_s.underscore
+      end
+
+      def is_mongoid_model? name
+        read_model(name) =~ /include Mongoid::\w+/
+      end
+
       def valid_strategy?
         valid_strategies.include? strategy.to_sym
       end
@@ -58,10 +76,6 @@ module Mongoid
         options[:logfile]
       end
 
-      def user_model_name
-        name || 'User'
-      end
-
       def orm
         :mongoid
       end
@@ -88,7 +102,7 @@ module Mongoid
       end
 
       def strategy_option_arg
-        return ", :role_class => :#{role_class.to_s.underscore}" if role_class_strategy? && role_class.to_s != 'Role'
+        return ", :role_class => :#{role_class.underscore}" if role_class_strategy? && role_class.to_s != 'Role'
         ''
       end
 
@@ -102,7 +116,7 @@ module Mongoid
       end
 
       def has_valid_roles_statement? 
-        !(read_model(user_model_name) =~ /valid_roles_are/).nil?
+        !(read_model(user_class) =~ /valid_roles_are/).nil?
       end
 
       def insertion_text

data/roles_mongoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{roles_mongoid}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2011-01-01}
+  s.date = %q{2011-01-10}
   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 = [
@@ -49,6 +49,7 @@ Gem::Specification.new do |s|
     "sandbox/roles_assign.rb",
     "sandbox/single_role.rb",
     "sandbox/test.rb",
+    "sandbox/test_query.rb",
     "spec/generator_spec_helper.rb",
     "spec/roles_mongoid/generators/roles_generator_spec.rb",
     "spec/roles_mongoid/strategy/api_examples.rb",
@@ -96,6 +97,7 @@ Gem::Specification.new do |s|
       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<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_runtime_dependency(%q<mongoid>, [">= 2.0.0.beta.20"])
       s.add_runtime_dependency(%q<bson>, [">= 1.1.4"])
@@ -103,7 +105,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.3"])
       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<mongoid>, ["~> 2.0.0.beta.19"])
       s.add_dependency(%q<bson>, [">= 1.1.1"])
@@ -111,6 +113,7 @@ Gem::Specification.new do |s|
       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<mongoid>, [">= 2.0.0.beta.20"])
       s.add_dependency(%q<bson>, [">= 1.1.4"])
@@ -118,7 +121,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<require_all>, ["~> 1.2.0"])
       s.add_dependency(%q<roles_generic>, [">= 0.3.3"])
       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<mongoid>, ["~> 2.0.0.beta.19"])
@@ -127,6 +130,7 @@ Gem::Specification.new do |s|
     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<mongoid>, [">= 2.0.0.beta.20"])
     s.add_dependency(%q<bson>, [">= 1.1.4"])
@@ -134,7 +138,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<require_all>, ["~> 1.2.0"])
     s.add_dependency(%q<roles_generic>, [">= 0.3.3"])
     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
 

data/sandbox/test_query.rb

@@ -0,0 +1,49 @@
+require 'mongoid'
+
+Mongoid.configure do |config|
+  config.master = Mongo::Connection.new.db('testing')
+end
+
+Mongoid.database.collections.each do |coll|
+  coll.remove
+end
+
+
+class User
+  include Mongoid::Document
+  
+  field :username, :type => String  
+  field :email, :type => String
+
+  def self.find_record(login)
+    found = where(:username => login).to_a
+    found = where(:email => login).to_a if found.empty?
+    found
+  end
+  
+  def self.find_record_generic(attributes)
+    where(attributes).first    
+  end 
+
+  def self.find_record_alt(login)
+    where("function() {return this.username == '#{login}' || this.email == '#{login}'}")
+  end  
+end
+
+User.create :username => 'guest', :email => 'guest@email.com'
+User.create :username => 'admin', :email => 'admin@email.com'
+User.create :username => 'blip',  :email => 'guest@email.com'
+User.create :username => 'blip', :email => 'guest@cool.com' 
+
+puts User.all
+
+puts "Found match 'blip'"
+
+# puts User.find_record('blip').first.inspect
+puts User.find_record_alt('blip').first.inspect
+
+# puts User.find_record_generic(:username => 'blip')
+
+puts "Found match 'guest@email.com'"
+
+puts User.find_record('guest@email.com').first.inspect

data/spec/roles_mongoid/generators/roles_generator_spec.rb

@@ -1,5 +1,7 @@
 require 'generator_spec_helper'
-require_generator :mongoid => :roles
+# require_generator :mongoid => :roles
+
+require 'generators/mongoid/roles/roles_generator'
 
 # root_dir = Rails3::Assist::Directory.rails_root
 root_dir = File.join(Rails.application.config.root_dir, 'rails')
@@ -28,7 +30,7 @@ describe 'role strategy generator: admin_flag' do
         arguments = "User --strategy admin_flag --roles admin user"
         puts "arguments: #{arguments}"
         g.run_generator arguments.args
-        root_dir.should have_model :user do |clazz|
+        root_dir.should have_model_file :user do |clazz|
           clazz.should include_module 'Mongoid::Document'
           clazz.should include_module 'Roles::Mongoid'
           puts "clazz: #{clazz}"        
@@ -42,11 +44,16 @@ describe 'role strategy generator: admin_flag' do
       create_model :user do
         '# content'
       end
+      # puts read_model :user
+      
       with_generator do |g|   
         arguments = "User --strategy one_role --roles admin user"
         puts "arguments: #{arguments}"
         g.run_generator arguments.args
-        root_dir.should have_model :user do |clazz|
+        
+        # puts read_model :user        
+        
+        root_dir.should have_model_file :user do |clazz|
           clazz.should include_module 'Mongoid::Document'
           clazz.should include_module 'Roles::Mongoid'
           puts "clazz: #{clazz}"        

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-01 00:00:00 +01:00
+date: 2011-01-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -110,8 +110,23 @@ dependencies:
   prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  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: 
     - - ">="
@@ -123,10 +138,10 @@ dependencies:
         version: 2.0.1
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: mongoid
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -140,10 +155,10 @@ dependencies:
         version: 2.0.0.beta.20
   type: :runtime
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: bson
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -155,10 +170,10 @@ dependencies:
         version: 1.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: sugar-high
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -170,10 +185,10 @@ dependencies:
         version: 0.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *id010
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: require_all
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -185,10 +200,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *id011
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: roles_generic
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -200,10 +215,10 @@ dependencies:
         version: 0.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *id012
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: rails3_artifactor
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -215,22 +230,22 @@ dependencies:
         version: 0.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *id013
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: logging_assist
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 1
-        - 6
-        version: 0.1.6
+        - 2
+        - 0
+        version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *id014
+  version_requirements: *id015
 description: Makes it easy to set a role strategy on your User model in Mongoid
 email: kmandrup@gmail.com
 executables: []
@@ -273,6 +288,7 @@ files:
 - sandbox/roles_assign.rb
 - sandbox/single_role.rb
 - sandbox/test.rb
+- sandbox/test_query.rb
 - spec/generator_spec_helper.rb
 - spec/roles_mongoid/generators/roles_generator_spec.rb
 - spec/roles_mongoid/strategy/api_examples.rb