enju_biblio 0.3.9 → 0.3.11

data/spec/controllers/manifestations_controller_spec.rb

@@ -575,6 +575,12 @@ describe ManifestationsController do
           post :create, params: { manifestation: @attrs.merge(attachment: fixture_file_upload('/../../examples/resource_import_file_sample1.tsv', 'text/csv')) }
           expect(assigns(:manifestation)).to be_valid
         end
+
+        it 'accepts custom values' do
+          post :create, params: { manifestation: @attrs.merge(manifestation_custom_values_attributes: Array.new(3){FactoryBot.attributes_for(:manifestation_custom_value, manifestation_custom_property_id: FactoryBot.create(:manifestation_custom_property).id)}) }
+          expect(assigns(:manifestation)).to be_valid
+          expect(assigns(:manifestation).manifestation_custom_values.count).to eq 3
+        end
       end
 
       describe 'with invalid params' do
@@ -716,6 +722,22 @@ describe ManifestationsController do
           }
           expect(assigns(:manifestation)).to eq @manifestation
         end
+
+        it 'accepts custom values' do
+          @manifestation.manifestation_custom_values << FactoryBot.build(:manifestation_custom_value)
+          put :update, params: { id: @manifestation.id, manifestation: @attrs.merge(manifestation_custom_values_attributes: [{id: @manifestation.manifestation_custom_values.first.id, value: 'test'}]) }
+          expect(assigns(:manifestation)).to be_valid
+          expect(assigns(:manifestation).manifestation_custom_values.count).to eq 1
+          expect(assigns(:manifestation).manifestation_custom_values.first.value).to eq 'test'
+        end
+
+        it 'accepts custom values when the value is empty' do
+          @manifestation.manifestation_custom_values << FactoryBot.build(:manifestation_custom_value)
+          put :update, params: { id: @manifestation.id, manifestation: @attrs.merge(manifestation_custom_values_attributes: [{id: @manifestation.manifestation_custom_values.first.id, value: ''}]) }
+          expect(assigns(:manifestation)).to be_valid
+          expect(assigns(:manifestation).manifestation_custom_values.count).to eq 1
+          expect(assigns(:manifestation).manifestation_custom_values.first.value).to eq ''
+        end
       end
 
       describe 'with invalid params' do

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: 2020_03_22_083458) do
+ActiveRecord::Schema.define(version: 2020_04_25_074822) do
 
   create_table "accepts", force: :cascade do |t|
     t.integer "basket_id"
@@ -433,24 +433,6 @@ ActiveRecord::Schema.define(version: 2020_03_22_083458) do
     t.index ["work_id"], name: "index_creates_on_work_id"
   end
 
-  create_table "custom_labels", force: :cascade do |t|
-    t.integer "library_group_id", null: false
-    t.string "label"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["library_group_id"], name: "index_custom_labels_on_library_group_id"
-  end
-
-  create_table "custom_properties", force: :cascade do |t|
-    t.integer "resource_id", null: false
-    t.string "resource_type", null: false
-    t.integer "custom_label_id", null: false
-    t.text "value"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["custom_label_id"], name: "index_custom_properties_on_custom_label_id"
-  end
-
   create_table "demands", force: :cascade do |t|
     t.integer "user_id"
     t.integer "item_id"
@@ -662,6 +644,27 @@ ActiveRecord::Schema.define(version: 2020_03_22_083458) do
     t.index ["user_id"], name: "index_inventory_files_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 "item_has_use_restrictions", force: :cascade do |t|
     t.integer "item_id", null: false
     t.integer "use_restriction_id", null: false
@@ -802,8 +805,6 @@ ActiveRecord::Schema.define(version: 2020_03_22_083458) do
     t.integer "header_logo_file_size"
     t.datetime "header_logo_updated_at"
     t.text "header_logo_meta"
-    t.text "default_custom_manifestation_label"
-    t.text "default_custom_item_label"
     t.index ["short_name"], name: "index_library_groups_on_short_name"
     t.index ["user_id"], name: "index_library_groups_on_user_id"
   end
@@ -842,6 +843,27 @@ ActiveRecord::Schema.define(version: 2020_03_22_083458) do
     t.index ["user_id"], name: "index_manifestation_checkout_stats_on_user_id"
   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"
