cream 0.7.0 → 0.7.2

data/lib/generators/cream/views/haml_util.rb

@@ -36,7 +36,7 @@ module Cream
             end
           end
 
-          directory haml_root, "app/views/#{scope || 'devise'}"
+          directory haml_root, "app/views/#{scope || 'cream'}"
         end
       end
     end

data/lib/generators/cream/views/views_generator.rb

@@ -1,4 +1,4 @@
-require 'generators/cream/string_ext'
+require 'sugar-high/path'
 require 'generators/views/haml_util'
 
 module Cream

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

@@ -10,12 +10,13 @@ module Devise
       desc "Configure Devise"
 
       # ORM to use
-      class_option :orm,                :type => :string,   :default => 'active_record',  :desc => "ORM to use"
-      class_option :logfile,            :type => :string,   :default => nil,              :desc => "Logfile location" 
+      class_option :orm,     :type => :string,   :default => 'active_record',   :desc => "ORM to use"
+      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
       	logger.add_logfile :logfile => logfile if logfile	        
-        devise_gems
+        devise_gems if gems?
 		    devise_install
         [:orm, :mailer, :protection].each{|m| send(:"#{m}_configure!", orm) }
       end
@@ -27,6 +28,10 @@ module Devise
 
       use_helpers :controller, :app, :special, :file
 
+      def gems?
+        options[:gems]        
+      end
+
       def logfile
         options[:logfile]
       end
@@ -51,30 +56,34 @@ module Devise
         rgen 'devise:install'
       end        
 
-      def bundle_install
-        run "bundle install"
+      def bundle_install *gems
+        run "bundle install #{gems.join(' ')}"
       end
 
       def devise_gems 
         logger.debug 'devise_gems'
         gem 'devise'
 
-        # Devise ORM integration
+        orm_gem = nil
+        # Devise ORM integration        
         case orm.to_sym
         when :mongoid
           say "Please configure Devise for Mongoid as similar to Rails 3 example app: http://github.com/fortuity/rails3-mongoid-devise"
         when :mongo_mapper
+          orm_gem = 'mm-devise'
           gem 'mm-devise'
         when :data_mapper
+          orm_gem = 'dm-devise'
           gem 'dm-devise'
         when :couch_db
+          orm_gem = 'devise_couch'
           gem 'devise_couch'
           say "Please note that Couch DB does not currently have a Roles implementation. Feel free to provide one."
           say "Look at Roles DataMapper (roles_data_mapper) for an example ;)"
         else
           say "Orm #{orm} is not currently supported by Cream. You are most welcome to provide a Cream adapter for that ORM ;)"
         end
-        # bundle_install
+        bundle_install 'devise', orm_gem
       end 
 
       def protection_configure! orm

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

@@ -10,16 +10,17 @@ module Devise
       desc "Configure Devise with Users"
 
       # Create Admin user
-      class_option :admin_user,         :type => :boolean,  :default => false,            :desc => "Create admin user"  
+      class_option :admin_user,   :type => :boolean,  :default => false,            :desc => "Create admin user"  
       # ORM to use
-      class_option :orm,                :type => :string,   :default => 'active_record',  :desc => "ORM to use"
-      class_option :logfile,            :type => :string,   :default => nil,              :desc => "Logfile location" 
-
+      class_option :orm,          :type => :string,   :default => 'active_record',  :desc => "ORM to use"
+      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"
 
-        devise_gems
+        devise_gems if gems?
         devise_default_user if !has_model? :user
       
         # # if User model is NOT configured with devise strategy
@@ -35,17 +36,21 @@ module Devise
 
       use_helpers :model
 
+      def gems?
+        options[:gems]        
+      end
+
       def logfile
         options[:logfile]
       end
 
       def devise_gems
         gem 'devise'
-        # bundle_install
+        bundle_install 'devise'
       end
 
-      def bundle_install
-        run "bundle install"
+      def bundle_install *gems
+        run "bundle install #{gems.jon(' ')}"
       end
     
       def devise_default_user

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

@@ -11,18 +11,18 @@ module Permits
 
       # ORM to use
       class_option :orm,      :type => :string,   :default => 'active_record',    :desc => "ORM to use"
-      class_option :roles,    :type => :array,   :default => ['guest', 'admin'],  :desc => "Roles for permits"
+      class_option :roles,    :type => :array,    :default => ['guest', 'admin'], :desc => "Roles for permits"
       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"
 
-		    permits_gems
-		    permits_initializer
+		    permits_gems if gems?
 
         # Run permits generator to generate permit for each role
-        rgen "permits --roles #{roles}"
+        rgen "permits --roles #{roles} --orm #{orm}"
       end           
 
       protected        
@@ -32,6 +32,10 @@ module Permits
       
       use_helpers :app, :file, :special
 
+      def gems?
+        options[:gems]        
+      end
+
       # rails generate ...
       def rgen command
         execute "rails g #{command}"
@@ -55,14 +59,13 @@ module Permits
       end
 
       def permits_gems
