rails_apps_composer 1.1.8 → 1.2.0

data/README.textile

@@ -72,7 +72,7 @@ $ rails_apps_composer new myapp -r haml
 For example, to build the "rails3-mongoid-devise":http://github.com/RailsApps/rails3-mongoid-devise/ example application, run the command:
 
 <pre>
-$ rails_apps_composer new myapp -r haml rspec cucumber guard mongoid action_mailer devise add_user home_page home_page_users seed_database users_page html5 navigation cleanup extras git
+$ rails_apps_composer new myapp -r haml rspec cucumber guard mongoid action_mailer devise add_user home_page home_page_users seed_database users_page html5 cleanup extras git
 </pre>
 
 Replace @myapp@ with the name you want for your application.
@@ -120,7 +120,7 @@ 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=haml,rspec,cucumber,guard,action_mailer,devise,add_user,home_page,home_page_users,seed_database,users_page,html5,navigation,cleanup,extras,git > ~/Desktop/template.txt
+$ rake print --silent RECIPES=haml,rspec,cucumber,guard,action_mailer,devise,add_user,home_page,home_page_users,seed_database,users_page,html5,cleanup,extras,git > ~/Desktop/template.txt
 </pre>
 
 Then generate the application using the @-T@ flag.
@@ -134,7 +134,7 @@ 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=haml,rspec,cucumber,guard,mongoid,action_mailer,devise,add_user,home_page,home_page_users,seed_database,users_page,html5,navigation,cleanup,extras,git > ~/Desktop/template.txt
+$ rake print --silent RECIPES=haml,rspec,cucumber,guard,mongoid,action_mailer,devise,add_user,home_page,home_page_users,seed_database,users_page,html5,cleanup,extras,git > ~/Desktop/template.txt
 </pre>
 
 Then generate the application using the @-T -O@ flags.
@@ -148,7 +148,7 @@ 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=haml,rspec,cucumber,guard,mongoid,seed_database,add_user,omniauth,home_page,home_page_users,html5,navigation,users_page,omniauth_email,cleanup,extras,git > ~/Desktop/template.txt
+$ rake print --silent RECIPES=haml,rspec,cucumber,guard,mongoid,seed_database,add_user,omniauth,home_page,home_page_users,html5,users_page,omniauth_email,cleanup,extras,git > ~/Desktop/template.txt
 </pre>
 
 Then generate the application using the @-T -O@ flags.
@@ -162,7 +162,7 @@ h4. Template for Rails 3 + Subdomains
 To build a reusable application template for the "rails3-subdomains":https://github.com/RailsApps/rails3-subdomains example application, run the command:
 
 <pre>
-$ rake print --silent RECIPES=haml,rspec,cucumber,guard,mongoid,action_mailer,devise,add_user,home_page,home_page_users,seed_database,users_page,subdomains,html5,navigation,cleanup,extras,git > ~/Desktop/template.txt
+$ rake print --silent RECIPES=haml,rspec,cucumber,guard,mongoid,action_mailer,devise,add_user,home_page,home_page_users,seed_database,users_page,subdomains,html5,cleanup,extras,git > ~/Desktop/template.txt
 </pre>
 
 Then generate the application using the @-T -O@ flags.

data/recipes/html5.rb

@@ -49,10 +49,34 @@ after_bundler do
     # complex css styles using Twitter Bootstrap
     get 'https://raw.github.com/RailsApps/rails3-application-templates/master/files/twitter-bootstrap/assets/stylesheets/application.css.scss', 'app/assets/stylesheets/application.css.scss'
   end
