rails_apps_composer 2.4.24 → 2.4.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc11acc4801ecb3ed6ce3773226ef3275eee4e8b
-  data.tar.gz: 9070dd6dccb53e371147935f6c3070a766515925
+  metadata.gz: ae94d7ef1ef1ed3e2c94151d58e9827e9a8b44f7
+  data.tar.gz: bbeb269bd02495aef1bde1695b617f2f6684a72f
 SHA512:
-  metadata.gz: b083e57012b616a2191f348b2f2542d41d83a19c9466a0e0459b53869f7baf3e14e81c715b38f3f35ab3703302bef3bca0ff3a532f4b7f125d4e70f1d62a2122
-  data.tar.gz: 658c2251d7c01202170e2c4e24dd174fba01c74845a2ca7580352b718520f3207ae992a3ceb2c03927c6925b0e1aab825aafa844c3dab667766f4369a26305c4
+  metadata.gz: 41d929c187621ef56fe8615ba4d97b22e5850528e7ea9d84a251d90774ab72520986793bf40f36160cb7503902be96211afa4da12aa75139981994e55a725abf
+  data.tar.gz: 03c2df4bff06248139ab11756138d929d44359cc880185aec85e34b4230e41981683bf8ab130d07f07452c5c76890aad047a9da4a2bdd3d4b8209df55e9ba4a9

data/recipes/apps4.rb

@@ -210,6 +210,73 @@ if prefer :apps4, 'rails-devise'
   end # after_bundler
 end # rails-devise
 
+### RAILS-OMNIAUTH ####
+
+if prefer :apps4, 'rails-omniauth'
+
+  # >-------------------------------[ after_bundler ]--------------------------------<
+
+  after_bundler do
+    say_wizard "recipe running after 'bundle install'"
+    repo = 'https://raw.github.com/RailsApps/rails-omniauth/master/'
+
+    # >-------------------------------[ Init ]--------------------------------<
+
+    copy_from_repo 'config/application.yml', :repo => repo
+    remove_file 'config/application.example.yml'
+    copy_file destination_root + '/config/application.yml', destination_root + '/config/application.example.yml'
+
+    # >-------------------------------[ Models ]--------------------------------<
+
+    copy_from_repo 'app/models/user.rb', :repo => repo
+
+    # >-------------------------------[ Controllers ]--------------------------------<
+
+    copy_from_repo 'app/controllers/home_controller.rb', :repo => repo
+    copy_from_repo 'app/controllers/sessions_controller.rb', :repo => repo
+    gsub_file 'app/controllers/sessions_controller.rb', /twitter/, prefs[:omniauth_provider]
+    copy_from_repo 'app/controllers/users_controller.rb', :repo => repo
+
+    # >-------------------------------[ Views ]--------------------------------<
+
+    copy_from_repo 'app/views/home/index.html.erb', :repo => repo
+    copy_from_repo 'app/views/users/edit.html.erb', :repo => repo
+    copy_from_repo 'app/views/users/index.html.erb', :repo => repo
+    copy_from_repo 'app/views/users/show.html.erb', :repo => repo
+
+    # >-------------------------------[ Routes ]--------------------------------<
+
+    copy_from_repo 'config/routes.rb', :repo => repo
+    ### CORRECT APPLICATION NAME ###
+    gsub_file 'config/routes.rb', /^.*.routes.draw do/, "#{app_const}.routes.draw do"
+
+  end
+
+  # >-------------------------------[ after_everything ]--------------------------------<
+
+  after_everything do
+    say_wizard "recipe running after 'bundle install'"
+
+    # >-------------------------------[ Clean up starter app ]--------------------------------<
+
+    # remove commented lines and multiple blank lines from Gemfile
+    # thanks to https://github.com/perfectline/template-bucket/blob/master/cleanup.rb
+    gsub_file 'Gemfile', /#.*\n/, "\n"
+    gsub_file 'Gemfile', /\n^\s*\n/, "\n"
+    # remove commented lines and multiple blank lines from config/routes.rb
+    gsub_file 'config/routes.rb', /  #.*\n/, "\n"
+    gsub_file 'config/routes.rb', /\n^\s*\n/, "\n"
+    # GIT
+    git :add => '-A' if prefer :git, true
+    git :commit => '-qm "rails_apps_composer: clean up starter app"' if prefer :git, true
+
+    ### GIT ###
+    git :add => '-A' if prefer :git, true
+    git :commit => '-qm "rails_apps_composer: learn-rails app"' if prefer :git, true
+
+  end # after_bundler
+end # rails-omniauth
+
 __END__
 
 name: apps4

