railman 0.6.13 → 0.6.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7033d6686d77861959227d4e9b27ef5611fb93e1
-  data.tar.gz: 4d946a16c6168c828465fd6c6c28bb94f439245a
+  metadata.gz: ff3a64f05648faa195706f4ae12a591089c00df6
+  data.tar.gz: ae60b309f39a1eca295a15814bcc9fecc002149c
 SHA512:
-  metadata.gz: bde38841e330a4d2d07e514744ea6738ad8f387bc2b71f15ed823e87c22ce1b5c5f4110b84cff79763681c9c4e395feaa842d1df29968e890af54451d1a7e3ca
-  data.tar.gz: 4ecdd838b4391f182366b5c9370ad259ab7df3c33c83c57ddfce472c2f112f2e8509e918b48dfeaa46afcbd59f8a7da2a3540adfe830cbf91446e88ef9f25952
+  metadata.gz: 3eff0133a2d9fb481bde443b16490f876dc123284a80b4546506ff30ee90d86971dc7a4ac46e0266fbc026a65c70d3c0c2cf45f88dc55a6eb6fe6be3cd7ab7f1
+  data.tar.gz: 509ac45277e79b7e041f979b4f7bc76daf10bd921d8e3558aebece6f167a75c87bd58c2000d86bbff6e4e3b6d74a3a21818e2fed852373147f430997446e621f

data/lib/railman/version.rb

@@ -1,3 +1,3 @@
 module Railman
-  VERSION = '0.6.13'
+  VERSION = '0.6.14'
 end

data/templates/rails_app/.env.example.development.tt

@@ -28,6 +28,8 @@ EXCEPTION_NOTIFICATION_SENDER = 'server@<%= @config.domain %>'
 UNICORN_BEHIND_NGINX = <%= @unicorn_behind_nginx %>
 # UNICORN_PORT = 3000
 
+# Redis settings
+REDIS_SERVER = 'localhost:6379/X'
 
 # Rails environment
 RAILS_ENV = 'development'

data/templates/rails_app/.env.example.production.tt

@@ -36,6 +36,8 @@ EXCEPTION_NOTIFICATION_SENDER = 'server@<%= @config.domain %>'
 UNICORN_BEHIND_NGINX = true
 UNICORN_WORKERS = 4
 
+# Redis settings
+REDIS_SERVER = 'localhost:6379/X'
 
 # Rails environment
 RAILS_ENV = 'production'

data/templates/rails_app/.env.example.test.tt

@@ -28,6 +28,8 @@ EXCEPTION_NOTIFICATION_SENDER = 'server@<%= @config.domain %>'
 UNICORN_BEHIND_NGINX = true
 # UNICORN_PORT = 3000
 
+# Redis settings
+REDIS_SERVER = 'localhost:6379/X'
 
 # Rails environment
 RAILS_ENV = 'test'

data/templates/rails_app/Gemfile

@@ -7,9 +7,10 @@ gem 'pg', '0.18.2'
 
 gem 'semantic-rails-ui'   # semantic-ui + simple_form + rails helpers
 
-gem 'dalli', '2.7.6'  # memcached client
-gem 'kgio', '2.10.0'  # gives dalli 20-30% performance boost
-gem 'redis-session-store'   # store sessions in redis
+gem 'hiredis', '0.6.1'
+gem 'redis', '3.3.1', require: %w(redis redis/connection/hiredis)
+gem 'redis-namespace', '1.5.2'
+gem 'redis-rails', '5.0.1'
 
 gem 'sidekiq', '4.1.1'    # backgroud jobs
 gem 'sidekiq-scheduler', '2.0.6'  # scheduled background jobs

data/templates/rails_app/config/environments/production.rb.tt

@@ -56,7 +56,7 @@ Rails.application.configure do
 
   # Use a different cache store in production.
   # config.cache_store = :mem_cache_store
-  config.cache_store = :dalli_store, { namespace: '<%= @config.app_name %>:' }
+  config.cache_store = :redis_store, "redis://#{ENV.fetch('REDIS_SERVER')}/<%= @config.app_name %>:#{Rails.env}:cache"
 
   # Enable serving of images, stylesheets, and JavaScripts from an asset server.
   # config.action_controller.asset_host = 'http://assets.example.com'

