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

data/spec/dummy/public/500.html

@@ -20,6 +20,7 @@
   <!-- This file lives in public/500.html -->
   <div class="dialog">
     <h1>We're sorry, but something went wrong.</h1>
+    <p>We've been notified about this issue and we'll take a look at it shortly.</p>
   </div>
 </body>
 </html>

data/spec/factories/custom_property.rb

@@ -0,0 +1,18 @@
+FactoryBot.define do
+  factory :custom_property do
+    sequence(:label){|n| "custom property #{n}"}
+    sequence(:value){|n| "カスタム項目 #{n}"}
+  end
+
+  factory :manifestation_custom_property, class: CustomProperty do
+    association :resource, factory: :manifestation
+    sequence(:label){|n| "custom property #{n}"}
+    sequence(:value){|n| "カスタム項目 #{n}"}
+  end
+
+  factory :item_custom_property, class: CustomProperty do
+    association :resource, factory: :item
+    sequence(:label){|n| "custom property #{n}"}
+    sequence(:value){|n| "カスタム項目 #{n}"}
+  end
+end

data/spec/factories/series_statement.rb

@@ -2,9 +2,10 @@ FactoryBot.define do
   factory :series_statement do |f|
     f.sequence(:original_title){|n| "series_statement_#{n}"}
   end
-  factory :series_statement_serial, class: SeriesStatement do |f|
-    f.sequence(:original_title){|n| "series_statement_serial_#{n}" }
+  factory :series_statement_serial, class: SeriesStatement do
+    sequence(:original_title){|n| "series_statement_serial_#{n}" }
+    sequence(:creator_string){|n| "シリーズの著者 #{n}" }
     #f.root_manifestation_id{FactoryBot.create(:manifestation_serial).id}
-    f.series_master{true}
+    series_master{true}
   end
 end

data/spec/fixtures/agents.yml

@@ -290,7 +290,6 @@ agent_00202:
 #  full_name_alternative               :text
 #  created_at                          :datetime
 #  updated_at                          :datetime
-#  deleted_at                          :datetime
 #  zip_code_1                          :string
 #  zip_code_2                          :string
 #  address_1                           :text

data/spec/fixtures/bookstores.yml

@@ -3,7 +3,6 @@ bookstore_00001:
   name: unknown
   fax_number: 
   updated_at: 2008-02-10 11:14:57.605329 +09:00
-  deleted_at: 
   telephone_number: 
   id: 1
   note: ""
@@ -16,7 +15,6 @@ bookstore_00002:
 
   fax_number: ""
   updated_at: 2008-02-10 12:15:14.840711 +09:00
-  deleted_at: 
   telephone_number: ""
   id: 2
   note: ""
@@ -29,7 +27,6 @@ bookstore_00003:
 
   fax_number: ""
   updated_at: 2008-02-10 12:15:33.555463 +09:00
-  deleted_at: 
   telephone_number: ""
   id: 3
   note: ""
@@ -42,7 +39,6 @@ bookstore_00004:
 
   fax_number: ""
   updated_at: 2008-02-10 12:16:07.726445 +09:00
-  deleted_at: 
   telephone_number: ""
   id: 4
   note: ""
@@ -55,7 +51,6 @@ bookstore_00005:
 
   fax_number: ""
   updated_at: 2008-02-10 12:16:17.990285 +09:00
-  deleted_at: 
   telephone_number: ""
   id: 5
   note: ""
@@ -68,7 +63,6 @@ bookstore_00006:
 
   fax_number: ""
   updated_at: 2008-02-10 12:16:25.906073 +09:00
-  deleted_at: 
   telephone_number: ""
   id: 6
   note: ""
@@ -79,7 +73,6 @@ bookstore_00007:
   name: Example store
   fax_number: ""
   updated_at: 2008-02-10 12:16:25.906073 +09:00
-  deleted_at: 
   telephone_number: ""
   id: 7
   note: ""
@@ -100,7 +93,6 @@ bookstore_00007:
 #  fax_number       :string(255)
 #  url              :string(255)
 #  position         :integer
-#  deleted_at       :datetime
 #  created_at       :datetime
 #  updated_at       :datetime
 #

