cream 0.8.7 → 0.8.8

data/Changelog.txt

@@ -1,3 +1,7 @@
+0.8.7 - Jan 9, 2011
+-----
+Added devise:customize generator, cleaned up design and fixed some bugs!
+
 0.8.6 - Jan 4, 2011
 -----
 Completed major refactoring to streamline generators and DRY things up!

data/Gemfile

@@ -14,7 +14,7 @@ group :default do
   gem "rails",             ">= 3.0.1"
 
   gem "rails3_artifactor", ">= 0.3.2"
-  gem 'logging_assist',    "~> 0.1.6"
+  gem 'logging_assist',    ">= 0.2.0"
 
   gem "r3_plugin_toolbox", ">= 0.4.0" 
   gem "sugar-high",        "~> 0.3.1"      

data/README.textile

@@ -59,8 +59,6 @@ Cream edge (directly from trunk or a feature branch), might have some extra good
 
 <code>gem 'cream', :git => 'https://github.com/kristianmandrup/cream.git'</code>
 
-Note: As a bonus you currently get access to a new *devise:customize* generator under development (Jan 7, 2011) 
-
 There is also a _:branch_ option to use a specific branch, fx a feature branch.
 
 If you want to develop on Cream: <code>git clone https://github.com/kristianmandrup/cream.git</code>

data/Rakefile

@@ -27,10 +27,10 @@ begin
     gem.add_dependency "rails",             ">= 3.0.1"
 
     gem.add_dependency "rails3_artifactor", "~> 0.3.2"
-    gem.add_dependency 'logging_assist',    "~> 0.1.6"
+    gem.add_dependency 'logging_assist',    ">= 0.1.6"
 
     gem.add_dependency "r3_plugin_toolbox", ">= 0.4.0" 
-    gem.add_dependency "sugar-high",        "~> 0.3.1"
+    gem.add_dependency "sugar-high",        ">= 0.3.1"
            
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
     

data/VERSION

@@ -1 +1 @@
-0.8.7
+0.8.8

data/cream.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cream}
-  s.version = "0.8.7"
+  s.version = "0.8.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
@@ -54,6 +54,7 @@ Gem::Specification.new do |s|
     "lib/cream/view/user_action_menu.rb",
     "lib/generators/cancan/config/config_generator.rb",
     "lib/generators/cream/app/app_generator.rb",
+    "lib/generators/cream/core_ext.rb",
     "lib/generators/cream/full_config/full_config_generator.rb",
     "lib/generators/cream/helpers/all.rb",
     "lib/generators/cream/helpers/args_helper.rb",
@@ -141,7 +142,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<cancan>, [">= 1.4.0"])
       s.add_runtime_dependency(%q<rails>, [">= 3.0.1"])
       s.add_runtime_dependency(%q<rails3_artifactor>, [">= 0.3.2"])
-      s.add_runtime_dependency(%q<logging_assist>, ["~> 0.1.6"])
+      s.add_runtime_dependency(%q<logging_assist>, [">= 0.2.0"])
       s.add_runtime_dependency(%q<r3_plugin_toolbox>, [">= 0.4.0"])
       s.add_runtime_dependency(%q<sugar-high>, ["~> 0.3.1"])
       s.add_development_dependency(%q<rspec>, [">= 2.0.1"])
@@ -159,9 +160,9 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<cancan>, [">= 1.4.0"])
       s.add_runtime_dependency(%q<rails>, [">= 3.0.1"])
       s.add_runtime_dependency(%q<rails3_artifactor>, ["~> 0.3.2"])
-      s.add_runtime_dependency(%q<logging_assist>, ["~> 0.1.6"])
+      s.add_runtime_dependency(%q<logging_assist>, [">= 0.1.6"])
       s.add_runtime_dependency(%q<r3_plugin_toolbox>, [">= 0.4.0"])
-      s.add_runtime_dependency(%q<sugar-high>, ["~> 0.3.1"])
+      s.add_runtime_dependency(%q<sugar-high>, [">= 0.3.1"])
     else
       s.add_dependency(%q<devise-links>, [">= 0.2.0"])
       s.add_dependency(%q<cancan-rest-links>, [">= 0.2.0"])
@@ -172,7 +173,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<cancan>, [">= 1.4.0"])
       s.add_dependency(%q<rails>, [">= 3.0.1"])
       s.add_dependency(%q<rails3_artifactor>, [">= 0.3.2"])
-      s.add_dependency(%q<logging_assist>, ["~> 0.1.6"])
+      s.add_dependency(%q<logging_assist>, [">= 0.2.0"])
       s.add_dependency(%q<r3_plugin_toolbox>, [">= 0.4.0"])
       s.add_dependency(%q<sugar-high>, ["~> 0.3.1"])
       s.add_dependency(%q<rspec>, [">= 2.0.1"])
@@ -190,9 +191,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<cancan>, [">= 1.4.0"])
       s.add_dependency(%q<rails>, [">= 3.0.1"])
       s.add_dependency(%q<rails3_artifactor>, ["~> 0.3.2"])
