enju_nii 0.2.0.beta.3 → 0.3.1

data/spec/controllers/cinii_books_controller_spec.rb

@@ -10,12 +10,12 @@ describe CiniiBooksController do
   describe "GET index" do
     login_fixture_admin
 
-    it "should get index", :vcr => true do
-      get :index, :query => 'library'
+    it "should get index", vcr: true do
+      get :index, params: { query: 'library' }
       assigns(:books).should_not be_empty
     end
 
-    it "should be empty if a query is not set", :vcr => true do
+    it "should be empty if a query is not set", vcr: true do
       get :index
       assigns(:books).should be_empty
     end

data/spec/controllers/nii_types_controller_spec.rb

@@ -40,7 +40,7 @@ describe NiiTypesController do
   describe "GET show" do
     it "assigns the requested nii_type as @nii_type" do
       nii_type = NiiType.create! valid_attributes
-      get :show, :id => nii_type.id
+      get :show, params: { id: nii_type.id }
       expect(assigns(:nii_type)).to eq(nii_type)
     end
   end
@@ -55,7 +55,7 @@ describe NiiTypesController do
   describe "GET edit" do
     it "assigns the requested nii_type as @nii_type" do
       nii_type = NiiType.create! valid_attributes
-      get :edit, :id => nii_type.id
+      get :edit, params: { id: nii_type.id }
       expect(assigns(:nii_type)).to eq(nii_type)
     end
   end
@@ -63,19 +63,19 @@ describe NiiTypesController do
   describe "POST create" do
     describe "with valid params" do
       it "creates a new NiiType" do
-        expect {
-          post :create, :nii_type => valid_attributes
-        }.to change(NiiType, :count).by(1)
+        expect do
+          post :create, params: { nii_type: valid_attributes }
+        end.to change(NiiType, :count).by(1)
       end
 
       it "assigns a newly created nii_type as @nii_type" do
-        post :create, :nii_type => valid_attributes
+        post :create, params: { nii_type: valid_attributes }
         expect(assigns(:nii_type)).to be_a(NiiType)
         expect(assigns(:nii_type)).to be_persisted
       end
 
       it "redirects to the created nii_type" do
-        post :create, :nii_type => valid_attributes
+        post :create, params: { nii_type: valid_attributes }
         expect(response).to redirect_to(NiiType.last)
       end
     end
@@ -84,14 +84,14 @@ describe NiiTypesController do
       it "assigns a newly created but unsaved nii_type as @nii_type" do
         # Trigger the behavior that occurs when invalid params are submitted
         NiiType.any_instance.stub(:save).and_return(false)
-        post :create, :nii_type => {name: "test"}
+        post :create, params: { nii_type: {name: "test"} }
         expect(assigns(:nii_type)).to be_a_new(NiiType)
       end
 
       it "re-renders the 'new' template" do
         # Trigger the behavior that occurs when invalid params are submitted
         NiiType.any_instance.stub(:save).and_return(false)
-        post :create, :nii_type => {name: "test"}
+        post :create, params: { nii_type: {name: "test"} }
         expect(response).to render_template("new")
       end
     end
@@ -105,26 +105,26 @@ describe NiiTypesController do
         # specifies that the NiiType created on the previous line
         # receives the :update_attributes message with whatever params are
         # submitted in the request.
-        NiiType.any_instance.should_receive(:update_attributes).with({'name' => 'test'})
-        put :update, :id => nii_type.id, :nii_type => {'name' => 'test'}
+        NiiType.any_instance.should_receive(:update).with('name' => 'test')
+        put :update, params: { id: nii_type.id, nii_type: {'name' => 'test'} }
       end
 
       it "assigns the requested nii_type as @nii_type" do
         nii_type = NiiType.create! valid_attributes
