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

data/spec/rails_helper.rb

@@ -16,7 +16,7 @@ require 'spec_helper'
 require 'rspec/rails'
 # Add additional requires below this line. Rails is not loaded until this point!
 require 'vcr'
-require 'factory_bot'
+require 'factory_bot_rails'
 require 'rspec/active_model/mocks'
 require 'pundit/rspec'
 require "capybara/rspec"
@@ -74,5 +74,5 @@ RSpec.configure do |config|
   end
 end
 
-FactoryBot.definition_file_paths << "#{::Rails.root}/../../spec/factories"
-FactoryBot.find_definitions
+#FactoryBot.definition_file_paths << "#{::Rails.root}/../../spec/factories"
+#FactoryBot.find_definitions

data/spec/system/custom_properties_spec.rb

@@ -0,0 +1,84 @@
+require 'rails_helper'
+
+RSpec.describe 'CustomProperties', type: :system do
+  include Devise::Test::IntegrationHelpers
+  fixtures :all
+
+  describe 'Manifestation' do
+    before do
+      @manifestation = FactoryBot.create(:manifestation_custom_property).resource
+      CarrierType.find_by(name: 'volume').update(attachment: File.open("#{Rails.root.to_s}/../../app/assets/images/icons/book.png"))
+    end
+
+    describe 'When logged in as Librarian' do
+      before do
+        sign_in users(:librarian1)
+      end
+
+      it 'should show custom property' do
+        visit manifestation_path(@manifestation.id, locale: :ja)
+        expect(page).to have_content @manifestation.custom_properties.first.label
+        expect(page).to have_content @manifestation.custom_properties.first.value
+      end
+    end
+
+    describe 'When logged in as User' do
+      before do
+        sign_in users(:user1)
+      end
+
+      it 'should not show custom property' do
+        visit manifestation_path(@manifestation.id, locale: :ja)
+        expect(page).not_to have_content @manifestation.custom_properties.first.label
+        expect(page).not_to have_content @manifestation.custom_properties.first.value
+      end
+    end
+
+    describe 'When not logged in' do
+      it 'should not show custom property' do
+        visit manifestation_path(@manifestation.id, locale: :ja)
+        expect(page).not_to have_content @manifestation.custom_properties.first.label
+        expect(page).not_to have_content @manifestation.custom_properties.first.value
+      end
+    end
+  end
+
+  describe 'Item' do
+    before do
+      @item = FactoryBot.create(:item_custom_property).resource
+      CarrierType.find_by(name: 'volume').update(attachment: File.open("#{Rails.root.to_s}/../../app/assets/images/icons/book.png"))
+    end
+
+    describe 'When logged in as Librarian' do
+      before do
+        sign_in users(:librarian1)
+      end
+
+      it 'should show custom property' do
+        visit item_path(@item.id, locale: :ja)
+        expect(page).to have_content @item.custom_properties.first.label
+        expect(page).to have_content @item.custom_properties.first.value
+      end
+    end
+
+    describe 'When logged in as User' do
+      before do
+        sign_in users(:user1)
+      end
+
+      it 'should not show custom property' do
+        visit item_path(@item.id, locale: :ja)
+        expect(page).not_to have_content @item.custom_properties.first.label
+        expect(page).not_to have_content @item.custom_properties.first.value
+      end
+    end
+
+    describe 'When not logged in' do
+      it 'should not show custom property' do
+        visit item_path(@item.id, locale: :ja)
+        expect(page).not_to have_content @item.custom_properties.first.label
+        expect(page).not_to have_content @item.custom_properties.first.value
+      end
+    end
+  end
+end

data/spec/system/items_spec.rb

@@ -19,6 +19,26 @@ RSpec.describe 'Manifestations', type: :system do
       visit item_path(@item.id, locale: :ja)
       expect(page).to have_content @item.memo
     end
