RubyGems - rails_apps_composer - Versions diffs - 1.0.7 → 1.0.10 - Mend

rails_apps_composer 1.0.7 → 1.0.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

data/recipes/application_layout.rb +5 -2
data/recipes/css_setup.rb +32 -1
data/recipes/cucumber.rb +1 -1
data/recipes/devise_navigation.rb +14 -11
data/recipes/extras.rb +23 -0
data/recipes/{boilerplate.rb → html5.rb} +35 -21
data/version.rb +1 -1
metadata +6 -5

data/recipes/application_layout.rb CHANGED Viewed

@@ -8,6 +8,7 @@ after_bundler do
   # Set up the default application layout
   if recipes.include? 'haml'
     remove_file 'app/views/layouts/application.html.erb'
+    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
 !!! 5
@@ -29,12 +30,14 @@ HAML
       gsub_file 'app/views/layouts/application.html.haml', /csrf_meta_tags/, 'csrf_meta_tag'
     end
   else
-    inject_into_file 'app/views/layouts/application.html.erb', :after => "<body>\n" do
-  <<-ERB
+    unless recipes.include? 'boilerplate'
+      inject_into_file 'app/views/layouts/application.html.erb', :after => "<body>\n" do
+    <<-ERB
   <%- flash.each do |name, msg| -%>
     <%= content_tag :div, msg, :id => "flash_\#{name}" if msg.is_a?(String) %>
   <%- end -%>
 ERB
+      end
     end
   end

data/recipes/css_setup.rb CHANGED Viewed

@@ -30,10 +30,41 @@ ul.hmenu li {
 }
 CSS
+  # Add a stylesheet for use with HTML5 Boilerplate
+  css_boilerplate = <<-CSS
+header nav ul {
+  list-style: none;
+  margin: 0 0 2em;
+  padding: 0;
+}
+header nav ul li {
+  display: inline;
+}
+#flash_notice, #flash_alert {
+  padding: 5px 8px;
+  margin: 10px 0;
+}
+#flash_notice {
+  background-color: #CFC;
+  border: solid 1px #6C6;
+}
+#flash_alert {
+  background-color: #FCC;
+  border: solid 1px #C66;
+}
+CSS
   if recipes.include? 'rails 3.0'
     create_file 'public/stylesheets/application.css', css
   else
-    append_file 'app/assets/stylesheets/application.css', css
+    if recipes.include? 'boilerplate'
+      append_file 'app/assets/stylesheets/application.css', css_boilerplate
+    else
+      append_file 'app/assets/stylesheets/application.css', css
+    end
   end
 end

data/recipes/cucumber.rb CHANGED Viewed

@@ -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', '>= 0.5.2', :group => :test
+    gem 'cucumber-rails', '>= 1.0.0', :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_navigation.rb CHANGED Viewed

@@ -64,33 +64,36 @@ ERB
     if recipes.include? 'boilerplate'
       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 'devise/menu/registration_items'
-      = render 'devise/menu/login_items'
+        inject_into_file 'app/views/layouts/application.html.haml', :after => "%header\n" do <<-HAML
+          %nav
+            %ul
+              = render 'devise/menu/registration_items'
+              = render 'devise/menu/login_items'
 HAML
         end
       else
-        inject_into_file 'app/views/layouts/application.html.erb', :after => "<body>\n" do
+        inject_into_file 'app/views/layouts/application.html.erb', :after => "<header>\n" do
   <<-ERB
-  <ul class="hmenu">
-    <%= render 'devise/menu/registration_items' %>
-    <%= render 'devise/menu/login_items' %>
-  </ul>
+      <nav>
+        <ul>
+          <%= render 'devise/menu/registration_items' %>
+          <%= render 'devise/menu/login_items' %>
+        </ul>
+      </nav>
 ERB
         end
       end
     else
       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
+        inject_into_file 'app/views/layouts/application.html.haml', :after => "%body\n" do <<-HAML
     %ul.hmenu
       = render 'devise/menu/registration_items'
       = render 'devise/menu/login_items'
 HAML
         end
       else