-        put :update, :id => nii_type.id, :nii_type => valid_attributes
+        put :update, params: { id: nii_type.id, nii_type: valid_attributes }
         expect(assigns(:nii_type)).to eq(nii_type)
       end
 
       it "redirects to the nii_type" do
         nii_type = NiiType.create! valid_attributes
-        put :update, :id => nii_type.id, :nii_type => valid_attributes
+        put :update, params: { id: nii_type.id, nii_type: valid_attributes }
         expect(response).to redirect_to(nii_type)
       end
 
       it "moves its position when specified" do
         nii_type = NiiType.create! valid_attributes
         position = nii_type.position
-        put :update, :id => nii_type.id, :move => 'higher'
+        put :update, params: { id: nii_type.id, move: 'higher' }
         expect(response).to redirect_to nii_types_url
         assigns(:nii_type).reload.position.should eq position - 1
       end
@@ -135,7 +135,7 @@ describe NiiTypesController do
         nii_type = NiiType.create! valid_attributes
         # Trigger the behavior that occurs when invalid params are submitted
         NiiType.any_instance.stub(:save).and_return(false)
-        put :update, :id => nii_type.id, :nii_type => {name: "test"}
+        put :update, params: { id: nii_type.id, nii_type: {name: "test"} }
         expect(assigns(:nii_type)).to eq(nii_type)
       end
 
@@ -143,7 +143,7 @@ describe NiiTypesController do
         nii_type = NiiType.create! valid_attributes
         # Trigger the behavior that occurs when invalid params are submitted
         NiiType.any_instance.stub(:save).and_return(false)
-        put :update, :id => nii_type.id, :nii_type => {name: "test"}
+        put :update, params: { id: nii_type.id, nii_type: {name: "test"} }
         expect(response).to render_template("edit")
       end
     end
@@ -152,16 +152,15 @@ describe NiiTypesController do
   describe "DELETE destroy" do
     it "destroys the requested nii_type" do
       nii_type = NiiType.create! valid_attributes
-      expect {
-        delete :destroy, :id => nii_type.id
-      }.to change(NiiType, :count).by(-1)
+      expect do
+        delete :destroy, params: { id: nii_type.id }
+      end.to change(NiiType, :count).by(-1)
     end
 
     it "redirects to the nii_types list" do
       nii_type = NiiType.create! valid_attributes
-      delete :destroy, :id => nii_type.id
+      delete :destroy, params: { id: nii_type.id }
       expect(response).to redirect_to(nii_types_url)
     end
   end
-
 end

data/spec/dummy/app/models/application_record.rb

@@ -0,0 +1,3 @@
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end

data/spec/dummy/app/models/user.rb

@@ -1,7 +1,7 @@
-class User < ActiveRecord::Base
+class User < ApplicationRecord
   devise :database_authenticatable, #:registerable,
     :recoverable, :rememberable, :trackable, #, :validatable
-    :lockable, :lock_strategy => :none, :unlock_strategy => :none
+    :lockable, lock_strategy: :none, unlock_strategy: :none
 
   include EnjuSeed::EnjuUser
 end

data/spec/dummy/bin/rails

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-APP_PATH = File.expand_path('../../config/application', __FILE__)
+APP_PATH = File.expand_path('../config/application', __dir__)
 require_relative '../config/boot'
 require 'rails/commands'

data/spec/dummy/bin/setup

@@ -1,29 +1,38 @@
 #!/usr/bin/env ruby
 require 'pathname'
+require 'fileutils'
+include FileUtils
 
 # path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
 
-Dir.chdir APP_ROOT do
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
   # This script is a starting point to setup your application.
-  # Add necessary setup steps to this file:
+  # Add necessary setup steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
+
+  # Install JavaScript dependencies if using Yarn
+  # system('bin/yarn')
 
-  puts "== Installing dependencies =="
-  system "gem install bundler --conservative"
-  system "bundle check || bundle install"
 
   # puts "\n== Copying sample files =="