-        gem 'cancan-permits'        
-      end 
+        gem 'cancan-permits'
+        bundle_install 'cancan-permits'
+      end
 
-      def permits_initializer
-        create_initializer :permits do 
-          "Permits::Ability.orm = :#{options[:orm]}"
-        end
-      end 
+      def bundle_install *gems
+        run "bundle install #{gems.jon(' ')}"
+      end
     end
   end
 end

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

@@ -15,10 +15,11 @@ module Roles
       class_option :roles,              :type => :array,    :default => ['guest', 'admin'], :desc => "Valid roles to use"
       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 => false,              :desc => "Add gems to gemfile?"       
+      
       def configure_roles
       	logger.add_logfile :logfile => logfile if logfile
-        roles_gems
+        roles_gems if gems?
         create_roles
         set_valid_roles_cream
         use_roles_strategy        
@@ -31,6 +32,10 @@ module Roles
       
       use_helpers :model, :file
 
+      def gems?
+        options[:gems]        
+      end
+
       def logfile
         options[:logfile]
       end
@@ -62,12 +67,13 @@ module Roles
       end
 
       def roles_gems
-        gem "roles_#{orm}"
-        # bundle_install
+        gem_name = "roles_#{orm}"
+        gem gem_name
+        bundle_install gem_name
       end 
 
-      def bundle_install
-        run "bundle install"
+      def bundle_install *gems
+        run "bundle install #{gems.join(' ')}"
       end
 
       def roles_generator

data/spec/generator_spec_helper.rb

@@ -16,7 +16,7 @@ RSpec.configure do |config|
   config.mock_with :mocha 
    
   config.before do
-    # create_rails_app
+    create_rails_app
   end
   
   # config.after do

data/spec/generators/cancan/config/cancan_config_generator_spec.rb

@@ -8,7 +8,7 @@ describe 'Generator' do
 
   before :each do              
     setup_generator 'config_generator' do
-      tests CanCan::Generators::ConfigGenerator
+      tests Cancan::Generators::ConfigGenerator
     end    
   end
 

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

@@ -1,30 +1,50 @@
-require 'spec_helper'
+require 'generator_spec_helper'
+require_generator :cream => :app
+
+LOGFILE = 'cream-app-config.log'
 
 describe 'Generator' do
-  with_generator do |g, c|
-    g.tests Cream::Generators::AppGenerator
-    c.setup
-  end
+  use_helpers :controller, :special, :file, :view
 
-  def check_generated_views folder=nil
-    with_generator do |g, check|
-      if folder
-        g.run_generator folder 
-      else             
-        g.run_generator
-        folder = 'menu'
-      end
-      check.view folder, '_admin_login_items.html.erb', %w{admin_block not_admin_block}
-      check.view folder, '_login_items.html.erb',       %w{user_block  not_user_block}
-      check.view folder, 'registration_items.html.erb', %w{user_block  not_user_block}
+  before :each do              
+    setup_generator :cream_app_generator do
+      tests Cream::Generators::AppGenerator
     end    
   end
 
-  it "should create views in default scope 'menu' " do
-    check_generated_views
+  describe "Configure Rails 3 app as a Cream app" do    
+    before do    
+      Dir.chdir Rails.root do        
+        @generator = with_generator do |g|
+          arguments = "--orm mongoid --logfile #{LOGFILE}".args
+          g.run_generator arguments
+        end
+      end
+    end
+
+    describe 'result of app generator' do       
+      it "should replace requirement statements in application file" do      
+        ["action_controller/railtie", "action_mailer/railtie", "active_resource/railtie", "rails/test_unit/railtie"].each do |req|
+          req = Regexp.escape(req)
+          read_application_file.should match /#{req}/
+        end
+      end
+
+      it "should add notice and alert flash displayers to application layout" do
+        [:alert, :notice].each do |name|
+          read_view(:layouts, :application).should match /<%= #{name} %>/
+        end
+      end
+
+      it "should generate Welcome controller" do
+        controller_file?(:welcome).should be_true
+      end
+      
+      it "should add root to routes file" do
+        read_routes_file.should match /root\s+:to\s*=>/
+      end
+    end
   end
-  
-  it "should create views in explicit scope 'login' " do
-    check_generated_views 'login'
-  end  
 end
+
+

data/spec/generators/cream/full_config/full_config_generator_spec.rb

@@ -0,0 +1,37 @@
+require 'generator_spec_helper'
+require_generator :cream => :full_config
+
+LOGFILE = 'cream-full_config.log'
+
+describe 'Generator' do
+  use_helpers :controller, :special, :file, :view
+
+  before :each do              
+    setup_generator :cream_full_config_generator do
+      tests Cream::Generators::FullConfigGenerator
+    end    
+  end
+
+  before do    
+    Dir.chdir Rails.root do        
+      @generator = with_generator do |g|
+        arguments = "--orm mongo_mapper --logfile #{LOGFILE}".args
+        g.run_generator arguments
+      end
+    end
+  end
+
+  describe "Configure Rails 3 app as a Cream configured app" do    
+    describe 'result of Cream config generator' do       
+      it "should add cream gem" do
+        Rails.root.should have_gem 'cream'
+      end
+
+      # it "should add mongoid devise gem" do
+      #   Rails.root.should have_gem 'mm-devise'
+      # end
+    end
+  end
+end
+
+

