enju_biblio 0.4.0.beta.2 → 0.4.0.rc.1

data/lib/generators/enju_biblio/setup/setup_generator.rb

@@ -5,6 +5,8 @@ class EnjuBiblio::SetupGenerator < Rails::Generators::Base
   def copy_setup_files
     directory("db/fixtures", "db/fixtures/enju_biblio")
     return if file == 'fixture'
+    inject_into_class 'app/controllers/application_controller.rb', ApplicationController,
+      "  include EnjuBiblio::Controller\n"
     append_to_file("config/schedule.rb", File.open(File.expand_path('../templates', __FILE__) + '/config/schedule.rb').read)
   end
 end

data/spec/controllers/items_controller_spec.rb

@@ -265,6 +265,19 @@ describe ItemsController do
           assigns(:item).manifestation.should_not be_nil
           expect(response).to redirect_to(item_url(assigns(:item)))
         end
+
+        it 'assigns custom properties to @item' do
+          item = FactoryBot.create(:item_custom_property).resource
+          custom_properties_attrs = {
+            custom_properties_attributes: [{label: 'test', value: 'テスト'}]
+          }
+          put :update, params: {
+            id: item.id, item: @attrs.merge(custom_properties_attrs)
+          }
+          expect(assigns(:item)).to eq item
+          expect(assigns(:item).custom_properties.map{|property| property.label}).to eq ['custom property 1', 'test']
+          expect(assigns(:item).custom_properties.map{|property| property.value}).to eq ['カスタム項目 1', 'テスト']
+        end
       end
 
       describe 'with invalid params' do
@@ -435,6 +448,18 @@ describe ItemsController do
           put :update, params: { id: @item, item: @invalid_attrs }
           expect(response).to render_template('edit')
         end
+
+        it 'assigns custom properties to @item' do
+          item = FactoryBot.create(:item_custom_property).resource
+          custom_properties_attrs = {
+            custom_properties_attributes: [{name: 'test', value: 'テスト'}]
+          }
+          put :update, params: {
+            id: item.id, item: @invalid_attrs.merge(custom_properties_attrs)
+          }
+          expect(assigns(:item).custom_properties.count).to eq 1
+          expect(assigns(:item)).to_not be_valid
+        end
       end
     end
 

data/spec/controllers/manifestations_controller_spec.rb

@@ -649,6 +649,7 @@ describe ManifestationsController do
     before(:each) do
       @manifestation = FactoryBot.create(:manifestation)
       @manifestation.series_statements = [SeriesStatement.find(1)]
+      @manifestation.publishers << FactoryBot.create(:agent)
       @attrs = valid_attributes
       @invalid_attrs = { original_title: '' }
     end
@@ -702,6 +703,32 @@ describe ManifestationsController do
           put :update, params: { id: @manifestation.id, manifestation: @attrs.merge(identifiers_attrs) }
           expect(assigns(:manifestation)).to eq @manifestation
         end
+
+        it 'assigns identifiers and publishers to @manifestation' do
+          identifiers_attrs = {
+            identifier_attributes: [FactoryBot.create(:identifier)]
+          }
+          publishers_attrs = {
+            publisher_attributes: [FactoryBot.create(:agent)]
+          }
+          put :update, params: {
+            id: @manifestation.id, manifestation: @attrs.merge(identifiers_attrs, publishers_attrs)
+          }
+          expect(assigns(:manifestation)).to eq @manifestation
+        end
+
+        it 'assigns custom properties to @manifestation' do
+          manifestation = FactoryBot.create(:manifestation_custom_property).resource
+          custom_properties_attrs = {
+            custom_properties_attributes: [{label: 'test', value: 'テスト'}]
+          }
+          put :update, params: {
+            id: manifestation.id, manifestation: @attrs.merge(custom_properties_attrs)
+          }
+          expect(assigns(:manifestation)).to eq manifestation
+          expect(assigns(:manifestation).custom_properties.map{|property| property.label}).to eq ['custom property 1', 'test']
+          expect(assigns(:manifestation).custom_properties.map{|property| property.value}).to eq ['カスタム項目 1', 'テスト']
+        end
       end
 
       describe 'with invalid params' do
@@ -714,6 +741,31 @@ describe ManifestationsController do
           put :update, params: { id: @manifestation, manifestation: @invalid_attrs }
           expect(response).to render_template('edit')
         end