-  # unless File.exist?("config/database.yml")
-  #   system "cp config/database.yml.sample config/database.yml"
+  # unless File.exist?('config/database.yml')
+  #   cp 'config/database.yml.sample', 'config/database.yml'
   # end
 
   puts "\n== Preparing database =="
-  system "bin/rake db:setup"
+  system! 'bin/rails db:setup'
 
   puts "\n== Removing old logs and tempfiles =="
-  system "rm -f log/*"
-  system "rm -rf tmp/cache"
+  system! 'bin/rails log:clear tmp:clear'
 
   puts "\n== Restarting application server =="
-  system "touch tmp/restart.txt"
+  system! 'bin/rails restart'
 end

data/spec/dummy/bin/update

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'pathname'
+require 'fileutils'
+include FileUtils
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
+  # This script is a way to update your development environment automatically.
+  # Add necessary update steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
+
+  puts "\n== Updating database =="
+  system! 'bin/rails db:migrate'
+
+  puts "\n== Removing old logs and tempfiles =="
+  system! 'bin/rails log:clear tmp:clear'
+
+  puts "\n== Restarting application server =="
+  system! 'bin/rails restart'
+end

data/spec/dummy/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/spec/dummy/config/application.rb

@@ -1,30 +1,20 @@
-require File.expand_path('../boot', __FILE__)
+require_relative 'boot'
 
 require 'rails/all'
 
 Bundler.require(*Rails.groups)
 require "enju_nii"
 require "enju_leaf"
-require "enju_subject"
-require 'globalize'
-require 'globalize-accessors'
+require "enju_message"
 
 module Dummy
   class Application < Rails::Application
+    # Initialize configuration defaults for originally generated Rails version.
+    config.load_defaults 5.2
+
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
-
-    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
-
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
-
-    # Do not swallow errors in after_commit/after_rollback callbacks.
-    config.active_record.raise_in_transactional_callbacks = true
   end
 end
 

data/spec/dummy/config/cable.yml

@@ -0,0 +1,10 @@
+development:
+  adapter: async
+
+test:
+  adapter: async
+
+production:
+  adapter: redis
+  url: redis://localhost:6379/1
+  channel_prefix: dummy_production

data/spec/dummy/config/database.yml

@@ -1,30 +1,25 @@
-sqlite: &sqlite
+# SQLite version 3.x
+#   gem install sqlite3
+#
+#   Ensure the SQLite 3 gem is defined in your Gemfile
+#   gem 'sqlite3'
+#
+default: &default
   adapter: sqlite3
-  database: db/<%= Rails.env %>.sqlite3
-
-mysql: &mysql
-  adapter: mysql2
-  username: root
-  password:
-  database: enju_<%= Rails.env %>
-
-postgresql: &postgresql
-  adapter: postgresql
-  username: postgres
-  password:
-  database: enju_<%= Rails.env %>
-
-defaults: &defaults
-  pool: 5
+  pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
   timeout: 5000
-  host: localhost
-  <<: *<%= ENV['DB'] || "sqlite" %>
 
 development:
-  <<: *defaults
+  <<: *default
+  database: db/development.sqlite3
 
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
 test:
-  <<: *defaults
+  <<: *default
+  database: db/test.sqlite3
 
 production:
-  <<: *defaults
+  <<: *default
+  database: db/production.sqlite3

data/spec/dummy/config/environment.rb

@@ -1,5 +1,5 @@
 # Load the Rails application.
-require File.expand_path('../application', __FILE__)
+require_relative 'application'
 
 # Initialize the Rails application.
 Rails.application.initialize!

data/spec/dummy/config/environments/development.rb

@@ -9,13 +9,28 @@ Rails.application.configure do
   # Do not eager load code on boot.
   config.eager_load = false
 