+
+    it 'should show price' do
+      @item.update(price: '1500')
+      visit item_path(@item.id, locale: :ja)
+      expect(page).to have_content @item.price
+    end
+
+    it 'should show budget_type' do
+      budget_type = BudgetType.find(1)
+      @item.update(budget_type: budget_type)
+      visit item_path(@item.id, locale: :ja)
+      expect(page).to have_content budget_type.display_name_ja
+    end
+
+    it 'should show bookstore' do
+      bookstore = Bookstore.find(2)
+      @item.update(bookstore: bookstore)
+      visit item_path(@item.id, locale: :ja)
+      expect(page).to have_content bookstore.name
+    end
   end
 
   describe 'When logged in as User' do
@@ -31,6 +51,26 @@ RSpec.describe 'Manifestations', type: :system do
       visit item_path(@item.id, locale: :ja)
       expect(page).not_to have_content @item.memo
     end
+
+    it 'should not show price' do
+      @item.update(price: '1500')
+      visit item_path(@item.id, locale: :ja)
+      expect(page).not_to have_content @item.price
+    end
+
+    it 'should not show budget_type' do
+      budget_type = BudgetType.find(1)
+      @item.update(budget_type: budget_type)
+      visit item_path(@item.id, locale: :ja)
+      expect(page).not_to have_content budget_type.display_name
+    end
+
+    it 'should not show bookstore' do
+      bookstore = Bookstore.find(2)
+      @item.update(bookstore: bookstore)
+      visit item_path(@item.id, locale: :ja)
+      expect(page).not_to have_content bookstore.name
+    end
   end
 
   describe 'When not logged in' do
@@ -39,5 +79,25 @@ RSpec.describe 'Manifestations', type: :system do
       visit item_path(@item.id, locale: :ja)
       expect(page).not_to have_content @item.memo
     end
+
+    it 'should not show budget_type' do
+      budget_type = BudgetType.find(1)
+      @item.update(budget_type: budget_type)
+      visit item_path(@item.id, locale: :ja)
+      expect(page).not_to have_content budget_type.display_name
+    end
+
+    it 'should not show bookstore' do
+      bookstore = Bookstore.find(2)
+      @item.update(bookstore: bookstore)
+      visit item_path(@item.id, locale: :ja)
+      expect(page).not_to have_content bookstore.name
+    end
+
+    it 'should not show price' do
+      @item.update(price: '1500')
+      visit item_path(@item.id, locale: :ja)
+      expect(page).not_to have_content @item.price
+    end
   end
 end

data/spec/system/series_statements_spec.rb

@@ -0,0 +1,16 @@
+require 'rails_helper'
+
+RSpec.describe 'SeriesStatements', type: :system do
+  include Devise::Test::IntegrationHelpers
+  fixtures :all
+  before do
+    @series_statement = FactoryBot.create(:series_statement)
+  end
+
+  describe 'When not logged in' do
+    it 'should show default series_statement' do
+      visit series_statement_path(@series_statement.id, locale: :ja)
+      expect(page).to have_content @series_statement.creator_string
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+require "rails_helper.rb"
+
+describe "manifestations/index.json.jbuilder", solr: true do
+  before(:each) do
+    manifestation = FactoryBot.create(:manifestation)
+    @manifestations = assign(:manifestations, [manifestation] )
+    @library_group = LibraryGroup.first
+    @count = {query_result: Manifestation.search.total}
+    view.stub(:filtered_params).and_return(ActionController::Parameters.new(per_page: 50).permit([:per_page]))
+  end
+
+  it "should export JSON format" do
+    params[:format] = "json"
+    render
+    expect(JSON.parse(rendered)['total_count']).to eq Manifestation.search.total
+  end
+end
+

data/spec/views/manifestations/{index.txt.erb_spec.rb → index.txt.ruby_spec.rb}

@@ -1,6 +1,6 @@
 require "rails_helper.rb"
 
-describe "manifestations/index.txt.erb" do
+describe "manifestations/index.txt.ruby" do
   before(:each) do
     manifestation = FactoryBot.create(:manifestation)
     manifestation.items << FactoryBot.create(:item, bookstore_id: 1, budget_type_id: 1, price: 100)