data/recipes/controllers.rb

@@ -5,8 +5,7 @@ after_bundler do
   say_wizard "recipe running after 'bundle install'"
   ### APPLICATION_CONTROLLER ###
   if prefer :authentication, 'omniauth'
-    #copy_from_repo 'app/controllers/application_controller.rb', :repo => 'https://raw.github.com/RailsApps/rails3-mongoid-omniauth/master/'
-    copy_from_repo 'app/controllers/application_controller-omniauth.rb', :prefs => 'omniauth'
+    copy_from_repo 'app/controllers/application_controller.rb', :repo => 'https://raw.github.com/RailsApps/rails-omniauth/master/'
   end
   if prefer :authorization, 'cancan'
     inject_into_file 'app/controllers/application_controller.rb', :before => "\nend" do <<-RUBY
@@ -19,10 +18,7 @@ RUBY
   end
   ### HOME_CONTROLLER ###
   if ['home_app','users_app','admin_app','subdomains_app'].include? prefs[:starter_app]
-    generate(:controller, "home index")
-  end
-  if ['users_app','admin_app','subdomains_app'].include? prefs[:starter_app]
-    gsub_file 'app/controllers/home_controller.rb', /def index/, "def index\n    @users = User.all"
+    generate(:controller, "home")
   end
   ### USERS_CONTROLLER ###
   case prefs[:starter_app]
@@ -30,13 +26,21 @@ RUBY
       if (prefer :authentication, 'devise') and (not prefer :apps4, 'rails-devise')
         copy_from_repo 'app/controllers/users_controller.rb', :repo => 'https://raw.github.com/RailsApps/rails3-devise-rspec-cucumber/master/'
       elsif prefer :authentication, 'omniauth'
-        copy_from_repo 'app/controllers/users_controller.rb', :repo => 'https://raw.github.com/RailsApps/rails3-mongoid-omniauth/master/'
+        if rails_4?
+          copy_from_repo 'app/controllers/users_controller.rb', :repo => 'https://raw.github.com/RailsApps/rails-omniauth/master/'
+        else
+          copy_from_repo 'app/controllers/users_controller.rb', :repo => 'https://raw.github.com/RailsApps/rails3-mongoid-omniauth/master/'
+        end
       end
     when 'admin_app'
       if (prefer :authentication, 'devise') and (not prefer :apps4, 'rails-devise')
         copy_from_repo 'app/controllers/users_controller.rb', :repo => 'https://raw.github.com/RailsApps/rails3-bootstrap-devise-cancan/master/'
       elsif prefer :authentication, 'omniauth'
-        copy_from_repo 'app/controllers/users_controller.rb', :repo => 'https://raw.github.com/RailsApps/rails3-mongoid-omniauth/master/'
+        if rails_4?
+          copy_from_repo 'app/controllers/users_controller.rb', :repo => 'https://raw.github.com/RailsApps/rails-omniauth/master/'
+        else
+          copy_from_repo 'app/controllers/users_controller.rb', :repo => 'https://raw.github.com/RailsApps/rails3-mongoid-omniauth/master/'
+        end
       end
     when 'subdomains_app'
       copy_from_repo 'app/controllers/users_controller.rb', :repo => 'https://raw.github.com/RailsApps/rails3-subdomains/master/'
