enju_subject 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1eb9c394a337f1e6771f22f07cccd209cd514239be76495ed4ecfa50659ea7e0
-  data.tar.gz: b7f9d5cb3430e1e5c05f1006e78b3ad5928d54db3d239169f50be2182f427e25
+  metadata.gz: 13a77e302ed1fea49a89324f48453fc11b65714371e5d2241333a6096948f570
+  data.tar.gz: 9cd009abe585d7662c0f826aaf7618acc4b8033afa6e8974e0d60a81e6405e4e
 SHA512:
-  metadata.gz: e4c6140f3c7d72fd6a3bbe577718c588e71148b15115d9d0b300a04f8839e324c9c997410a8b88dab020beeaba0ba93ef68c639054bc52bd58585c87031799e0
-  data.tar.gz: 6f00c3852029b0b759c1d8eb9cac38c345aa8901a2e8ac36e376de596243819b83c605a75faed3df5238b66c628748e039a1dedd9c75d433df09c7d4f12791c6
+  metadata.gz: ec447e0ba0fc1b0e270f02e462adb264c5653d2083343e803ed676162ca57cb4b25826659bb6edc52c4c7f25f3cfcc40a44e8c69b7f3d9354e1510c7c2e9bef5
+  data.tar.gz: 5a0b71003ae24e8b308c29b337b03869a6e7392703399c0a57d225190724aaf41c8d72087654c7b0945f71c15a1aa4ab2fad03c4ecb76a983dbde24acb23afe8

data/app/controllers/classification_types_controller.rb

@@ -62,7 +62,7 @@ class ClassificationTypesController < ApplicationController
     end
 
     respond_to do |format|
-      if @classification_type.update_attributes(classification_type_params)
+      if @classification_type.update(classification_type_params)
         format.html { redirect_to @classification_type, notice:  t('controller.successfully_updated', model:  t('activerecord.models.classification_type')) }
         format.json { head :no_content }
       else

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]
@@ -85,7 +84,7 @@ class ClassificationsController < ApplicationController
   # PUT /classifications/1.json
   def update
     respond_to do |format|
-      if @classification.update_attributes(classification_params)
+      if @classification.update(classification_params)
         format.html { redirect_to @classification, notice: t('controller.successfully_updated', model: t('activerecord.models.classification')) }
         format.json { head :no_content }
       else

data/app/controllers/subject_heading_types_controller.rb

@@ -62,7 +62,7 @@ class SubjectHeadingTypesController < ApplicationController
     end
 
     respond_to do |format|
-      if @subject_heading_type.update_attributes(subject_heading_type_params)
+      if @subject_heading_type.update(subject_heading_type_params)
         format.html { redirect_to @subject_heading_type, notice:  t('controller.successfully_updated', model:  t('activerecord.models.subject_heading_type')) }
         format.json { head :no_content }
       else

data/app/controllers/subject_types_controller.rb

@@ -62,7 +62,7 @@ class SubjectTypesController < ApplicationController
     end
 
     respond_to do |format|
-      if @subject_type.update_attributes(subject_type_params)
+      if @subject_type.update(subject_type_params)
         format.html { redirect_to @subject_type, notice:  t('controller.successfully_updated', model:  t('activerecord.models.subject_type')) }
         format.json { head :no_content }
       else

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]
@@ -107,7 +106,7 @@ class SubjectsController < ApplicationController
   # PUT /subjects/1.json
   def update
     respond_to do |format|
-      if @subject.update_attributes(subject_params)
+      if @subject.update(subject_params)
         format.html { redirect_to @subject, notice: t('controller.successfully_updated', model: t('activerecord.models.subject')) }
         format.json { head :no_content }
       else

data/app/models/classification.rb

@@ -1,4 +1,4 @@
-class Classification < ActiveRecord::Base
+class Classification < ApplicationRecord
   belongs_to :classification_type
   belongs_to :manifestation, touch: true, optional: true
 

data/app/models/classification_type.rb

@@ -1,4 +1,4 @@
-class ClassificationType < ActiveRecord::Base
+class ClassificationType < ApplicationRecord
   include MasterModel
   has_many :classifications
   validates :name, format: { with: /\A[0-9a-z][0-9a-z_\-]*[0-9a-z]\Z/ }

