enju_subject 0.4.0.beta.1 → 0.4.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 394e3e8ec1f70a4d86cc1a06caff3ec295cd5a792d90e1051e5cd85fdf813bc4
-  data.tar.gz: e3552ec21acdc26c0e955079e87007f6416a77d028599e65526f0a007ee2481b
+  metadata.gz: 35b726916583322eb2ecf61f7118f50266c243c54467586c7e5824db275f9eb4
+  data.tar.gz: 2e4c772b81d3ec1d8cc14e3a8b38eede56e989a7855997d34ba8b8aa757d9e6a
 SHA512:
-  metadata.gz: ed27799276e47bdbb1f587117699c503e84c0119fb5c510d7a527d20825f5ce02ef669108f696de0ad627cb11cc398e5c7b78c89438cde457cc00f20042d2b65
-  data.tar.gz: df142581d47f451f9b66eebb9392dde48f290e5ab160a6922e57d4bc19bec9fc02d1e4866035a8ed4f9d63d93af1d5c62012ce8d1dd793ecad7fd9712ae37cd7
+  metadata.gz: f1399eed89425b626bb248b28945df9001b10b903471137c794ab5ef3ed625cc4938ed62f452730f71c26758b0e2cb75db6691862b655f05d496a73e7700f648
+  data.tar.gz: 7b0fdbd7e335fc3f0bef8e975239afb97332777cd4bcc4dec981ca77bcff4566889d2c8f3de2ab0dc26423d497401ece141d408101ef3f2f51036cf2d42b6e9f

data/app/controllers/classifications_controller.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 class ClassificationsController < ApplicationController
   before_action :set_classification, only: [:show, :edit, :update, :destroy]
   before_action :check_policy, only: [:index, :new, :create]

data/app/controllers/subjects_controller.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 class SubjectsController < ApplicationController
   before_action :set_subject, only: [:show, :edit, :update, :destroy]
   before_action :check_policy, only: [:index, :new, :create]
@@ -53,7 +52,7 @@ class SubjectsController < ApplicationController
   # GET /subjects/1.json
   def show
     if params[:term]
-      subject = Subject.where(term: params[:term]).first
+      subject = Subject.find_by(term: params[:term])
       redirected_to subject
       return
     end

data/app/models/classification.rb

@@ -17,13 +17,13 @@ end
 #
 # Table name: classifications
 #
-#  id                     :integer          not null, primary key
+#  id                     :bigint           not null, primary key
 #  parent_id              :integer
 #  category               :string           not null
 #  note                   :text
 #  classification_type_id :integer          not null
-#  created_at             :datetime
-#  updated_at             :datetime
+#  created_at             :datetime         not null
+#  updated_at             :datetime         not null
 #  lft                    :integer
 #  rgt                    :integer
 #  manifestation_id       :integer

data/app/models/classification_type.rb

@@ -8,11 +8,11 @@ end
 #
 # Table name: classification_types
 #
-#  id           :integer          not null, primary key
+#  id           :bigint           not null, primary key
 #  name         :string           not null
 #  display_name :text
 #  note         :text
 #  position     :integer
-#  created_at   :datetime
-#  updated_at   :datetime
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #

data/app/models/subject.rb

@@ -22,19 +22,18 @@ end
 #
 # Table name: subjects
 #
-#  id                      :integer          not null, primary key
-#  parent_id               :integer
+#  id                      :bigint           not null, primary key
+#  parent_id               :bigint
 #  use_term_id             :integer
 #  term                    :string
 #  term_transcription      :text
-#  subject_type_id         :integer          not null
+#  subject_type_id         :bigint           not null
 #  scope_note              :text
 #  note                    :text
-#  required_role_id        :integer          default(1), not null
+#  required_role_id        :bigint           default(1), not null
 #  lock_version            :integer          default(0), not null
 #  created_at              :datetime
 #  updated_at              :datetime
-#  deleted_at              :datetime
 #  url                     :string
 #  manifestation_id        :integer
 #  subject_heading_type_id :integer

data/app/models/subject_heading_type.rb

@@ -8,11 +8,11 @@ end
 #
 # Table name: subject_heading_types
 #
-#  id           :integer          not null, primary key
+#  id           :bigint           not null, primary key
 #  name         :string           not null
 #  display_name :text
 #  note         :text
 #  position     :integer
-#  created_at   :datetime
-#  updated_at   :datetime
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #

data/app/models/subject_type.rb

@@ -8,11 +8,11 @@ end
 #
 # Table name: subject_types
 #
-#  id           :integer          not null, primary key
+#  id           :bigint           not null, primary key
 #  name         :string           not null
 #  display_name :text
 #  note         :text
 #  position     :integer
-#  created_at   :datetime
-#  updated_at   :datetime
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #

data/app/views/manifestations/_subject_facet.html.erb

@@ -2,7 +2,7 @@
 <%- unless @subject_facet.blank? -%>
 <ul>
   <%- @subject_facet[0..19].each do |facet| -%>
-    <%- subject = Subject.where(id: facet.value).first -%>
+    <%- subject = Subject.find_by(id: facet.value) -%>
     <%- if subject -%>
       <li>
         <%= link_to "#{subject.term} (#{facet.count})", url_for(params.permit.merge(page: nil, subject: "\"#{subject.term}\"", view: nil, only_path: true)) -%>

data/db/migrate/029_create_subjects.rb

@@ -1,5 +1,5 @@
-class CreateSubjects < ActiveRecord::Migration[4.2]
-  def self.up
+class CreateSubjects < ActiveRecord::Migration[5.2]
+  def change
     create_table :subjects do |t|
       t.references :parent, index: true
       t.integer :use_term_id
@@ -12,13 +12,8 @@ class CreateSubjects < ActiveRecord::Migration[4.2]
       t.integer :lock_version, default: 0, null: false
       t.datetime :created_at
       t.datetime :updated_at
-      t.datetime :deleted_at
     end
     add_index :subjects, :term
     add_index :subjects, :use_term_id
   end
-
-  def self.down
-    drop_table :subjects
-  end
 end

data/db/migrate/142_create_classifications.rb

@@ -1,4 +1,4 @@
-class CreateClassifications < ActiveRecord::Migration[4.2]
+class CreateClassifications < ActiveRecord::Migration[5.2]
   def self.up
     create_table :classifications do |t|
       t.integer :parent_id

data/db/migrate/144_create_classification_types.rb

@@ -1,4 +1,4 @@
-class CreateClassificationTypes < ActiveRecord::Migration[4.2]
+class CreateClassificationTypes < ActiveRecord::Migration[5.2]
   def self.up
     create_table :classification_types do |t|
       t.string :name, null: false

data/db/migrate/145_create_subject_heading_types.rb

@@ -1,4 +1,4 @@
-class CreateSubjectHeadingTypes < ActiveRecord::Migration[4.2]
+class CreateSubjectHeadingTypes < ActiveRecord::Migration[5.2]
   def self.up
     create_table :subject_heading_types do |t|
       t.string :name, null: false

data/db/migrate/146_create_subject_types.rb

@@ -1,4 +1,4 @@
-class CreateSubjectTypes < ActiveRecord::Migration[4.2]
+class CreateSubjectTypes < ActiveRecord::Migration[5.2]
   def self.up
     create_table :subject_types do |t|
       t.string :name, null: false

data/db/migrate/20110913120629_add_lft_and_rgt_to_classification.rb

@@ -1,4 +1,4 @@
-class AddLftAndRgtToClassification < ActiveRecord::Migration[4.2]
+class AddLftAndRgtToClassification < ActiveRecord::Migration[5.2]
   def self.up
     add_column :classifications, :lft, :integer
     add_column :classifications, :rgt, :integer

data/db/migrate/20120406020752_add_url_to_subject.rb

@@ -1,4 +1,4 @@
-class AddUrlToSubject < ActiveRecord::Migration[4.2]
+class AddUrlToSubject < ActiveRecord::Migration[5.2]
   def change
     add_column :subjects, :url, :string
   end

data/db/migrate/20130504133816_add_manifestation_id_to_subject.rb

@@ -1,4 +1,4 @@
-class AddManifestationIdToSubject < ActiveRecord::Migration[4.2]
+class AddManifestationIdToSubject < ActiveRecord::Migration[5.2]
   def change
     add_column :subjects, :manifestation_id, :integer
     add_index :subjects, :manifestation_id

data/db/migrate/20130504143515_add_manifestation_id_to_classification.rb

@@ -1,4 +1,4 @@
-class AddManifestationIdToClassification < ActiveRecord::Migration[4.2]
+class AddManifestationIdToClassification < ActiveRecord::Migration[5.2]
   def change
     add_column :classifications, :manifestation_id, :integer
     add_index :classifications, :manifestation_id

