cosmit-suspenders 1.36.3 → 1.36.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1e7d713bc808f4f69cf91bd35385907a058f652
-  data.tar.gz: 0d7d1d58b5824d23b934250d7d953065e26fee63
+  metadata.gz: fdc956dc5cd1c680d372ca6a800d6e6205d6ab97
+  data.tar.gz: 28141451d6927789fa8ccc585401d5d1827435c2
 SHA512:
-  metadata.gz: 4a973ba3c5e9038aaa08491f892aa021e49a334a70f14c360e7677bb735ef741629192291f3a922a971796e5384ad0c41dd48c91443e95ab13d8a9e204bf99df
-  data.tar.gz: e99cb007eca65640927c2bca461859e6b319e13d105f74d9b23c6b7a0f2a51c3e8f8c346ee09b3f40ed465569a11acf780f9fb544ce4423dbe1c2bc3064c523e
+  metadata.gz: fe7578fcf6a4a2c4dbf947cfbc8648ef9eba5e093377bfc2b8a111a2888caebf7044055a99b4547beab1ec87c571dee256a45849d043e603c03065589860e17c
+  data.tar.gz: 9d840f116f0fa276413ca73151da1bb3c8d6b528b65dba2ee64d967b7f8506ddd8ec96e74c0755fd692a3c36cac43236f82de95881f6c32101c13331a4c9bcce

data/lib/suspenders/app_builder.rb

@@ -51,7 +51,7 @@ module Suspenders
     def set_test_delivery_method
       inject_into_file(
         "config/environments/development.rb",
-        "\n  config.action_mailer.delivery_method = :test",
+        "\n  config.action_mailer.delivery_method = :letter_opener",
         after: "config.action_mailer.raise_delivery_errors = true",
       )
     end
@@ -129,37 +129,22 @@ module Suspenders
     end
 
     def configure_smtp
-      copy_file 'smtp.rb', 'config/smtp.rb'
-
-      prepend_file 'config/environments/production.rb',
-        %{require Rails.root.join("config/smtp")\n}
-
       config = <<-RUBY
 
-  config.action_mailer.delivery_method = :smtp
-  config.action_mailer.smtp_settings = SMTP_SETTINGS
-      RUBY
-
-      inject_into_file 'config/environments/production.rb', config,
-        after: "config.action_mailer.raise_delivery_errors = false"
-    end
-
-    def enable_rack_canonical_host
-      config = <<-RUBY
-
-  if ENV.fetch("HEROKU_APP_NAME", "").include?("staging-pr-")
-    ENV["APPLICATION_HOST"] = ENV["HEROKU_APP_NAME"] + ".herokuapp.com"
-  end
+ActionMailer::Base.smtp_settings = {
+  address: 'smtp.sendgrid.net',
+  port: '587',
+  authentication: :plain,
+  user_name: ENV['SENDGRID_USERNAME'],
+  password: ENV['SENDGRID_PASSWORD'],
+  domain: 'heroku.com',
+  enable_starttls_auto: true
+}
 
-  # Ensure requests are only served from one, canonical host name
-  config.middleware.use Rack::CanonicalHost, ENV.fetch("APPLICATION_HOST")
       RUBY
 
-      inject_into_file(
-        "config/environments/production.rb",
-        config,
-        after: "Rails.application.configure do",
-      )
+      inject_into_file 'config/environment.rb', config,
+        before: "Rails.application.initialize!"
     end
 
     def enable_rack_deflater
@@ -179,7 +164,7 @@ module Suspenders
     def setup_asset_host
       replace_in_file 'config/environments/production.rb',
         "# config.action_controller.asset_host = 'http://assets.example.com'",
-        'config.action_controller.asset_host = ENV.fetch("ASSET_HOST", ENV.fetch("APPLICATION_HOST"))'
+        "config.action_controller.asset_host = 'https://#{self.app_name}.herokuapp.com'"
 
       replace_in_file 'config/initializers/assets.rb',
         "config.assets.version = '1.0'",
@@ -199,7 +184,15 @@ module Suspenders
       config = <<-RUBY
 
 Rails.application.configure do
-  # ...
+  if ENV.fetch("HEROKU_APP_NAME", "").include?("staging-pr-")
+    config.action_mailer.asset_host = ("https://" + ENV["HEROKU_APP_NAME"] + ".herokuapp.com")
+    config.action_mailer.default_url_options = { host: ENV["HEROKU_APP_NAME"] + ".herokuapp.com" }
+    config.action_controller.default_url_options = { host: ENV["HEROKU_APP_NAME"] + ".herokuapp.com" }
+  else
+    config.action_mailer.asset_host = ("https://" + ENV["HEROKU_APP_NAME"]+ "-staging" + ".herokuapp.com")
+    config.action_mailer.default_url_options = { host: ENV["HEROKU_APP_NAME"]+ "-staging" + ".herokuapp.com" }
+    config.action_controller.default_url_options = { host: ENV["HEROKU_APP_NAME"]+ "-staging" + ".herokuapp.com" }
+  end
 end
       RUBY
 