@@ -1050,9 +1072,7 @@ ActiveRecord::Schema.define(version: 2020_03_22_083458) 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"

data/spec/factories/item_custom_property.rb

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :item_custom_property do
+    sequence(:name){|n| "property_name_#{n}"}
+    sequence(:display_name){|n| "プロパティ名_#{n}"}
+  end
+end

data/spec/factories/item_custom_value.rb

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :item_custom_value do
+    association :item_custom_property
+    sequence(:value){|n| "value_#{n}"}
+  end
+end

data/spec/factories/manifestation_custom_property.rb

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :manifestation_custom_property do
+    sequence(:name){|n| "property_name_#{n}"}
+    sequence(:display_name){|n| "プロパティ名_#{n}"}
+  end
+end

data/spec/factories/manifestation_custom_value.rb

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :manifestation_custom_value do
+    association :manifestation_custom_property
+    sequence(:value){|n| "value_#{n}"}
+  end
+end

data/spec/fixtures/creates.yml

@@ -2,6 +2,7 @@
 create_00001: 
   updated_at: 2007-12-13 19:56:07.002082 +09:00
   agent_id: 1
+  create_type_id: 1
   id: 1
   work_id: 1
   position: 1
@@ -9,6 +10,7 @@ create_00001:
 create_00002: 
   updated_at: 2007-12-13 19:56:48.538796 +09:00
   agent_id: 1
+  create_type_id: 1
   id: 2
   work_id: 2
   position: 1

data/spec/fixtures/item_custom_properties.yml

@@ -0,0 +1,24 @@
+one:
+  id: 1
+  name: custom_1
+  display_name: "カスタム項目1"
+  position: 1
+
+two:
+  id: 2
+  name: custom_2
+  display_name: "カスタム項目1"
+  position: 2
+
+# == Schema Information
+#
+# Table name: item_custom_properties
+#
+#  id           :integer          not null, primary key
+#  name         :string           not null
+#  display_name :text             not null
+#  note         :text
+#  position     :integer          default(1), not null
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
+#

data/spec/fixtures/library_groups.yml

@@ -14,8 +14,6 @@ one:
     ::/0"
   user_id: 1
   pub_year_facet_range_interval: 10
-  default_custom_manifestation_label: "custom1\r\ncustom2\r\ncustom3"
-  default_custom_item_label: "custom1\r\ncustom2\r\ncustom3"
 
 # == Schema Information
 #

data/spec/fixtures/manifestation_custom_properties.yml

@@ -0,0 +1,24 @@
+one:
+  id: 1
+  name: custom_1
+  display_name: "カスタム項目1"
+  position: 1
+
+two:
+  id: 2
+  name: custom_2
+  display_name: "カスタム項目1"
+  position: 2
+
+# == Schema Information
+#
+# Table name: manifestation_custom_properties
+#
+#  id           :integer          not null, primary key
+#  name         :string           not null
+#  display_name :text             not null
+#  note         :text
+#  position     :integer          default(1), not null
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
+#

data/spec/fixtures/picture_files.yml

@@ -47,9 +47,7 @@ picture_file_00004:
 #  id                      :integer          not null, primary key
 #  picture_attachable_id   :integer
 #  picture_attachable_type :string
-#  content_type            :string
 #  title                   :text
-#  thumbnail               :string
 #  position                :integer
 #  created_at              :datetime
 #  updated_at              :datetime

data/spec/fixtures/produces.yml

@@ -3,6 +3,7 @@ produce_00001:
   updated_at: 2008-01-11 23:28:19.277110 +09:00
   manifestation_id: 1
   agent_id: 1
+  produce_type_id: 1
   id: 1
   position: 1
   created_at: 2008-01-11 23:28:19.277110 +09:00
@@ -10,6 +11,7 @@ produce_00002:
   updated_at: 2008-01-11 23:28:57.068191 +09:00
   manifestation_id: 2
   agent_id: 2
+  produce_type_id: 1
   id: 2
   position: 1
   created_at: 2008-01-11 23:28:57.068191 +09:00

data/spec/fixtures/realizes.yml

