orats 5.2.2 → 5.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71f1db5426317338f60bff52f7059a63bd3bca5eaf5d245ea807eeb5e2e969a5
-  data.tar.gz: 88239786293cdc784c92667dd352c5712834e77d8c14d6cf9ffbdde2c4cc3b63
+  metadata.gz: 64a096396a9e4f70fcce79a5a6e4e789c287ea6d070597f46859029a28cb5d8c
+  data.tar.gz: b1b453d939fcc89cb0f275e2772f8ffa055b0457a890cc85c8d65a07a3acb3d2
 SHA512:
-  metadata.gz: ab96fd767f7ad6195f714a18fb6f7253b2521bf5cbaef8357e95336654a848dc8cf4d8ff02725bd0835502bb09c031198129e58d1ce1e436e3903e8dda8605fd
-  data.tar.gz: e984d9f40cd38e0fe3afe986318e01661a40c9adfb0c5adab3d6cf973213398fd2c5cb000047b81327d4667ad094122601291d1785c5cfb47a10125b66dc7da0
+  metadata.gz: 232c868c77dfdf4815804129c53c0b660d0fe438c31b47848c0f6fe91aed320d6618793ecee65018c849f85e7bc6314fb0185935f9255fc7d657486e22fc629c
+  data.tar.gz: a2d35ebf42671c9358ac36760a608eed116eba504f9ddc1c77bec062fb004fdec148cf988f52e132587019b3d4676edc90820a5ad640bae529b7cc8b1e92f9c9

data/.rubocop.yml

@@ -1,10 +1,13 @@
 AllCops:
-  TargetRubyVersion: 2.1
+  TargetRubyVersion: 2.5
 
 Documentation:
   # Skips checking to make sure top level modules / classes have a comment.
   Enabled: false
 
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
 Style/PercentLiteralDelimiters:
   PreferredDelimiters:
     default: ()

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## orats 5.2.3 (September 29, 2018)
+
+- Fix Rack timeout error by introducing `RACK_TIMEOUT_SERVICE_TIMEOUT` in `.env`
+
 ## orats 5.2.2 (April 19, 2018)
 
 - Fix undefined `_r` variable / method error in `content_security_policy.rb`

data/README.md