data/app/models/subject.rb

@@ -1,4 +1,4 @@
-class Subject < ActiveRecord::Base
+class Subject < ApplicationRecord
   belongs_to :manifestation, touch: true, optional: true
   belongs_to :subject_type
   belongs_to :subject_heading_type

data/app/models/subject_heading_type.rb

@@ -1,4 +1,4 @@
-class SubjectHeadingType < ActiveRecord::Base
+class SubjectHeadingType < ApplicationRecord
   include MasterModel
   has_many :subjects
   validates :name, format: {with: /\A[0-9a-z][0-9a-z_\-]*[0-9a-z]\Z/}

data/app/models/subject_type.rb

@@ -1,4 +1,4 @@
-class SubjectType < ActiveRecord::Base
+class SubjectType < ApplicationRecord
   include MasterModel
   has_many :subjects
   validates :name, format: {with: /\A[0-9A-Za-z][0-9a-z_\-]*[0-9a-z]\Z/}

data/app/views/classification_types/_form.html.erb

@@ -3,7 +3,7 @@
 
   <div class="field">
     <%= f.label :name %><br />
-    <%= f.text_field :name, class: 'short_name' %>
+    <%= f.text_field :name, required: true, class: 'short_name' %>
   </div>
   <div class="field">
     <%= f.label :display_name %><br />

data/app/views/subject_heading_types/_form.html.erb

@@ -3,7 +3,7 @@
 
   <div class="field">
     <%= f.label :name %><br />
-    <%= f.text_field :name %>
+    <%= f.text_field :name, required: true %>
   </div>
   <div class="field">
     <%= f.label :display_name %><br />

data/app/views/subject_types/_form.html.erb

@@ -3,7 +3,7 @@
 
   <div class="field">
     <%= f.label :name %><br />
-    <%= f.text_field :name %>
+    <%= f.text_field :name, required: true %>
   </div>
   <div class="field">
     <%= f.label :display_name %><br />

data/lib/enju_subject/version.rb

@@ -1,3 +1,3 @@
 module EnjuSubject
-  VERSION = "0.3.2".freeze
+  VERSION = "0.3.3".freeze
 end

data/spec/dummy/db/migrate/20081027150907_create_picture_files.rb

@@ -3,9 +3,7 @@ class CreatePictureFiles < ActiveRecord::Migration[4.2]
     create_table :picture_files do |t|
       t.integer :picture_attachable_id
       t.string :picture_attachable_type
-      t.string :content_type
       t.text :title
-      t.string :thumbnail
       t.integer :position
 
       t.timestamps

data/spec/dummy/db/migrate/20200425072340_create_manifestation_custom_properties.rb

@@ -0,0 +1,12 @@
+class CreateManifestationCustomProperties < ActiveRecord::Migration[5.2]
+  def change
+    create_table :manifestation_custom_properties do |t|
+      t.string :name, null: false, comment: 'ラベル名', index: {unique: true}
+      t.text :display_name, null: false, comment: '表示名'
+      t.text :note, comment: '備考'
+      t.integer :position, default: 1, null: false
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/20200425072349_create_item_custom_properties.rb

@@ -0,0 +1,12 @@
+class CreateItemCustomProperties < ActiveRecord::Migration[5.2]
+  def change
+    create_table :item_custom_properties do |t|
+      t.string :name, null: false, comment: 'ラベル名', index: {unique: true}
+      t.text :display_name, null: false, comment: '表示名'
+      t.text :note, comment: '備考'
+      t.integer :position, default: 1, null: false
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/20200425074758_create_manifestation_custom_values.rb

@@ -0,0 +1,12 @@
+class CreateManifestationCustomValues < ActiveRecord::Migration[5.2]
+  def change
+    create_table :manifestation_custom_values do |t|
+      t.references :manifestation_custom_property, null: false, foreign_key: true, index: {name: 'index_manifestation_custom_values_on_custom_property_id'}
+      t.references :manifestation, null: false, foreign_key: true
+      t.text :value
+
+      t.timestamps
+    end
+    add_index :manifestation_custom_values, [:manifestation_custom_property_id, :manifestation_id], unique: true, name: 'index_manifestation_custom_values_on_property_manifestation'
+  end
+end

