orats 5.0.3 → 5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7c876d02dca8517be317f10f0112a67dda8129d
-  data.tar.gz: c94d98c498563ecc3498e39f7680600342e9392f
+  metadata.gz: eb20963767e37cb986ff42fb5a57f75b2b5f1f4f
+  data.tar.gz: 508c76aed5f130ab05257bc146560b896cb4a03b
 SHA512:
-  metadata.gz: 0b1105a104c18de32733948292b1629c71d8981f38ef63648cc7867002b05d7b520c97bd73459a0315c16ac713d2eaaa7c864eb51f4478798609d310a04cd45a
-  data.tar.gz: b4bf8bd14171a0b0b867d20d48caa6f956d95371e9376c28f776310b16b04aacfb047e8c02b9416f8f5856fe45a4eead186f4e100c87059fc5767f1787cbe098
+  metadata.gz: 7f3be6ed7d606750b8f958a174383571f6cdfe27fb2f630479ad8002462be3073a5f54a61f0410da031b5a99ce116dec7f50144b3be641d41c2b6797180ec143
+  data.tar.gz: 5ac1c565210c8f9cada3dc39882b6a66285a6100a9873d9da8f2d7bfc45e53d40d3a55f629341110f5e90379aa097d0805ad00c5985937144235a86cb176c8c6

data/.rubocop.yml

@@ -5,6 +5,15 @@ Documentation:
   # Skips checking to make sure top level modules / classes have a comment.
   Enabled: false
 
+Style/PercentLiteralDelimiters:
+  PreferredDelimiters:
+    default: ()
+    '%r': '{}'
+    '%w': '()'
+    '%W': '()'
+    '%i': '()'
+    '%I': '()'
+
 Style/ClassAndModuleChildren:
   # Skips checking the style of children definitions at classes and modules.
   #

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## orats 5.1.1 (June 16, 2017)
+
+- Update Ruby to `2.4`
+- Update rails to `5.1.1`
+- Update sidekiq to `5.0`
+- Update Puma to `3.9`
+- Update pg to `0.21`
+- Update redis-rails to `5.0`
+- Bring back jQuery with `jquery-rails`
+- Comment out Capybara in the `Gemfile` (Rails 5.1 has it enabled by default)
+- Switch from Debian to Alpine as a base image in the `Dockerfile`
+- Remove compiling assets inside of the `Dockerfile`
+- Hard code `/app` in the `Dockerfile` and `docker-compose.yml` volumes
+- Change the `MAINTAINER` instruction to use a `LABEL` in the `Dockerfile`
+
 ## orats 5.0.3 (December 21, 2016)
 
 - Update Rails to `5.0.1`

data/README.md

@@ -13,13 +13,17 @@ application on top of it.
 It also happens to use Docker so that your app can be ran on any major
 platform -- even without needing Ruby installed.
 