@@ -1,4 +1,4 @@
-[![Gem Version](https://badge.fury.io/rb/orats.png)](http://badge.fury.io/rb/orats) [![Build Status](https://secure.travis-ci.org/nickjj/orats.png)](http://travis-ci.org/nickjj/orats)
+[![Gem Version](https://badge.fury.io/rb/orats.svg)](http://badge.fury.io/rb/orats) [![Build Status](https://secure.travis-ci.org/nickjj/orats.svg)](http://travis-ci.org/nickjj/orats)
 
 ## What is orats?
 

data/lib/orats/templates/base/.env.example

@@ -29,7 +29,7 @@ WEB_CONCURRENCY=1
 # Feel free to modify this value to fit the needs of your project, but if you
 # have any request that takes more than 5 seconds you probably need to re-think
 # what you are doing 99.99% of the time.
-REQUEST_TIMEOUT=5
+RACK_TIMEOUT_SERVICE_TIMEOUT=5
 
 # Required by the Postgres Docker image. This sets up the initial database when
 # you first run it.
@@ -40,8 +40,11 @@ POSTGRES_PASSWORD=yourpassword
 # such as: orats_base_development or orats_base_production.
 DATABASE_URL=postgresql://orats_base:yourpassword@postgres:5432/orats_base?encoding=utf8&pool=5&timeout=5000
 
-# The full Redis URL for the Redis cache. The last segment is the namespace.
-REDIS_CACHE_URL=redis://:yourpassword@redis:6379/0/cache
+# The full Redis URL for the Redis cache.
+REDIS_CACHE_URL=redis://:yourpassword@redis:6379/0
+
+# The namespace used by the Redis cache.
+REDIS_CACHE_NAMESPACE=cache
 
 # Action mailer (e-mail) settings.
 # You will need to enable less secure apps in your Google account if you plan

data/lib/orats/templates/base/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.1
+  TargetRubyVersion: 2.5
 
   Exclude:
     - 'db/**/*'
@@ -10,6 +10,9 @@ Documentation:
   # Skips checking to make sure top level modules / classes have a comment.
   Enabled: false
 
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
 Style/ClassAndModuleChildren:
   # Skips checking the style of children definitions at classes and modules.
   #

data/lib/orats/templates/base/Gemfile

@@ -12,7 +12,7 @@ gem 'rails', '~> 5.2.0'
 gem 'puma', '~> 3.11'
 
 # Use Rack Timeout. Read more: https://github.com/heroku/rack-timeout
-gem 'rack-timeout', '~> 0.4'
+gem 'rack-timeout', '~> 0.5'
 
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 gem 'jbuilder', '~> 2.5'
@@ -21,7 +21,7 @@ gem 'jbuilder', '~> 2.5'
 gem 'pg', '~> 1.0'
 
 # Use Redis Rails to set up a Redis backed Cache and / or Session
-gem 'redis-rails', '~> 5.0'
+gem 'redis', '~> 4.0'
 
 # Use Sidekiq as a background job processor through Active Job
 gem 'sidekiq', '~> 5.1'

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

@@ -1,11 +1,9 @@
 #!/usr/bin/env ruby
 APP_ROOT = File.expand_path('..', __dir__)
 Dir.chdir(APP_ROOT) do
-  begin
-    exec 'yarnpkg', *ARGV
-  rescue Errno::ENOENT
-    warn 'Yarn executable was not detected in the system.'
-    warn 'Download Yarn at https://yarnpkg.com/en/docs/install'
-    exit 1
-  end
+  exec 'yarnpkg', *ARGV
+rescue Errno::ENOENT
+  warn 'Yarn executable was not detected in the system.'
+  warn 'Download Yarn at https://yarnpkg.com/en/docs/install'
+  exit 1
 end

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

@@ -46,7 +46,10 @@ module OratsBase
     }
 
     # Set Redis as the back-end for the cache.
-    config.cache_store = :redis_store, ENV['REDIS_CACHE_URL']
+    config.cache_store = :redis_cache_store, {
+      url: ENV['REDIS_CACHE_URL'],
+      namespace: ENV['REDIS_CACHE_NAMESPACE']
+    }
 
     # Set Sidekiq as the back-end for Active Job.
     config.active_job.queue_adapter = :sidekiq
@@ -65,7 +68,7 @@ end
 
 # Show in-line form errors.
 ActionView::Base.field_error_proc = proc do |html_tag, instance|
-  if html_tag =~ /\<label/
+  if /\<label/.match?(html_tag)
     html_tag
   else
     errors = Array(instance.error_message).join(',')

data/lib/orats/util.rb

@@ -1,11 +1,11 @@
 class Util
   def self.underscore(term)
     # taken from ActiveSupport
-    term.gsub!(/::/, '/')
-    term.gsub!(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
-    term.gsub!(/([a-z\d])([A-Z])/, '\1_\2')
-    term.tr!('-', '_')
-    term.downcase
+    term.gsub(/::/, '/')
+        .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+        .gsub(/([a-z\d])([A-Z])/, '\1_\2')
+        .tr('-', '_')
+        .downcase
   end
 
   def self.classify(term)

data/lib/orats/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orats
 version: !ruby/object:Gem::Version
-  version: 5.2.2
+  version: 5.2.3
 platform: ruby
 authors:
 - Nick Janetakis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-19 00:00:00.000000000 Z
+date: 2018-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -164,7 +164,6 @@ files:
 - lib/orats/templates/base/config/initializers/mime_types.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
 - lib/orats/templates/base/config/initializers/wrap_parameters.rb
 - lib/orats/templates/base/config/locales/en.yml
 - lib/orats/templates/base/config/puma.rb
@@ -225,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Opinionated rails application templates.

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

@@ -1 +0,0 @@
-Rack::Timeout.timeout = ENV.fetch('REQUEST_TIMEOUT') { 5 }.to_i