cream 0.8.9.2 → 0.8.9.3

data/lib/generators/cream/helpers/execute_helper.rb

@@ -7,7 +7,7 @@ module Cream
       end        
 
       def execute command
-        logger.debug command
+        debug! command
         run command
       end
 

data/lib/generators/cream/helpers/gemfile_helper.rb

@@ -3,10 +3,10 @@ module Cream
     module Gemfile 
       def add_gem_version name, version
         if !has_gem? name
-          logger.debug "Adding gem: #{name}, #{version}"
+          debug! "Adding gem: #{name}, #{version}"
           gem name, :version => version
         else
-          logger.debug "gem: #{name}, #{version} already in Gemfile"
+          debug! "gem: #{name}, #{version} already in Gemfile"
         end        
       end
 
@@ -17,10 +17,10 @@ module Cream
         end
 
         if !has_gem? name
-          logger.debug "Adding gem: #{name}"
+          debug! "Adding gem: #{name}"
           gem name
         else
-          logger.debug "gem: #{name} already in Gemfile"          
+          debug! "gem: #{name} already in Gemfile"          
         end
       end
     end

data/lib/generators/devise/config/app_helper.rb

@@ -1,7 +1,7 @@
 module DeviseConfigGenerator
   module AppHelper    
     def protection_configure!
-      logger.debug "Configuring: devise authentication filter"
+      debug! "Configuring: devise authentication filter"
       ## Add Devise protection to Application controller:
       insert_into_controller :application do
         "before_filter :authenticate_user!"
@@ -12,7 +12,7 @@ module DeviseConfigGenerator
     # require 'devise/orm/mongo_mapper'
     def orm_configure!
       return if orm == :active_record
-      logger.debug "Configuring orm: [#{orm}]"
+      debug! "Configuring orm: [#{orm}]"
       
       if !devise_initializer?        
         say "WARNING: initializer/devise.rb not found", :yellow
@@ -20,7 +20,7 @@ module DeviseConfigGenerator
       end
         
       if !has_statement?(orm_replacement)
-        logger.debug "require 'devise/orm/#{orm}' already in devise.rb initializer"
+        debug! "require 'devise/orm/#{orm}' already in devise.rb initializer"
         return
       end
 
@@ -33,7 +33,7 @@ module DeviseConfigGenerator
     end
       
     def mailer_configure!
-      logger.debug "Configuring: devise mailer"            
+      debug! "Configuring: devise mailer"            
       insert_application_config "action_mailer.default_url_options = { :host => 'localhost:3000' }"
     end
     

data/lib/generators/devise/config/config_generator.rb

@@ -2,7 +2,6 @@ require 'sugar-high/file'
 require 'sugar-high/module'
 require 'cream'
 require 'rails3_artifactor'
-require 'logging_assist'
 require 'generators/cream/helpers/all'
 
 # include helpers
@@ -17,11 +16,12 @@ module Devise
 
       # ORM to use
       class_option :orm,          :type => :string,   :default => 'active_record',   :desc => "ORM to use"
+      class_option :logging,      :type => :boolean,  :default => false,             :desc => "Logging on?" 
       class_option :logfile,      :type => :string,   :default => nil,               :desc => "Logfile location" 
       class_option :gems,         :type => :boolean,  :default => true,              :desc => "Add gems to gemfile?"
 
       def configure_devise
-      	logger.add_logfile :logfile => logfile if logfile	        
+      	logit!
       	devise_gems if gems?      	  
       	say "WARNING: Not configuring devise gems for #{orm}", :yellow if !gems?
          
@@ -43,10 +43,10 @@ module Devise
     
       def devise_install        
         if devise_initializer?
-          logger.debug "initializers/devise.rb was found so devise:install will not be run"
+          debug! "initializers/devise.rb was found so devise:install will not be run"
           return 
         end
-        logger.debug "initializers/devise.rb was NOT found so devise:install will now be run" 
+        debug! "initializers/devise.rb was NOT found so devise:install will now be run" 
         rgen 'devise:install'
       end        
 

data/lib/generators/devise/customize/customize_generator.rb

@@ -2,7 +2,6 @@ require 'sugar-high/file'
 require 'sugar-high/module'
 require 'cream'
 require 'rails3_artifactor'
-require 'logging_assist'
 require 'generators/cream/helpers/all'
 
 require_all File.dirname(__FILE__) # + '/helpers'
@@ -16,14 +15,15 @@ module Devise
 
       # ORM to use
       class_option :orm,        :type => :string,   :default => 'active_record',   :desc => "ORM to use"
