enju_biblio 0.3.10.rc.1 → 0.3.12

data/spec/controllers/manifestations_controller_spec.rb

@@ -58,25 +58,6 @@ describe ManifestationsController do
         expect(response).to render_template('manifestations/index')
       end
 
-      it 'assigns all manifestations as @manifestations in sru format without operation' do
-        get :index, format: 'sru'
-        assert_response :success
-        expect(assigns(:manifestations)).to be_nil
-        expect(response).to render_template('manifestations/explain')
-      end
-
-      it 'assigns all manifestations as @manifestations in sru format with operation' do
-        get :index, params: { format: 'sru', operation: 'searchRetrieve', query: 'ruby' }
-        expect(assigns(:manifestations)).to_not be_nil
-        expect(response).to render_template('manifestations/index')
-      end
-
-      it 'assigns all manifestations as @manifestations in sru format with operation and title' do
-        get :index, params: { format: 'sru', query: 'title=ruby', operation: 'searchRetrieve' }
-        expect(assigns(:manifestations)).to_not be_nil
-        expect(response).to render_template('manifestations/index')
-      end
-
       it 'assigns all manifestations as @manifestations in openurl' do
         get :index, params: { api: 'openurl', title: 'ruby' }
         expect(assigns(:manifestations)).to_not be_nil

data/spec/dummy/db/schema.rb

@@ -1072,9 +1072,7 @@ ActiveRecord::Schema.define(version: 2020_04_25_074822) 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/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

@@ -14,11 +14,11 @@ two:
 #
 # Table name: item_custom_properties
 #
-#  id                        :bigint           not null, primary key
-#  name                      :string           not null
-#  display_name :jsonb            not null
-#  note                      :text
-#  position                  :integer          default(1), not null
-#  created_at                :datetime         not null
-#  updated_at                :datetime         not null
+#  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/manifestation_custom_properties.yml

@@ -14,11 +14,11 @@ two:
 #
 # Table name: manifestation_custom_properties
 #
-#  id                        :bigint           not null, primary key
-#  name                      :string           not null
-#  display_name :jsonb            not null
-#  note                      :text
-#  position                  :integer          default(1), not null
-#  created_at                :datetime         not null
-#  updated_at                :datetime         not null
+#  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

@@ -8,11 +8,11 @@ end
 #
 # Table name: item_custom_properties
 #
-#  id                        :bigint           not null, primary key
-#  name                      :string           not null
-#  display_name_translations :jsonb            not null
-#  note                      :text
-#  position                  :integer          default(1), not null
-#  created_at                :datetime         not null
-#  updated_at                :datetime         not null
+#  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

@@ -8,9 +8,9 @@ end
 #
 # Table name: item_custom_values
 #
-#  id                      :bigint           not null, primary key
-#  item_custom_property_id :bigint           not null
-#  item_id                 :bigint           not null
+#  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

@@ -8,11 +8,11 @@ end
 #
 # Table name: manifestation_custom_properties
 #
-#  id                        :bigint           not null, primary key
-#  name                      :string           not null
-#  display_name_translations :jsonb            not null
-#  note                      :text
-#  position                  :integer          default(1), not null
-#  created_at                :datetime         not null
-#  updated_at                :datetime         not null
+#  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

@@ -8,9 +8,9 @@ end
 #
 # Table name: manifestation_custom_values
 #
-#  id                               :bigint           not null, primary key
-#  manifestation_custom_property_id :bigint           not null
-#  manifestation_id                 :bigint           not null
+#  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

@@ -98,71 +98,6 @@ describe Manifestation, solr: true do
     lambda{Openurl.new({aufirst: "テスト 名称"})}.should raise_error(OpenurlQuerySyntaxError)
   end
 