@@ -51,7 +55,7 @@ RUBY
   ### SESSIONS_CONTROLLER ###
   if prefer :authentication, 'omniauth'
     filename = 'app/controllers/sessions_controller.rb'
-    copy_from_repo filename, :repo => 'https://raw.github.com/RailsApps/rails3-mongoid-omniauth/master/'
+    copy_from_repo filename, :repo => 'https://raw.github.com/RailsApps/rails-omniauth/master/'
     gsub_file filename, /twitter/, prefs[:omniauth_provider] unless prefer :omniauth_provider, 'twitter'
     if prefer :authorization, 'cancan'
       inject_into_file filename, "    user.add_role :admin if User.count == 1 # make the first user an admin\n", :after => "session[:user_id] = user.id\n"

data/recipes/email.rb

@@ -82,7 +82,7 @@ TEXT
 \n
   config.action_mailer.smtp_settings = {
     address: "smtp.sendgrid.net",
-    port: 25,
+    port: 587,
     domain: ENV["DOMAIN_NAME"],
     authentication: "plain",
     user_name: ENV["SENDGRID_USERNAME"],
@@ -98,7 +98,7 @@ TEXT
   \n
     config.action_mailer.smtp_settings = {
       :address   => "smtp.mandrillapp.com",
-      :port      => 25,
+      :port      => 587,
       :user_name => ENV["MANDRILL_USERNAME"],
       :password  => ENV["MANDRILL_APIKEY"]
     }

data/recipes/frontend.rb

@@ -36,13 +36,6 @@ after_everything do
   # create navigation links using the rails_layout gem
   generate 'layout:navigation -f'
   # replace with specialized navigation partials
-  if prefer :authentication, 'omniauth'
-    if prefer :authorization, 'cancan'
-      copy_from 'https://raw.github.com/RailsApps/rails-composer/master/files/app/views/layouts/_navigation-cancan-omniauth.html.erb', 'app/views/layouts/_navigation.html.erb'
-    else
-      copy_from_repo 'app/views/layouts/_navigation-omniauth.html.erb', :prefs => 'omniauth'
-    end
-  end
   copy_from_repo 'app/views/layouts/_navigation-subdomains_app.html.erb', :prefs => 'subdomains_app'
 
   ### GIT ###

data/recipes/gems.rb

@@ -19,14 +19,17 @@ if (prefs[:dev_webserver] == prefs[:prod_webserver])
   add_gem 'unicorn' if prefer :dev_webserver, 'unicorn'
   add_gem 'unicorn-rails' if prefer :dev_webserver, 'unicorn'
   add_gem 'puma' if prefer :dev_webserver, 'puma'
+  add_gem 'passenger' if prefer :dev_webserver, 'passenger_standalone'
 else
   add_gem 'thin', :group => [:development, :test] if prefer :dev_webserver, 'thin'
   add_gem 'unicorn', :group => [:development, :test] if prefer :dev_webserver, 'unicorn'
   add_gem 'unicorn-rails', :group => [:development, :test] if prefer :dev_webserver, 'unicorn'
   add_gem 'puma', :group => [:development, :test] if prefer :dev_webserver, 'puma'
+  add_gem 'passenger', :group => [:development, :test] if prefer :dev_webserver, 'passenger_standalone'
   add_gem 'thin', :group => :production if prefer :prod_webserver, 'thin'
   add_gem 'unicorn', :group => :production if prefer :prod_webserver, 'unicorn'
   add_gem 'puma', :group => :production if prefer :prod_webserver, 'puma'
+  add_gem 'passenger', :group => :production if prefer :prod_webserver, 'passenger_standalone'
 end
 
 ## Rails 4.0 attr_accessible Compatibility
@@ -283,10 +286,12 @@ FILE
     create_file 'Procfile', 'web: bundle exec rails server -p $PORT' if prefer :prod_webserver, 'thin'
     create_file 'Procfile', 'web: bundle exec unicorn -p $PORT' if prefer :prod_webserver, 'unicorn'
     create_file 'Procfile', 'web: bundle exec puma -p $PORT' if prefer :prod_webserver, 'puma'
+    create_file 'Procfile', 'web: bundle exec passenger start -p $PORT' if prefer :prod_webserver, 'passenger_standalone'
     if (prefs[:dev_webserver] != prefs[:prod_webserver])
       create_file 'Procfile.dev', 'web: bundle exec rails server -p $PORT' if prefer :dev_webserver, 'thin'
       create_file 'Procfile.dev', 'web: bundle exec unicorn -p $PORT' if prefer :dev_webserver, 'unicorn'
       create_file 'Procfile.dev', 'web: bundle exec puma -p $PORT' if prefer :dev_webserver, 'puma'
+      create_file 'Procfile.dev', 'web: bundle exec passenger start -p $PORT' if prefer :dev_webserver, 'passenger_standalone'
     end
   end
   ## Git

data/recipes/models.rb

@@ -54,19 +54,16 @@ RUBY
   end
   ### OMNIAUTH ###
   if prefer :authentication, 'omniauth'
-    repo = 'https://raw.github.com/RailsApps/rails3-mongoid-omniauth/master/'
+    repo = 'https://raw.github.com/RailsApps/rails-omniauth/master/'
     copy_from_repo 'config/initializers/omniauth.rb', :repo => repo
     gsub_file 'config/initializers/omniauth.rb', /twitter/, prefs[:omniauth_provider] unless prefer :omniauth_provider, 'twitter'
-    generate 'model User name:string email:string provider:string uid:string' unless prefer :orm, 'mongoid'
-    run 'bundle exec rake db:migrate' unless prefer :orm, 'mongoid'
-    copy_from_repo 'app/models/user.rb', :repo => repo  # copy the User model (Mongoid version)
-    unless prefer :orm, 'mongoid'
-      ## OMNIAUTH AND ACTIVE RECORD
-      gsub_file 'app/models/user.rb', /class User/, 'class User < ActiveRecord::Base'
-      gsub_file 'app/models/user.rb', /^\s*include Mongoid::Document\n/, ''
-      gsub_file 'app/models/user.rb', /^\s*field.*\n/, ''
-      gsub_file 'app/models/user.rb', /^\s*# run 'rake db:mongoid:create_indexes' to create indexes\n/, ''
-      gsub_file 'app/models/user.rb', /^\s*index\(\{ email: 1 \}, \{ unique: true, background: true \}\)\n/, ''
+    if prefer :orm, 'mongoid'
+      repo = 'https://raw.github.com/RailsApps/rails3-mongoid-omniauth/master/'
+      copy_from_repo 'app/models/user.rb', :repo => repo
+    else
+      generate 'model User name:string email:string provider:string uid:string'
+      run 'bundle exec rake db:migrate'
+      copy_from_repo 'app/models/user.rb', :repo => repo
     end
   end
   ### SUBDOMAINS ###

data/recipes/railsapps.rb

@@ -31,7 +31,8 @@ when "4"
         [["learn-rails", "learn-rails"],
         ["rails-bootstrap", "rails-bootstrap"],
         ["rails-foundation", "rails-foundation"],
-        ["rails-devise", "rails-devise"]]
+        ["rails-devise", "rails-devise"],
+        ["rails-omniauth", "rails-omniauth"]]
     when 'contributed_app'
       prefs[:apps4] = multiple_choice "No contributed applications are available.",
         [["continue", "none"]]