data/spec/views/manifestations/{show.txt.erb_spec.rb → show.txt.ruby_spec.rb}

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe "manifestations/show.txt.erb" do
+describe "manifestations/show.txt.ruby" do
   fixtures :all
 
   before(:each) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_biblio
 version: !ruby/object:Gem::Version
-  version: 0.4.0.beta.2
+  version: 0.4.0.rc.1
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-10 00:00:00.000000000 Z
+date: 2020-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enju_library
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0.beta.3
+        version: 0.4.0.rc.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0.beta.3
+        version: 0.4.0.rc.1
 - !ruby/object:Gem::Dependency
   name: marc
   requirement: !ruby/object:Gem::Requirement
@@ -114,98 +114,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta.1
+        version: 2.0.0.rc.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta.1
+        version: 2.0.0.rc.1
 - !ruby/object:Gem::Dependency
   name: enju_manifestation_viewer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0.beta.1
+        version: 0.4.0.rc.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0.beta.1
+        version: 0.4.0.rc.1
 - !ruby/object:Gem::Dependency
   name: enju_message
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0.beta.1
+        version: 0.4.0.rc.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0.beta.1
+        version: 0.4.0.rc.1
 - !ruby/object:Gem::Dependency
   name: enju_subject
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0.beta.1
+        version: 0.4.0.rc.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0.beta.1
-- !ruby/object:Gem::Dependency
-  name: enju_bookmark
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.0.beta.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.0.beta.1
+        version: 0.4.0.rc.1
 - !ruby/object:Gem::Dependency
   name: enju_ndl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0.beta.1
+        version: 0.4.0.rc.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0.beta.1
-- !ruby/object:Gem::Dependency
-  name: enju_oai
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.0.beta.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.0.beta.1
+        version: 0.4.0.rc.1
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -226,14 +198,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
@@ -350,16 +322,16 @@ dependencies:
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -402,6 +374,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.2'
 description: Bibliographic record module for Next-L Enju
 email:
 - nabeta@fastmail.fm
@@ -482,6 +468,7 @@ files:
 - app/models/country.rb
 - app/models/create.rb
 - app/models/create_type.rb
+- app/models/custom_property.rb
 - app/models/doi_record.rb
 - app/models/donate.rb
 - app/models/form_of_work.rb
@@ -669,6 +656,7 @@ files:
 - app/views/import_requests/index.html.erb
 - app/views/import_requests/new.html.erb
 - app/views/import_requests/show.html.erb
+- app/views/items/_custom_property_fields.html.erb
 - app/views/items/_form.html.erb
 - app/views/items/_observe_field.html.erb
 - app/views/items/_shelf_picture.html+phone.erb
@@ -715,6 +703,7 @@ files:
 - app/views/manifestations/_colorbox.html.erb
 - app/views/manifestations/_contributor_fields.html.erb
 - app/views/manifestations/_creator_fields.html.erb
+- app/views/manifestations/_custom_property_fields.html.erb
 - app/views/manifestations/_edit_detail.html.erb
 - app/views/manifestations/_edition_and_number.html.erb
 - app/views/manifestations/_export_detail.html.erb
@@ -782,14 +771,14 @@ files:
 - app/views/manifestations/index.rdf.builder
 - app/views/manifestations/index.rss.builder
 - app/views/manifestations/index.sru.builder
-- app/views/manifestations/index.txt.erb
+- app/views/manifestations/index.txt.ruby
 - app/views/manifestations/new.html.erb
 - app/views/manifestations/show.html+phone.erb
 - app/views/manifestations/show.html.erb
 - app/views/manifestations/show.js.erb
 - app/views/manifestations/show.mods.builder
 - app/views/manifestations/show.rdf.builder
-- app/views/manifestations/show.txt.erb
+- app/views/manifestations/show.txt.ruby
 - app/views/medium_of_performances/_form.html.erb
 - app/views/medium_of_performances/edit.html.erb
 - app/views/medium_of_performances/index.html.erb
