rails_apps_composer 1.0.12 → 1.0.14

data/recipes/cucumber.rb

@@ -13,7 +13,7 @@ if config['cucumber']
     gem 'cucumber-rails', '>= 1.0.2', :group => :test
     gem 'capybara', '>= 1.0.0', :group => :test
     gem 'database_cleaner', '>= 0.6.7', :group => :test
-    gem 'launchy', '>= 0.4.0', :group => :test
+    gem 'launchy', '>= 2.0.5', :group => :test
   end
 else
   recipes.delete('cucumber')
@@ -35,9 +35,6 @@ end
 if config['cucumber']
   if recipes.include? 'devise'
     after_bundler do
-      # Cucumber wants to test GET requests not DELETE requests for destroy_user_session_path
-      # (see https://github.com/RailsApps/rails3-devise-rspec-cucumber/issues/3)
-      gsub_file 'config/initializers/devise.rb', 'config.sign_out_via = :delete', 'config.sign_out_via = :get'
       say_wizard "Copying Cucumber scenarios from the rails3-devise-rspec-cucumber examples"
       begin
         # copy all the Cucumber scenario files from the rails3-devise-rspec-cucumber example app

data/recipes/devise.rb

@@ -34,6 +34,12 @@ if config['devise']
     # Prevent logging of password_confirmation
     gsub_file 'config/application.rb', /:password/, ':password, :password_confirmation'
 
+    if recipes.include? 'cucumber'
+      # Cucumber wants to test GET requests not DELETE requests for destroy_user_session_path
+      # (see https://github.com/RailsApps/rails3-devise-rspec-cucumber/issues/3)
+      gsub_file 'config/initializers/devise.rb', 'config.sign_out_via = :delete', 'config.sign_out_via = :get'
+    end
+    
   end
 
   after_everything do

data/recipes/html5.rb

@@ -3,11 +3,11 @@
 
 if config['html5']
   if recipes.include? 'rails 3.1'
+    gem 'frontend-helpers'
     after_bundler do
       say_wizard "HTML5 Boilerplate recipe running 'after bundler'"
       # Download HTML5 Boilerplate JavaScripts
-      get "https://raw.github.com/paulirish/html5-boilerplate/master/js/libs/modernizr-2.0.min.js", "app/assets/javascripts/modernizr.js"
-      get "https://raw.github.com/paulirish/html5-boilerplate/master/js/libs/respond.min.js", "app/assets/javascripts/respond.js"
+      get "https://raw.github.com/paulirish/html5-boilerplate/master/js/libs/modernizr-2.0.6.min.js", "app/assets/javascripts/modernizr.js"
       # Download stylesheet to normalize or reset CSS
       case config['css_option']
         when 'skeleton'
@@ -33,38 +33,8 @@ if config['html5']
       if recipes.include? 'haml'
         # create some Haml helpers
         # We have to use single-quote-style-heredoc to avoid interpolation.
-        inject_into_file 'app/helpers/application_helper.rb', :after => "ApplicationHelper\n" do <<-'RUBY'
-  # Create a named haml tag to wrap IE conditional around a block
-  # http://paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither
-  def ie_tag(name=:body, attrs={}, &block)
-    attrs.symbolize_keys!
-    haml_concat("<!--[if lt IE 7]> #{ tag(name, add_class('ie6', attrs), true) } <![endif]-->".html_safe)
-    haml_concat("<!--[if IE 7]>    #{ tag(name, add_class('ie7', attrs), true) } <![endif]-->".html_safe)
-    haml_concat("<!--[if IE 8]>    #{ tag(name, add_class('ie8', attrs), true) } <![endif]-->".html_safe)
-    haml_concat("<!--[if gt IE 8]><!-->".html_safe)
-    haml_tag name, attrs do
-      haml_concat("<!--<![endif]-->".html_safe)
-      block.call
-    end
-  end
-
-  def ie_html(attrs={}, &block)
-    ie_tag(:html, attrs, &block)
-  end
-
-  def ie_body(attrs={}, &block)
-    ie_tag(:body, attrs, &block)
-  end
-
-private
-
-  def add_class(name, attrs)
-    classes = attrs[:class] || ''
-    classes.strip!
-    classes = ' ' + classes if !classes.blank?
-    classes = name + classes
-    attrs.merge(:class => classes)
-  end
+        inject_into_file 'app/controllers/application_controller.rb', :after => "protect_from_forgery\n" do <<-'RUBY'
+  include FrontendHelpers::Html5Helper
 RUBY
         end
         # Haml version of default application layout