@@ -119,6 +120,19 @@ case prefs[:apps4]
     prefs[:quiet_assets] = true
     prefs[:local_env_file] = 'figaro'
     prefs[:better_errors] = true
+  when 'rails-omniauth'
+    prefs[:git] = true
+    prefs[:unit_test] = false
+    prefs[:integration] = false
+    prefs[:fixtures] = false
+    prefs[:email] = 'none'
+    prefs[:authentication] = 'omniauth'
+    prefs[:authorization] = 'none'
+    prefs[:starter_app] = false
+    prefs[:form_builder] = 'none'
+    prefs[:quiet_assets] = true
+    prefs[:local_env_file] = 'figaro'
+    prefs[:better_errors] = true
 end
 
 case prefs[:railsapps]

data/recipes/routes.rb

@@ -20,8 +20,11 @@ after_bundler do
     end
     ## OMNIAUTH
     if prefer :authentication, 'omniauth'
-      copy_from_repo 'config/routes.rb', :repo => 'https://raw.github.com/RailsApps/rails3-mongoid-omniauth/master/'
-      gsub_file 'config/routes.rb', /match/, 'get' if rails_4?
+      if rails_4?
+        copy_from_repo 'config/routes.rb', :repo => 'https://raw.github.com/RailsApps/rails-omniauth/master/'
+      else
+        copy_from_repo 'config/routes.rb', :repo => 'https://raw.github.com/RailsApps/rails3-mongoid-omniauth/master/'
+      end
     end
   end
   ### SUBDOMAINS ###