+
+        it 'assigns identifiers and publishers to @manifestation' do
+          identifiers_attrs = {
+            identifier_attributes: [FactoryBot.create(:identifier)]
+          }
+          publishers_attrs = {
+            publisher_attributes: [FactoryBot.create(:agent)]
+          }
+          put :update, params: {
+            id: @manifestation.id, manifestation: @invalid_attrs.merge(identifiers_attrs, publishers_attrs)
+          }
+          expect(assigns(:manifestation)).to_not be_valid
+        end
+
+        it 'assigns custom properties to @manifestation' do
+          manifestation = FactoryBot.create(:manifestation_custom_property).resource
+          custom_properties_attrs = {
+            custom_properties_attributes: [{name: 'test', value: 'テスト'}]
+          }
+          put :update, params: {
+            id: manifestation.id, manifestation: @invalid_attrs.merge(custom_properties_attrs)
+          }
+          expect(assigns(:manifestation).custom_properties.count).to eq 1
+          expect(assigns(:manifestation)).to_not be_valid
+        end
       end
     end
 

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

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

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

@@ -8,11 +8,9 @@ class User < ApplicationRecord
 
   include EnjuSeed::EnjuUser
   include EnjuMessage::EnjuUser
-  include EnjuBookmark::EnjuUser
 end
 
 Manifestation.include(EnjuSubject::EnjuManifestation)
 Manifestation.include(EnjuManifestationViewer::EnjuManifestation)
 Manifestation.include(EnjuNdl::EnjuManifestation)
-Manifestation.include(EnjuBookmark::EnjuManifestation)
 Item.include(EnjuLibrary::EnjuItem)

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

@@ -9,28 +9,13 @@ Rails.application.configure do
   # Do not eager load code on boot.
   config.eager_load = 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
+  # Show full error reports and disable caching.
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
 
   # 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
 
@@ -42,13 +27,15 @@ Rails.application.configure do
   # number of complex assets.
   config.assets.debug = true
 
-  # Suppress logger output for asset requests.
-  config.assets.quiet = 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
 
   # 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,14 +14,15 @@ 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 = 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
 
   # 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?
+  config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier
@@ -30,20 +31,16 @@ Rails.application.configure do
   # Do not fallback to assets pipeline if a precompiled asset is missed.
   config.assets.compile = false
 
-  # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
+  # 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
 
-  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
-  # config.action_controller.asset_host = 'http://assets.example.com'
+  # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
 
   # 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
 
@@ -52,15 +49,16 @@ Rails.application.configure do
   config.log_level = :debug
 
   # Prepend all log lines with the following tags.
-  config.log_tags = [ :request_id ]
+  # config.log_tags = [ :subdomain, :uuid ]
+
+  # Use a different logger for distributed setups.
+  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
 
   # Use a different cache store in production.
   # config.cache_store = :mem_cache_store
 
-  # 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
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
+  # config.action_controller.asset_host = 'http://assets.example.com'
 
   # 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.
@@ -76,16 +74,6 @@ 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,11 +12,9 @@ Rails.application.configure do
   # preloads Rails for running tests, you may have to set it to true.
   config.eager_load = false
 
-  # 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.seconds.to_i}"
-  }
+  # Configure static file server for tests with Cache-Control for performance.
+  config.serve_static_files   = true
+  config.static_cache_control = 'public, max-age=3600'
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
@@ -27,13 +25,15 @@ Rails.application.configure do
 
   # Disable request forgery protection in test environment.
   config.action_controller.allow_forgery_protection = false
-  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
 

data/spec/dummy/config/initializers/assets.rb