data/spec/dummy/db/migrate/20200425074822_create_item_custom_values.rb

@@ -0,0 +1,12 @@
+class CreateItemCustomValues < ActiveRecord::Migration[5.2]
+  def change
+    create_table :item_custom_values do |t|
+      t.references :item_custom_property, null: false, foreign_key: true, index: {name: 'index_item_custom_values_on_custom_property_id'}
+      t.references :item, null: false, foreign_key: true
+      t.text :value
+
+      t.timestamps
+    end
+    add_index :item_custom_values, [:item_custom_property_id, :item_id], unique: true, name: 'index_item_custom_values_on_custom_item_property_and_item_id'
+  end
+end

data/spec/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2019_12_19_122214) do
+ActiveRecord::Schema.define(version: 2020_04_25_074822) do
 
   create_table "accepts", force: :cascade do |t|
     t.integer "basket_id"
@@ -402,6 +402,27 @@ ActiveRecord::Schema.define(version: 2019_12_19_122214) do
     t.index ["user_id"], name: "index_import_requests_on_user_id"
   end
 
+  create_table "item_custom_properties", force: :cascade do |t|
+    t.string "name", null: false
+    t.text "display_name", null: false
+    t.text "note"
+    t.integer "position", default: 1, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["name"], name: "index_item_custom_properties_on_name", unique: true
+  end
+
+  create_table "item_custom_values", force: :cascade do |t|
+    t.integer "item_custom_property_id", null: false
+    t.integer "item_id", null: false
+    t.text "value"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["item_custom_property_id", "item_id"], name: "index_item_custom_values_on_custom_item_property_and_item_id", unique: true
+    t.index ["item_custom_property_id"], name: "index_item_custom_values_on_custom_property_id"
+    t.index ["item_id"], name: "index_item_custom_values_on_item_id"
+  end
+
   create_table "items", force: :cascade do |t|
     t.string "call_number"
     t.string "item_identifier"
@@ -525,6 +546,27 @@ ActiveRecord::Schema.define(version: 2019_12_19_122214) do
     t.datetime "updated_at"
   end
 
+  create_table "manifestation_custom_properties", force: :cascade do |t|
+    t.string "name", null: false
+    t.text "display_name", null: false
+    t.text "note"
+    t.integer "position", default: 1, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["name"], name: "index_manifestation_custom_properties_on_name", unique: true
+  end
+
+  create_table "manifestation_custom_values", force: :cascade do |t|
+    t.integer "manifestation_custom_property_id", null: false
+    t.integer "manifestation_id", null: false
+    t.text "value"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["manifestation_custom_property_id", "manifestation_id"], name: "index_manifestation_custom_values_on_property_manifestation", unique: true
+    t.index ["manifestation_custom_property_id"], name: "index_manifestation_custom_values_on_custom_property_id"
+    t.index ["manifestation_id"], name: "index_manifestation_custom_values_on_manifestation_id"
+  end
+
   create_table "manifestation_relationship_types", force: :cascade do |t|
     t.string "name", null: false
     t.text "display_name"
@@ -700,9 +742,7 @@ ActiveRecord::Schema.define(version: 2019_12_19_122214) do
   create_table "picture_files", force: :cascade do |t|
     t.integer "picture_attachable_id"
     t.string "picture_attachable_type"
-    t.string "content_type"
     t.text "title"
-    t.string "thumbnail"
     t.integer "position"
     t.datetime "created_at"
     t.datetime "updated_at"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_subject
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Kosuke Tanabe
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-30 00:00:00.000000000 Z
+date: 2020-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enju_biblio
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.8
+        version: 0.3.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.8
+        version: 0.3.10
 - !ruby/object:Gem::Dependency
   name: enju_leaf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 1.3.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 1.3.4
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -140,16 +140,16 @@ dependencies:
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.23
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.23
 - !ruby/object:Gem::Dependency
   name: generator_spec
   requirement: !ruby/object:Gem::Requirement
@@ -518,13 +518,15 @@ files:
 - spec/dummy/db/migrate/20190818075603_add_memo_to_manifestation.rb
 - spec/dummy/db/migrate/20190818075628_add_memo_to_item.rb
 - spec/dummy/db/migrate/20191219122214_create_custom_properties.rb
+- spec/dummy/db/migrate/20200425072340_create_manifestation_custom_properties.rb
+- spec/dummy/db/migrate/20200425072349_create_item_custom_properties.rb
+- spec/dummy/db/migrate/20200425074758_create_manifestation_custom_values.rb
+- spec/dummy/db/migrate/20200425074822_create_item_custom_values.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
-- spec/dummy/public/apple-touch-icon-precomposed.png
-- spec/dummy/public/apple-touch-icon.png
 - spec/dummy/public/favicon.ico
 - spec/dummy/spec/fixtures/subjects.yml
 - spec/factories/classification.rb
@@ -569,7 +571,7 @@ files:
 homepage: https://github.com/next-l/enju_subject
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -585,7 +587,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: enju_subject plugin
 test_files:
@@ -635,10 +637,8 @@ test_files:
 - spec/dummy/Rakefile
 - spec/dummy/public/favicon.ico
 - spec/dummy/public/422.html
-- spec/dummy/public/apple-touch-icon.png
 - spec/dummy/public/500.html
 - spec/dummy/public/404.html
-- spec/dummy/public/apple-touch-icon-precomposed.png
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
 - spec/dummy/db/migrate/20170305064014_add_csv_charset_conversion_to_library_group.rb
@@ -652,6 +652,7 @@ test_files:
 - spec/dummy/db/migrate/20150421023923_create_identities.rb
 - spec/dummy/db/migrate/20160610093229_add_html_snippet_to_library_group.rb
 - spec/dummy/db/migrate/20151213072705_add_footer_banner_to_library_group.rb
+- spec/dummy/db/migrate/20200425072340_create_manifestation_custom_properties.rb
 - spec/dummy/db/migrate/20120413100352_add_fingerprint_to_picture_file.rb
 - spec/dummy/db/migrate/20111124110355_create_produce_types.rb
 - spec/dummy/db/migrate/20090719201843_create_extents.rb
@@ -661,6 +662,7 @@ test_files:
 - spec/dummy/db/migrate/20140518111006_create_message_transitions.rb
 - spec/dummy/db/migrate/124_create_bookstores.rb
 - spec/dummy/db/migrate/20140519170214_create_resource_import_file_transitions.rb
+- spec/dummy/db/migrate/20200425074758_create_manifestation_custom_values.rb
 - spec/dummy/db/migrate/20110318183304_add_valid_period_for_new_user_to_user_group.rb
 - spec/dummy/db/migrate/20120510140958_add_closed_to_shelf.rb
 - spec/dummy/db/migrate/20160813203039_add_user_id_to_library_group.rb
@@ -709,6 +711,7 @@ test_files:
 - spec/dummy/db/migrate/20140709113905_create_user_export_file_transitions.rb
 - spec/dummy/db/migrate/20140519171220_create_import_request_transitions.rb
 - spec/dummy/db/migrate/080_create_library_groups.rb
+- spec/dummy/db/migrate/20200425074822_create_item_custom_values.rb
 - spec/dummy/db/migrate/20091214131723_create_series_statements.rb
 - spec/dummy/db/migrate/20120413170705_add_error_message_to_resource_import_file.rb
 - spec/dummy/db/migrate/20081025083323_create_countries.rb
@@ -808,6 +811,7 @@ test_files:
 - spec/dummy/db/migrate/20120511072422_add_agent_identifier_to_agent.rb
 - spec/dummy/db/migrate/20110301121550_add_birth_date_and_death_date_to_agent.rb
 - spec/dummy/db/migrate/20160813191733_add_family_name_first_to_library_group.rb
+- spec/dummy/db/migrate/20200425072349_create_item_custom_properties.rb
 - spec/dummy/db/migrate/120_create_baskets.rb
 - spec/dummy/db/migrate/20140628073524_add_user_encoding_to_agent_import_file.rb
 - spec/dummy/db/migrate/20140721151416_add_default_shelf_id_to_resource_import_file.rb