@@ -223,30 +216,27 @@ end
     end
 
     def create_shared_javascripts
-      copy_file '_javascript.html.slim', 'app/views/partials/_javascript.html.slim'
+      copy_file '_javascripts.html.slim', 'app/views/partials/_javascripts.html.slim'
     end
 
     def create_application_layout
-      template 'suspenders_layout.html.slim.erb',
-        'app/views/layouts/application.html.slim',
-        force: true
+      template 'suspenders_layout.html.slim',
+               'app/views/layouts/application.html.slim',
+               force: true
     end
 
     def create_application_header
-      template '_header.html.slim.erb',
-        'app/views/partials/_header.html.slim',
-        force: true
+      copy_file '_header.html.slim', 'app/views/partials/_header.html.slim'
     end
 
     def create_application_footer
-      template '_footer.html.slim.erb',
-        'app/views/partials/_footer.html.slim',
-        force: true
+      copy_file '_footer.html.slim', 'app/views/partials/_footer.html.slim'
     end
 
     def use_postgres_config_template
-      template 'postgresql_database.yml.erb', 'config/database.yml',
-        force: true
+      template 'postgresql_database.yml.erb',
+               'config/database.yml',
+               force: true
     end
 
     def create_database
@@ -310,36 +300,38 @@ end
       template "config_locales_en.yml.erb", "config/locales/en.yml"
     end
 
-    def configure_rack_timeout
-      rack_timeout_config = <<-RUBY
-Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i
-      RUBY
-
-      append_file "config/environments/production.rb", rack_timeout_config
-    end
-
     def configure_simple_form
-      bundle_command "install"
-      bundle_command "exec rails generate simple_form:install"
+      bundle_command "exec rails generate simple_form:install --bootstrap"
+      inject_into_file "app/assets/javascripts/application.js",
+                       "//= require bootstrap",
+                       after: "//= require_tree ."
     end
 
     def configure_devise
-      bundle_command "install"
       bundle_command "exec rails generate devise:install"
+      bundle_command "exec rake db:migrate"
     end
 
     def configure_active_admin
-      bundle_command "install"
-      bundle_command "exec rails generate active_admin:install"
+      bundle_command "exec rails generate active_admin:install --skip-users"
       bundle_command "exec rake db:migrate"
       bundle_command "exec rake db:seed"
     end
 
     def configure_initjs
-      bundle_command "install"
       bundle_command 'exec rails generate initjs:install'
     end
 
+    def copy_flash_javascript_file
+      template "flash.js.coffee.erb", "app/assets/javascripts/#{self.app_name.underscore}/modules/flash.js.coffee"
+    end
+
+    def replace_flash_javascript_file
+      replace_in_file "app/assets/javascripts/#{self.app_name.underscore}/#{self.app_name.underscore}.js.coffee",
+                      "modules: -> []",
+                      "modules: -> [#{self.app_name.camelize}.Flash]"
+    end
+
     def configure_action_mailer
       action_mailer_host "development", %{"localhost:3000"}
       action_mailer_host "test", %{"www.example.com"}
@@ -363,10 +355,27 @@ Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i
 
     def setup_stylesheets
       remove_file "app/assets/stylesheets/application.css"
+
       copy_file "application.scss",
                 "app/assets/stylesheets/application.scss"
     end
 