@@ -12,4 +12,4 @@ Rails.application.config.assets.paths << Rails.root.join('../../', 'node_modules
 # 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 )
-Rails.application.config.assets.precompile += %w( *.png icons/*.png *.gif enju_leaf/*.css )
+Rails.application.config.assets.precompile += %w( *.png icons/*.png *.gif *.css )

data/spec/dummy/db/migrate/059_create_libraries.rb

@@ -1,4 +1,4 @@
-class CreateLibraries < ActiveRecord::Migration[4.2]
+class CreateLibraries < ActiveRecord::Migration[5.2]
   def change
     create_table :libraries do |t|
       t.string :name, index: true, null: false
@@ -20,7 +20,6 @@ class CreateLibraries < ActiveRecord::Migration[4.2]
       t.references :country
 
       t.timestamps
-      t.datetime :deleted_at
     end
   end
 end

data/spec/dummy/db/migrate/069_create_shelves.rb

@@ -1,4 +1,4 @@
-class CreateShelves < ActiveRecord::Migration[4.2]
+class CreateShelves < ActiveRecord::Migration[5.2]
   def change
     create_table :shelves do |t|
       t.string :name, null: false
@@ -8,7 +8,6 @@ class CreateShelves < ActiveRecord::Migration[4.2]
       t.integer :items_count, default: 0, null: false
       t.integer :position
       t.timestamps
-      t.datetime :deleted_at
     end
   end
 end

data/spec/dummy/db/migrate/077_create_user_groups.rb

@@ -1,4 +1,4 @@
-class CreateUserGroups < ActiveRecord::Migration[4.2]
+class CreateUserGroups < ActiveRecord::Migration[5.2]
   def change
     create_table :user_groups do |t|
       t.string :name, not_null: true
@@ -6,7 +6,6 @@ class CreateUserGroups < ActiveRecord::Migration[4.2]
       t.text :note
       t.integer :position
       t.timestamps
-      t.datetime :deleted_at
     end
   end
 end

data/spec/dummy/db/migrate/080_create_library_groups.rb

@@ -1,4 +1,4 @@
-class CreateLibraryGroups < ActiveRecord::Migration[4.2]
+class CreateLibraryGroups < ActiveRecord::Migration[5.2]
   def change
     create_table :library_groups do |t|
       t.string :name, null: false

data/spec/dummy/db/migrate/120_create_baskets.rb

@@ -1,4 +1,4 @@
-class CreateBaskets < ActiveRecord::Migration[4.2]
+class CreateBaskets < ActiveRecord::Migration[5.2]
   def change
     create_table :baskets do |t|
       t.references :user, index: true

data/spec/dummy/db/migrate/124_create_bookstores.rb

@@ -1,4 +1,4 @@
-class CreateBookstores < ActiveRecord::Migration[4.2]
+class CreateBookstores < ActiveRecord::Migration[5.2]
   def change
     create_table :bookstores do |t|
       t.text :name, null: false
@@ -9,7 +9,6 @@ class CreateBookstores < ActiveRecord::Migration[4.2]
       t.string :fax_number
       t.string :url
       t.integer :position
-      t.datetime :deleted_at
 
       t.timestamps
     end

data/spec/dummy/db/migrate/130_create_request_status_types.rb

@@ -1,4 +1,4 @@
-class CreateRequestStatusTypes < ActiveRecord::Migration[4.2]
+class CreateRequestStatusTypes < ActiveRecord::Migration[5.2]
   def change
     create_table :request_status_types do |t|
       t.string :name, null: false

data/spec/dummy/db/migrate/131_create_request_types.rb

@@ -1,4 +1,4 @@
-class CreateRequestTypes < ActiveRecord::Migration[4.2]
+class CreateRequestTypes < ActiveRecord::Migration[5.2]
   def change
     create_table :request_types do |t|
       t.string :name, null: false

data/spec/dummy/db/migrate/20081006090811_create_subscriptions.rb

@@ -1,11 +1,10 @@
-class CreateSubscriptions < ActiveRecord::Migration[4.2]
+class CreateSubscriptions < ActiveRecord::Migration[5.2]
   def change
     create_table :subscriptions do |t|
       t.text :title, null: false
       t.text :note
       t.references :user, index: true
       t.references :order_list, index: true
-      t.datetime :deleted_at
       t.integer :subscribes_count, default: 0, null: false
 
       t.timestamps

data/spec/dummy/db/migrate/20081006093246_create_subscribes.rb

@@ -1,4 +1,4 @@
-class CreateSubscribes < ActiveRecord::Migration[4.2]
+class CreateSubscribes < ActiveRecord::Migration[5.2]
   def change
     create_table :subscribes do |t|
       t.references :subscription, index: true, null: false

data/spec/dummy/db/migrate/20081023092436_create_search_engines.rb

@@ -1,4 +1,4 @@
-class CreateSearchEngines < ActiveRecord::Migration[4.2]
+class CreateSearchEngines < ActiveRecord::Migration[5.2]
   def change
     create_table :search_engines do |t|
       t.string :name, null: false

data/spec/dummy/db/migrate/20100211105551_add_admin_networks_to_library_group.rb

@@ -1,4 +1,4 @@
-class AddAdminNetworksToLibraryGroup < ActiveRecord::Migration[4.2]
+class AddAdminNetworksToLibraryGroup < ActiveRecord::Migration[5.2]
   def self.up
     add_column :library_groups, :admin_networks, :text
   end

data/spec/dummy/db/migrate/20100314190054_add_opening_hour_to_library.rb

@@ -1,4 +1,4 @@
-class AddOpeningHourToLibrary < ActiveRecord::Migration[4.2]
+class AddOpeningHourToLibrary < ActiveRecord::Migration[5.2]
   def self.up
     add_column :libraries, :opening_hour, :text
   end

data/spec/dummy/db/migrate/20110222073537_add_url_to_library_group.rb

@@ -1,4 +1,4 @@
-class AddUrlToLibraryGroup < ActiveRecord::Migration[4.2]
+class AddUrlToLibraryGroup < ActiveRecord::Migration[5.2]
   def self.up
     add_column :library_groups, :url, :string, default: 'http://localhost:3000/'
   end