roles_mongo_mapper 0.3.1 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

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

@@ -3,32 +3,43 @@ require 'logging_assist'
 
 module MongoMapper 
   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 MongoMapper User model" 
+
+      argument     :user_class,   :type => :string,   :default => 'User',           :desc => "User class name"
       
-      class_option :strategy, :type => :string, :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, one_role, many_roles, roles_mask)"
 
-      class_option :logfile,      :type => :string,   :default => nil,   :desc => "Logfile location"
-      class_option :roles,        :type => :array,    :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"      
+
+      class_option :logfile,      :type => :string,   :aliases => "-l",   :default => nil,    :desc => "Logfile location"
 
       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 valid. The valid strategies are: #{valid_strategies.join(', ')}", :red
           return
         end
 
-        if !has_model_file?(user_model_name)
-          say "User model #{user_model_name} not found", :red
+        if !has_model_file?(user_class)
+          say "User model #{user_class} not found", :red
           return 
         end
 
+        if !is_mongo_mapper_model?(user_class)
+          say "User model #{user_class} is not a Mongo Mapper Document", :red
+          return 
+        end
+        
         begin 
-          insert_into_model user_model_name, :after => /include MongoMapper::\w+/ do
+          logger.debug "Trying to insert roles code into #{user_class}"     
+                   
+          insert_into_model user_class, :after => /include MongoMapper::\w+/ do
             insertion_text
           end     
         rescue Exception => e
@@ -45,6 +56,10 @@ module MongoMapper
 
       use_orm :mongo_mapper
 
+      def is_mongo_mapper_model? name
+        read_model(name) =~ /include MongoMapper::\w+/
+      end
+
       def role_class_strategy? 
         # :embed_one_role, :embed_many_roles
         [:one_role, :many_roles].include? strategy.to_sym
@@ -69,10 +84,6 @@ module MongoMapper
         options[:logfile]
       end
 
-      def user_model_name
-        name || 'User'
-      end
-
       def orm
         :mongo_mapper
       end
@@ -108,7 +119,7 @@ module MongoMapper
       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_mongo_mapper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{roles_mongo_mapper}
-  s.version = "0.3.1"
+  s.version = "0.3.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-06}
   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 = [

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.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-06 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency