rails_apps_composer 1.0.25 → 1.0.26

data/README.textile

@@ -30,8 +30,8 @@ h2. Dependencies
 
 Before generating a new Rails app, you will need:
 
-* The Ruby language (version 1.9.2)
-* Rails (3.0 or 3.1)
+* The Ruby language (version 1.9.3)
+* Rails 3.1
 
 Recipes will detect which version of Rails is in use. Some of the recipes behave differently depending on the version of Rails.
 
@@ -76,7 +76,7 @@ $ rails_apps_composer new myapp -r jquery 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 jquery haml rspec cucumber guard mongoid action_mailer devise add_user home_page home_page_users seed_database users_page css_setup application_layout navigation cleanup ban_spiders git
+$ rails_apps_composer new myapp -r jquery haml rspec cucumber guard mongoid action_mailer devise add_user home_page home_page_users seed_database users_page css_setup application_layout html5 navigation cleanup ban_spiders extras git
 </pre>
 
 Replace @myapp@ with the name you want for your application.
@@ -127,7 +127,7 @@ To build a reusable application template for the "rails3-devise-rspec-cucumber":
 $ rake print --silent RECIPES=jquery,haml,rspec,cucumber,guard,action_mailer,devise,add_user,home_page,home_page_users,seed_database,users_page,css_setup,application_layout,html5,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.
+Then generate the application using the @-T@ flag.
 
 <pre>
 $ rails new myapp -m ~/Desktop/template.txt -T
@@ -141,7 +141,7 @@ To build a reusable application template for the "rails3-mongoid-devise":http://
 $ rake print --silent RECIPES=jquery,haml,rspec,cucumber,guard,mongoid,action_mailer,devise,add_user,home_page,home_page_users,seed_database,users_page,css_setup,application_layout,html5,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.
+Then generate the application using the @-T -O@ flags.
 
 <pre>
 $ rails new myapp -m ~/Desktop/template.txt -T -O
@@ -155,7 +155,21 @@ To build a reusable application template for the "rails3-mongoid-omniauth":http:
 $ rake print --silent RECIPES=jquery,haml,rspec,cucumber,guard,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.
+Then generate the application using the @-T -O@ flags.
+
+<pre>
+$ rails new myapp -m ~/Desktop/template.txt -T -O
+</pre>
+
+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=jquery,haml,rspec,cucumber,guard,mongoid,action_mailer,devise,add_user,home_page,home_page_users,seed_database,users_page,css_setup,application_layout,subdomains,html5,navigation,cleanup,ban_spiders,extras,git > ~/Desktop/template.txt
+</pre>
+
+Then generate the application using the @-T -O@ flags.
 
 <pre>
 $ rails new myapp -m ~/Desktop/template.txt -T -O

data/recipes/cucumber.rb

@@ -11,7 +11,7 @@ if config['cucumber']
   else
     # for Rails 3.1+, use optimistic versioning for gems
     gem 'cucumber-rails', '>= 1.2.0', :group => :test
-    gem 'capybara', '>= 1.1.1', :group => :test
+    gem 'capybara', '>= 1.1.2', :group => :test
     gem 'database_cleaner', '>= 0.7.0', :group => :test
     gem 'launchy', '>= 2.0.5', :group => :test
   end

data/recipes/navigation.rb

@@ -131,20 +131,21 @@ ERB
       create_file 'app/views/shared/_navigation.html.haml' do <<-'HAML'
 %li
   = link_to 'Main', root_url(:host => request.domain)
-- unless request.subdomain.present? && request.subdomain != "www"
+- if request.subdomain.present? && request.subdomain != "www"
   - if user_signed_in?
     %li
-      = link_to('Edit account', edit_user_registration_path)
+      = link_to('Edit account', edit_user_registration_url)
+    %li
+      = link_to('Logout', destroy_user_session_url, :method=>'delete')
   - else
     %li
-      = link_to('Sign up', new_user_registration_path)
+      = 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_path, :method=>'delete')
-  - else
-    %li
-      = link_to('Login', new_user_session_path)
+      = link_to('Logout', destroy_user_session_url, :method=>'delete')
 HAML
       end
     end

data/recipes/subdomains.rb

@@ -13,7 +13,7 @@ if recipes.include? 'haml'
           when 'one-per-user'
             # user name as a subdomain
             inject_into_file 'app/models/user.rb', :before => 'validates_uniqueness_of' do <<-RUBY
-  validates_format_of :name, with: /^[a-z0-9_]+$/, message: 'must be lowercase alphanumerics only'
+validates_format_of :name, with: /^[a-z0-9_]+$/, message: 'must be lowercase alphanumerics only'
   validates_length_of :name, maximum: 32, message: 'exceeds maximum of 32 characters'
   validates_exclusion_of :name, in: ['www', 'mail', 'ftp'], message: 'is not available'
   
@@ -64,13 +64,26 @@ RUBY
             # create routes for subdomains
             gsub_file 'config/routes.rb', /root :to => "home#index"/, ''
             inject_into_file 'config/routes.rb', :after => 'resources :users, :only => :show' do <<-RUBY
+
   constraints(Subdomain) do
     match '/' => 'profiles#show'
   end
   root :to => "home#index"
 RUBY
             end
-            
+            remove_file 'app/views/users/show.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/users/show.html.haml' do
+<<-'HAML'
+%p
+  User: #{@user.name}
+%p
+  Email: #{@user.email if @user.email}
+%p
+  Profile: #{link_to root_url(:subdomain => @user.name), root_url(:subdomain => @user.name)}
+HAML
+            end
             remove_file 'app/views/home/index.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.
@@ -79,10 +92,10 @@ RUBY
 %h3 Home
 - @users.each do |user|
   %br/ 
-  User: #{link_to user.name, user}
-  Profile: #{link_to root_url(:subdomain => user.name), root_url(:subdomain => user.name)}
+  #{user.name} profile: #{link_to root_url(:subdomain => user.name), root_url(:subdomain => user.name)}
 HAML
             end
+            gsub_file 'app/controllers/users_controller.rb', /before_filter :authenticate_user!/, ''
         end
       end
     elsif recipes.include? 'rails 3.0'

data/recipes/users_page.rb

@@ -22,7 +22,7 @@ RUBY
     # Modify the routes
     #----------------------------------------------------------------------------
     # @devise_for :users@ route must be placed above @resources :users, :only => :show@.
-    gsub_file 'config/routes.rb', /get \"users\/show\"/, '#get \"users\/show\"'
+    gsub_file 'config/routes.rb', /get \"users\/show\"/, ''
     gsub_file 'config/routes.rb', /devise_for :users/ do
     <<-RUBY
 devise_for :users

data/templates/layout.erb

@@ -50,6 +50,7 @@ say_wizard "Checking configuration. Please confirm your preferences."
 # >---------------------------[ Autoload Modules/Classes ]-----------------------------<
 
 inject_into_file 'config/application.rb', :after => 'config.autoload_paths += %W(#{config.root}/extras)' do <<-'RUBY'
+
     config.autoload_paths += %W(#{config.root}/lib)
 RUBY
 end

data/version.rb

@@ -1,3 +1,3 @@
 module RailsWizard
-  VERSION = "1.0.25"
+  VERSION = "1.0.26"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_apps_composer
 version: !ruby/object:Gem::Version
-  version: 1.0.25
+  version: 1.0.26
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-15 00:00:00.000000000 Z
+date: 2011-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2153235160 !ruby/object:Gem::Requirement
+  requirement: &2161307300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153235160
+  version_requirements: *2161307300
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2153234660 !ruby/object:Gem::Requirement
+  requirement: &2161306780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153234660
+  version_requirements: *2161306780
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2153234160 !ruby/object:Gem::Requirement
+  requirement: &2161306100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153234160
+  version_requirements: *2161306100
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153233600 !ruby/object:Gem::Requirement
+  requirement: &2161305540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *2153233600
+  version_requirements: *2161305540
 - !ruby/object:Gem::Dependency
   name: mg
-  requirement: &2153232980 !ruby/object:Gem::Requirement
+  requirement: &2161305000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153232980
+  version_requirements: *2161305000
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2153232320 !ruby/object:Gem::Requirement
+  requirement: &2161296980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *2153232320
+  version_requirements: *2161296980
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2153231640 !ruby/object:Gem::Requirement
+  requirement: &2161296400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153231640
+  version_requirements: *2161296400
 description: A gem with recipes to create Rails application templates you can use
   to generate Rails starter apps.
 email:
@@ -180,7 +180,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3880893974405196726
+      hash: 1441423725882514269
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -189,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3880893974405196726
+      hash: 1441423725882514269
 requirements: []
 rubyforge_project: rails_apps_composer
 rubygems_version: 1.8.11