rails_apps_composer 1.0.10 → 1.0.11

data/README.textile

@@ -12,7 +12,7 @@ Any issues? Please create a "GitHub issue":http://github.com/RailsApps/rails_app
 
 h2. !http://twitter-badges.s3.amazonaws.com/t_logo-a.png(Follow on Twitter)!:http://www.twitter.com/rails_apps Follow on Twitter !http://railsapps.github.com/images/mailing-list-icon.jpg(Join the Mailing List)!:http://eepurl.com/dQx3o Join the Mailing List
 
-Follow the project on Twitter: "rails_apps":http://twitter.com/rails_apps. Tweet some praise if you like what you've found.
+Follow the project on Twitter: "@rails_apps":http://twitter.com/rails_apps. Tweet some praise if you like what you've found.
 
 <a href="http://eepurl.com/dQx3o">Join the email list</a> (low volume, announcements only) for project updates and my tips about Rails resources.
 
@@ -31,9 +31,9 @@ h2. Dependencies
 Before generating a new Rails app, you will need:
 
 * The Ruby language (version 1.9.2)
-* Rails
+* Rails (3.0 or 3.1)
 
-Recipes can be written to detect which version of Rails is in use. Some of the recipes behave differently  depending on the version of Rails.
+Recipes will detect which version of Rails is in use. Some of the recipes behave differently depending on the version of Rails.
 
 See "Managing Rails Versions and Gems":http://railsapps.github.com/managing-rails-versions-gems.html for detailed instructions and advice.
 
@@ -67,7 +67,7 @@ h2. Make Your Own Starter App for One-Time Use
 
 h4. Select Recipes
 
-You can mix and match recipes to create your own customized starter app. Browse the repository "recipes directory":https://github.com/RailsApps/rails_apps_composer/tree/master/recipes to see what is available. Then provide your list of recipes to the Rails Apps Composer gem using the @-r@ option and generate an app as needed. Here's an example that creates a simple app using jquery and haml:
+You can mix and match recipes to create your own customized starter app. See an annotated list of available "recipes for the Rails Apps Composer gem":http://railsapps.github.com/rails-apps-recipes.html. For an up-to-date list, browse the repository "recipes directory":https://github.com/RailsApps/rails_apps_composer/tree/master/recipes to see what is available. Then provide your list of recipes to the Rails Apps Composer gem using the @-r@ option and generate an app as needed. Here's an example that creates a simple app using jquery and haml:
 
 <pre>
 $ rails_apps_composer new APP_NAME -r jquery haml
@@ -79,6 +79,8 @@ For example, to build the "rails3-mongoid-devise":http://github.com/RailsApps/ra
 $ rails_apps_composer new APP_NAME -r jquery haml rspec cucumber mongoid action_mailer devise add_user home_page home_page_users seed_database users_page css_setup application_layout devise_navigation cleanup ban_spiders git
 </pre>
 
+Replace @APP_NAME@ with the name you want for your application.
+
 h2. Make Your Own Starter App with a Reusable Application Template
 
 You can modify the recipes and save an application template that creates your own customized starter app.
@@ -122,13 +124,13 @@ h4. Template for Rails 3 + Devise + RSpec + Cucumber
 To build a reusable application template for the "rails3-devise-rspec-cucumber":http://github.com/RailsApps/rails3-devise-rspec-cucumber/ example application, run the command:
 
 <pre>
-$ rake print --silent RECIPES=jquery,haml,rspec,cucumber,action_mailer,devise,add_user,home_page,home_page_users,seed_database,users_page,css_setup,application_layout,devise_navigation,cleanup,ban_spiders,git > ~/Desktop/template.txt
+$ rake print --silent RECIPES=jquery,haml,rspec,cucumber,action_mailer,devise,add_user,home_page,home_page_users,seed_database,users_page,css_setup,application_layout,html5,devise_navigation,cleanup,ban_spiders,extras,git > ~/Desktop/template.txt
 </pre>
 
 Then generate the application using the @-T@ flag. Add the @-J@ flag for Rails 3.0.
 
 <pre>