-        inject_into_file 'app/views/layouts/application.html.erb', :after => "<header>\n" do
+        inject_into_file 'app/views/layouts/application.html.erb', :after => "<body>\n" do
   <<-ERB
   <ul class="hmenu">
     <%= render 'devise/menu/registration_items' %>

data/recipes/extras.rb ADDED Viewed

@@ -0,0 +1,23 @@
+# Application template recipe for the rails_apps_composer. Check for a newer version here:
+# https://github.com/RailsApps/rails_apps_composer/blob/master/recipes/extras.rb
+if config['footnotes']
+  say_wizard "Extras recipe running 'after bundler'"
+  gem 'rails-footnotes', '>= 3.7', :group => :development
+else
+  recipes.delete('footnotes')
+end
+__END__
+name: Extras
+description: "Various extras including 'rails-footnotes' for development."
+author: RailsApps
+category: other
+tags: [utilities, configuration]
+config:
+  - footnotes:
+      type: boolean
+      prompt: Would you like to use 'rails-footnotes' during development?

data/recipes/{boilerplate.rb → html5.rb} RENAMED Viewed

@@ -1,29 +1,33 @@
 # Application template recipe for the rails_apps_composer. Check for a newer version here:
-# https://github.com/RailsApps/rails_apps_composer/blob/master/recipes/boilerplate.rb
+# https://github.com/RailsApps/rails_apps_composer/blob/master/recipes/html5.rb
-if config['boilerplate']
+if config['html5']
   if recipes.include? 'rails 3.1'
     after_bundler do
-      say_wizard "Boilerplate recipe running 'after bundler'"
+      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/plugins.js", "app/assets/javascripts/plugins.js"
-      # Download HTML5 Boilerplate Stylesheet
-      get "https://raw.github.com/paulirish/html5-boilerplate/master/css/style.css", "app/assets/stylesheets/boilerplate.scss"
+      # Download stylesheet to normalize or reset CSS
+      case config['css_option']
+        when 'normalize'
+          get "https://raw.github.com/necolas/normalize.css/master/normalize.css", "app/assets/stylesheets/normalize.scss"
+        when 'reset'
+          get "https://raw.github.com/paulirish/html5-boilerplate/master/css/style.css", "app/assets/stylesheets/reset.scss"
+      end
       # Download HTML5 Boilerplate Site Root Assets
-      get "https://raw.github.com/paulirish/html5-boilerplate/master/apple-touch-icon-114x114-precomposed.png", "app/assets/images/apple-touch-icon-114x114-precomposed.png"
-      get "https://raw.github.com/paulirish/html5-boilerplate/master/apple-touch-icon-57x57-precomposed.png", "app/assets/images/apple-touch-icon-57x57-precomposed.png"
-      get "https://raw.github.com/paulirish/html5-boilerplate/master/apple-touch-icon-72x72-precomposed.png", "app/assets/images/apple-touch-icon-72x72-precomposed.png"
-      get "https://raw.github.com/paulirish/html5-boilerplate/master/apple-touch-icon-precomposed.png", "app/assets/images/apple-touch-icon-precomposed.png"
-      get "https://raw.github.com/paulirish/html5-boilerplate/master/apple-touch-icon.png", "app/assets/images/apple-touch-icon.png"
+      get "https://raw.github.com/paulirish/html5-boilerplate/master/apple-touch-icon-114x114-precomposed.png", "public/apple-touch-icon-114x114-precomposed.png"
+      get "https://raw.github.com/paulirish/html5-boilerplate/master/apple-touch-icon-57x57-precomposed.png", "public/apple-touch-icon-57x57-precomposed.png"
+      get "https://raw.github.com/paulirish/html5-boilerplate/master/apple-touch-icon-72x72-precomposed.png", "public/apple-touch-icon-72x72-precomposed.png"
+      get "https://raw.github.com/paulirish/html5-boilerplate/master/apple-touch-icon-precomposed.png", "public/apple-touch-icon-precomposed.png"
+      get "https://raw.github.com/paulirish/html5-boilerplate/master/apple-touch-icon.png", "public/apple-touch-icon.png"
       get "https://raw.github.com/paulirish/html5-boilerplate/master/crossdomain.xml", "public/crossdomain.xml"
       get "https://raw.github.com/paulirish/html5-boilerplate/master/humans.txt", "public/humans.txt"
       # Set up the default application layout
       if recipes.include? 'haml'