-  it "should search in sru" do
-    sru = Sru.new({query: "title=Ruby"})
-    sru.search
-    sru.manifestations.size.should eq 18
-    sru.manifestations.first.titles.first.should eq 'Ruby'
-    sru = Sru.new({query: "title=^ruby"})
-    sru.search
-    sru.manifestations.size.should eq 9
-    sru = Sru.new({query: 'title ALL "awk sed"'})
-    sru.search
-    sru.manifestations.size.should eq 2
-    sru.manifestations.collect{|m| m.id}.should eq [184, 116]
-    sru = Sru.new({query: 'title ANY "ruby awk sed"'})
-    sru.search
-    sru.manifestations.size.should eq 22
-    sru = Sru.new({query: 'isbn=9784756137470'})
-    sru.search
-    sru.manifestations.first.id.should eq 114
-    sru = Sru.new({query: "creator=テスト"})
-    sru.search
-    sru.manifestations.size.should eq 1
-  end
-
-  it "should search date in sru" do
-    sru = Sru.new({query: "from = 2000-09 AND until = 2000-11-01"})
-    sru.search
-    sru.manifestations.size.should eq 1
-    sru.manifestations.first.id.should eq 120
-    sru = Sru.new({query: "from = 1993-02-24"})
-    sru.search
-    sru.manifestations.size.should eq 5
-    sru = Sru.new({query: "until = 2006-08-06"})
-    sru.search
-    sru.manifestations.size.should eq 4
-  end
-
-  it "should accept sort_by in sru" do
-    sru = Sru.new({query: "title=Ruby"})
-    sru.sort_by.should eq({sort_by: 'created_at', order: 'desc'})
-    sru = Sru.new({query: 'title=Ruby AND sortBy="title/sort.ascending"', sortKeys: 'creator,0', version: '1.2'})
-    sru.sort_by.should eq({sort_by: 'sort_title', order: 'asc'})
-    sru = Sru.new({query: 'title=Ruby AND sortBy="title/sort.ascending"', sortKeys: 'creator,0', version: '1.1'})
-    sru.sort_by.should eq({sort_by: 'creator', order: 'desc'})
-    sru = Sru.new({query: 'title=Ruby AND sortBy="title/sort.ascending"', sortKeys: 'creator,1', version: '1.1'})
-    sru.sort_by.should eq({sort_by: 'creator', order: 'asc'})
-    sru = Sru.new({query: 'title=Ruby AND sortBy="title'})
-    sru.sort_by.should eq({sort_by: 'sort_title', order: 'asc'})
-    # TODO ソート基準が入手しやすさの場合の処理
-  end
-
-  it "should accept ranges in sru" do
-    sru = Sru.new({query: "from = 1993-02-24 AND until = 2006-08-06 AND title=プログラミング"})
-    sru.search
-    sru.manifestations.size.should eq 2
-    sru = Sru.new({query: "until = 2000 AND title=プログラミング"})
-    sru.search
-    sru.manifestations.size.should eq 1
-    sru = Sru.new({query: "from = 2006 AND title=プログラミング"})
-    sru.search
-    sru.manifestations.size.should eq 1
-    sru = Sru.new({query: "from = 2007 OR title=awk"})
-    sru.search
-    sru.manifestations.size.should eq 6
-  end
-
   it "should_get_number_of_pages" do
     manifestations(:manifestation_00001).number_of_pages.should eq 100
   end
@@ -261,7 +196,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

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

data/spec/models/resource_import_file_spec.rb

@@ -380,7 +380,11 @@ resource_import_file_test_description	test\\ntest	test\\ntest	test_description	t
       item_00003.include_supplements.should be_truthy
 
       Item.find_by(item_identifier: '00004').include_supplements.should be_falsy
-      Item.find_by(item_identifier: '00025').call_number.should eq "547|ヤ"
+
+      item_00025 = Item.find_by(item_identifier: '00025')
+      expect(item_00025.manifestation.original_title).to eq "テスト4"
+      expect(item_00025.manifestation.subjects.pluck(:term)).to eq ['test2', 'test3']
+      expect(item_00025.call_number).to eq "547|ヤ"
     end
 
     it "should update custom values", vcr: true do

data/spec/views/item_custom_properties/index.html.erb_spec.rb

@@ -17,6 +17,7 @@ RSpec.describe "item_custom_properties/index", type: :view do
   end
 
   it "renders a list of item_custom_properties" do
+    allow(view).to receive(:policy).and_return double(create?: true, update?: true, destroy?: true)
     render
     assert_select "tr>td", text: "name1".to_s, count: 1
     assert_select "tr>td", text: "MyText".to_s, count: 2

data/spec/views/items/index.json.jbuilder_spec.rb

@@ -0,0 +1,15 @@
+require "rails_helper.rb"
+
+describe "items/index.json.jbuilder", solr: true do
+  before(:each) do
+    item = FactoryBot.create(:item)
+    @items = assign(:items, [item] )
+  end
+
+  it "should export JSON format" do
+    params[:format] = "json"
+    render
+    expect(rendered).not_to match(/memo/)
+  end
+end
+

data/spec/views/items/show.json.jbuilder_spec.rb

@@ -0,0 +1,15 @@
+require 'rails_helper'
+
+describe "items/show.json.jbuilder" do
+  fixtures :all
+
+  before(:each) do
+    assign(:item, FactoryBot.create(:item))
+  end
+
+  it "renders a template" do
+    render
+    expect(rendered).to match(/item_identifier/)
+    expect(rendered).not_to match(/memo/)
+  end
+end