data/spec/generators/permits/config/permits_config_generator_spec.rb

@@ -31,7 +31,7 @@ describe 'Generator' do
       end
 
       it "should generate a permits initializer file with orm set to mongoid" do      
-        File.read(initializer_file(:permits)).should match /Permits::Application.orm = mongoid/
+        File.read(initializer_file(:permits)).should match /Permits::Application.orm = :mongoid/
       end      
     end
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 2
+  version: 0.7.2
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-16 00:00:00 +02:00
+date: 2010-10-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,8 +29,7 @@ dependencies:
         - 2
         - 0
         - 0
-        - rc
-        version: 2.0.0.rc
+        version: 2.0.0
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -194,8 +193,8 @@ dependencies:
         segments: 
         - 0
         - 2
-        - 5
-        version: 0.2.5
+        - 8
+        version: 0.2.8
   type: :runtime
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
@@ -239,8 +238,8 @@ dependencies:
         segments: 
         - 0
         - 2
-        - 10
-        version: 0.2.10
+        - 11
+        version: 0.2.11
   type: :runtime
   version_requirements: *id015
 description: Provides assistance for setting up Session, Role and Permission systems for a Rails 3 app. Support for multiple ORMs
@@ -274,7 +273,6 @@ files:
 - features/role_strategy/clears_role_strategy.feature
 - init.rb
 - lib/cream.rb
-- lib/cream/configure.rb
 - lib/cream/configure/after_init/role_config.rb
 - lib/cream/configure/rails.rb
 - lib/cream/controller/ability.rb
@@ -284,21 +282,13 @@ files:
 - lib/cream/namespaces.rb
 - lib/cream/rails/config.rb
 - lib/cream/role.rb
+- lib/cream/roles_config.rb
 - lib/cream/view/host_area.rb
 - lib/cream/view/role_area.rb
 - lib/cream/view/user_action_menu.rb
 - lib/generators/cancan/config/config_generator.rb
 - lib/generators/cream/app/app_generator.rb
-- lib/generators/cream/config/DESIGN NOTES.markdown
-- lib/generators/cream/config/config_generator.rb
-- lib/generators/cream/config/modules/app_config.rb
-- lib/generators/cream/config/modules/cancan_config.rb
-- lib/generators/cream/config/modules/cream_config.rb
-- lib/generators/cream/config/modules/devise_config.rb
-- lib/generators/cream/config/modules/devise_users_config.rb
-- lib/generators/cream/config/modules/helper.rb
-- lib/generators/cream/config/modules/permits_config.rb
-- lib/generators/cream/config/modules/roles_config.rb
+- lib/generators/cream/full_config/full_config_generator.rb
 - lib/generators/cream/views/haml_util.rb
 - lib/generators/cream/views/views_generator.rb
 - lib/generators/cream_refactor.rb
@@ -320,14 +310,7 @@ files:
 - spec/generator_spec_helper.rb
 - spec/generators/cancan/config/cancan_config_generator_spec.rb
 - spec/generators/cream/app/app_generator_spec.rb
-- spec/generators/cream/config/CONFIG_GENERATOR_SPEC.markdown
-- spec/generators/cream/config/devise/existing_devise_users.rb
-- spec/generators/cream/config/empty_app/default_args_spec.rb
-- spec/generators/cream/config/permits/existing_permits_spec.rb
-- spec/generators/cream/config/permits/no_permits_spec.rb
-- spec/generators/cream/config/roles/default_roles.rb
-- spec/generators/cream/config/roles/roles_spec.rb
-- spec/generators/cream/shared_examples.rb
+- spec/generators/cream/full_config/full_config_generator_spec.rb
 - spec/generators/cream/views_generator_spec.rb
 - spec/generators/devise/config/devise_config_generator_spec.rb
 - spec/generators/devise/users/devise_users_generator_spec.rb
@@ -387,13 +370,7 @@ test_files:
 - spec/generator_spec_helper.rb
 - spec/generators/cancan/config/cancan_config_generator_spec.rb
 - spec/generators/cream/app/app_generator_spec.rb
-- spec/generators/cream/config/devise/existing_devise_users.rb
-- spec/generators/cream/config/empty_app/default_args_spec.rb
-- spec/generators/cream/config/permits/existing_permits_spec.rb
-- spec/generators/cream/config/permits/no_permits_spec.rb
-- spec/generators/cream/config/roles/default_roles.rb
-- spec/generators/cream/config/roles/roles_spec.rb
-- spec/generators/cream/shared_examples.rb
+- spec/generators/cream/full_config/full_config_generator_spec.rb
 - spec/generators/cream/views_generator_spec.rb
 - spec/generators/devise/config/devise_config_generator_spec.rb
 - spec/generators/devise/users/devise_users_generator_spec.rb