data/templates/rails_app/config/initializers/redis.rb.tt

@@ -0,0 +1,2 @@
+$redis = Redis::Namespace.new("<%= @config.app_name %>:#{Rails.env}:app", redis: Redis.new(url: "redis://#{ENV.fetch('REDIS_SERVER')}"))
+$redis_root = Redis::Namespace.new("<%= @config.app_name %>:#{Rails.env}", redis: Redis.new(url: "redis://#{ENV.fetch('REDIS_SERVER')}"))

data/templates/rails_app/config/initializers/session_store.rb.tt

@@ -1,6 +1,7 @@
 # Be sure to restart your server when you modify this file.
 
-Rails.application.config.session_store :redis_session_store, {
+Rails.application.config.session_store :redis_store,
+  redis_server: "redis://#{ENV.fetch('REDIS_SERVER')}/<%= @config.app_name %>:#{Rails.env}:sessions",
   key: "_<%= @config.app_name %>_session",
-  redis: { key_prefix: "<%= @config.app_name %>:", expire_after: 30.minutes }
-}
+  expire_after: 30.minutes
+

data/templates/rails_app/config/initializers/sidekiq.rb.tt

@@ -1,7 +1,7 @@
 require 'sidekiq/scheduler'
 
 # Configure Sidekiq Redis connection to use the '<%= @config.app_name %>' namespace
-redis_config = { url: 'redis://localhost:6379', namespace: '<%= @config.app_name %>:' }
+redis_config = { url: "redis://#{ENV.fetch('REDIS_SERVER')}", namespace: "<%= @config.app_name %>:#{Rails.env}:sidekiq" }
 
 Sidekiq.configure_server do |config|
   config.redis = redis_config

data/templates/rails_app/config/server/nginx.conf.tt

@@ -19,6 +19,8 @@ server {
     proxy_set_header Host $http_host;
     proxy_redirect off;
     proxy_pass http://<%= @config.app_name %>;
+
+    add_header Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" always;
   }
 
   client_max_body_size 100m;
@@ -33,6 +35,7 @@ server {
     if ($request_filename ~* ^.*?\.(eot)|(ttf)|(woff)|(svg)|(otf)$){
       add_header Access-Control-Allow-Origin *;
     }
+    add_header Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" always;
     break;
   }
 
@@ -41,6 +44,7 @@ server {
     gzip_static on; # to serve pre-gzipped version
     expires max;
     add_header Cache-Control public;
+    add_header Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" always;
   }
 
   # Let's Encrypt certificates

data/templates/rails_app/test/integration/homepage_test.rb.tt

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'webtest_helper'
 
 class HomepageTest < WebTest
   test 'homepage' do

data/templates/rails_app/test/test_helper.rb

@@ -17,50 +17,3 @@ class UnitTest < ActiveSupport::TestCase
   # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
   fixtures :all
 end
-
-# configure webtests with capybara and poltergeist (headless)
-require 'capybara/rails'
-require 'capybara_minitest_spec'
-require 'capybara/poltergeist'
-
-CAPYBARA_WINDOW_SIZE = [1024, 768]
-
-if ENV['HEADLESS'] == 'true'
-  # headless driver configuration
-  Capybara.register_driver :poltergeist do |app|
-    poltergeist_options = { debug: false, timeout: 30, js_errors: true, window_size: CAPYBARA_WINDOW_SIZE }
-    Capybara::Poltergeist::Driver.new(app, poltergeist_options)
-  end
-  Capybara.default_driver = :poltergeist
-else
-  # chrome browser driver configuration
-  Capybara.register_driver :selenium do |app|
-    Capybara::Selenium::Driver.new(app, :browser => :chrome)
-  end
-  Capybara.default_driver = :selenium
-  Capybara.current_session.driver.browser.manage.window.resize_to CAPYBARA_WINDOW_SIZE[0], CAPYBARA_WINDOW_SIZE[1]
-end
-Capybara.default_max_wait_time = 5   # how long should capybara wait for elements to appear on the page (ajax)
-
-# use database_cleaner to clean the database after every test with truncation, instead of using transactional fixtures
-require 'database_cleaner'
-DatabaseCleaner.strategy = :truncation
-
-# default test class for webtests
-class WebTest < ActionDispatch::IntegrationTest
-  include Capybara::DSL
-  extend Minitest::Spec::DSL
-  include Minitest::Reporters::Screenshot
-
-  # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
-  fixtures :all
-
-  # disable transactional fixtures, as we use DatabaseCleaner
-  self.use_transactional_fixtures = false
-
-  # clean database after each test with database_cleaner
-  def after_teardown
-    super
-    DatabaseCleaner.clean
-  end
-end