data/recipes/setup.rb

@@ -13,9 +13,11 @@ sqlite_detected = gemfile.include? 'sqlite3'
 
 ## Web Server
 prefs[:dev_webserver] = multiple_choice "Web server for development?", [["WEBrick (default)", "webrick"],
-  ["Thin", "thin"], ["Unicorn", "unicorn"], ["Puma", "puma"]] unless prefs.has_key? :dev_webserver
+  ["Thin", "thin"], ["Unicorn", "unicorn"], ["Puma", "puma"], ["Phusion Passenger (Apache/Nginx)", "passenger"],
+  ["Phusion Passenger (Standalone)", "passenger_standalone"]] unless prefs.has_key? :dev_webserver
 prefs[:prod_webserver] = multiple_choice "Web server for production?", [["Same as development", "same"],
-  ["Thin", "thin"], ["Unicorn", "unicorn"], ["Puma", "puma"]] unless prefs.has_key? :prod_webserver
+  ["Thin", "thin"], ["Unicorn", "unicorn"], ["Puma", "puma"], ["Phusion Passenger (Apache/Nginx)", "passenger"],
+  ["Phusion Passenger (Standalone)", "passenger_standalone"]] unless prefs.has_key? :prod_webserver
 if prefs[:prod_webserver] == 'same'
   case prefs[:dev_webserver]
     when 'thin'
@@ -24,6 +26,10 @@ if prefs[:prod_webserver] == 'same'
       prefs[:prod_webserver] = 'unicorn'
     when 'puma'
       prefs[:prod_webserver] = 'puma'
+    when 'passenger'
+      prefs[:prod_webserver] = 'passenger'
+    when 'passenger_standalone'
+      prefs[:prod_webserver] = 'passenger_standalone'
   end
 end
 

data/recipes/views.rb

@@ -37,7 +37,7 @@ after_bundler do
     copy_from_repo 'app/views/users/show.html.erb'
     copy_from_repo 'app/views/users/show-subdomains_app.html.erb', :prefs => 'subdomains_app'
     ## EDIT
-    copy_from_repo 'app/views/users/edit-omniauth.html.erb', :prefs => 'omniauth'
+    copy_from_repo 'app/views/users/edit.html.erb', :repo => 'https://raw.github.com/RailsApps/rails-omniauth/master/'
   end
   ### PROFILES ###
   copy_from_repo 'app/views/profiles/show-subdomains_app.html.erb', :prefs => 'subdomains_app'

data/version.rb

@@ -1,3 +1,3 @@
 module RailsWizard
-  VERSION = "2.4.24"
+  VERSION = "2.4.25"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_apps_composer
 version: !ruby/object:Gem::Version
-  version: 2.4.24
+  version: 2.4.25
 platform: ruby
 authors:
 - Daniel Kehoe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-01 00:00:00.000000000 Z
+date: 2014-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n