-      s.add_dependency(%q<logging_assist>, ["~> 0.1.6"])
+      s.add_dependency(%q<logging_assist>, [">= 0.1.6"])
       s.add_dependency(%q<r3_plugin_toolbox>, [">= 0.4.0"])
-      s.add_dependency(%q<sugar-high>, ["~> 0.3.1"])
+      s.add_dependency(%q<sugar-high>, [">= 0.3.1"])
     end
   else
     s.add_dependency(%q<devise-links>, [">= 0.2.0"])
@@ -204,7 +205,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<cancan>, [">= 1.4.0"])
     s.add_dependency(%q<rails>, [">= 3.0.1"])
     s.add_dependency(%q<rails3_artifactor>, [">= 0.3.2"])
-    s.add_dependency(%q<logging_assist>, ["~> 0.1.6"])
+    s.add_dependency(%q<logging_assist>, [">= 0.2.0"])
     s.add_dependency(%q<r3_plugin_toolbox>, [">= 0.4.0"])
     s.add_dependency(%q<sugar-high>, ["~> 0.3.1"])
     s.add_dependency(%q<rspec>, [">= 2.0.1"])
@@ -222,9 +223,9 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<cancan>, [">= 1.4.0"])
     s.add_dependency(%q<rails>, [">= 3.0.1"])
     s.add_dependency(%q<rails3_artifactor>, ["~> 0.3.2"])
-    s.add_dependency(%q<logging_assist>, ["~> 0.1.6"])
+    s.add_dependency(%q<logging_assist>, [">= 0.1.6"])
     s.add_dependency(%q<r3_plugin_toolbox>, [">= 0.4.0"])
-    s.add_dependency(%q<sugar-high>, ["~> 0.3.1"])
+    s.add_dependency(%q<sugar-high>, [">= 0.3.1"])
   end
 end
 

data/lib/cream/helper/role.rb

@@ -17,12 +17,18 @@ module Cream::Helper
       return if Labels.state_check Labels.extract(options), current_user
       yield 
     end
-    
+
     # does the user have ANY of the given roles?
     # Uses generic roles API    
     def has_role? user_role
       current_user && current_user.has_role?(user_role)
     end
+    
+    # does the user have ANY of the given roles?
+    # Uses generic roles API    
+    def has_any_role? user_role
+      current_user && current_user.has_any_role?(user_role)
+    end
 
     # does the user have ALL of the given roles?
     # Uses generic roles API
@@ -30,6 +36,20 @@ module Cream::Helper
       current_user && current_user.has_roles?(roles.flat_uniq)
     end
 
+    # using group membership as guard
+
+    def for_user_in_group name, &block
+      yield if current_user && current_user.is_in_group?(name)
+    end
+
+    def for_user_in_groups *names, &block
+      yield if current_user && current_user.is_in_group?(names.flat_uniq)
+    end
+
+    def for_user_in_any_group *names, &block
+      yield if current_user && current_user.is_in_any_groups?(names.flat_uniq)
+    end
+
     # returns true if the current user owns the object
     # tries default 'owner' relations if none given as an argument
     def owner? obj, relation=nil
@@ -44,14 +64,16 @@ module Cream::Helper
 
     # execute block if user DOES have any of the given roles
     def for_roles *user_roles, &block
-      user_roles = user_roles.flatten
+      user_roles = user_roles.flat_uniq
       yield if has_roles?(user_roles) && block
     end 
+    alias_method :when_user_is, :for_roles
 
     def for_any_role *user_roles, &block
-      user_roles = user_roles.flatten
-      yield if has_role?(user_roles) && block
+      user_roles = user_roles.flat_uniq
+      yield if has_any_role?(user_roles) && block
     end 
+    alias_method :when_user_is_any_of, :for_any_role
 
     def for_role user_role, &block     
       if is_negation_role?(user_role) 
@@ -61,9 +83,10 @@ module Cream::Helper
       yield if has_role?(user_role) && block
     end 
     
+    
     # execute block if user DOES NOT have any of the given roles
     def not_for_roles(*user_roles, &block)            
-      user_roles = user_roles.flatten
+      user_roles = user_roles.flat_uniq
       yield if !has_roles?(user_roles) && block
     end        
 
@@ -73,7 +96,8 @@ module Cream::Helper
         return
       end
       yield if !has_role?(user_role) && block
-    end        
+    end
+    alias_method :when_user_is_not, :not_for_roles
 
     protected 
     

data/lib/generators/cream/core_ext.rb

@@ -0,0 +1,14 @@
+# TODO: 
+# model_file_name and similar methods in rails3_assist and rails3_artifaftor should be fixed to always call underscore on filenames
+
+class String
+  def as_filename
+    self.underscore  
+  end
+end
+
+class Symbol
+  def as_filename
+    self.to_s.underscore  
+  end
+end

data/lib/generators/cream/full_config/full_config_generator.rb

@@ -35,6 +35,8 @@ module Cream
       class_option :migrations,     :type => :boolean,  :default => false,            :desc => "Autorun database migrations?", :aliases => '-m'
 
       # Devise customize
+      class_option :customize,   :type => :array,    :default => [],          :desc => "Which elements of devise to customize (customize generator)"      
+      
       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')"
 