data/templates/rails_app/test/webtest_helper.rb

@@ -0,0 +1,60 @@
+require 'simplecov' if ENV['COVERAGE'] == 'true'
+
+# default rails test configuration
+ENV['RAILS_ENV'] ||= 'test'
+require File.expand_path('../../config/environment', __FILE__)
+require 'rails/test_help'
+
+# use minitest-reporters to create xmls for jenkins and nicer terminal reporting
+require 'minitest/reporters'
+require 'minitest/reporters/screenshot_reporter'
+Minitest::Reporters.use! [Minitest::Reporters::SpecReporter.new,
+                          Minitest::Reporters::JUnitReporter.new,
+                          Minitest::Reporters::ScreenshotReporter.new]
+
+# configure webtests with capybara and poltergeist (headless)
+require 'capybara/rails'
+require 'capybara_minitest_spec'
+require 'capybara/poltergeist'
+
+CAPYBARA_WINDOW_SIZE = [1024, 768]
+
+if ENV['HEADLESS'] == 'true'
+  # headless driver configuration
+  Capybara.register_driver :poltergeist do |app|
+    poltergeist_options = { debug: false, timeout: 30, js_errors: true, window_size: CAPYBARA_WINDOW_SIZE }
+    Capybara::Poltergeist::Driver.new(app, poltergeist_options)
+  end
+  Capybara.default_driver = :poltergeist
+else
+  # chrome browser driver configuration
+  Capybara.register_driver :selenium do |app|
+    Capybara::Selenium::Driver.new(app, :browser => :chrome)
+  end
+  Capybara.default_driver = :selenium
+  Capybara.current_session.driver.browser.manage.window.resize_to CAPYBARA_WINDOW_SIZE[0], CAPYBARA_WINDOW_SIZE[1]
+end
+Capybara.default_max_wait_time = 5   # how long should capybara wait for elements to appear on the page (ajax)
+
+# use database_cleaner to clean the database after every test with truncation, instead of using transactional fixtures
+require 'database_cleaner'
+DatabaseCleaner.strategy = :truncation
+
+# default test class for webtests
+class WebTest < ActionDispatch::IntegrationTest
+  include Capybara::DSL
+  extend Minitest::Spec::DSL
+  include Minitest::Reporters::Screenshot
+
+  # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
+  fixtures :all
+
+  # disable transactional fixtures, as we use DatabaseCleaner
+  self.use_transactional_fixtures = false
+
+  # clean database after each test with database_cleaner
+  def after_teardown
+    super
+    DatabaseCleaner.clean
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: railman
 version: !ruby/object:Gem::Version
-  version: 0.6.13
+  version: 0.6.14
 platform: ruby
 authors:
 - Igor Jancev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-09 00:00:00.000000000 Z
+date: 2016-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -219,6 +219,7 @@ files:
 - templates/rails_app/config/initializers/inflections.rb
 - templates/rails_app/config/initializers/log_formatting.rb
 - templates/rails_app/config/initializers/mime_types.rb
+- templates/rails_app/config/initializers/redis.rb.tt
 - templates/rails_app/config/initializers/session_store.rb.tt
 - templates/rails_app/config/initializers/sidekiq.rb.tt
 - templates/rails_app/config/initializers/wrap_parameters.rb
@@ -252,6 +253,7 @@ files:
 - templates/rails_app/test/mailers/.keep
 - templates/rails_app/test/models/.keep
 - templates/rails_app/test/test_helper.rb
+- templates/rails_app/test/webtest_helper.rb
 - templates/rails_app/vendor/assets/javascripts/.keep
 - templates/rails_app/vendor/assets/stylesheets/.keep
 homepage: https://github.com/igorj/railman