@@ -3,6 +3,7 @@ realize_00001:
   updated_at: 2008-01-11 23:28:19.277110 +09:00
   expression_id: 1
   agent_id: 1
+  realize_type_id: 1
   id: 1
   position: 1
   created_at: 2008-01-11 23:28:19.277110 +09:00
@@ -10,6 +11,7 @@ realize_00002:
   updated_at: 2008-01-11 23:28:57.068191 +09:00
   expression_id: 2
   agent_id: 2
+  realize_type_id: 1
   id: 2
   position: 2
   created_at: 2008-01-11 23:28:57.068191 +09:00

data/spec/models/item_custom_property_spec.rb

@@ -0,0 +1,18 @@
+require 'rails_helper'
+
+RSpec.describe ItemCustomProperty, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
+
+# == Schema Information
+#
+# Table name: item_custom_properties
+#
+#  id           :integer          not null, primary key
+#  name         :string           not null
+#  display_name :text             not null
+#  note         :text
+#  position     :integer          default(1), not null
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
+#

data/spec/models/item_custom_value_spec.rb

@@ -0,0 +1,17 @@
+require 'rails_helper'
+
+RSpec.describe ItemCustomValue, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
+
+# == Schema Information
+#
+# Table name: item_custom_values
+#
+#  id                      :integer          not null, primary key
+#  item_custom_property_id :integer          not null
+#  item_id                 :integer          not null
+#  value                   :text
+#  created_at              :datetime         not null
+#  updated_at              :datetime         not null
+#

data/spec/models/manifestation_custom_property_spec.rb

@@ -0,0 +1,18 @@
+require 'rails_helper'
+
+RSpec.describe ManifestationCustomProperty, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
+
+# == Schema Information
+#
+# Table name: manifestation_custom_properties
+#
+#  id           :integer          not null, primary key
+#  name         :string           not null
+#  display_name :text             not null
+#  note         :text
+#  position     :integer          default(1), not null
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
+#

data/spec/models/manifestation_custom_value_spec.rb

@@ -0,0 +1,17 @@
+require 'rails_helper'
+
+RSpec.describe ManifestationCustomValue, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
+
+# == Schema Information
+#
+# Table name: manifestation_custom_values
+#
+#  id                               :integer          not null, primary key
+#  manifestation_custom_property_id :integer          not null
+#  manifestation_id                 :integer          not null
+#  value                            :text
+#  created_at                       :datetime         not null
+#  updated_at                       :datetime         not null
+#

data/spec/models/manifestation_spec.rb

@@ -261,7 +261,7 @@ describe Manifestation, solr: true do
       lines = Manifestation.export()
       csv = CSV.parse(lines, headers: true, col_sep: "\t")
       m = csv.find{|row| row["manifestation_id"].to_i == manifestation.id }
-      expect(m["isbn"]).to eq "9784043898039//9784840239219"
+      expect(m["identifier:isbn"]).to eq "9784043898039//9784840239219"
     end
 
     it "should respect the role of the user" do
@@ -292,6 +292,21 @@ describe Manifestation, solr: true do
       expect(m["note"]).to eq "test\ntest"
       expect(m["item_note"]).to eq "test\ntest"
     end
+
+    it 'should export custom properties"' do
+      item = FactoryBot.create(:item)
+      item.item_custom_values << FactoryBot.build(:item_custom_value)
+      item.manifestation.manifestation_custom_values << FactoryBot.build(:manifestation_custom_value)
+      lines = Manifestation.export(role: 'Librarian')
+      csv = CSV.parse(lines, headers: true, col_sep: "\t")
+      m = csv.find{|row| row["manifestation_id"].to_i == item.manifestation.id }
+      item.item_custom_values.each do |custom_value|
+        expect(m["item:#{custom_value.item_custom_property.name}"]).to eq custom_value.value
+      end
+      item.manifestation.manifestation_custom_values.each do |custom_value|
+        expect(m["manifestation:#{custom_value.manifestation_custom_property.name}"]).to eq custom_value.value
+      end
+    end
   end
 end
 

data/spec/models/picture_file_spec.rb

