rails_apps_composer 1.4.11 → 1.4.12

data/recipes/action_mailer.rb

@@ -1,6 +1,16 @@
 # Application template recipe for the rails_apps_composer. Check for a newer version here:
 # https://github.com/RailsApps/rails_apps_composer/blob/master/recipes/action_mailer.rb
 
+case config['mailer']
+  when 'smtp'
+    recipes << 'smtp'
+  when 'gmail'
+    recipes << 'gmail'
+  when 'sendgrid'
+    gem 'sendgrid'
+    recipes << 'sendgrid'
+end
+
 after_bundler do
   ### modifying environment configuration files for ActionMailer
   say_wizard "ActionMailer recipe running 'after bundler'"
@@ -10,8 +20,8 @@ after_bundler do
   <<-RUBY
 config.action_mailer.default_url_options = { :host => 'localhost:3000' }
   config.action_mailer.delivery_method = :smtp
-  # change to false to prevent email from being sent during development
-  config.action_mailer.perform_deliveries = true
+  # change to true to allow email to be sent during development
+  config.action_mailer.perform_deliveries = false
   config.action_mailer.raise_delivery_errors = true
   config.action_mailer.default :charset => "utf-8"
 RUBY
@@ -40,7 +50,7 @@ RUBY
   end
 
   ### modifying environment configuration files to send email using a GMail account
-  if config['gmail']
+  if recipes.include? 'gmail'
     gmail_configuration_text = <<-TEXT
 \n
   config.action_mailer.smtp_settings = {
@@ -57,19 +67,38 @@ TEXT
     inject_into_file 'config/environments/development.rb', gmail_configuration_text, :after => 'config.action_mailer.default :charset => "utf-8"'
     inject_into_file 'config/environments/production.rb', gmail_configuration_text, :after => 'config.action_mailer.default :charset => "utf-8"'
   end
+
+  ### modifying environment configuration files to send email using a SendGrid account
+  if recipes.include? 'sendgrid'
+    sendgrid_configuration_text = <<-TEXT
+\n
+  config.action_mailer.smtp_settings = {
+    address: "smtp.sendgrid.net",
+    port: 25,
+    domain: "example.com",
+    authentication: "plain",
+    user_name: ENV["SENDGRID_USERNAME"],
+    password: ENV["SENDGRID_PASSWORD"]
+  }
+TEXT
+    say_wizard gmail_configuration_text
+    inject_into_file 'config/environments/development.rb', sendgrid_configuration_text, :after => 'config.action_mailer.default :charset => "utf-8"'
+    inject_into_file 'config/environments/production.rb', sendgrid_configuration_text, :after => 'config.action_mailer.default :charset => "utf-8"'
+  end
   
 end
-  
+
 __END__
 
 name: ActionMailer
-description: "Configure ActionMailer to show errors during development and suppress failures when the app is deployed to production."
+description: "Configure ActionMailer for email."
 author: RailsApps
 
 category: other
 tags: [utilities, configuration]
 
 config:
-  - gmail:
-      type: boolean
-      prompt: Would you like the app to use a GMail account to send email?
+  - mailer:
+      type: multiple_choice
+      prompt: "How will you send email?"
+      choices: [["SMTP account", smtp], ["Gmail account", gmail], ["SendGrid account", sendgrid]]

data/recipes/add_user.rb

@@ -91,9 +91,6 @@ RUBY
       end
     end
 
-    # patch for https://github.com/RailsApps/rails3-application-templates/issues/35
-    gsub_file 'app/models/user.rb', /:remember_meend/, ":remember_me\nend"
-
     unless recipes.include? 'haml'
 
       # Generate Devise views (unless you are using Haml)

data/recipes/devise.rb

@@ -6,12 +6,12 @@ case config['devise']
     recipes.delete('devise')
     say_wizard "Devise recipe skipped."
   when 'standard'
-    gem 'devise', '>= 2.1.0.rc2'
+    gem 'devise', '>= 2.1.0'
   when 'confirmable'
-    gem 'devise', '>= 2.1.0.rc2'
+    gem 'devise', '>= 2.1.0'
     recipes << 'devise-confirmable'
   when 'invitable'
-    gem 'devise', '>= 2.1.0.rc2'
+    gem 'devise', '>= 2.1.0'
     gem 'devise_invitable', '>= 1.0.1'
     recipes << 'devise-confirmable'
     recipes << 'devise-invitable'

data/recipes/haml.rb

@@ -2,7 +2,7 @@
 # https://github.com/RailsApps/rails_apps_composer/blob/master/recipes/haml.rb
 
 if config['haml']
-  gem 'haml', '>= 3.1.5'
+  gem 'haml', '>= 3.1.6'
   gem 'haml-rails', '>= 0.3.4', :group => :development
 else
   recipes.delete('haml')

data/recipes/html5.rb

@@ -19,7 +19,7 @@ case config['css_option']
   when 'bootstrap_sass'
     # https://github.com/thomas-mcdonald/bootstrap-sass
     # http://rubysource.com/twitter-bootstrap-less-and-sass-understanding-your-options-for-rails-3-1/
-    gem 'bootstrap-sass', '>= 2.0.1'
+    gem 'bootstrap-sass', '>= 2.0.3'
     recipes << 'bootstrap'
 
 end

data/version.rb

@@ -1,3 +1,3 @@
 module RailsWizard
-  VERSION = "1.4.11"
+  VERSION = "1.4.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_apps_composer
 version: !ruby/object:Gem::Version
-  version: 1.4.11
+  version: 1.4.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-13 00:00:00.000000000 Z
+date: 2012-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -225,7 +225,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 816194076222959709
+      hash: -622808843777637371
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -234,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 816194076222959709
+      hash: -622808843777637371
 requirements: []
 rubyforge_project: rails_apps_composer
 rubygems_version: 1.8.23