+      class_option :logging,    :type => :boolean,  :default => false,             :desc => "Logging on?" 
       class_option :logfile,    :type => :string,   :default => nil,               :desc => "Logfile location"
 
       class_option :user_name,   :type => :boolean,  :default => true,        :desc => "Add username as login option"
       class_option :login_type,  :type => :string,   :default => 'generic',   :desc => "How to login: 'email', 'username', 'generic' (i.e 'username' or 'email')"
       
       def main_flow
-      	logger.add_logfile :logfile => logfile if logfile
-      	logger.debug 'customizing devise...'
+        logit!
+      	debug! 'customizing devise...'
 
         Devise::Customizers::UserName.new(orm, user_class, login_attribute).add_to_user_class if add_user_name?    
       end

data/lib/generators/devise/customize/helpers/username_helper.rb

@@ -17,9 +17,9 @@ module Devise
       end
 
       def add_to_user_class
-        logger.debug 'add_to_user_class'
+        debug! 'add_to_user_class'
         if active_record? && !has_migration_file?(:add_username_to_users)
-          logger.debug 'create migration: add_username_to_users'
+          debug! 'create migration: add_username_to_users'
           %x[rails g migration add_username_to_users username:string]
           %x[rake db:migrate]        
         end
@@ -54,7 +54,7 @@ module Devise
       end
 
       def configure_generic_login
-        logger.debug 'configure generic login'
+        debug! 'configure generic login'
         add_virtual_login_accessor        
         override_user_auth        
         modify_retrieve_password
@@ -126,7 +126,7 @@ module Devise
         end
 
         def modify_initializer
-          logger.debug 'modify devise initializer'
+          debug! 'modify devise initializer'
           return if devise_init_content? keys_stmt_replacement(login_attribute)
         
           replace_initializer_content :devise,  :where => default_keys_stmt, :with => keys_stmt_replacement(login_attribute)

data/lib/generators/devise/users/helper.rb

@@ -42,7 +42,7 @@ module DeviseUserGenerator
       begin
         read_model(user.as_filename) =~ /devise/
       rescue Exception => e
-        logger.info "Exception for #has_devise_user? #{user}: #{e.message}"
+        info! "Exception for #has_devise_user? #{user}: #{e.message}"
         false
       end
     end

data/lib/generators/devise/users/routes_helper.rb

@@ -2,69 +2,74 @@ module DeviseUserGenerator
   module RoutesHelper
     def model_routes
       arg = "#{user_class.pluralize.underscore}"
-      arg << ", :admins" if admin_user?
+      # arg << ", :admins" if admin_user?
       arg
     end
 
     def routes_configure!
-      routes_content = routes_for_roles
+      routes_content = default_signin_routes << user_type_routes
       puts "Insert into routes: #{routes_content}"
       insert_into_routes do
         routes_content
       end
     end
-
-    def routes_for_roles    
-      say customize_note, :green
     