data/spec/fixtures/budget_types.yml

@@ -2,14 +2,14 @@
 
 public_fund:
   name: Public fund
-  display_name: Public fund
+  display_name_translations: {"en": "Public fund", "ja": "公的資金"}
   note: 
   position: 1
   id: 1
 
 donation:
   name: Donation
-  display_name: Donation
+  display_name_translations: {"en": "Donation", "ja": "寄贈"}
   note: 
   position: 2
   id: 2
@@ -18,12 +18,13 @@ donation:
 #
 # Table name: budget_types
 #
-#  id           :integer         not null, primary key
-#  name         :string(255)
-#  display_name :text
-#  note         :text
-#  position     :integer
-#  created_at   :datetime
-#  updated_at   :datetime
+#  id                        :bigint           not null, primary key
+#  name                      :string
+#  display_name              :text
+#  note                      :text
+#  position                  :integer
+#  created_at                :datetime         not null
+#  updated_at                :datetime         not null
+#  display_name_translations :jsonb            not null
 #
 

data/spec/fixtures/events.yml

@@ -5,7 +5,6 @@ event_00001:
   end_at: 2008-01-14 02:54:00 +09:00
   name: 仕事始め
   display_name: 仕事始め
-  deleted_at: 
   start_at: 2008-01-13 02:54:00 +09:00
   id: 1
   note: なんとかかんとか
@@ -17,7 +16,6 @@ event_00002:
   end_at: 2008-01-14 02:54:00 +09:00
   name: テスト
   display_name: テスト
-  deleted_at: 
   start_at: 2008-01-13 02:54:00 +09:00
   id: 2
   note: テスト用のイベントです。
@@ -29,7 +27,6 @@ event_00003:
   end_at: 2008-02-05 00:00:00 +09:00
   name: ミーティング
   display_name: ミーティング
-  deleted_at: 
   start_at: 2008-01-13 00:00:00 +09:00
   id: 3
   note: ""
@@ -41,7 +38,6 @@ event_00004:
   end_at: 2008-02-06 00:00:00 +09:00
   name: テスト
   display_name: テスト
-  deleted_at: 
   start_at: 2008-02-05 00:00:00 +09:00
   id: 4
   note: なんとかかんとか
@@ -53,7 +49,6 @@ event_00005:
   end_at: 2008-02-08 00:00:00 +09:00
   name: test
   display_name: test
-  deleted_at: 
   start_at: 2008-02-05 00:00:00 +09:00
   id: 5
   note: ""
@@ -65,7 +60,6 @@ event_00006:
   end_at: 2008-02-08 00:00:00 +09:00
   name: なんとかかんとか
   display_name: なんとかかんとか
-  deleted_at: 
   start_at: 2008-02-05 00:00:00 +09:00
   id: 6
   note: ""
@@ -77,7 +71,6 @@ event_00007:
   end_at: 2008-02-08 00:00:00 +09:00
   name: test
   display_name: test
-  deleted_at: 
   start_at: 2008-02-05 00:00:00 +09:00
   id: 7
   note: test
@@ -89,7 +82,6 @@ event_00008:
   end_at: 2008-02-05 15:00:00 +09:00
   name: test
   display_name: test
-  deleted_at: 
   start_at: 2008-02-05 15:00:00 +09:00
   id: 8
   note: test
@@ -108,7 +100,6 @@ event_00008:
 #  start_at          :datetime
 #  end_at            :datetime
 #  all_day           :boolean         default(FALSE), not null
-#  deleted_at        :datetime
 #  created_at        :datetime
 #  updated_at        :datetime
 #  display_name      :text

data/spec/fixtures/items.yml

@@ -231,7 +231,7 @@ item_00021:
   include_supplements: false
   created_at: 2007-08-24 23:46:20.484813 +09:00
 item_00022: 
-  updated_at: 2007-08-24 23:46:20.484813 +09:00
+  updated_at: 2007-08-24 23:46:21.484813 +09:00
   item_identifier: '00022'
   circulation_status_id: 2
   checkout_type_id: 3
