cream 0.9.0 → 0.9.1

data/README.textile

@@ -24,9 +24,12 @@ Cream comes with a suite of specialized generators that should let you configure
 
 Note: Lately Cream also has options for some common customizations such as allowing login using either username or email. 
 
-h2. Status update (Feb 13)
+h2. Status update (May 7, 2011)
 
-Just added a @registrations_for@ option to the @devise:users@ generator. This allows you to specify for which user types to create individual registration controllers and pages (if needed). The routes_helper has been updated in order to be aligned with this approach. Please try out edge and let me know how well it works.
+*IMPORTANT*
+
+The project has undergone a lot of bugfixes during 4-7 of May, thanks to @alecslupu who was patient enough to go through all the pain to find the bugs and assist me in fixing them. Thanks! Please use the latest master branches for cream, cancan-permits, roles_active_record, rails_assist and rails_artifactor. If you get problems from any other dependency gems, I recommend that you use their github master branch as the source.
+I hope to release all gems ASAP when I know they all play nice ;)
 
 h2. Objectives
 
@@ -47,7 +50,7 @@ h2. The magic behind the curtain...
 Cream leverages an extensive "Tool suite":https://github.com/kristianmandrup/cream/wiki/Tool-suite-for-designing-powerful-generators-and-gems-for-Rails-3 I have created specifically to make it much easier/faster to create gems and generators for Rails 3 and spec/test them with RSpec 2, all using more natural DSLs and APIs. 
 If you look into the Cream code you can see extensive usage of this "magic" (especially in the generators).
 
-Status (Jan 15): I'm currently in the process of refactoring and improving this underlying "tool suite". I might call it _rails-mixer_ or something :P ?
+Status (Jan 15): I'm currently in the process of refactoring and improving this underlying "tool suite". I might call it _rails-mixer_ or something.
 
 h2. Cream user group
 

data/VERSION

@@ -1 +1 @@
-0.9.0
+0.9.1

