roles_mongoid 0.3.3 → 0.3.4

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

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

@@ -5,6 +5,8 @@ module Mongoid
   module Generators
     class RolesGenerator < Rails::Generators::NamedBase      
       desc "Add role strategy to a model" 
+
+      # argument name
       
       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)"
@@ -15,9 +17,16 @@ module Mongoid
       def apply_role_strategy
         logger.add_logfile :logfile => logfile if logfile
         logger.debug "apply_role_strategy for : #{strategy} in model #{name}"
-        insert_into_model name do
+
+        say "User model #{user_model_name} not found", :red if !has_model_file?(user_model_name)
+
+        insert_into_model user_model_name, :after => /include Mongoid::\w+/ do
           insertion_text
-        end
+        end     
+
+        unless read_model(:user) =~ /use_roles_strategy/
+          inject_into_file model_file(:user), "use_roles_strategy :#{strategy}\n\n", :before => "class"
+        end        
       end 
       
       protected                  
@@ -27,6 +36,14 @@ module Mongoid
 
       use_orm :mongoid
 
+      def logfile
+        options[:logfile]
+      end
+
+      def user_model_name
+        name || 'User'
+      end
+
       def orm
         :mongoid
       end
@@ -52,9 +69,14 @@ module Mongoid
       end
 
       def roles_statement
+        return '' if has_valid_roles_statement?
         roles ? "valid_roles_are #{roles.join(', ')}" : ''
       end
 
+      def has_valid_roles_statement? 
+        !(read_model(user_model_name) =~ /valid_roles_are/).nil?
+      end
+
       def insertion_text
         %Q{include Roles::#{orm.to_s.camelize} 
   #{role_strategy_statement}

data/roles_mongoid.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{roles_mongoid}
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]

data/spec/roles_mongoid/generators/roles_generator_spec.rb

@@ -23,6 +23,7 @@ describe 'role strategy generator: admin_flag' do
       create_model :user do
         '# content'
       end
+      
       with_generator do |g|   
         arguments = "User --strategy admin_flag --roles admin user"
         puts "arguments: #{arguments}"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - Kristian Mandrup