enju_biblio 0.3.8 → 0.3.10

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
@@ -717,17 +723,20 @@ describe ManifestationsController do
           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', 'テスト']
+        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
 
@@ -754,18 +763,6 @@ describe ManifestationsController do
           }
           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/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"
@@ -433,15 +433,6 @@ ActiveRecord::Schema.define(version: 2019_12_19_122214) do
     t.index ["work_id"], name: "index_creates_on_work_id"
   end
 
-  create_table "custom_properties", force: :cascade do |t|
-    t.integer "resource_id", null: false
-    t.string "resource_type", null: false
-    t.text "label", null: false
-    t.text "value"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-  end
-
   create_table "demands", force: :cascade do |t|
     t.integer "user_id"
     t.integer "item_id"
@@ -653,6 +644,27 @@ ActiveRecord::Schema.define(version: 2019_12_19_122214) 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
@@ -831,6 +843,27 @@ ActiveRecord::Schema.define(version: 2019_12_19_122214) 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"
@@ -1039,9 +1072,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"

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

@@ -13,24 +13,38 @@ one:
   admin_networks: "0.0.0.0/0\r\n\
     ::/0"
   user_id: 1
-  max_number_of_results: 200
-  family_name_first: true
+  pub_year_facet_range_interval: 10
 
 # == Schema Information
 #
 # Table name: library_groups
 #
-#  id             :integer          not null, primary key
-#  name           :string(255)      not null
-#  display_name   :text
-#  short_name     :string(255)      not null
-#  my_networks    :text
-#  login_banner   :text
-#  note           :text
-#  country_id     :integer
-#  position       :integer
-#  created_at     :datetime         not null
-#  updated_at     :datetime         not null
-#  admin_networks :text
-#  url            :string(255)      default("http://localhost:3000/")
+#  id                            :integer          not null, primary key
+#  name                          :string           not null
+#  display_name                  :text
+#  short_name                    :string           not null
+#  my_networks                   :text
+#  old_login_banner              :text
+#  note                          :text
+#  country_id                    :integer
+#  position                      :integer
+#  created_at                    :datetime
+#  updated_at                    :datetime
+#  admin_networks                :text
+#  allow_bookmark_external_url   :boolean          default(FALSE), not null
+#  url                           :string           default("http://localhost:3000/")
+#  settings                      :text
+#  html_snippet                  :text
+#  book_jacket_source            :string
+#  max_number_of_results         :integer          default(500)
+#  family_name_first             :boolean          default(TRUE)
+#  screenshot_generator          :string
+#  pub_year_facet_range_interval :integer          default(10)
+#  user_id                       :integer
+#  csv_charset_conversion        :boolean          default(FALSE), not null
+#  header_logo_file_name         :string
+#  header_logo_content_type      :string
+#  header_logo_file_size         :integer
+#  header_logo_updated_at        :datetime
+#  header_logo_meta              :text
 #

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/fixtures/resource_import_results.yml

@@ -5,14 +5,14 @@ one:
   resource_import_file_id: 1
   manifestation_id: 1
   item_id: 1
-  body: MyText
+  body: "original_title\tmanifestation_id"
 
 two:
   id: 2
   resource_import_file_id: 1
   manifestation_id: 1
   item_id: 1
-  body: MyText
+  body: "MyText\t10"
 
 # == Schema Information
 #

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
@@ -293,29 +293,19 @@ describe Manifestation, solr: true do
       expect(m["item_note"]).to eq "test\ntest"
     end
 
-    it 'should export custom properties with Librarian role' do
+    it 'should export custom properties"' do
       item = FactoryBot.create(:item)
-      item.manifestation.custom_properties << FactoryBot.build(:custom_property, label: 'テスト項目1', value: 'テスト')
-      2.times do
-        item.custom_properties << FactoryBot.build(:custom_property, label: 'テスト項目2', value: 'test')
-      end
-
+      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 }
-      expect(m['manifestation_custom_property_1']).to eq 'テスト項目1: テスト'
-      expect(m['item_custom_property_2']).to eq 'テスト項目2: test'
-    end
-
-    it 'should not export custom properties with User role' do
-      item = FactoryBot.create(:item)
-      item.manifestation.custom_properties << FactoryBot.build(:custom_property, label: 'テスト項目1', value: 'テスト')
-      item.custom_properties << FactoryBot.build(:custom_property, label: 'テスト項目2', value: 'test')
-
-      lines = Manifestation.export(role: 'User')
-      csv = CSV.parse(lines, headers: true, col_sep: "\t")
-      expect(csv['manifestation_custom_property_1'].compact).to be_empty
-      expect(csv['item_custom_property_2'].compact).to be_empty
+      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