@@ -240,9 +240,9 @@ item_00022:
   manifestation_id: 11
   id: 22
   include_supplements: false
-  created_at: 2007-08-24 23:46:20.484813 +09:00
+  created_at: 2007-08-24 23:46:21.484813 +09:00
 item_00023: 
-  updated_at: 2007-08-24 23:46:20.484813 +09:00
+  updated_at: 2007-08-24 23:46:22.484813 +09:00
   item_identifier: '00023'
   circulation_status_id: 16
   checkout_type_id: 3
@@ -251,9 +251,9 @@ item_00023:
   manifestation_id: 11
   id: 23
   include_supplements: false
-  created_at: 2007-08-24 23:46:20.484813 +09:00
+  created_at: 2007-08-24 23:46:22.484813 +09:00
 item_00024: 
-  updated_at: 2007-08-24 23:46:08.607081 +09:00
+  updated_at: 2007-08-24 23:46:23.607081 +09:00
   item_identifier: '00024'
   circulation_status_id: 2
   checkout_type_id: 1
@@ -262,10 +262,10 @@ item_00024:
   manifestation_id: 102
   id: 24
   include_supplements: false
-  created_at: 2007-08-24 23:46:08.607081 +09:00
-  acquired_at: 2015-08-25 23:46:08.607081 +09:00
+  created_at: 2007-08-24 23:23:08.607081 +09:00
+  acquired_at: 2015-08-25 23:23:08.607081 +09:00
 item_00025: 
-  updated_at: 2007-08-24 23:46:08.607081 +09:00
+  updated_at: 2007-08-24 23:46:24.607081 +09:00
   item_identifier: '00025'
   circulation_status_id: 2
   checkout_type_id: 1
@@ -274,8 +274,8 @@ item_00025:
   manifestation_id: 102
   id: 25
   include_supplements: false
-  created_at: 2007-08-24 23:46:08.607081 +09:00
-  acquired_at: 2015-09-25 23:46:08.607081 +09:00
+  created_at: 2007-08-24 23:46:24.607081 +09:00
+  acquired_at: 2015-09-25 23:46:24.607081 +09:00
 
 # == Schema Information
 #
@@ -286,7 +286,6 @@ item_00025:
 #  item_identifier         :string
 #  created_at              :datetime
 #  updated_at              :datetime
-#  deleted_at              :datetime
 #  shelf_id                :integer          default(1), not null
 #  include_supplements     :boolean          default(FALSE), not null
 #  note                    :text

data/spec/fixtures/library_groups.yml

@@ -15,25 +15,25 @@ one:
     "ja":"[Next-L Enju Leaf __VERSION__](https://github.com/next-l/enju_leaf), オープンソース統合図書館システム | [このシステムについて](/page/about) | [不具合を報告する](https://github.com/next-l/enju_leaf/issues) | [マニュアル](https://next-l.github.io/manual/1.3/)"}
   admin_networks: "0.0.0.0/0\r\n\
     ::/0"
-  user_id: 1
+  email: library@example.jp
   pub_year_facet_range_interval: 10
 
 # == Schema Information
 #
 # Table name: library_groups
 #
-#  id                            :integer          not null, primary key
+#  id                            :bigint           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
+#  created_at                    :datetime         not null
+#  updated_at                    :datetime         not null
 #  admin_networks                :text
+#  allow_bookmark_external_url   :boolean          default(FALSE), not null
 #  url                           :string           default("http://localhost:3000/")
 #  settings                      :text
 #  html_snippet                  :text
@@ -42,14 +42,9 @@ one:
 #  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         :bigint
-#  header_logo_updated_at        :datetime
-#  header_logo_meta              :text
 #  display_name_translations     :jsonb            not null
 #  login_banner_translations     :jsonb            not null
 #  footer_banner_translations    :jsonb            not null
+#  email                         :string
 #

data/spec/fixtures/manifestations.yml

@@ -1841,7 +1841,6 @@ manifestation_00217:
 #  date_copyrighted                :datetime
 #  created_at                      :datetime
 #  updated_at                      :datetime
