moved to rails 5.1.1

Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 
 
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '5.0.1'
+gem 'rails', '5.1.1'
 # Use sqlite3 as the database for Active Record
 # Use sqlite3 as the database for Active Record
 gem 'sqlite3'
 gem 'sqlite3'
 # Use SCSS for stylesheets
 # Use SCSS for stylesheets
@@ -10,7 +10,7 @@ gem 'sass-rails', '~> 5.0'
 # Use Uglifier as compressor for JavaScript assets
 # Use Uglifier as compressor for JavaScript assets
 gem 'uglifier', '>= 1.3.0'
 gem 'uglifier', '>= 1.3.0'
 # Use CoffeeScript for .coffee assets and views
 # Use CoffeeScript for .coffee assets and views
-gem 'coffee-rails', '~> 4.1.0'
+# gem 'coffee-rails', '~> 4.1.0'
 # See https://github.com/rails/execjs#readme for more supported runtimes
 # See https://github.com/rails/execjs#readme for more supported runtimes
 # gem 'therubyracer', platforms: :ruby
 # gem 'therubyracer', platforms: :ruby
 
 

bin/setup

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

config/application.rb

 require_relative 'boot'
 require_relative 'boot'
 
 
-require 'rails/all'
+require "rails"
+# Pick the frameworks you want:
+require "active_model/railtie"
+# require "active_job/railtie"
+require "active_record/railtie"
+require "action_controller/railtie"
+require "action_mailer/railtie"
+require "action_view/railtie"
+# require "action_cable/engine"
+# require "sprockets/railtie"
+require "rails/test_unit/railtie"
 
 
 # Require the gems listed in Gemfile, including any gems
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
 # you've limited to :test, :development, or :production.
@@ -8,9 +18,16 @@ Bundler.require(*Rails.groups)
 
 
 module ControlPanel
 module ControlPanel
   class Application < Rails::Application
   class Application < Rails::Application
+    # Initialize configuration defaults for originally generated Rails version.
+    config.load_defaults 5.1
+
     # Settings in config/environments/* take precedence over those specified here.
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
     # -- all .rb files in that directory are automatically loaded.
+
+    # Only loads a smaller set of middleware suitable for API only apps.
+    # Middleware like session, flash, cookies can be added back manually.
+    # Skip views, helpers and assets when generating a new resource.
     config.api_only = true
     config.api_only = true
     # Add folders under the services and adapters directory
     # Add folders under the services and adapters directory
     %w(data nilm db db_folder db_stream permission user_group user data_view).each do |service|
     %w(data nilm db db_folder db_stream permission user_group user data_view).each do |service|

config/cable.yml

@@ -7,3 +7,4 @@ test:
 production:
 production:
   adapter: redis
   adapter: redis
   url: redis://localhost:6379/1
   url: redis://localhost:6379/1
+  channel_prefix: control_panel_production

config/environments/development.rb

@@ -18,7 +18,7 @@ Rails.application.configure do
 
 
     config.cache_store = :memory_store
     config.cache_store = :memory_store
     config.public_file_server.headers = {
     config.public_file_server.headers = {
-      'Cache-Control' => 'public, max-age=172800'
+      'Cache-Control' => "public, max-age=#{2.days.seconds.to_i}"
     }
     }
   else
   else
     config.action_controller.perform_caching = false
     config.action_controller.perform_caching = false

config/environments/test.rb

@@ -15,7 +15,7 @@ Rails.application.configure do
   # Configure public file server for tests with Cache-Control for performance.
   # Configure public file server for tests with Cache-Control for performance.
   config.public_file_server.enabled = true
   config.public_file_server.enabled = true
   config.public_file_server.headers = {
   config.public_file_server.headers = {
-    'Cache-Control' => 'public, max-age=3600'
+    'Cache-Control' => "public, max-age=#{1.hour.seconds.to_i}"
   }
   }
 
 
   # Show full error reports and disable caching.
   # Show full error reports and disable caching.

config/initializers/assets.rb

@@ -3,9 +3,10 @@
 # Version of your assets, change this if you want to expire all your assets.
 # Version of your assets, change this if you want to expire all your assets.
 Rails.application.config.assets.version = '1.0'
 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
 # Rails.application.config.assets.paths << Emoji.images_path
 
 
 # Precompile additional assets.
 # Precompile additional assets.
-# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-# Rails.application.config.assets.precompile += %w( search.js )
+# application.js, application.css, and all non-JS/CSS in the app/assets
+# folder are already added.
+# Rails.application.config.assets.precompile += %w( admin.js admin.css )

config/locales/en.yml

@@ -16,6 +16,16 @@
 #
 #
 # This would use the information in config/locales/es.yml.
 # This would use the information in config/locales/es.yml.
 #
 #