-  # Show full error reports and disable caching.
-  config.consider_all_requests_local       = true
-  config.action_controller.perform_caching = false
+  # Show full error reports.
+  config.consider_all_requests_local = true
+
+  # Enable/disable caching. By default caching is disabled.
+  if Rails.root.join('tmp/caching-dev.txt').exist?
+    config.action_controller.perform_caching = true
+
+    config.cache_store = :memory_store
+    config.public_file_server.headers = {
+      'Cache-Control' => "public, max-age=#{2.days.seconds.to_i}"
+    }
+  else
+    config.action_controller.perform_caching = false
+
+    config.cache_store = :null_store
+  end
 
   # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 
+  config.action_mailer.perform_caching = false
+
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
@@ -27,15 +42,13 @@ Rails.application.configure do
   # number of complex assets.
   config.assets.debug = true
 
-  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
-  # yet still be able to expire them through the digest params.
-  config.assets.digest = true
-
-  # Adds additional error checking when serving assets at runtime.
-  # Checks for improperly declared sprockets dependencies.
-  # Raises helpful error messages.
-  config.assets.raise_runtime_errors = true
+  # Suppress logger output for asset requests.
+  config.assets.quiet = true
 
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
+
+  # Use an evented file watcher to asynchronously detect changes in source code,
+  # routes, locales, etc. This feature depends on the listen gem.
+  # config.file_watcher = ActiveSupport::EventedFileUpdateChecker
 end

data/spec/dummy/config/environments/production.rb

@@ -14,15 +14,14 @@ Rails.application.configure do
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
-  # Enable Rack::Cache to put a simple HTTP cache in front of your application
-  # Add `rack-cache` to your Gemfile before enabling this.
-  # For large-scale production use, consider using a caching reverse proxy like
-  # NGINX, varnish or squid.
-  # config.action_dispatch.rack_cache = 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 = true
 
   # Disable serving static files from the `/public` folder by default since
   # Apache or NGINX already handles this.
-  config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?
+  config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier
@@ -31,16 +30,20 @@ Rails.application.configure do
   # Do not fallback to assets pipeline if a precompiled asset is missed.
   config.assets.compile = false
 
-  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
-  # yet still be able to expire them through the digest params.
-  config.assets.digest = true
-
   # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
 
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
+  # config.action_controller.asset_host = 'http://assets.example.com'
+
   # Specifies the header that your server uses for sending files.
   # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
   # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
 
+  # Mount Action Cable outside main process or domain
+  # config.action_cable.mount_path = nil
+  # config.action_cable.url = 'wss://example.com/cable'
+  # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ]
+
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   # config.force_ssl = true
 
@@ -49,16 +52,15 @@ Rails.application.configure do
   config.log_level = :debug
 
   # Prepend all log lines with the following tags.
-  # config.log_tags = [ :subdomain, :uuid ]
-
-  # Use a different logger for distributed setups.
-  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
+  config.log_tags = [ :request_id ]
 
   # Use a different cache store in production.
   # config.cache_store = :mem_cache_store
 
-  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
-  # config.action_controller.asset_host = 'http://assets.example.com'
+  # Use a real queuing backend for Active Job (and separate queues per environment)
+  # config.active_job.queue_adapter     = :resque
+  # config.active_job.queue_name_prefix = "dummy_#{Rails.env}"
+  config.action_mailer.perform_caching = false
 
   # Ignore bad email addresses and do not raise email delivery errors.
   # Set this to true and configure the email server for immediate delivery to raise delivery errors.
@@ -74,6 +76,16 @@ Rails.application.configure do
   # Use default logging formatter so that PID and timestamp are not suppressed.
   config.log_formatter = ::Logger::Formatter.new
 
+  # Use a different logger for distributed setups.
+  # require 'syslog/logger'
+  # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')
+
+  if ENV["RAILS_LOG_TO_STDOUT"].present?
+    logger           = ActiveSupport::Logger.new(STDOUT)
+    logger.formatter = config.log_formatter
+    config.logger    = ActiveSupport::TaggedLogging.new(logger)
+  end
+
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false
 end