-#  deleted_at                      :datetime
 #  access_address                  :string
 #  language_id                     :integer          default(1), not null
 #  carrier_type_id                 :integer          default(1), not null

data/spec/models/agent_spec.rb

@@ -87,7 +87,6 @@ end
 #  full_name_alternative               :text
 #  created_at                          :datetime
 #  updated_at                          :datetime
-#  deleted_at                          :datetime
 #  zip_code_1                          :string
 #  zip_code_2                          :string
 #  address_1                           :text

data/spec/models/custom_property_spec.rb

@@ -0,0 +1,18 @@
+require 'rails_helper'
+
+RSpec.describe CustomProperty, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
+
+# == Schema Information
+#
+# Table name: custom_properties
+#
+#  id            :bigint           not null, primary key
+#  resource_id   :integer          not null
+#  resource_type :string           not null
+#  label         :text             not null
+#  value         :text
+#  created_at    :datetime         not null
+#  updated_at    :datetime         not null
+#

data/spec/models/item_spec.rb

@@ -18,7 +18,6 @@ end
 #  item_identifier         :string
 #  created_at              :datetime
 #  updated_at              :datetime
-#  deleted_at              :datetime
 #  shelf_id                :integer          default(1), not null
 #  include_supplements     :boolean          default(FALSE), not null
 #  note                    :text

data/spec/models/manifestation_spec.rb

@@ -227,8 +227,8 @@ describe Manifestation, solr: true do
       csv["item_id"].compact.should_not be_empty
       csv["item_created_at"].compact.should_not be_empty
       csv["item_updated_at"].compact.should_not be_empty
-      csv["subject:unknown"].compact.should eq manifestations(:manifestation_00001).items.count.times.map{"next-l"}
-      csv["classification:ndc9"].compact.should eq manifestations(:manifestation_00001).items.count.times.map{"400"}
+      csv["subject:unknown"].compact.inject(0){|count, a| count += 1 if a == 'next-l'; count}.should eq manifestations(:manifestation_00001).items.count
+      csv["classification:ndc9"].compact.inject(0){|count, a| count += 1 if a == '400'; count}.should eq manifestations(:manifestation_00001).items.count
       csv["extent"].compact.should_not be_empty
       csv["dimensions"].compact.should_not be_empty
     end
@@ -274,13 +274,13 @@ describe Manifestation, solr: true do
 
     it "should respect the role of the user" do
       FactoryBot.create(:item, bookstore_id: 1, price: 100, budget_type_id: 1)
-      lines = Manifestation.export
+      lines = Manifestation.export(role: 'Guest')
       csv = CSV.parse(lines, headers: true, col_sep: "\t")
       expect(csv["bookstore"].compact).to be_empty
       expect(csv["item_price"].compact).to be_empty
       expect(csv["budget_type"].compact).to be_empty
 
-      lines = Manifestation.export(format: :txt, role: :Librarian)
+      lines = Manifestation.export(role: 'Librarian')
       csv = CSV.parse(lines, headers: true, col_sep: "\t")
       expect(csv["bookstore"].compact).not_to be_empty
       expect(csv["item_price"].compact).not_to be_empty
@@ -296,9 +296,34 @@ describe Manifestation, solr: true do
       expect(csv["note"].compact).not_to be_empty
       expect(csv["item_note"].compact).not_to be_empty
       m = csv.find{|row| row["manifestation_id"].to_i == manifestation.id }
-      expect(m["description"]).to eq 'test\ntest'
-      expect(m["note"]).to eq 'test\ntest'
-      expect(m["item_note"]).to eq 'test\ntest'
+      expect(m["description"]).to eq "test\ntest"
+      expect(m["note"]).to eq "test\ntest"
+      expect(m["item_note"]).to eq "test\ntest"
+    end
+
+    it 'should export custom properties with Librarian role' 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
+
+      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
     end
   end
 end
@@ -317,7 +342,6 @@ end
 #  date_copyrighted                :datetime
 #  created_at                      :datetime
 #  updated_at                      :datetime
-#  deleted_at                      :datetime
 #  access_address                  :string
 #  language_id                     :integer          default(1), not null
 #  carrier_type_id                 :integer          default(1), not null