-$ rails new testapp -m ~/Desktop/template.txt -T -J
+$ rails new testapp -m ~/Desktop/template.txt -T
 </pre>
 
 h4. Template for Rails 3 + Mongoid + Devise
@@ -136,13 +138,13 @@ h4. Template for Rails 3 + Mongoid + Devise
 To build a reusable application template for the "rails3-mongoid-devise":http://github.com/RailsApps/rails3-mongoid-devise/ example application, run the command:
 
 <pre>
-$ rake print --silent RECIPES=jquery,haml,rspec,cucumber,mongoid,action_mailer,devise,add_user,home_page,home_page_users,seed_database,users_page,css_setup,application_layout,devise_navigation,cleanup,ban_spiders,git > ~/Desktop/template.txt
+$ rake print --silent RECIPES=jquery,haml,rspec,cucumber,mongoid,action_mailer,devise,add_user,home_page,home_page_users,seed_database,users_page,css_setup,application_layout,html5,devise_navigation,cleanup,ban_spiders,extras,git > ~/Desktop/template.txt
 </pre>
 
 Then generate the application using the @-T -O@ flags. Add the @-J@ flag for Rails 3.0.
 
 <pre>
-$ rails new testapp -m ~/Desktop/template.txt -T -O -J
+$ rails new testapp -m ~/Desktop/template.txt -T -O
 </pre>
 
 h4. Template for Rails 3 + Mongoid + OmniAuth
@@ -150,13 +152,13 @@ h4. Template for Rails 3 + Mongoid + OmniAuth
 To build a reusable application template for the "rails3-mongoid-omniauth":http://github.com/RailsApps/rails3-mongoid-omniauth/ example application, run the command:
 
 <pre>
-$ rake print --silent RECIPES=jquery,haml,rspec,cucumber,mongoid,seed_database,add_user,omniauth,home_page,home_page_users,css_setup,application_layout,navigation,users_page,omniauth_email,cleanup,ban_spiders,git > ~/Desktop/template.txt
+$ rake print --silent RECIPES=jquery,haml,rspec,cucumber,mongoid,seed_database,add_user,omniauth,home_page,home_page_users,css_setup,application_layout,html5,navigation,users_page,omniauth_email,cleanup,ban_spiders,extras,git > ~/Desktop/template.txt
 </pre>
 
 Then generate the application using the @-T -O@ flags. Add the @-J@ flag for Rails 3.0.
 
 <pre>
-$ rails new testapp -m ~/Desktop/template.txt -T -O -J
+$ rails new testapp -m ~/Desktop/template.txt -T -O
 </pre>
 
 h2. The Recipes
@@ -241,7 +243,7 @@ RSpec, Cucumber, and Yard recipes were contributed by "Ramon Brooker":http://cog
 Additional recipes by Daniel Kehoe, "http://danielkehoe.com/":http://danielkehoe.com/.
 
 Is the gem useful to you? Follow the project on Twitter:
-"rails_apps":http://twitter.com/rails_apps
+"@rails_apps":http://twitter.com/rails_apps
 and tweet some praise. I'd love to know you were helped out by the gem.
 
 h2. License

data/recipes/application_layout.rb

@@ -30,7 +30,7 @@ HAML
       gsub_file 'app/views/layouts/application.html.haml', /csrf_meta_tags/, 'csrf_meta_tag'
     end
   else
-    unless recipes.include? 'boilerplate'
+    unless recipes.include? 'html5'
       inject_into_file 'app/views/layouts/application.html.erb', :after => "<body>\n" do
     <<-ERB
   <%- flash.each do |name, msg| -%>

data/recipes/css_setup.rb

@@ -60,7 +60,7 @@ CSS
   if recipes.include? 'rails 3.0'
     create_file 'public/stylesheets/application.css', css
   else
-    if recipes.include? 'boilerplate'
+    if recipes.include? 'html5'
       append_file 'app/assets/stylesheets/application.css', css_boilerplate
     else
       append_file 'app/assets/stylesheets/application.css', css

data/recipes/cucumber.rb