@@ -72,7 +42,7 @@ RUBY
         remove_file 'app/views/layouts/application.html.haml'
         # There is Haml code in this script. Changing the indentation is perilous between HAMLs.
         create_file 'app/views/layouts/application.html.haml' do <<-HAML
-- ie_html :lang => 'en', :class => 'no-js' do
+- html_tag class: 'no-js' do
   %head
     %title #{app_name}
     %meta{:charset => "utf-8"}
@@ -81,7 +51,7 @@ RUBY
     = stylesheet_link_tag :application
     = javascript_include_tag :application
     = csrf_meta_tags
-    %body
+    %body{:class => params[:controller]}
       #container.container
         %header
           - flash.each do |name, msg|
@@ -112,7 +82,7 @@ HAML
   <%= javascript_include_tag "application" %>
   <%= csrf_meta_tags %>
 </head>
-<body>
+<body class="<%= params[:controller] %>">
   <div id="container" class="container">
     <header>
     </header>
@@ -141,6 +111,7 @@ ERB
     say_wizard "Don't know what to do for Rails version #{Rails::VERSION::STRING}. HTML5 Boilerplate recipe skipped."
   end
 else
+  say_wizard "HTML5 Boilerplate recipe skipped. No CSS styles added."
   recipes.delete('html5')
 end
 
@@ -159,6 +130,6 @@ config:
       prompt: Would you like to install HTML5 Boilerplate?
   - css_option:
       type: multiple_choice
-      prompt: "How do you like your CSS?"
-      choices: [["Normalize CSS and add Skeleton styling", skeleton], ["Normalize CSS for consistent styling across browsers", normalize], ["Completely reset all CSS to eliminate styling", reset]]
+      prompt: "If you've chosen HTML5 Boilerplate, how do you like your CSS?"
+      choices: [["Do nothing", nothing], ["Normalize CSS and add Skeleton styling", skeleton], ["Normalize CSS for consistent styling across browsers", normalize], ["Completely reset all CSS to eliminate styling", reset]]
 

data/recipes/mongoid.rb

@@ -11,7 +11,7 @@ if config['mongoid']
   else
     # for Rails 3.1+, use optimistic versioning for gems
     gem 'bson_ext', '>= 1.3.1'
-    gem 'mongoid', '>= 2.0.2'
+    gem 'mongoid', '>= 2.1.5'
   end
 else
   recipes.delete('mongoid')

data/recipes/rspec.rb

@@ -28,7 +28,7 @@ if config['rspec']
     end
     if config['factory_girl']
       # use the factory_girl gem for test fixtures
-      gem 'factory_girl_rails', '>= 1.1.rc1', :group => :test
+      gem 'factory_girl_rails', '>= 1.1.0', :group => :test
     end
   end
 else

data/recipes/sass.rb

@@ -1,13 +1,11 @@
-unless recipes.include? 'haml'
-  gem 'haml', '>= 3.0.0'
-end
+gem 'sass', '>= 3.1.6'
 
 __END__
 
 name: SASS
-description: "Utilize SASS (through the HAML gem) for really awesome stylesheets!"
-author: mbleigh
+description: "Utilize SASS for really awesome stylesheets!"
+author: mbleigh & mrc2407
 
-exclusive: css_replacement 
+exclusive: css_replacement
 category: assets
 tags: [css]

data/version.rb

@@ -1,3 +1,3 @@
 module RailsWizard
-  VERSION = "1.0.12"
+  VERSION = "1.0.14"
 end

metadata

@@ -2,7 +2,7 @@
 name: rails_apps_composer
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.12
+  version: 1.0.14
 platform: ruby
 authors: 
 - Daniel Kehoe
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-09 00:00:00 Z
+date: 2011-08-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: i18n
@@ -177,7 +177,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1731271717490803066
+      hash: 1501726947205474913
       segments: 
       - 0
       version: "0"
@@ -186,14 +186,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1731271717490803066
+      hash: 1501726947205474913
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: rails_apps_composer
-rubygems_version: 1.8.5
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: A version of the RailsWizard gem with custom recipes for Rails starter apps.