data/cream.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cream}
-  s.version = "0.9.0"
+  s.version = "0.9.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Kristian Mandrup}]
-  s.date = %q{2011-05-06}
+  s.date = %q{2011-05-07}
   s.description = %q{An integrated Authentication, Authorization and Roles solution for your Rails 3 app with support for multiple ORMs}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [

data/lib/generators/cream/app/app_generator.rb

@@ -47,11 +47,11 @@ require "rails/test_unit/railtie"
        
       def app_routes
         routes = read_routes_file
-        # if no :welcome controller
+        # if no 'root' route
         if !(routes =~ /root\s+:/)
-          # create one with an 'index' view.
-          rgen "controller Welcome index"
-          File.insert_into routes_file, :after => 'do', :content => 'root :to => "welcome#index"'
+          # create a MainController with an #index action.
+          rgen "controller Main index"
+          File.insert_into routes_file, :after => 'do', :content => 'root :to => "main#index"'
         end
       end
       

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

@@ -30,7 +30,7 @@ module DeviseUserGenerator
   match '/sign_in' => 'main#index'
   match '/log_in'  => 'main#index'
 
-  devise_scope do
+  devise_for :#{name_default_users} do
     get '/sign_in'  => 'main#index', :as => :new_user_session    
   end
       

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

@@ -53,13 +53,14 @@ module Devise
         
         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' 
+            # 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
       end
 
@@ -68,7 +69,7 @@ module Devise
       extend  RailsAssist::UseMacro
 
       include Cream::GeneratorHelper
-      
+
       include DeviseUserGenerator::Helper
       include DeviseUserGenerator::RoutesHelper
 

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

@@ -25,7 +25,8 @@ module Permits
 		    permits_gems if gems?
 
         # Run permits generator to generate permit for each role
-        rgen "cancan:permits --roles #{roles_list} --orm #{orm}"
+        rgen "cancan:permits #{roles_list} --orm #{orm}"
+        # rgen "cancan:permits --roles #{roles_list} --orm #{orm}"
         rgen "cancan:licenses"
       end
 

data/spec/generators/cream/app/app_generator_spec.rb

@@ -36,8 +36,8 @@ describe 'Generator' do
         end
       end
 
-      it "should generate Welcome controller" do
-        controller_file?(:welcome).should be_true
+      it "should generate MainController" do
+        controller_file?(:main).should be_true
       end
       
       it "should add root to routes file" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cream
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-06 00:00:00.000000000Z
+date: 2011-05-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise-links
-  requirement: &2157585740 !ruby/object:Gem::Requirement
+  requirement: &2156150280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *2157585740
+  version_requirements: *2156150280
 - !ruby/object:Gem::Dependency
   name: cancan-rest-links
-  requirement: &2157584900 !ruby/object:Gem::Requirement
+  requirement: &2156149120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *2157584900
+  version_requirements: *2156149120
 - !ruby/object:Gem::Dependency
   name: cancan-permits
-  requirement: &2157584060 !ruby/object:Gem::Requirement
+  requirement: &2156148240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.3.11
   type: :runtime
   prerelease: false
-  version_requirements: *2157584060
+  version_requirements: *2156148240
 - !ruby/object:Gem::Dependency
   name: require_all
-  requirement: &2157583120 !ruby/object:Gem::Requirement
+  requirement: &2156147220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2157583120
+  version_requirements: *2156147220
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &2157582240 !ruby/object:Gem::Requirement
+  requirement: &2156146120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *2157582240
+  version_requirements: *2156146120
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &2157580920 !ruby/object:Gem::Requirement
+  requirement: &2156145260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 1.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2157580920
+  version_requirements: *2156145260
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2157580160 !ruby/object:Gem::Requirement
+  requirement: &2156144380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2157580160
+  version_requirements: *2156144380
 - !ruby/object:Gem::Dependency
   name: rails_artifactor
-  requirement: &2157579440 !ruby/object:Gem::Requirement
+  requirement: &2156143700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 0.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *2157579440
+  version_requirements: *2156143700
 - !ruby/object:Gem::Dependency
   name: r3_plugin_toolbox
-  requirement: &2157578780 !ruby/object:Gem::Requirement
+  requirement: &2156142840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2157578780
+  version_requirements: *2156142840
 - !ruby/object:Gem::Dependency
   name: sugar-high
-  requirement: &2157578020 !ruby/object:Gem::Requirement
+  requirement: &2156141880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2157578020
+  version_requirements: *2156141880
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2157572480 !ruby/object:Gem::Requirement
+  requirement: &2156135080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: 2.0.1
   type: :development
   prerelease: false
-  version_requirements: *2157572480
+  version_requirements: *2156135080
 - !ruby/object:Gem::Dependency
   name: generator-spec
-  requirement: &2157571860 !ruby/object:Gem::Requirement
+  requirement: &2156133700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: 0.7.0
   type: :development
   prerelease: false
-  version_requirements: *2157571860
+  version_requirements: *2156133700
 - !ruby/object:Gem::Dependency
   name: rspec-action_view
-  requirement: &2157571100 !ruby/object:Gem::Requirement
+  requirement: &2156132680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: 0.3.1
   type: :development
   prerelease: false
-  version_requirements: *2157571100
+  version_requirements: *2156132680
 - !ruby/object:Gem::Dependency
   name: rails-app-spec
-  requirement: &2157570440 !ruby/object:Gem::Requirement
+  requirement: &2156130620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: 0.3.0
   type: :development
   prerelease: false
-  version_requirements: *2157570440
+  version_requirements: *2156130620
 - !ruby/object:Gem::Dependency
   name: devise-spec
-  requirement: &2157569800 !ruby/object:Gem::Requirement
+  requirement: &2156127260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: 0.1.3
   type: :development
   prerelease: false
-  version_requirements: *2157569800
+  version_requirements: *2156127260
 - !ruby/object:Gem::Dependency
   name: roles-spec
-  requirement: &2157568940 !ruby/object:Gem::Requirement
+  requirement: &2156121400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: 0.1.3
   type: :development
   prerelease: false
-  version_requirements: *2157568940
+  version_requirements: *2156121400
 - !ruby/object:Gem::Dependency
   name: require_all
-  requirement: &2157568240 !ruby/object:Gem::Requirement
+  requirement: &2156120880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,10 +197,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2157568240
+  version_requirements: *2156120880
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &2157567440 !ruby/object:Gem::Requirement
+  requirement: &2156120000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,10 +208,10 @@ dependencies:
         version: 0.5.8
   type: :runtime
   prerelease: false
-  version_requirements: *2157567440
+  version_requirements: *2156120000
 - !ruby/object:Gem::Dependency
   name: devise-links
-  requirement: &2157566480 !ruby/object:Gem::Requirement
+  requirement: &2156119260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,10 +219,10 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *2157566480
+  version_requirements: *2156119260
 - !ruby/object:Gem::Dependency
   name: cancan-rest-links
-  requirement: &2157565660 !ruby/object:Gem::Requirement
+  requirement: &2156118580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -230,10 +230,10 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *2157565660
+  version_requirements: *2156118580
 - !ruby/object:Gem::Dependency
   name: cancan-permits
-  requirement: &2157562340 !ruby/object:Gem::Requirement
+  requirement: &2156117800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -241,10 +241,10 @@ dependencies:
         version: 0.3.11
   type: :runtime
   prerelease: false
-  version_requirements: *2157562340
+  version_requirements: *2156117800
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &2157561600 !ruby/object:Gem::Requirement
+  requirement: &2156117180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -252,10 +252,10 @@ dependencies:
         version: 1.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *2157561600
+  version_requirements: *2156117180
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &2157560760 !ruby/object:Gem::Requirement
+  requirement: &2156116580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -263,10 +263,10 @@ dependencies:
         version: 1.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *2157560760
+  version_requirements: *2156116580
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2157560020 !ruby/object:Gem::Requirement
+  requirement: &2156115960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -274,10 +274,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2157560020
+  version_requirements: *2156115960
 - !ruby/object:Gem::Dependency
   name: rails_artifactor
-  requirement: &2157559300 !ruby/object:Gem::Requirement
+  requirement: &2156115340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -285,10 +285,10 @@ dependencies:
         version: 0.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *2157559300
+  version_requirements: *2156115340
 - !ruby/object:Gem::Dependency
   name: r3_plugin_toolbox
-  requirement: &2157558440 !ruby/object:Gem::Requirement
+  requirement: &2156114720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -296,10 +296,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2157558440
+  version_requirements: *2156114720
 - !ruby/object:Gem::Dependency
   name: sugar-high
-  requirement: &2157557760 !ruby/object:Gem::Requirement
+  requirement: &2156113740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -307,7 +307,7 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2157557760
+  version_requirements: *2156113740
 description: An integrated Authentication, Authorization and Roles solution for your
   Rails 3 app with support for multiple ORMs
 email: kmandrup@gmail.com