+  # get an appropriate navigation partial
+  if recipes.include? 'haml'
+    if recipes.include? 'devise'
+      get 'https://raw.github.com/RailsApps/rails3-application-templates/master/files/navigation/devise/_navigation.html.haml', 'app/views/layouts/_navigation.html.haml'
+    elsif recipes.include? 'omniauth'
+      get 'https://raw.github.com/RailsApps/rails3-application-templates/master/files/navigation/omniauth/_navigation.html.haml', 'app/views/layouts/_navigation.html.haml'
+    elsif recipes.include? 'subdomains'
+      get 'https://raw.github.com/RailsApps/rails3-application-templates/master/files/navigation/subdomains/_navigation.html.haml', 'app/views/layouts/_navigation.html.haml'
+    else
+      get 'https://raw.github.com/RailsApps/rails3-application-templates/master/files/navigation/none/_navigation.html.haml', 'app/views/layouts/_navigation.html.haml'
+    end
+  else
+    if recipes.include? 'devise'
+      get 'https://raw.github.com/RailsApps/rails3-application-templates/master/files/navigation/devise/_navigation.html.erb', 'app/views/layouts/_navigation.html.erb'
+    elsif recipes.include? 'omniauth'
+      get 'https://raw.github.com/RailsApps/rails3-application-templates/master/files/navigation/omniauth/_navigation.html.erb', 'app/views/layouts/_navigation.html.erb'
+    elsif recipes.include? 'subdomains'
+      get 'https://raw.github.com/RailsApps/rails3-application-templates/master/files/navigation/subdomains/_navigation.html.erb', 'app/views/layouts/_navigation.html.erb'
+    else
+      get 'https://raw.github.com/RailsApps/rails3-application-templates/master/files/navigation/none/_navigation.html.erb', 'app/views/layouts/_navigation.html.erb'
+    end
+  end
   if recipes.include? 'haml'
     gsub_file 'app/views/layouts/application.html.haml', /App_Name/, "#{app_name.humanize.titleize}"
+    gsub_file 'app/views/layouts/_navigation.html.haml', /App_Name/, "#{app_name.humanize.titleize}"
   else
     gsub_file 'app/views/layouts/application.html.erb', /App_Name/, "#{app_name.humanize.titleize}"
+    gsub_file 'app/views/layouts/_navigation.html.erb', /App_Name/, "#{app_name.humanize.titleize}"
   end
   case config['css_option']
 
@@ -60,7 +84,7 @@ after_bundler do
       say_wizard 'installing Twitter Bootstrap HTML5 framework (less)'
       generate 'bootstrap:install'
       remove_file 'app/assets/stylesheets/application.css' # already created application.css.scss above
-      insert_into_file 'app/assets/stylesheets/bootstrap_and_overrides.css.less', "body { padding-top: 60px; }\n", :after => "@import "twitter/bootstrap/bootstrap";\n"
+      insert_into_file 'app/assets/stylesheets/bootstrap_and_overrides.css.less', "body { padding-top: 60px; }\n", :after => "@import \"twitter/bootstrap/bootstrap\";\n"
 
     when 'bootstrap_sass'
       say_wizard 'installing Twitter Bootstrap HTML5 framework (sass)'

data/version.rb

@@ -1,3 +1,3 @@
 module RailsWizard
-  VERSION = "1.1.8"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_apps_composer
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-06 00:00:00.000000000 Z
+date: 2012-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2161236900 !ruby/object:Gem::Requirement
+  requirement: &2157748600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161236900
+  version_requirements: *2157748600
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2161236400 !ruby/object:Gem::Requirement
+  requirement: &2157748100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2161236400
+  version_requirements: *2157748100
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2161230300 !ruby/object:Gem::Requirement
+  requirement: &2157747660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161230300
+  version_requirements: *2157747660
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2161229440 !ruby/object:Gem::Requirement
+  requirement: &2157747200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161229440
+  version_requirements: *2157747200
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2161228660 !ruby/object:Gem::Requirement
+  requirement: &2157740660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *2161228660
+  version_requirements: *2157740660
 - !ruby/object:Gem::Dependency
   name: mg
-  requirement: &2161228180 !ruby/object:Gem::Requirement
+  requirement: &2157740020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161228180
+  version_requirements: *2157740020
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2161227560 !ruby/object:Gem::Requirement
+  requirement: &2157739380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *2161227560
+  version_requirements: *2157739380
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2161227120 !ruby/object:Gem::Requirement
+  requirement: &2157738900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161227120
+  version_requirements: *2157738900
 description: A gem with recipes to create Rails application templates you can use
   to generate Rails starter apps.
 email:
@@ -137,7 +137,6 @@ files:
 - recipes/mongohq.rb
 - recipes/mongoid.rb
 - recipes/mongolab.rb
-- recipes/navigation.rb
 - recipes/omniauth.rb
 - recipes/omniauth_email.rb
 - recipes/rails_admin.rb
@@ -178,7 +177,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4335969651070518607
+      hash: 4050339708211014768
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -187,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4335969651070518607
+      hash: 4050339708211014768
 requirements: []
 rubyforge_project: rails_apps_composer
 rubygems_version: 1.8.16