+    def setup_colors_stylesheet
+      copy_file "_colors.scss", "app/assets/stylesheets/variables/_colors.scss"
+
+      inject_into_file "app/assets/stylesheets/application.scss",
+                       "\n// ==== Variables\n@import \"variables/colors\";",
+                       after: '@import "font-awesome";'
+    end
+
+    def setup_flash_stylesheet
+      copy_file "_flash.scss", "app/assets/stylesheets/componentes/_flash.scss"
+
+      inject_into_file "app/assets/stylesheets/application.scss",
+                       "\n// ==== Components\n@import \"components/flash\"; ",
+                       after: '@import "variables/colors";'
+    end
+
     def setup_default_directories
       [
         'app/views/pages',
@@ -509,6 +518,11 @@ end
       end
     end
 
+    def uncomment_devise_secret_token
+      config = "config.secret_key"
+      uncomment_lines("config/initializers/devise.rb", config)
+    end
+
     private
 
     def raise_on_missing_translations_in(environment)

data/lib/suspenders/generators/app_generator.rb

@@ -32,8 +32,13 @@ module Suspenders
     def suspenders_customization
       invoke :customize_gemfile
       invoke :setup_simple_form
+      invoke :setup_database
       invoke :setup_devise
+      invoke :setup_stylesheets
+      invoke :setup_colors_stylesheet
+      invoke :setup_flash_stylesheet
       invoke :setup_initjs
+      invoke :setup_flash_messages
       invoke :setup_development_environment
       invoke :setup_test_environment
       invoke :setup_production_environment
@@ -41,23 +46,22 @@ module Suspenders
       invoke :setup_secret_token
       invoke :create_suspenders_views
       invoke :configure_app
-      invoke :setup_stylesheets
       invoke :copy_miscellaneous_files
       invoke :customize_error_pages
       invoke :remove_config_comment_lines
       invoke :remove_routes_comment_lines
       invoke :setup_dotfiles
       invoke :setup_git
-      invoke :setup_database
-      invoke :create_heroku_apps
-      invoke :create_github_repo
       invoke :setup_bundler_audit
-      invoke :setup_spring
       invoke :setup_active_admin
+      invoke :uncomment_devise_secret_token
+      invoke :create_heroku_apps
+      invoke :create_github_repo
       invoke :outro
     end
 
     def customize_gemfile
+      say 'Setting up Gemfile'
       build :set_ruby_to_version_being_used
 
       if options[:heroku]
@@ -68,18 +72,28 @@ module Suspenders
     end
 
     def setup_simple_form
+      say 'Setting up Simple Form'
       build :configure_simple_form
     end
 
     def setup_devise
+      say 'Setting up Devise'
       build :configure_devise
     end
 
     def setup_initjs
+      say 'Setting up InitJS'
       build :configure_initjs
     end
 
+    def setup_flash_messages
+      say 'Setting up Flash Messages'
+      build :copy_flash_javascript_file
+      build :replace_flash_javascript_file
+    end
+
     def setup_active_admin
+      say 'Setting up Active Admin'
       build :configure_active_admin
     end
 
@@ -127,8 +141,6 @@ module Suspenders
     def setup_production_environment
       say 'Setting up the production environment'
       build :configure_smtp
-      build :configure_rack_timeout
-      build :enable_rack_canonical_host
       build :enable_rack_deflater
       build :setup_asset_host
     end
@@ -169,6 +181,16 @@ module Suspenders
       build :setup_stylesheets
     end
 
+    def setup_colors_stylesheet
+      say 'Set up colors stylesheet'
+      build :setup_colors_stylesheet
+    end
+
+    def setup_flash_stylesheet
+      say 'Set up flash stylesheet'
+      build :setup_flash_stylesheet
+    end
+
     def setup_git
       if !options[:skip_git]
         say "Initializing git"
@@ -200,10 +222,12 @@ module Suspenders
     end
 
     def setup_dotfiles
+      say 'Setting up Dotfiles'
       build :copy_dotfiles
     end
 
     def setup_default_directories
+      say 'Setting up Default Directories'
       build :setup_default_directories
     end
 
@@ -212,12 +236,8 @@ module Suspenders
       build :setup_bundler_audit
     end
 
-    def setup_spring
-      say "Springifying binstubs"
-      build :setup_spring
-    end
-
     def init_git
+      say 'Setting up GIT'
       build :init_git
     end
 
@@ -239,6 +259,10 @@ module Suspenders
       build :remove_routes_comment_lines
     end
 
+    def uncomment_devise_secret_token
+      build :uncomment_devise_secret_token
+    end
+
     def outro
       say 'Congratulations! You just pulled our suspenders.'
     end

data/lib/suspenders/version.rb

@@ -1,5 +1,5 @@
 module Suspenders
   RAILS_VERSION = "~> 4.2"
   RUBY_VERSION = IO.read("#{File.dirname(__FILE__)}/../../.ruby-version").strip
-  VERSION = "1.36.3"
+  VERSION = "1.36.11"
 end

data/spec/features/new_project_spec.rb

@@ -138,7 +138,7 @@ RSpec.describe "Suspend a new project with default configuration" do
   it "configs :test email delivery method for development" do
     dev_env_file = IO.read("#{project_path}/config/environments/development.rb")
     expect(dev_env_file).
-      to match(/^ +config.action_mailer.delivery_method = :test$/)
+      to match(/^ +config.action_mailer.delivery_method = :letter_opener$/)
   end
 
   it "uses APPLICATION_HOST, not HOST in the production config" do

data/templates/Gemfile.erb

@@ -25,6 +25,7 @@ group :development do
   gem "quiet_assets"
   gem "spring"
   gem "spring-commands-rspec"
+  gem "letter_opener"
 end
 
 group :development, :test do

data/templates/_colors.scss

@@ -0,0 +1,19 @@
+// # =================================================================
+// # Colors
+// # =================================================================
+
+// ==== Brand colors
+$yellow:        #ffc82a;
+$black:         #333;
+
+// ==== Gray
+$gray-light:    #f2f2f2;
+$gray:          #e2e2e2;
+$gray-medium:   #bbb;
+$gray-dark:     #999;
+$gray-darkest:  #666;
+
+// ==== Flash
+$error:         #f05f5c;
+$success:       #2ecc71;
+$info:          #5e98a3;

data/templates/_flash.scss

@@ -0,0 +1,31 @@
+.flash {
+  font-size: 26px;
+  color: white;
+  z-index: 500;
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+  text-align: center;
+  .wrapper {
+    padding: 20px;
+  }
+  .success.wrapper, .notice.wrapper {
+    background-color: $success;
+  }
+  .failure.wrapper, .alerts-error.wrapper, .alerts-error.wrapper {
+    background-color: $error;
+  }
+  .locale.wrapper {
+    background-color: $info;
+  }
+  .warning.wrapper {
+    color: $black;
+    background-color: $yellow;
+  }
+}
+
+@media (max-width: 768px) {
+  .flash {
+    font-size: 18px;
+  }
+}

data/templates/app.json.erb

@@ -1,13 +1,12 @@
 {
   "name":"<%= app_name.dasherize %>",
-  "scripts":{},
+  "scripts":{
+    "postdeploy": "bin/rake db:migrate"
+  },
   "env":{
     "APPLICATION_HOST":{
       "required":true
     },
-    "EMAIL_RECIPIENTS":{
-      "required":true
-    },
     "HEROKU_APP_NAME": {
       "required":true
     },
@@ -19,22 +18,11 @@
     },
     "SECRET_KEY_BASE":{
       "generator":"secret"
-    },
-    "SMTP_ADDRESS":{
-      "required":true
-    },
-    "SMTP_DOMAIN":{
-      "required":true
-    },
-    "SMTP_PASSWORD":{
-      "required":true
-    },
-    "SMTP_USERNAME":{
-      "required":true
     }
   },
   "addons":[
     "heroku-postgresql",
     "sendgrid"
-  ]
+  ],
+  "buildpacks": []
 }