-        # Haml version of default application layout
         # create some Haml helpers
-        inject_into_class 'app/helpers/application_helper.rb', ApplicationHelper do <<-RUBY
+        # 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)
@@ -57,6 +61,7 @@ private
   end
 RUBY
         end
+        # Haml version of default application layout
         remove_file 'app/views/layouts/application.html.erb'
         remove_file 'app/views/layouts/application.html.haml'
         # There is Haml code in this script. Changing the indentation is perilous between HAMLs.
@@ -94,12 +99,16 @@ HAML
   <title>#{app_name}</title>
   <meta name="description" content="">
   <meta name="author" content="">
+  <%= stylesheet_link_tag    "application" %>
+  <%= javascript_include_tag "application" %>
+  <%= csrf_meta_tags %>
 </head>
 <body>
   <div id="container">
     <header>
     </header>
     <div id="main" role="main">
+      <%= yield %>
     </div>
     <footer>
     </footer>
@@ -107,27 +116,28 @@ HAML
 </body>
 </html>
 ERB
+        end
         inject_into_file 'app/views/layouts/application.html.erb', :after => "<header>\n" do
   <<-ERB
-  <%- flash.each do |name, msg| -%>
-    <%= content_tag :div, msg, :id => "flash_\#{name}" if msg.is_a?(String) %>
-  <%- end -%>
+      <%- flash.each do |name, msg| -%>
+        <%= content_tag :div, msg, :id => "flash_\#{name}" if msg.is_a?(String) %>
+      <%- end -%>
 ERB
         end
       end
     end
   elsif recipes.include? 'rails 3.0'
-    say_wizard "Not supported for Rails version #{Rails::VERSION::STRING}. Boilerplate recipe skipped."
+    say_wizard "Not supported for Rails version #{Rails::VERSION::STRING}. HTML5 Boilerplate recipe skipped."
   else
-    say_wizard "Don't know what to do for Rails version #{Rails::VERSION::STRING}. Boilerplate recipe skipped."
+    say_wizard "Don't know what to do for Rails version #{Rails::VERSION::STRING}. HTML5 Boilerplate recipe skipped."
   end
 else
-  recipes.delete('boilerplate')
+  recipes.delete('html5')
 end
 __END__
-name: boilerplate
+name: html5
 description: "Install HTML5 Boilerplate."
 author: RailsApps
@@ -135,7 +145,11 @@ category: other
 tags: [utilities, configuration]
 config:
-  - boilerplate:
+  - html5:
       type: boolean
       prompt: Would you like to install HTML5 Boilerplate?
+  - 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]]

data/version.rb CHANGED Viewed

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

metadata CHANGED Viewed

@@ -2,7 +2,7 @@
 name: rails_apps_composer
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 1.0.7
+  version: 1.0.10
 platform: ruby
 authors:
 - Daniel Kehoe
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-06-18 00:00:00 Z
+date: 2011-06-21 00:00:00 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -111,7 +111,6 @@ files:
 - recipes/add_user_name.rb
 - recipes/application_layout.rb
 - recipes/ban_spiders.rb
-- recipes/boilerplate.rb
 - recipes/capybara.rb
 - recipes/cleanup.rb
 - recipes/css_setup.rb
@@ -119,12 +118,14 @@ files:
 - recipes/devise.rb
 - recipes/devise_navigation.rb
 - recipes/env_yaml.rb
+- recipes/extras.rb
 - recipes/git.rb
 - recipes/haml.rb
 - recipes/heroku.rb
 - recipes/home_page.rb
 - recipes/home_page_users.rb
 - recipes/hoptoad.rb
+- recipes/html5.rb
 - recipes/jammit.rb
 - recipes/jquery.rb
 - recipes/less.rb
@@ -176,7 +177,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      hash: 3173488338098663201
+      hash: 1920492739263753196
       segments:
       - 0
       version: "0"
@@ -185,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      hash: 3173488338098663201
+      hash: 1920492739263753196
       segments:
       - 0
       version: "0"