@@ -998,6 +987,7 @@ files:
 - db/migrate/20190712163038_add_display_name_translations_to_carrier_type.rb
 - db/migrate/20190818075603_add_memo_to_manifestation.rb
 - db/migrate/20190818075628_add_memo_to_item.rb
+- db/migrate/20191219122214_create_custom_properties.rb
 - lib/enju_biblio.rb
 - lib/enju_biblio/engine.rb
 - lib/enju_biblio/openurl.rb
@@ -1295,9 +1285,7 @@ files:
 - spec/dummy/db/migrate/20180107172413_add_constraints_to_most_recent_for_bookmark_stat_transitions.rb
 - spec/dummy/db/migrate/20180709023035_acts_as_taggable_on_migration.acts_as_taggable_on_engine.rb
 - spec/dummy/db/migrate/20180709023036_add_missing_unique_indices.acts_as_taggable_on_engine.rb
-- spec/dummy/db/migrate/20180709023037_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb
 - spec/dummy/db/migrate/20180709023038_add_missing_taggable_index.acts_as_taggable_on_engine.rb
-- spec/dummy/db/migrate/20180709023039_change_collation_for_tag_names.acts_as_taggable_on_engine.rb
 - spec/dummy/db/migrate/20180709023040_add_missing_indexes_on_taggings.acts_as_taggable_on_engine.rb
 - spec/dummy/db/migrate/20180709161346_add_created_at_to_tag.rb
 - spec/dummy/db/migrate/20181119170645_add_foreign_key_to_events_referencing_event_categories.rb
@@ -1308,6 +1296,7 @@ files:
 - spec/dummy/db/migrate/20190630151446_add_display_name_translations_to_role.rb
 - spec/dummy/db/migrate/20190630153136_add_display_name_translations_to_event.rb
 - spec/dummy/db/migrate/20190706052525_add_display_name_translations_to_circulation_status.rb
+- spec/dummy/db/migrate/20191216131755_add_email_to_library_group.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/public/404.html
@@ -1330,6 +1319,7 @@ files:
 - spec/factories/country.rb
 - spec/factories/create.rb
 - spec/factories/create_types.rb
+- spec/factories/custom_property.rb
 - spec/factories/donate.rb
 - spec/factories/form_of_work.rb
 - spec/factories/frequency.rb
@@ -1444,6 +1434,7 @@ files:
 - spec/models/country_spec.rb
 - spec/models/create_spec.rb
 - spec/models/create_type_spec.rb
+- spec/models/custom_property_spec.rb
 - spec/models/doi_record_spec.rb
 - spec/models/donate_spec.rb
 - spec/models/form_of_work_spec.rb
@@ -1504,8 +1495,10 @@ files:
 - spec/support/controller_macros.rb
 - spec/support/devise.rb
 - spec/support/vcr.rb
+- spec/system/custom_properties_spec.rb
 - spec/system/items_spec.rb
 - spec/system/manifestations_spec.rb
+- spec/system/series_statements_spec.rb
 - spec/views/agent_types/edit.html.erb_spec.rb
 - spec/views/agent_types/index.html.erb_spec.rb
 - spec/views/agent_types/new.html.erb_spec.rb
@@ -1524,10 +1517,11 @@ files:
 - spec/views/import_requests/show.html.erb_spec.rb
 - spec/views/items/index.html.erb_spec.rb
 - spec/views/manifestations/index.html.erb_spec.rb
+- spec/views/manifestations/index.json.jbuilder_spec.rb
 - spec/views/manifestations/index.rdf.builder_spec.rb
-- spec/views/manifestations/index.txt.erb_spec.rb
+- spec/views/manifestations/index.txt.ruby_spec.rb
 - spec/views/manifestations/show.html.erb_spec.rb
-- spec/views/manifestations/show.txt.erb_spec.rb
+- spec/views/manifestations/show.txt.ruby_spec.rb
 - spec/views/owns/edit.html.erb_spec.rb
 - spec/views/owns/index.html.erb_spec.rb
 - spec/views/owns/new.html.erb_spec.rb