data/templates/flash.js.coffee.erb

@@ -0,0 +1,11 @@
+<%= app_name.camelize %>.Flash =
+  init: ->
+    setTimeout( ->
+      $('.flash').slideDown()
+    , 100)
+    if $('.flash').length > 0
+      setTimeout( ->
+        $('.flash').slideUp()
+      , 8000)
+    $(document).one 'click', ->
+      $('.flash').slideUp()

data/templates/secrets.yml

@@ -4,6 +4,7 @@ default: &default
 
 development:
   <<: *default
+  secret_key_base: '3eu3he3heu3hueh3uehu3heu3hueh3u'
 
 test:
   <<: *default

data/templates/staging.rb

@@ -1,5 +1 @@
 require_relative "production"
-
-Mail.register_interceptor(
-  RecipientInterceptor.new(ENV.fetch("EMAIL_RECIPIENTS"))
-)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cosmit-suspenders
 version: !ruby/object:Gem::Version
-  version: 1.36.3
+  version: 1.36.11
 platform: ruby
 authors:
 - COSMIT
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-01 00:00:00.000000000 Z
+date: 2016-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -140,10 +140,12 @@ files:
 - templates/Gemfile.erb
 - templates/Procfile
 - templates/README.md.erb
+- templates/_colors.scss
 - templates/_flash.html.slim
+- templates/_flash.scss
 - templates/_footer.html.slim
 - templates/_header.html.slim
-- templates/_javascript.html.slim
+- templates/_javascripts.html.slim
 - templates/action_mailer.rb
 - templates/app.json.erb
 - templates/application.scss
@@ -163,6 +165,7 @@ files:
 - templates/errors.rb
 - templates/factories.rb
 - templates/factory_girl_rspec.rb
+- templates/flash.js.coffee.erb
 - templates/hound.yml
 - templates/i18n.rb
 - templates/json_encoding.rb
@@ -172,7 +175,6 @@ files:
 - templates/rails_helper.rb
 - templates/secrets.yml
 - templates/shoulda_matchers_config_rspec.rb
-- templates/smtp.rb
 - templates/spec_helper.rb
 - templates/staging.rb
 - templates/suspenders_gitignore

data/templates/smtp.rb

@@ -1,9 +0,0 @@
-SMTP_SETTINGS = {
-  address: ENV.fetch("SMTP_ADDRESS"), # example: "smtp.sendgrid.net"
-  authentication: :plain,
-  domain: ENV.fetch("SMTP_DOMAIN"), # example: "heroku.com"
-  enable_starttls_auto: true,
-  password: ENV.fetch("SMTP_PASSWORD"),
-  port: "587",
-  user_name: ENV.fetch("SMTP_USERNAME")
-}