data/recipes/navigation.rb

@@ -1,162 +0,0 @@
-# Application template recipe for the rails_apps_composer. Check for a newer version here:
-# https://github.com/RailsApps/rails_apps_composer/blob/master/recipes/navigation.rb
-
-after_bundler do
-
-  say_wizard "Navigation recipe running 'after bundler'"
-  
-    if recipes.include? 'devise'
-      # Create navigation links for Devise
-      if recipes.include? 'haml'
-        # There is Haml code in this script. Changing the indentation is perilous between HAMLs.
-        # We have to use single-quote-style-heredoc to avoid interpolation.
-        create_file "app/views/shared/_navigation.html.haml" do <<-'HAML'
-- if user_signed_in?
-  %li
-    = link_to('Logout', destroy_user_session_path, :method=>'delete')
-- else
-  %li
-    = link_to('Login', new_user_session_path)
-- if user_signed_in?
-  %li
-    = link_to('Edit account', edit_user_registration_path)
-- else
-  %li
-    = link_to('Sign up', new_user_registration_path)
-HAML
-        end
-      else
-        create_file "app/views/shared/_navigation.html.erb" do <<-ERB
-<% if user_signed_in? %>
-  <li>
-  <%= link_to('Logout', destroy_user_session_path, :method=>'delete') %>        
-  </li>
-<% else %>
-  <li>
-  <%= link_to('Login', new_user_session_path)  %>  
-  </li>
-<% end %>
-<% if user_signed_in? %>
-  <li>
-  <%= link_to('Edit account', edit_user_registration_path) %>
-  </li>
-<% else %>
-  <li>
-  <%= link_to('Sign up', new_user_registration_path)  %>
-  </li>
-<% end %>
-ERB
-        end
-      end
-
-    else
-      # Create navigation links
-      if recipes.include? 'haml'
-        # There is Haml code in this script. Changing the indentation is perilous between HAMLs.
-        # We have to use single-quote-style-heredoc to avoid interpolation.
-        create_file "app/views/shared/_navigation.html.haml" do <<-'HAML'
-- if user_signed_in?
-  %li
-    Logged in as #{current_user.name}
-  %li
-    = link_to('Logout', signout_path)
-- else
-  %li
-    = link_to('Login', signin_path)
-HAML
-        end
-      else
-        create_file "app/views/shared/_navigation.html.erb" do <<-ERB
-<% if user_signed_in? %>
-  <li>
-  Logged in as <%= current_user.name %>
-  </li>
-  <li>
-  <%= link_to('Logout', signout_path) %>        
-  </li>
-<% else %>
-  <li>
-  <%= link_to('Login', signin_path)  %>  
-  </li>
-<% end %>
-ERB
-        end
-      end
-    end
-
-    # Add navigation links to the default application layout
-    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
-        %nav
-          %ul.hmenu
-            = render 'shared/navigation'
-HAML
-        end
-      else
-        inject_into_file 'app/views/layouts/application.html.erb', :after => "<header>\n" do <<-ERB
-        <nav>
-          <ul class="hmenu">
-            <%= render 'shared/navigation' %>
-          </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 => "%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
-
-    # Throw it all away and create new navigation if we're enabling subdomains
-    if recipes.include? 'subdomains'
-      remove_file 'app/views/shared/_navigation.html.haml'
-      # There is Haml code in this script. Changing the indentation is perilous between HAMLs.
-      # We have to use single-quote-style-heredoc to avoid interpolation.
-      create_file 'app/views/shared/_navigation.html.haml' do <<-'HAML'
-%li
-  = link_to 'Main', root_url(:host => request.domain)
-- if request.subdomain.present? && request.subdomain != "www"
-  - if user_signed_in?
-    %li
-      = link_to('Edit account', edit_user_registration_url)
-    %li
-      = link_to('Logout', destroy_user_session_url, :method=>'delete')
-  - else
-    %li
-      = link_to('Login', new_user_session_url)
-- else
-  %li
-    = link_to('Sign up', new_user_registration_url(:host => request.domain))
-  - if user_signed_in?
-    %li
-      = link_to('Logout', destroy_user_session_url, :method=>'delete')
-HAML
-      end
-    end
-
-end
-
-__END__
-
-name: Navigation
-description: "Add navigation links."
-author: RailsApps
-
-category: other
-tags: [utilities, configuration]