-      routes_customize_comment << roles_routes
+    def user_types_to_route 
+      @user_types_to_route ||= user_types_except(:guest).delete_if do |user_type|
+        name_user_types = user_type.pluralize
+        is_there = !(read_routes_file =~ /devise_for :#{name_user_types}, :class_name =>/).nil?
+        debug! "not doing devise routing for #{name_user_types} as it is already there" if is_there
+        is_there
+      end
     end
 
-    def roles_except *names
-      roles.reject {|r| names.include? r.to_sym }
-    end
+    def default_signin_routes 
+      name_default_users = user_class.underscore.gsub('/', '_').pluralize
+      default_user_class = user_class.classify
+      %Q{
+  match '/sign_in' => 'main#index'
+  match '/log_in'  => 'main#index'
 
-    def roles_routes 
-      roles_to_route = roles_except(:guest).delete_if do |role|        
-        is_there = !(read_routes_file =~ /devise_for :#{role.pluralize}, :class_name =>/).nil?
-        logger.debug "not doing devise routing for #{role.pluralize} as it is already there" if is_there
-        is_there
-      end
+  devise_scope do
+    get '/sign_in'  => 'main#index', :as => :new_user_session    
+  end
+      
+  devise_for :#{name_default_users}, :class_name => '#{default_user_class}', :controllers => {:sessions => 'main'} do
+    get '/sign_in' => 'main#index', :as => :new_user_session
+  end}
+    end
 
-      roles_to_route.each do |role|
-        if read_routes_file =~ /devise_for :#{role.pluralize}/          
-          logger.debug "removing old devise routing for: #{role}"
-          File.remove_content_from routes_file, :where => /devise_for :#{role.pluralize}/
+    def user_type_routes 
+      user_types_to_route.each do |user_type|
+        name_user_types = user_type.pluralize
+        if read_routes_file =~ /devise_for :#{name_user_types}/          
+          debug! "removing old devise routing for: #{name_user_types}"
+          File.remove_content_from routes_file, :where => /devise_for :#{name_user_types}/
         end
       end
 
-      logger.debug "performing devise role routing for: #{roles_to_route}"
-      roles_to_route.map do |role|      
-          %Q{
-  devise_for :#{role.pluralize}, :class_name => '#{role.classify}'
-  as :#{role} do
-    match "/#{role.pluralize}/sign_up" => "devise/registrations#new", :as => :#{role}_signup
+      debug! "performing devise role routing for: #{user_types_to_route}"
+
+      user_types_to_route.map do |user_type| 
+        name_user_types = user_type.pluralize     
+        name_user_type = user_type.underscore.gsub('/', '_')
+          %Q{            
+  devise_for :#{name_user_types}, :class_name => '#{user_type.classify}', :controllers => {:registrations => 'devise/registrations', :sessions => 'main'} do
+    match "/#{name_user_types}/sign_in" => "devise/sessions#new", :as => :#{name_user_type}_signin
+    match "/#{name_user_types}/sign_up" => "devise/registrations#new", :as => :#{name_user_type}_signup
   end
   }
       end.join("\n")
-    end
+    end    
     
-
-    def routes_customize_comment
-      return "" if read_routes_file =~ /customize controller action/
-      %q{
-# customize controller action if needed to render individual registration form for each role    
-# Example:
-# match "/editors/sign_up" => "user_registrations#new_editor", :as => :editor_signup
-
-#  'user_registrations_controller.rb' with the action #new_editor
-# def new_editor
-#   build_resource({})
-# end
-# 
-# and the registration form in 'views/user_registrations/new_editor.html.erb'
-#
-}
+    protected
+    
+    def roles_except *names
+      roles.reject {|r| names.include? r.to_sym }
     end
+
+    def user_types_except *names
+      user_types.reject {|r| user_types.include? r.to_sym }
+    end    
   end
 end

data/lib/generators/devise/users/users_generator.rb

@@ -2,7 +2,6 @@ require 'sugar-high/file'
 require 'sugar-high/module'
 require 'cream'
 require 'rails3_artifactor'
-require 'logging_assist'
 require 'generators/cream/helpers/all'
 
 # include helpers
@@ -18,19 +17,22 @@ module Devise
 
       class_option :user_class,     :type => :string,   :default => 'User',           :desc => "User class"
 
+      class_option :registrations_for,  :type => :array,   :default => [],            :desc => "User types individual registrations"
+
       # ORM to use
       class_option :orm,            :type => :string,   :default => 'active_record',  :desc => "ORM to use"
       class_option :roles,          :type => :array,    :default => [],               :desc => "Roles"
-      class_option :default_roles,  :type => :boolean,  :default => true,             :desc => "Create default roles :admin and :guest"
+      # class_option :default_roles,  :type => :boolean,  :default => true,             :desc => "Create default roles :admin and :guest"
 
       class_option :user_types,     :type => :array,    :default => ['admin'],        :desc => "Devise Users to create that override the generic base User", :aliases => '-ut'
 
+      class_option :logging,        :type => :boolean,  :default => false,             :desc => "Logging on?" 
       class_option :logfile,        :type => :string,   :default => nil,              :desc => "Logfile location" 
       class_option :gems,           :type => :boolean,  :default => false,            :desc => "Add gems to gemfile?"
       
       def configure_devise_users      
-      	logger.add_logfile :logfile => logfile if logfile
-        logger.debug "Configure Devise Users"
+      	logit!
+        debug! "Configure Devise Users"
 
         self.class.use_orm orm.to_sym
 
@@ -48,6 +50,17 @@ module Devise
         end
         
         routes_configure!
+        
+        registrations.each do |reg|
+          if user_type? reg
+          # create controller   
+          controller = "#{reg}::Registrations".camelcase
+          rgen "controller #{controller} new"
+          rgen "view #{controller} new"
+          
+          # make controller a devise controller
+          replace_controller_inheritance controller.underscore, 'Devise::RegistrationsController' 
+        end
       end
 
       protected
@@ -62,12 +75,24 @@ module Devise
 
       use_helpers :model, :app, :special, :file
 
+      def remove_controller_inheritance name
+        File.remove_content_from controller_file_name(name.as_filename), :where => /<\s*ApplicationController/
+      end
+
+      def replace_controller_inheritance name, replace_controller  
+        File.replace_content_from controller_file_name(name.as_filename), :where => /<\s*ApplicationController/, :with => replace_controller
+      end
+
+      def registrations
+        options[:registrations_for]
+      end
+
       # creates a new user model of a given name without devise strategies, instead inheriting from the base User
       # Never create a Guest user model as this should always be a "fake" (suggestions!?) 
       def create_user name
         return if name.to_sym == :guest
 
-        logger.debug "create devise user: #{name}"
+        debug! "create devise user: #{name}"
         create_user_model name
         # remove any current inheritance
         remove_inheritance name
@@ -102,30 +127,6 @@ module Devise
       def devise_base_user
         create_devise_model user_class
       end
-
-      private
-
-      def customize_note
-        %q{
-Customize controller action if needed to render an individual registration form for each devise User type
-
-Example:
-
-- routes.rb:
-
-  match "/editors/sign_up" => "user_registrations#new_editor", :as => :editor_signup
-
-- user_registrations_controller.rb:
-
-  def new_editor
-    build_resource({})
-  end
-
-Then create the registration form (view) for the :editor user in 'views/user_registrations/new_editor.html.erb'  
-See comments in routes.rb for more info. There is also a page on the wiki about advanced routes customization.
-}
-      end
-      
     end
   end
 end

data/lib/generators/permits/config/config_generator.rb

@@ -2,7 +2,6 @@ require 'sugar-high/file'
 require 'sugar-high/module'
 require 'cream'
 require 'rails3_artifactor'
-require 'logging_assist'
 require 'generators/cream/helpers/all'
 
 module Permits
@@ -15,12 +14,13 @@ module Permits
       class_option :roles,          :type => :array,    :desc => "Roles for permits"
       class_option :default_roles,  :type => :boolean,  :default => true,  :desc => "Create default roles :admin and :guest"      
 
+      class_option :logging,    :type => :boolean,  :default => false,             :desc => "Logging on?" 
       class_option :logfile,  :type => :string,   :default => nil,                :desc => "Logfile location" 
       class_option :gems,     :type => :boolean,  :default => false,              :desc => "Add gems to gemfile?"       
 
       def configure_permits
-      	logger.add_logfile :logfile => logfile if logfile
-        logger.debug "Configure Permits"
+      	logit!
+        debug! "Configure Permits"
 
 		    permits_gems if gems?
 

data/lib/generators/roles/config/config_generator.rb

@@ -2,7 +2,6 @@ require 'sugar-high/file'
 require 'sugar-high/module'
 require 'cream'
 require 'rails3_artifactor'
-require 'logging_assist'
 require 'generators/cream/helpers/all'
 
 module Roles
@@ -20,12 +19,16 @@ module Roles
       class_option :role_class,         :type => :string, :aliases => "-rc",  :default => 'Role',     :desc => "Role class name", :optional => true
       class_option :user_role_class,    :type => :string, :aliases => "-urc", :default => 'UserRole', :desc => "User-Role (join table) class name", :optional => true
 
+      class_option :logging,            :type => :boolean,  :default => false,             :desc => "Logging on?" 
       class_option :logfile,            :type => :string,   :default => nil,                :desc => "Logfile location" 
       class_option :default_roles,      :type => :boolean,  :default => true,               :desc => "Create default roles :admin and :guest"
       class_option :gems,               :type => :boolean,  :default => true,               :desc => "Add gems to gemfile?"       
       
       def configure_roles
-      	logger.add_logfile :logfile => logfile if logfile
+        if logging_on?
+          require 'logging_assist'
+      	  
+    	  end
 
         # make the artifactor model methods behave according to selected orm! - this is a macro
         set_orm      	
@@ -55,7 +58,8 @@ module Roles
       end 
 
       def create_roles
-        rgen "#{roles_generator} #{user_class} --strategy #{strategy} --roles #{roles_list} #{default_roles_option} #{class_options}"        
+        # #{default_roles_option}
+        rgen "#{roles_generator} #{user_class} --strategy #{strategy} --roles #{roles_list} #{class_options}"        
       end
 
       def set_valid_roles_cream
@@ -106,9 +110,9 @@ module Roles
         "valid_roles_are Cream::Role.available"
       end
 
-      def default_roles_option
-        default_roles? ? '--default-roles' : '--no-default-roles'
-      end      
+      # def default_user_types_option
+      #   default_user_types? ? '--default-user-types' : '--no-default-user-types'
+      # end      
     end
   end
 end