@@ -80,7 +82,8 @@ module Cream
       end
 
       def run_migrations
-        return if orm != 'active_record'
+        return if orm != :active_record
+        logger.debug "Running DB migrations"          
         execute "rake db:migrate"
       end
 
@@ -91,7 +94,10 @@ module Cream
       def run_devise
         rgen "devise:config #{user_class} --orm #{orm} #{admin_user_option}"
         rgen "devise:users --orm #{orm} --roles #{roles_list} #{admin_user_option} --no-gems"
-        rgen "devise:customize #{user_class} --orm #{orm} --login-type #{login_type} #{user_name_option}"
+
+        say("Devise credentials not customized since --customize option was not used to say so!", :green) if !customize_credentials?
+
+        rgen "devise:customize #{user_class} --orm #{orm} --login-type #{login_type} #{user_name_option}" if customize_credentials?
       end
 
       def run_cancan
@@ -117,6 +123,14 @@ require 'cream/configure/rails'
         end
       end
 
+      def customize_credentials?
+        customize.include? 'credentials'
+      end
+
+      def customize
+        options[:customize]
+      end
+
       def login_type
         options[:login_type]
       end

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

@@ -1,3 +1,4 @@
+require 'generators/cream/core_ext'
 require_all File.dirname(__FILE__)
 
 module Cream

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

@@ -15,7 +15,7 @@ module Cream
       end
       
       def has_user_model?
-        model_file?(user_class)
+        model_file?(user_class.as_filename)
       end
 
       def set_orm

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

@@ -7,8 +7,10 @@ module DeviseUserGenerator
       }
     end
 
-    def inherit_model hash                         
-      File.replace_content_from model_file_name(subclass hash), :where => /class #{admin_class_name}/, :with => "class #{admin_class_name} < #{superclass hash}"
+    def inherit_model hash                      
+      class_name = subclass(hash)   
+      superclass_name = superclass(hash)
+      File.replace_content_from model_file_name(class_name.as_filename), :where => /class #{class_name}/, :with => "class #{class_name} < #{superclass_name}"
     end
 
     def superclass hash
@@ -20,15 +22,15 @@ module DeviseUserGenerator
     end
 
     def remove_inheritance user
-      File.remove_content_from model_file_name(user), :where => /<\s*ActiveRecord::Base/
+      File.remove_content_from model_file_name(user.as_filename), :where => /<\s*ActiveRecord::Base/
     end  
 
     def has_admin_model?
-      has_model? admin_class
+      has_model? admin_class.as_filename
     end
 
     def has_user_model?
-      has_model? user_class        
+      has_model? user_class.as_filename        
     end
 
     def user_generator 
@@ -38,7 +40,7 @@ module DeviseUserGenerator
     def has_devise_user? user
       return true if is_admin?(user) && !admin_class
       begin
-        read_model(user) =~ /devise/
+        read_model(user.as_filename) =~ /devise/
       rescue Exception => e
         logger.info "Exception for #has_devise_user? #{user}: #{e.message}"
         false

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

@@ -7,8 +7,10 @@ module DeviseUserGenerator
     end
 
     def routes_configure!
+      routes_content = routes_for_roles
+      puts "Insert into routes: #{routes_content}"
       insert_into_routes do
-        routes_for_roles
+        routes_content
       end
     end
 
@@ -23,9 +25,22 @@ module DeviseUserGenerator
     end
 
     def roles_routes 
-      roles_except(:guest).map do |role|
-        next if read_routes_file =~ /devise_for :#{role.pluralize}/
-        %Q{
+      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
+
+      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}/
+        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

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

@@ -113,18 +113,22 @@ module Devise
 
       def customize_note
         %q{
-  Customize controller action if needed to render individual registration form for each role
-  Example:
+Customize controller action if needed to render individual registration form for each role
 
-  routes.rb
-    match "/editors/sign_up" => "user_registrations#new_editor", :as => :editor_signup
+Example:
 
-  user_registrations_controller.rb
-    def new_editor
-      build_resource({})
-    end
+- routes.rb:
+
+  match "/editors/sign_up" => "user_registrations#new_editor", :as => :editor_signup
+
+- user_registrations_controller.rb:
+
+  def new_editor
+    build_resource({})
+  end
 
-  Create the registration form for the editor user in 'views/user_registrations/new_editor.html.erb'  
+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
       

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 7
-  version: 0.8.7
+  - 8
+  version: 0.8.8
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -157,13 +157,13 @@ dependencies:
   requirement: &id010 !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: *id010
@@ -427,7 +427,7 @@ dependencies:
   requirement: &id028 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
@@ -457,7 +457,7 @@ dependencies:
   requirement: &id030 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
@@ -514,6 +514,7 @@ files:
 - lib/cream/view/user_action_menu.rb
 - lib/generators/cancan/config/config_generator.rb
 - lib/generators/cream/app/app_generator.rb
+- lib/generators/cream/core_ext.rb
 - lib/generators/cream/full_config/full_config_generator.rb
 - lib/generators/cream/helpers/all.rb
 - lib/generators/cream/helpers/args_helper.rb