@@ -10,7 +10,7 @@ if config['cucumber']
     gem 'launchy', '0.4.0', :group => :test
   else
     # for Rails 3.1+, use optimistic versioning for gems
-    gem 'cucumber-rails', '>= 1.0.0', :group => :test
+    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

data/recipes/devise.rb

@@ -7,7 +7,7 @@ if config['devise']
     gem 'devise', '1.3.4'
   else
     # for Rails 3.1+, use optimistic versioning for gems
-    gem 'devise', '>= 1.3.4'
+    gem 'devise', '>= 1.4.0'
   end
 else
   recipes.delete('devise')

data/recipes/devise_navigation.rb

@@ -61,7 +61,7 @@ ERB
     end
 
     # Add navigation links to the default application layout
-    if recipes.include? 'boilerplate'
+    if recipes.include? 'html5'
       if recipes.include? 'haml'
         # There is Haml code in this script. Changing the indentation is perilous between HAMLs.
         inject_into_file 'app/views/layouts/application.html.haml', :after => "%header\n" do <<-HAML

data/recipes/html5.rb

@@ -10,10 +10,16 @@ if config['html5']
       get "https://raw.github.com/paulirish/html5-boilerplate/master/js/libs/respond.min.js", "app/assets/javascripts/respond.js"
       # Download stylesheet to normalize or reset CSS
       case config['css_option']
+        when 'skeleton'
+          get "https://raw.github.com/necolas/normalize.css/master/normalize.css", "app/assets/stylesheets/normalize.css.scss"
+          get "https://raw.github.com/dhgamache/Skeleton/master/stylesheets/base.css", "app/assets/stylesheets/base.css.scss"
+          get "https://raw.github.com/dhgamache/Skeleton/master/stylesheets/layout.css", "app/assets/stylesheets/layout.css.scss"
+          get "https://raw.github.com/dhgamache/Skeleton/master/stylesheets/skeleton.css", "app/assets/stylesheets/skeleton.css.scss"
+          get "https://raw.github.com/dhgamache/Skeleton/master/javascripts/app.js", "app/assets/javascripts/tabs.js"
         when 'normalize'
-          get "https://raw.github.com/necolas/normalize.css/master/normalize.css", "app/assets/stylesheets/normalize.scss"
+          get "https://raw.github.com/necolas/normalize.css/master/normalize.css", "app/assets/stylesheets/normalize.css.scss"
         when 'reset'
-          get "https://raw.github.com/paulirish/html5-boilerplate/master/css/style.css", "app/assets/stylesheets/reset.scss"
+          get "https://raw.github.com/paulirish/html5-boilerplate/master/css/style.css", "app/assets/stylesheets/reset.css.scss"
       end
       # Download HTML5 Boilerplate Site Root Assets
       get "https://raw.github.com/paulirish/html5-boilerplate/master/apple-touch-icon-114x114-precomposed.png", "public/apple-touch-icon-114x114-precomposed.png"
@@ -69,11 +75,14 @@ RUBY
 - ie_html :lang => 'en', :class => 'no-js' do
   %head
     %title #{app_name}
+    %meta{:charset => "utf-8"}
+    %meta{:http-equiv => "X-UA-Compatible", :content => "IE=edge,chrome=1"}
+    %meta{:name => "viewport", :content => "width=device-width, initial-scale=1, maximum-scale=1"}
     = stylesheet_link_tag :application
     = javascript_include_tag :application
     = csrf_meta_tags
     %body
-      #container
+      #container.container
         %header
           - flash.each do |name, msg|
             = content_tag :div, msg, :id => "flash_\#{name}" if msg.is_a?(String)
@@ -104,7 +113,7 @@ HAML
   <%= csrf_meta_tags %>
 </head>
 <body>
-  <div id="container">
+  <div id="container" class="container">
     <header>
     </header>
     <div id="main" role="main">
@@ -151,5 +160,5 @@ config:
   - css_option:
       type: multiple_choice
       prompt: "How do you like your CSS?"