@@ -12,9 +12,7 @@ end
 #  id                      :integer          not null, primary key
 #  picture_attachable_id   :integer
 #  picture_attachable_type :string
-#  content_type            :string
 #  title                   :text
-#  thumbnail               :string
 #  position                :integer
 #  created_at              :datetime
 #  updated_at              :datetime

data/spec/models/resource_export_file_spec.rb

@@ -26,10 +26,10 @@ describe ResourceExportFile do
     expect(columns).to include "item_price"
   end
 
-  it "should export NCID value" do
+  it "should export custom identifier's value" do
     manifestation = FactoryBot.create(:manifestation)
-    ncid = IdentifierType.find_by(name: "ncid")
-    identifier = FactoryBot.create(:identifier, identifier_type: ncid, body: "BA91833159")
+    custom = IdentifierType.find_by(name: "custom")
+    identifier = FactoryBot.create(:identifier, identifier_type: custom, body: "a11223344")
     export_file = ResourceExportFile.new
     export_file.user = users(:admin)
     export_file.save!
@@ -37,8 +37,8 @@ describe ResourceExportFile do
     file = export_file.resource_export
     expect(file).to be_truthy
     lines = File.open(file.path).readlines.map(&:chomp)
-    expect(lines.first.split(/\t/)).to include "ncid"
-    expect(lines.last.split(/\t/)).to include "BA91833159"
+    expect(lines.first.split(/\t/)).to include "identifier:custom"
+    expect(lines.last.split(/\t/)).to include "a11223344"
   end
 
   it "should export carrier_type" do
@@ -50,9 +50,7 @@ describe ResourceExportFile do
     export_file.save!
     export_file.export!
     file = export_file.resource_export
-    expect(file).to be_truthy
-    csv = CSV.open(file.path, {headers: true, col_sep: "\t"})
-    csv.each do |row|
+    CSV.open(file.path, {headers: true, col_sep: "\t"}).each do |row|
       expect(row).to have_key "carrier_type"
       case row["manifestation_id"].to_i
       when 1
@@ -62,6 +60,61 @@ describe ResourceExportFile do
       end
     end
   end
+
+  it "should export create_type, realize_type and produce_type" do
+    export_file = ResourceExportFile.new
+    export_file.user = users(:admin)
+    export_file.save!
+    export_file.export!
+    file = export_file.resource_export
+    CSV.open(file.path, {headers: true, col_sep: "\t"}).each do |row|
+      manifestation = Manifestation.find(row['manifestation_id'])
+      manifestation.creates.each do |create|
+        if create.create_type
+          expect(row['creator']).to match "#{create.agent.full_name}||#{create.create_type.name}"
+        end
+      end
+
+      manifestation.realizes.each do |realize|
+        if realize.realize_type
+          expect(row['contributor']).to match "#{realize.agent.full_name}||#{realize.realize_type.name}"
+        end
+      end
+
+      manifestation.produces.each do |produce|
+        if produce.produce_type
+          expect(row['publisher']).to match "#{produce.agent.full_name}||#{produce.produce_type.name}"
+        end
+      end
+    end
+  end
+
+  it "should export custom properties" do
+    item = FactoryBot.create(:item)
+    3.times do
+      item.manifestation.manifestation_custom_values << FactoryBot.build(:manifestation_custom_value)
+    end
+    3.times do
+      item.item_custom_values << FactoryBot.build(:item_custom_value)
+    end
+    export_file = ResourceExportFile.new
+    export_file.user = users(:admin)
+    export_file.save!
+    export_file.export!
+    file = export_file.resource_export
+    CSV.open(file.path, {headers: true, col_sep: "\t"}).each do |row|
+      if row['manifestation_id'] == item.manifestation.id
+        item.manifestation_custom_values.each do |value|
+          expect(row).to have_key "manifestation:#{value.manifestation_custom_property.name}"
+          expect(row["manifestation:#{value.manifestation_custom_property.name}"]).to eq value
+        end
+        item.item_custom_values.each do |value|
+          expect(row).to have_key "item:#{value.item_custom_property.name}"
+          expect(row["item:#{value.item_custom_property.name}"]).to eq value
+        end
+      end
+    end
+  end
 end
 
 # == Schema Information