+# The following keys must be escaped otherwise they will not be retrieved by
+# the default I18n backend:
+#
+# true, false, on, off, yes, no
+#
+# Instead, surround them with single quotes.
+#
+# en:
+#   'true': 'foo'
+#
 # To learn more, please read the Rails Internationalization guide
 # To learn more, please read the Rails Internationalization guide
 # available at http://guides.rubyonrails.org/i18n.html.
 # available at http://guides.rubyonrails.org/i18n.html.
 
 

config/puma.rb

 # Puma can serve each request in a thread from an internal thread pool.
 # Puma can serve each request in a thread from an internal thread pool.
-# The `threads` method setting takes two numbers a minimum and maximum.
+# The `threads` method setting takes two numbers: a minimum and maximum.
 # Any libraries that use thread pools should be configured to match
 # Any libraries that use thread pools should be configured to match
 # the maximum value specified for Puma. Default is set to 5 threads for minimum
 # the maximum value specified for Puma. Default is set to 5 threads for minimum
-# and maximum, this matches the default thread size of Active Record.
+# and maximum; this matches the default thread size of Active Record.
 #
 #
-threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }.to_i
+threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }
 threads threads_count, threads_count
 threads threads_count, threads_count
 
 
-# Specifies the `port` that Puma will listen on to receive requests, default is 3000.
+# Specifies the `port` that Puma will listen on to receive requests; default is 3000.
 #
 #
 port        ENV.fetch("PORT") { 3000 }
 port        ENV.fetch("PORT") { 3000 }
 
 
@@ -32,16 +32,25 @@ environment ENV.fetch("RAILS_ENV") { "development" }
 #
 #
 # preload_app!
 # preload_app!
 
 
+# If you are preloading your application and using Active Record, it's
+# recommended that you close any connections to the database before workers
+# are forked to prevent connection leakage.
+#
+# before_fork do
+#   ActiveRecord::Base.connection_pool.disconnect! if defined?(ActiveRecord)
+# end
+
 # The code in the `on_worker_boot` will be called if you are using
 # The code in the `on_worker_boot` will be called if you are using
 # clustered mode by specifying a number of `workers`. After each worker
 # clustered mode by specifying a number of `workers`. After each worker
-# process is booted this block will be run, if you are using `preload_app!`
-# option you will want to use this block to reconnect to any threads
-# or connections that may have been created at application boot, Ruby
+# process is booted, this block will be run. If you are using the `preload_app!`
+# option, you will want to use this block to reconnect to any threads
+# or connections that may have been created at application boot, as Ruby
 # cannot share connections between processes.
 # cannot share connections between processes.
 #
 #
 # on_worker_boot do
 # on_worker_boot do
 #   ActiveRecord::Base.establish_connection if defined?(ActiveRecord)
 #   ActiveRecord::Base.establish_connection if defined?(ActiveRecord)
 # end
 # end
+#
 
 
 # Allow puma to be restarted by `rails restart` command.
 # Allow puma to be restarted by `rails restart` command.
 plugin :tmp_restart
 plugin :tmp_restart

config/secrets.yml

@@ -10,13 +10,23 @@
 # Make sure the secrets in this file are kept private
 # Make sure the secrets in this file are kept private
 # if you're sharing your code publicly.
 # if you're sharing your code publicly.
 
 
+# Shared secrets are available across all environments.
+
+# shared:
+#   api_key: a1B2c3D4e5F6
+
+# Environmental secrets are only available for that specific environment.
+
 development:
 development:
-  secret_key_base: fab2042587cdf751633b04a5b9ee9d35b6e3f7e6d58072dbf7522943b41b7ec38485a0dd393727e9f8a99cec0c0c38e846d21e9eaf4def9e585ca7c599750086
+  secret_key_base: 5378da95ac37be4d4bab4010596a835b639e01dd084ea37e151bf05fc5dec0c6f46f1b162e9325121d757a4683df9880819ba269f488f93a647c935f9b1453d0
 
 
 test:
 test:
-  secret_key_base: 54f457fa59508035f7b585741602a1a674b98dd52f7e7365cfd599381d48a95c1b27e8ab397dc7dbaf2fa34a8cb7c1f970b59ec7fff0c9a080c6a3ba4a68cf66
+  secret_key_base: 4bb907a33b2b802d006591923f59fa1d0c355f0005dea53efee24b842b17b6b2addd264b20d2d51283c7a0d291efe6888cd1c7e1959f07ccb56304a713696b1e
+
+# Do not keep production secrets in the unencrypted secrets file.
+# Instead, either read values from the environment.
+# Or, use `bin/rails secrets:setup` to configure encrypted secrets
+# and move the `production:` environment over there.
 
 
-# Do not keep production secrets in the repository,
-# instead read values from the environment.
 production:
 production:
   secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
   secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>