@@ -1650,7 +1644,6 @@ test_files:
 - spec/dummy/db/migrate/20130504195916_add_subject_heading_type_id_to_subject.rb
 - spec/dummy/db/migrate/20081220023628_create_user_reserve_stats.rb
 - spec/dummy/db/migrate/035_create_reserves.rb
-- spec/dummy/db/migrate/20180709023039_change_collation_for_tag_names.acts_as_taggable_on_engine.rb
 - spec/dummy/db/migrate/20090519203307_create_participates.rb
 - spec/dummy/db/migrate/20160610093229_add_html_snippet_to_library_group.rb
 - spec/dummy/db/migrate/20190630151446_add_display_name_translations_to_role.rb
@@ -1759,6 +1752,7 @@ test_files:
 - spec/dummy/db/migrate/20160703184747_add_most_recent_to_user_checkout_stat_transitions.rb
 - spec/dummy/db/migrate/20140812152348_create_event_export_files.rb
 - spec/dummy/db/migrate/055_create_bookmarks.rb
+- spec/dummy/db/migrate/20191216131755_add_email_to_library_group.rb
 - spec/dummy/db/migrate/20120129014038_create_budget_types.rb
 - spec/dummy/db/migrate/20180107172413_add_constraints_to_most_recent_for_bookmark_stat_transitions.rb
 - spec/dummy/db/migrate/20140528045617_create_manifestation_reserve_stat_transitions.rb
@@ -1785,7 +1779,6 @@ test_files:
 - spec/dummy/db/migrate/20180107161951_add_constraints_to_most_recent_for_user_checkout_stat_transitions.rb
 - spec/dummy/db/migrate/20081023092436_create_search_engines.rb
 - spec/dummy/db/migrate/20120125050502_add_depth_to_message.rb
-- spec/dummy/db/migrate/20180709023037_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb
 - spec/dummy/db/migrate/20180709161346_add_created_at_to_tag.rb
 - spec/dummy/db/migrate/20150924115059_create_withdraws.rb
 - spec/dummy/db/migrate/149_create_message_templates.rb
@@ -1847,6 +1840,7 @@ test_files:
 - spec/models/content_type_spec.rb
 - spec/models/manifestation_relationship_type_spec.rb
 - spec/models/own_spec.rb
+- spec/models/custom_property_spec.rb
 - spec/models/realize_type_spec.rb
 - spec/models/identifier_type_spec.rb
 - spec/models/doi_record_spec.rb
@@ -1893,7 +1887,9 @@ test_files:
 - spec/requests/realize_types_spec.rb
 - spec/requests/series_statement_merge_lists_spec.rb
 - spec/requests/items_spec.rb
+- spec/system/series_statements_spec.rb
 - spec/system/manifestations_spec.rb
+- spec/system/custom_properties_spec.rb
 - spec/system/items_spec.rb
 - spec/support/controller_macros.rb
 - spec/support/vcr.rb
@@ -1911,6 +1907,7 @@ test_files:
 - spec/factories/language.rb
 - spec/factories/agent.rb
 - spec/factories/agent_merge.rb
+- spec/factories/custom_property.rb
 - spec/factories/license.rb
 - spec/factories/agent_relationship_type.rb
 - spec/factories/identifier_type.rb
@@ -2076,10 +2073,11 @@ test_files:
 - spec/views/creates/show.html.erb_spec.rb
 - spec/views/creates/new.html.erb_spec.rb
 - spec/views/creates/index.html.erb_spec.rb
-- spec/views/manifestations/index.txt.erb_spec.rb
 - spec/views/manifestations/show.html.erb_spec.rb
 - spec/views/manifestations/index.rdf.builder_spec.rb
-- spec/views/manifestations/show.txt.erb_spec.rb
+- spec/views/manifestations/index.txt.ruby_spec.rb
+- spec/views/manifestations/show.txt.ruby_spec.rb
+- spec/views/manifestations/index.json.jbuilder_spec.rb
 - spec/views/manifestations/index.html.erb_spec.rb
 - spec/views/realizes/edit.html.erb_spec.rb
 - spec/views/realizes/show.html.erb_spec.rb