data/db/migrate/20130504195916_add_subject_heading_type_id_to_subject.rb

@@ -1,4 +1,4 @@
-class AddSubjectHeadingTypeIdToSubject < ActiveRecord::Migration[4.2]
+class AddSubjectHeadingTypeIdToSubject < ActiveRecord::Migration[5.2]
   def change
     add_column :subjects, :subject_heading_type_id, :integer
   end

data/db/migrate/20150923173139_add_url_to_classification.rb

@@ -1,4 +1,4 @@
-class AddUrlToClassification < ActiveRecord::Migration[4.2]
+class AddUrlToClassification < ActiveRecord::Migration[5.2]
   def change
     add_column :classifications, :url, :string
   end

data/db/migrate/20150925092505_add_label_to_classification.rb

@@ -1,4 +1,4 @@
-class AddLabelToClassification < ActiveRecord::Migration[4.2]
+class AddLabelToClassification < ActiveRecord::Migration[5.2]
   def change
     add_column :classifications, :label, :string
   end

data/lib/enju_subject/version.rb

@@ -1,3 +1,3 @@
 module EnjuSubject
-  VERSION = "0.4.0.beta.1"
+  VERSION = "0.4.0.rc.1".freeze
 end

data/spec/dummy/app/controllers/application_controller.rb

@@ -4,7 +4,6 @@ class ApplicationController < ActionController::Base
   include EnjuLibrary::Controller
   include EnjuBiblio::Controller
   include EnjuSubject::Controller
-  before_action :set_paper_trail_whodunnit
   after_action :verify_authorized
 
   include Pundit

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

@@ -9,33 +9,53 @@ 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.
+  # Run rails dev:cache to toggle caching.
+  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.to_i}"
+    }
+  else
+    config.action_controller.perform_caching = false
+
+    config.cache_store = :null_store
+  end
+
+  # Store uploaded files on the local file system (see config/storage.yml for options)
+  config.active_storage.service = :local
 
   # 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
 
   # Raise an error on page load if there are pending migrations.
   config.active_record.migration_error = :page_load
 
+  # Highlight code that triggered database queries in logs.
+  config.active_record.verbose_query_logs = true
+
   # Debug mode disables concatenation and preprocessing of assets.
   # This option may cause significant delays in view rendering with a large
   # 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,13 @@ 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
+  # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"]
+  # or in config/master.key. This key is used to decrypt credentials (and other encrypted files).
+  # config.require_master_key = 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 +29,23 @@ 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
 
+  # Store uploaded files on the local file system (see config/storage.yml for options)
+  config.active_storage.service = :local
+
+  # 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 +54,16 @@ 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 +79,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

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

@@ -12,9 +12,11 @@ Rails.application.configure do
   # preloads Rails for running tests, you may have to set it to true.
   config.eager_load = false
 
-  # Configure static file server for tests with Cache-Control for performance.
-  config.serve_static_files   = true
-  config.static_cache_control = 'public, max-age=3600'
+  # Configure public file server for tests with Cache-Control for performance.
+  config.public_file_server.enabled = true
+  config.public_file_server.headers = {
+    'Cache-Control' => "public, max-age=#{1.hour.to_i}"
+  }
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
@@ -26,19 +28,20 @@ Rails.application.configure do
   # Disable request forgery protection in test environment.
   config.action_controller.allow_forgery_protection = false
 
+  # Store uploaded files on the local file system in a temporary directory
+  config.active_storage.service = :test
+
+  config.action_mailer.perform_caching = false
+
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Randomize the order test cases are executed.
-  config.active_support.test_order = :random
-
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
-
   config.action_mailer.default_url_options = {host: 'localhost:3000'}
 end

data/spec/dummy/db/migrate/001_create_agents.rb

@@ -1,4 +1,4 @@
-class CreateAgents < ActiveRecord::Migration[4.2]
+class CreateAgents < ActiveRecord::Migration[5.2]
   def change
     create_table :agents do |t|
       t.string :last_name
@@ -13,7 +13,6 @@ class CreateAgents < ActiveRecord::Migration[4.2]
       t.text :full_name_transcription
       t.text :full_name_alternative
       t.timestamps
-      t.datetime :deleted_at
       t.string :zip_code_1
       t.string :zip_code_2
       t.text :address_1