-      choices: [["Normalize CSS for consistent styling across browsers", normalize], ["Completely reset all CSS to eliminate styling", reset]]
+      choices: [["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/navigation.rb

@@ -39,20 +39,39 @@ ERB
     end
 
     # Add navigation links to the default application layout
-    if recipes.include? 'haml'
-      # There is Haml code in this script. Changing the indentation is perilous between HAMLs.
-      inject_into_file 'app/views/layouts/application.html.haml', :after => "%body\n" do <<-HAML
-  %ul.hmenu
-    = render 'shared/navigation'
+    if recipes.include? 'html5'
+      if recipes.include? 'haml'
+        # There is Haml code in this script. Changing the indentation is perilous between HAMLs.
+        inject_into_file 'app/views/layouts/application.html.haml', :after => "%header\n" do <<-HAML
+          %ul.hmenu
+            = render 'shared/navigation'
 HAML
+        end
+      else
+        inject_into_file 'app/views/layouts/application.html.erb', :after => "<header>\n" do
+  <<-ERB
+          <ul class="hmenu">
+            <%= render 'shared/navigation' %>
+          </ul>
+ERB
+        end
       end
     else
-      inject_into_file 'app/views/layouts/application.html.erb', :after => "<body>\n" do
+      if recipes.include? 'haml'
+        # There is Haml code in this script. Changing the indentation is perilous between HAMLs.
+        inject_into_file 'app/views/layouts/application.html.haml', :after => "%body\n" do <<-HAML
+  %ul.hmenu
+    = render 'shared/navigation'
+HAML
+        end
+      else
+        inject_into_file 'app/views/layouts/application.html.erb', :after => "<body>\n" do
   <<-ERB
   <ul class="hmenu">
     <%= render 'shared/navigation' %>
   </ul>
 ERB
+        end
       end
     end
 

data/recipes/omniauth.rb

@@ -46,21 +46,17 @@ RUBY
     inject_into_file 'app/models/user.rb', :before => 'end' do <<-RUBY
 
   def self.create_with_omniauth(auth)
-    begin
-      create! do |user|
-        user.provider = auth['provider']
-        user.uid = auth['uid']
-        if auth['user_info']
-          user.name = auth['user_info']['name'] if auth['user_info']['name'] # Twitter, Google, Yahoo, GitHub
-          user.email = auth['user_info']['email'] if auth['user_info']['email'] # Google, Yahoo, GitHub
-        end
-        if auth['extra']['user_hash']
-          user.name = auth['extra']['user_hash']['name'] if auth['extra']['user_hash']['name'] # Facebook
-          user.email = auth['extra']['user_hash']['email'] if auth['extra']['user_hash']['email'] # Facebook
-        end
+    create! do |user|
+      user.provider = auth['provider']
+      user.uid = auth['uid']
+      if auth['user_info']
+        user.name = auth['user_info']['name'] if auth['user_info']['name'] # Twitter, Google, Yahoo, GitHub
+        user.email = auth['user_info']['email'] if auth['user_info']['email'] # Google, Yahoo, GitHub
+      end
+      if auth['extra'] && auth['extra']['user_hash']
+        user.name = auth['extra']['user_hash']['name'] if auth['extra']['user_hash']['name'] # Facebook
+        user.email = auth['extra']['user_hash']['email'] if auth['extra']['user_hash']['email'] # Facebook
       end
-    rescue Exception
-      raise Exception, "cannot create user record"
     end
   end
 

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.beta1', :group => :test
+      gem 'factory_girl_rails', '>= 1.1.beta3', :group => :test
     end
   end
 else

data/version.rb

@@ -1,3 +1,3 @@
 module RailsWizard
-  VERSION = "1.0.10"
+  VERSION = "1.0.11"
 end

metadata

@@ -2,7 +2,7 @@
 name: rails_apps_composer
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors: 
 - Daniel Kehoe
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-21 00:00:00 Z
+date: 2011-06-29 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: 1920492739263753196
+      hash: -2521305615818415648
       segments: 
       - 0
       version: "0"
@@ -186,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1920492739263753196
+      hash: -2521305615818415648
       segments: 
       - 0
       version: "0"