+If you want to learn about Docker specifically then I recommend checking out
+the [Dive Into Docker: The Complete Docker Course for Developers course](https://diveintodocker.com/courses/dive-into-docker). You can even watch the
+first 20 videos for free.
+
 ## What versions are you targeting?
 
-#### Ruby 2.3+
+#### Ruby 2.4+
 
-#### Rails 5+
+#### Rails 5.1+
 
-#### Docker 1.11+
+#### Docker 1.11+ / Docker Compose API v2+
 
 ## Contents
 - [Installation](#installation)
@@ -86,6 +90,8 @@ add it.
     - Use `redis` as the cache backend
     - Use `sidekiq` as a background worker through Active Job
     - Use a standalone Action Cable server
+    - jQuery is installed with `jquery-rails`
+    - Capybara is commented out in the `Gemfile`
 - **Features**:
     - Add a `pages` controller with `home` action
 - **Config**:
@@ -120,6 +126,8 @@ add it.
 Check out the blog post
 [Dockerize a Rails 5, Postgres, Redis, Sidekiq and Action Cable Application](http://nickjanetakis.com/blog/dockerize-a-rails-5-postgres-redis-sidekiq-action-cable-app-with-docker-compose).
 
+Another option is to take my [Dive Into Docker course](https://diveintodocker.com/courses/dive-into-docker).
+
 #### What do I do after I generate the application?
 
 Start by reading the above blog post, because the Docker blog post explains
@@ -178,7 +186,7 @@ cp -r /tmp/orats/lib/orats/templates/base /tmp/foo_bar
 # Swap a few custom values into the base project.
 find /tmp/foo_bar -type f -exec sed -i -e 's/OratsBase/FooBar/g' {} \;
 find /tmp/foo_bar -type f -exec sed -i -e 's/orats_base/foo_bar/g' {} \;
-find /tmp/foo_bar -type f -exec sed -i -e 's/VERSION/5.0.3/g' {} \;
+find /tmp/foo_bar -type f -exec sed -i -e 's/VERSION/5.1.1/g' {} \;
 
 # Rename the example .env file since `.env` is git ignored.
 mv /tmp/orats/.env.example /tmp/orats/.env

data/lib/orats/templates/base/.dockerignore

@@ -1,5 +1,5 @@
 .git
 .dockerignore
 .byebug_history
-/log/*
-/tmp/*
+log/*
+tmp/*

data/lib/orats/templates/base/Dockerfile

@@ -1,102 +1,15 @@
-FROM ruby:2.3-slim
-# Docker images can start off with nothing, but it's extremely
-# common to pull in from a base image. In our case we're pulling
-# in from the slim version of the official Ruby 2.3 image.
-#
-# Details about this image can be found here:
-# https://hub.docker.com/_/ruby/
-#
-# Slim is pulling in from the official Debian Jessie image.
-#
-# You can tell it's using Debian Jessie by clicking the
-# Dockerfile link next to the 2.3-slim bullet on the Docker hub.
-#
-# The Docker hub is the standard place for you to find official
-# Docker images. Think of it like GitHub but for Docker images.
+FROM ruby:2.4-alpine
 
-MAINTAINER Nick Janetakis <nick.janetakis@gmail.com>
-# It is good practice to set a maintainer for all of your Docker
-# images. It's not necessary but it's a good habit.
+RUN apk update && apk add build-base nodejs postgresql-dev
 
-RUN apt-get update && apt-get install -qq -y --no-install-recommends \
-      build-essential nodejs libpq-dev
-# Ensure that our apt package list is updated and install a few
-# packages to ensure that we can compile assets (nodejs) and
-# communicate with PostgreSQL (libpq-dev).
-
-ENV INSTALL_PATH /orats_base
-# The name of the application is orats_base and while there
-# is no standard on where your project should live inside of the Docker
-# image, I like to put it in the root of the image and name it
-# after the project.
-#
-# We don't even need to set the INSTALL_PATH variable, but I like
-# to do it because we're going to be referencing it in a few spots
-# later on in the Dockerfile.
-#
-# The variable could be named anything you want.
-
-RUN mkdir -p $INSTALL_PATH
-# This just creates the folder in the Docker image at the
-# install path we defined above.
-
-WORKDIR $INSTALL_PATH
-# We're going to be executing a number of commands below, and
-# having to CD into the /orats_base folder every time would be
-# lame, so instead we can set the WORKDIR to be /orats_base.
-#
-# By doing this, Docker will be smart enough to execute all
-# future commands from within this directory.
+RUN mkdir /app
+WORKDIR /app
 
 COPY Gemfile Gemfile.lock ./
-# This is going to copy in the Gemfile and Gemfile.lock from our
-# work station at a path relative to the Dockerfile to the
-# orats_base/ path inside of the Docker image.
-#
-# It copies it to /orats_base because of the WORKDIR being set.
-#
-# We copy in our Gemfile before the main app because Docker is
-# smart enough to cache "layers" when you build a Docker image.
-#
-# You see, each command we have in the Dockerfile is going to be
-# ran and then saved as a separate layer. Docker is smart enough
-# to only re-build pieces that change, in order from top to bottom.
-#
-# This is an advanced concept but it means that we'll be able to
-# cache all of our gems so that if we make an application code
-# change, it won't re-run bundle install unless a gem changed.
-
 RUN bundle install --binstubs
-# We want binstubs to be available so we can directly call sidekiq and
-# potentially other binaries as command overrides without depending on
-# bundle exec.
-# This is mainly due for production compatibility assurance.
 
 COPY . .
-# This might look a bit alien but it's copying in everything from
-# the current directory relative to the Dockerfile, over to the
-# /orats_base folder inside of the Docker image.
-#
-# We can get away with using the . for the second argument because
-# this is how the unix command cp (copy) works. It stands for the
-# current directory.
-
-RUN bundle exec rake RAILS_ENV=production DATABASE_URL=postgresql://user:pass@127.0.0.1/dbname ACTION_CABLE_ALLOWED_REQUEST_ORIGINS=foo,bar SECRET_TOKEN=dummytoken assets:precompile
-# Provide a dummy DATABASE_URL and more to Rails so it can pre-compile
-# assets. The values do not need to be real, just valid syntax.
-#
-# If you're saving your assets to a CDN and are working with multiple
-# app instances, you may want to remove this step and deal with asset
-# compilation at a different stage of your deployment.
 
-VOLUME ["$INSTALL_PATH/public"]
-# In production you will very likely reverse proxy Rails with nginx.
-# This sets up a volume so that nginx can read in the assets from
-# the Rails Docker image without having to copy them to the Docker host.
+LABEL maintainer="Nick Janetakis <nick.janetakis@gmail.com>"
 
 CMD puma -C config/puma.rb
-# This is the command that's going to be ran by default if you run the
-# Docker image without any arguments.
-#
-# In our case, it will start the Puma app server while passing in
-# its config file.

data/lib/orats/templates/base/Gemfile

@@ -1,10 +1,15 @@
 source 'https://rubygems.org'
 
+git_source(:github) do |repo_name|
+  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?('/')
+  "https://github.com/#{repo_name}.git"
+end
+
 # Looking to use the Edge version? gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 5.0.1'
+gem 'rails', '~> 5.1.1'
 
 # Use Puma as the app server
-gem 'puma', '~> 3.0'
+gem 'puma', '~> 3.9'
 
 # Use Rack Timeout. Read more: https://github.com/heroku/rack-timeout
 gem 'rack-timeout', '~> 0.4'
@@ -13,19 +18,19 @@ gem 'rack-timeout', '~> 0.4'
 gem 'jbuilder', '~> 2.5'
 
 # Use PostgreSQL as the database for Active Record
-gem 'pg', '~> 0.18'
+gem 'pg', '~> 0.21'
 
 # Use Redis Rails to set up a Redis backed Cache and / or Session
-gem 'redis-rails', '~> 5.0.0.pre'
+gem 'redis-rails', '~> 5.0'
 
 # Use Sidekiq as a background job processor through Active Job
-gem 'sidekiq', '~> 4.2'
+gem 'sidekiq', '~> 5.0'
 
 # Use Clockwork for recurring background tasks without needing cron
 # gem 'clockwork', '~> 2.0'
 
 # Use Kaminari for pagination
-# gem 'kaminari', '~> 0.16'
+# gem 'kaminari', '~> 0.17'
 
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 5.0'
@@ -34,7 +39,7 @@ gem 'sass-rails', '~> 5.0'
 gem 'uglifier', '>= 1.3.0'
 
 # Use jQuery as the JavaScript library
-gem 'jquery-rails'
+gem 'jquery-rails', '~> 4.3'
 
 # Use Turbolinks. Read more: https://github.com/turbolinks/turbolinks
 gem 'turbolinks', '~> 5'
@@ -48,6 +53,10 @@ gem 'font-awesome-rails', '~> 4.7'
 group :development, :test do
   # Call 'byebug' anywhere in your code to drop into a debugger console
   gem 'byebug', platform: :mri
+
+  # End to end testing of your rails apps (Rails 5.1+ supports this)
+  # gem 'capybara', '~> 2.13'
+  # gem 'selenium-webdriver'
 end
 
 group :development do
@@ -58,7 +67,7 @@ group :development do
   gem 'web-console', '~> 3.3.0'
 
   # Get notified of file changes. Read more: https://github.com/guard/listen
-  gem 'listen', '~> 3.0.5'
+  gem 'listen', '>= 3.0.5', '< 3.2'
 
   # Use Spring. Read more: https://github.com/rails/spring
   gem 'spring'
@@ -66,4 +75,4 @@ group :development do
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+gem 'tzinfo-data'

data/lib/orats/templates/base/Gemfile.lock

@@ -1,207 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actioncable (5.0.1)
-      actionpack (= 5.0.1)
-      nio4r (~> 1.2)
-      websocket-driver (~> 0.6.1)
-    actionmailer (5.0.1)
-      actionpack (= 5.0.1)
-      actionview (= 5.0.1)
-      activejob (= 5.0.1)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (5.0.1)
-      actionview (= 5.0.1)
-      activesupport (= 5.0.1)
-      rack (~> 2.0)
-      rack-test (~> 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.1)
-      activesupport (= 5.0.1)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (5.0.1)
-      activesupport (= 5.0.1)
-      globalid (>= 0.3.6)
-    activemodel (5.0.1)
-      activesupport (= 5.0.1)
-    activerecord (5.0.1)
-      activemodel (= 5.0.1)
-      activesupport (= 5.0.1)
-      arel (~> 7.0)
-    activesupport (5.0.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    arel (7.1.4)
-    autoprefixer-rails (6.5.4)
-      execjs
-    bootstrap-sass (3.3.7)
-      autoprefixer-rails (>= 5.2.1)
-      sass (>= 3.3.4)
-    builder (3.2.2)
-    byebug (9.0.6)
-    concurrent-ruby (1.0.3)
-    connection_pool (2.2.1)
-    debug_inspector (0.0.2)
-    erubis (2.7.0)
-    execjs (2.7.0)
-    ffi (1.9.14)
-    font-awesome-rails (4.7.0.1)
-      railties (>= 3.2, < 5.1)
-    globalid (0.3.7)
-      activesupport (>= 4.1.0)
-    i18n (0.7.0)
-    jbuilder (2.6.1)
-      activesupport (>= 3.0.0, < 5.1)
-      multi_json (~> 1.2)
-    jquery-rails (4.2.1)
-      rails-dom-testing (>= 1, < 3)
-      railties (>= 4.2.0)
-      thor (>= 0.14, < 2.0)
-    listen (3.0.8)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    loofah (2.0.3)
-      nokogiri (>= 1.5.9)
-    mail (2.6.4)
-      mime-types (>= 1.16, < 4)
-    method_source (0.8.2)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_portile2 (2.1.0)
-    minitest (5.10.1)
-    multi_json (1.12.1)
-    nio4r (1.2.1)
-    nokogiri (1.6.8.1)
-      mini_portile2 (~> 2.1.0)
-    pg (0.19.0)
-    puma (3.6.2)
-    rack (2.0.1)
-    rack-mini-profiler (0.10.1)
-      rack (>= 1.2.0)
-    rack-protection (1.5.3)
-      rack
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rack-timeout (0.4.2)
-    rails (5.0.1)
-      actioncable (= 5.0.1)
-      actionmailer (= 5.0.1)
-      actionpack (= 5.0.1)
-      actionview (= 5.0.1)
-      activejob (= 5.0.1)
-      activemodel (= 5.0.1)
-      activerecord (= 5.0.1)
-      activesupport (= 5.0.1)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 5.0.1)
-      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.1)
-      activesupport (>= 4.2.0, < 6.0)
-      nokogiri (~> 1.6.0)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (5.0.1)
-      actionpack (= 5.0.1)
-      activesupport (= 5.0.1)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (12.0.0)
-    rb-fsevent (0.9.8)
-    rb-inotify (0.9.7)
-      ffi (>= 0.5.0)
-    redis (3.3.2)
-    redis-actionpack (5.0.1)
-      actionpack (>= 4.0, < 6)
-      redis-rack (>= 1, < 3)
-      redis-store (>= 1.1.0, < 1.4.0)
-    redis-activesupport (5.0.1)
-      activesupport (>= 3, < 6)
-      redis-store (~> 1.2.0)
-    redis-rack (2.0.0)
-      rack (~> 2.0)
-      redis-store (~> 1.2.0)
-    redis-rails (5.0.1)
-      redis-actionpack (~> 5.0.0)
-      redis-activesupport (~> 5.0.0)
-      redis-store (~> 1.2.0)
-    redis-store (1.2.0)
-      redis (>= 2.2)
-    sass (3.4.23)
-    sass-rails (5.0.6)
-      railties (>= 4.0.0, < 6)
-      sass (~> 3.1)
-      sprockets (>= 2.8, < 4.0)
-      sprockets-rails (>= 2.0, < 4.0)
-      tilt (>= 1.1, < 3)
-    sidekiq (4.2.7)
-      concurrent-ruby (~> 1.0)
-      connection_pool (~> 2.2, >= 2.2.0)
-      rack-protection (>= 1.5.0)
-      redis (~> 3.2, >= 3.2.1)
-    spring (2.0.0)
-      activesupport (>= 4.2)
-    spring-watcher-listen (2.0.1)
-      listen (>= 2.7, < 4.0)
-      spring (>= 1.2, < 3.0)
-    sprockets (3.7.1)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.0)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    thor (0.19.4)
-    thread_safe (0.3.5)
-    tilt (2.0.5)
-    turbolinks (5.0.1)
-      turbolinks-source (~> 5)
-    turbolinks-source (5.0.0)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    uglifier (3.0.4)
-      execjs (>= 0.3.0, < 3)
-    web-console (3.3.1)
-      actionview (>= 5.0)
-      activemodel (>= 5.0)
-      debug_inspector
-      railties (>= 5.0)
-    websocket-driver (0.6.4)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bootstrap-sass (~> 3.3)
-  byebug
-  font-awesome-rails (~> 4.7)
-  jbuilder (~> 2.5)
-  jquery-rails
-  listen (~> 3.0.5)
-  pg (~> 0.18)
-  puma (~> 3.0)
-  rack-mini-profiler (~> 0.10)
-  rack-timeout (~> 0.4)
-  rails (~> 5.0.1)
-  redis-rails (~> 5.0.0.pre)
-  sass-rails (~> 5.0)
-  sidekiq (~> 4.2)
-  spring
-  spring-watcher-listen (~> 2.0.0)
-  turbolinks (~> 5)
-  tzinfo-data
-  uglifier (>= 1.3.0)
-  web-console (~> 3.3.0)
-
-BUNDLED WITH
-   1.12.5

data/lib/orats/templates/base/app/assets/javascripts/application.js

@@ -16,7 +16,7 @@
 // about supported directives.
 //
 //= require jquery
-//= require jquery_ujs
+//= require rails-ujs
 //= require turbolinks
 //= require bootstrap/affix
 //= require bootstrap/alert

data/lib/orats/templates/base/app/assets/stylesheets/application.scss

@@ -23,11 +23,9 @@
 // @import "bootstrap-sprockets";
 @import "bootstrap/variables";
 @import "bootstrap/mixins";
-
 // Reset
 @import "bootstrap/normalize";
 @import "bootstrap/print";
-
 // Core CSS
 @import "bootstrap/scaffolding";
 @import "bootstrap/type";
@@ -36,7 +34,6 @@
 @import "bootstrap/tables";
 @import "bootstrap/forms";
 @import "bootstrap/buttons";
-
 // Components
 @import "bootstrap/component-animations";
 // @import "bootstrap/glyphicons";
@@ -59,31 +56,28 @@
 @import "bootstrap/panels";
 @import "bootstrap/wells";
 @import "bootstrap/close";
-
 // Components w/ JavaScript
 @import "bootstrap/modals";
 @import "bootstrap/tooltip";
 @import "bootstrap/popovers";
 @import "bootstrap/carousel";
-
 // Utility classes
 @import "bootstrap/utilities";
 @import "bootstrap/responsive-utilities";
-
 .alert-notice {
-  @extend .alert-success;
+    @extend .alert-success;
 }
 
 .alert-alert {
-  @extend .alert-danger;
+    @extend .alert-danger;
 }
 
 img {
-  @extend .img-responsive;
+    @extend .img-responsive;
 }
 
 .validation-error {
-  margin-top: 2px;
-  color: $brand-danger;
-  font-size: $font-size-small;
-}
+    margin-top: 2px;
+    color: $brand-danger;
+    font-size: $font-size-small;
+}

data/lib/orats/templates/base/app/controllers/pages_controller.rb

@@ -1,4 +1,3 @@
 class PagesController < ApplicationController
-  def home
-  end
+  def home; end
 end

data/lib/orats/templates/base/app/views/pages/home.html.erb

@@ -18,11 +18,11 @@
 
     <hr/>
 
-    <h3>Learn more about Docker and this project</h3>
+    <h3>Learn more about Docker</h3>
 
     <ul>
       <li>
-        <%= link_to 'Learn how this application was Dockerized', 'http://nickjanetakis.com/blog/dockerize-a-rails-5-postgres-redis-sidekiq-action-cable-app-with-docker-compose' %>
+        <%= link_to 'Learn how to build web apps with Docker', 'https://diveintodocker.com/courses/dive-into-docker' %>
       </li>
     </ul>
 

data/lib/orats/templates/base/bin/setup

@@ -18,6 +18,9 @@ chdir APP_ROOT do
   system! 'gem install bundler --conservative'
   system('bundle check') || system!('bundle install')
 
+  # Install JavaScript dependencies if using Yarn
+  # system('bin/yarn')
+
   # puts "\n== Copying sample files =="
   # unless File.exist?('config/database.yml')
   #   cp 'config/database.yml.sample', 'config/database.yml'

data/lib/orats/templates/base/bin/yarn

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+VENDOR_PATH = File.expand_path('..', __dir__)
+Dir.chdir(VENDOR_PATH) do
+  begin
+    exec "yarnpkg #{ARGV.join(' ')}"
+  rescue Errno::ENOENT
+    $stderr.puts 'Yarn executable was not detected in the system.'
+    $stderr.puts 'Download Yarn at https://yarnpkg.com/en/docs/install'
+    exit 1
+  end
+end

data/lib/orats/templates/base/config/application.rb

@@ -8,6 +8,9 @@ Bundler.require(*Rails.groups)
 
 module OratsBase
   class Application < Rails::Application
+    # Initialize configuration defaults for originally generated Rails version.
+    config.load_defaults 5.1
+
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
 
@@ -20,7 +23,7 @@ module OratsBase
     # or a third party host such as Loggly, etc..
     logger           = ActiveSupport::Logger.new(STDOUT)
     logger.formatter = config.log_formatter
-    config.log_tags  = [:subdomain, :uuid]
+    config.log_tags  = %i[subdomain uuid]
     config.logger    = ActiveSupport::TaggedLogging.new(logger)
 
     # Action mailer settings.

data/lib/orats/templates/base/config/environments/production.rb

@@ -12,6 +12,11 @@ Rails.application.configure do
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
+  # Attempt to read encrypted secrets from `config/secrets.yml.enc`.
+  # Requires an encryption key in `ENV["RAILS_MASTER_KEY"]` or
+  # `config/secrets.yml.key`.
+  config.read_encrypted_secrets = false
+
   # Disable serving static files from the `/public` folder by default since
   # Apache or NGINX already handles this.
   config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?

data/lib/orats/templates/base/config/initializers/assets.rb

@@ -3,9 +3,12 @@
 # Version of your assets, change this if you want to expire all your assets.
 Rails.application.config.assets.version = '1.0'
 
-# Add additional assets to the asset load path
+# Add additional assets to the asset load path.
 # Rails.application.config.assets.paths << Emoji.images_path
 
+# Add Yarn node_modules folder to the asset load path.
+Rails.application.config.assets.paths << Rails.root.join('node_modules')
+
 # Pre-compile additional assets.
 Rails.application.config.assets.precompile << proc do |path|
   true if path =~ /\.(eot|svg|ttf|woff|png)\z/

data/lib/orats/templates/base/config/spring.rb

@@ -1,6 +1,6 @@
-%w(
+%w[
   .ruby-version
   .rbenv-vars
   tmp/restart.txt
   tmp/caching-dev.txt
-).each { |path| Spring.watch(path) }
+].each { |path| Spring.watch(path) }

data/lib/orats/templates/base/docker-compose.yml

@@ -2,7 +2,7 @@ version: '2'
 
 services:
   postgres:
-    image: 'postgres:9.5'
+    image: 'postgres:9.6-alpine'
     environment:
       POSTGRES_USER: 'orats_base'
       POSTGRES_PASSWORD: 'yourpassword'
@@ -27,7 +27,7 @@ services:
     ports:
       - '3000:3000'
     volumes:
-      - '.:/orats_base'
+      - '.:/app'
     env_file:
       - '.env'
 
@@ -38,7 +38,7 @@ services:
     build: .
     command: sidekiq -C config/sidekiq.yml.erb
     volumes:
-      - '.:/orats_base'
+      - '.:/app'
     env_file:
       - '.env'
 
@@ -50,7 +50,7 @@ services:
     ports:
       - '28080:28080'
     volumes:
-      - '.:/orats_base'
+      - '.:/app'
     env_file:
       - '.env'
 

data/lib/orats/templates/base/test/application_system_test_case.rb

@@ -0,0 +1,5 @@
+require 'test_helper'
+
+# class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
+#   driven_by :selenium, using: :chrome, screen_size: [1400, 1400]
+# end

data/lib/orats/templates/base/test/test_helper.rb

@@ -1,4 +1,3 @@
-ENV['RAILS_ENV'] ||= 'test'
 require File.expand_path('../../config/environment', __FILE__)
 require 'rails/test_help'
 

data/lib/orats/version.rb

@@ -1,4 +1,4 @@
 # set the version of this gem
 module Orats
-  VERSION = '5.0.3'.freeze
+  VERSION = '5.1.1'.freeze
 end

data/orats.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'orats/version'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orats
 version: !ruby/object:Gem::Version
-  version: 5.0.3
+  version: 5.1.1
 platform: ruby
 authors:
 - Nick Janetakis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-21 00:00:00.000000000 Z
+date: 2017-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -142,6 +142,7 @@ files:
 - lib/orats/templates/base/bin/rake
 - lib/orats/templates/base/bin/setup
 - lib/orats/templates/base/bin/update
+- lib/orats/templates/base/bin/yarn
 - lib/orats/templates/base/cable/config.ru
 - lib/orats/templates/base/config.ru
 - lib/orats/templates/base/config/application.rb
@@ -160,7 +161,6 @@ files:
 - lib/orats/templates/base/config/initializers/filter_parameter_logging.rb
 - lib/orats/templates/base/config/initializers/inflections.rb
 - lib/orats/templates/base/config/initializers/mime_types.rb
-- lib/orats/templates/base/config/initializers/new_framework_defaults.rb
 - lib/orats/templates/base/config/initializers/session_store.rb
 - lib/orats/templates/base/config/initializers/sidekiq.rb
 - lib/orats/templates/base/config/initializers/timeout.rb
@@ -183,6 +183,7 @@ files:
 - lib/orats/templates/base/public/apple-touch-icon.png
 - lib/orats/templates/base/public/favicon.ico
 - lib/orats/templates/base/public/robots.txt
+- lib/orats/templates/base/test/application_system_test_case.rb
 - lib/orats/templates/base/test/controllers/.keep
 - lib/orats/templates/base/test/controllers/pages_controller_test.rb
 - lib/orats/templates/base/test/fixtures/.keep

data/lib/orats/templates/base/config/initializers/new_framework_defaults.rb

@@ -1,27 +0,0 @@
-# Be sure to restart your server when you modify this file.
-#
-# This file contains migration options to ease your Rails 5.0 upgrade.
-#
-# Read the Rails 5.0 release notes for more info on each option.
-
-# Enable per-form CSRF tokens. Previous versions had false.
-Rails.application.config.action_controller.per_form_csrf_tokens = true
-
-# Enable origin-checking CSRF mitigation. Previous versions had false.
-Rails.application.config
-     .action_controller.forgery_protection_origin_check = true
-
-# Make Ruby 2.4 preserve the timezone of the receiver when calling `to_time`.
-# Previous versions had false.
-ActiveSupport.to_time_preserves_timezone = true
-
-# Require `belongs_to` associations by default. Previous versions had false.
-Rails.application.config.active_record.belongs_to_required_by_default = true
-
-# Do not halt callback chains when a callback returns false.
-# Previous versions had true.
-ActiveSupport.halt_callback_chains_on_return_false = false
-
-# Configure SSL options to enable HSTS with subdomains.
-# Previous versions had false.
-Rails.application.config.ssl_options = { hsts: { subdomains: true } }