enju_biblio 0.2.3 → 0.2.4

data/spec/factories/agent_merge.rb

@@ -1,6 +1,6 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :agent_merge do |f|
-    f.agent_merge_list_id{FactoryGirl.create(:agent_merge_list).id}
-    f.agent_id{FactoryGirl.create(:agent).id}
+    f.agent_merge_list_id{FactoryBot.create(:agent_merge_list).id}
+    f.agent_id{FactoryBot.create(:agent).id}
   end
 end

data/spec/factories/agent_merge_list.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :agent_merge_list do |f|
     f.sequence(:title){|n| "agent_merge_list_#{n}"}
   end

data/spec/factories/basket.rb

@@ -1,5 +1,5 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :basket do |f|
-    f.user_id{FactoryGirl.create(:user).id}
+    f.user_id{FactoryBot.create(:user).id}
   end
 end

data/spec/factories/carrier_type.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :carrier_type do |f|
     f.sequence(:name){|n| "carrier_type_#{n}"}
   end

data/spec/factories/checkout.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :checkout, :class => Checkout do |f|
     f.due_date Time.zone.now.next_week
     f.association :item, factory: :item

data/spec/factories/classification.rb

@@ -1,6 +1,6 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :classification do |f|
     f.sequence(:category){|n| "classification_#{n}"}
-    f.classification_type_id{FactoryGirl.create(:classification_type).id}
+    f.classification_type_id{FactoryBot.create(:classification_type).id}
   end
 end

data/spec/factories/classification_type.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :classification_type do |f|
     f.sequence(:name){|n| "classification_type_#{n}"}
   end

data/spec/factories/content_type.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :content_type do |f|
     f.sequence(:name){|n| "content_type_#{n}"}
   end

data/spec/factories/country.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :country do |f|
     f.sequence(:name){|n| "country_#{n}"}
     f.sequence(:alpha_2){|n| "alpha_2_#{n}"}

data/spec/factories/create.rb

@@ -1,6 +1,6 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :create do |f|
-    f.work_id{FactoryGirl.create(:manifestation).id}
-    f.agent_id{FactoryGirl.create(:agent).id}
+    f.work_id{FactoryBot.create(:manifestation).id}
+    f.agent_id{FactoryBot.create(:agent).id}
   end
 end

data/spec/factories/create_types.rb

@@ -1,6 +1,6 @@
 # Read about factories at http://github.com/thoughtbot/factory_girl
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :create_type do
     name "mystring"
     display_name "MyText"

data/spec/factories/donate.rb

@@ -1,6 +1,6 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :donate do |f|
-    f.item_id{FactoryGirl.create(:item).id}
-    f.agent_id{FactoryGirl.create(:agent).id}
+    f.item_id{FactoryBot.create(:item).id}
+    f.agent_id{FactoryBot.create(:agent).id}
   end
 end

data/spec/factories/form_of_work.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :form_of_work do |f|
     f.sequence(:name){|n| "form_of_work_#{n}"}
   end

data/spec/factories/frequency.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :frequency do |f|
     f.sequence(:name){|n| "frequency_#{n}"}
   end

data/spec/factories/identifier.rb

@@ -1,6 +1,6 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :identifier do |f|
     f.sequence(:body){|n| "identifier_body_#{n}"}
-    f.identifier_type_id{FactoryGirl.create(:identifier_type).id}
+    f.identifier_type_id{FactoryBot.create(:identifier_type).id}
   end
 end

data/spec/factories/identifier_type.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :identifier_type do |f|
     f.sequence(:name){|n| "identifier_type_#{n}"}
   end

data/spec/factories/import_request.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :import_request do |f|
     f.sequence(:isbn){|n| "isbn_#{n}"}
   end

data/spec/factories/item.rb

@@ -1,7 +1,7 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :item do |f|
     f.sequence(:item_identifier){|n| "item_#{n}"}
     f.circulation_status_id{CirculationStatus.find(1).id}
-    f.manifestation_id{FactoryGirl.create(:manifestation).id}
+    f.manifestation_id{FactoryBot.create(:manifestation).id}
   end
 end

data/spec/factories/language.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :language do |f|
     f.sequence(:name){|n| "language_#{n}"}
     f.sequence(:iso_639_1){|n| "639_1_#{n}"}

data/spec/factories/library.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :library do |f|
     f.sequence(:name){|n| "library#{n}"}
     f.sequence(:short_display_name){|n| "library_#{n}"}
@@ -6,7 +6,7 @@ FactoryGirl.define do
   end
 end
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :invalid_library, :class => Library do |f|
     f.library_group_id{LibraryGroup.first.id}
   end

data/spec/factories/license.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :license do |f|
     f.sequence(:name){|n| "license_#{n}"}
   end

data/spec/factories/manifestation.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :manifestation do |f|
     f.sequence(:original_title){|n| "manifestation_title_#{n}"}
     f.carrier_type_id{CarrierType.find(1).id}
@@ -9,6 +9,6 @@ FactoryGirl.define do
     f.carrier_type_id{CarrierType.find(1).id}
     f.language_id{Language.find(1).id}
     f.serial{true}
-    f.series_statements{[FactoryGirl.create(:series_statement_serial)]}
+    f.series_statements{[FactoryBot.create(:series_statement_serial)]}
   end
 end

data/spec/factories/manifestation_relationship.rb

@@ -1,6 +1,6 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :manifestation_relationship do |f|
-    f.parent_id{FactoryGirl.create(:manifestation).id}
-    f.child_id{FactoryGirl.create(:manifestation).id}
+    f.parent_id{FactoryBot.create(:manifestation).id}
+    f.child_id{FactoryBot.create(:manifestation).id}
   end
 end

data/spec/factories/manifestation_relationship_type.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :manifestation_relationship_type do |f|
     f.sequence(:name){|n| "manifestation_relationship_type_#{n}"}
   end

data/spec/factories/medium_of_performance.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :medium_of_performance do |f|
     f.sequence(:name){|n| "medium_of_performance_#{n}"}
   end

data/spec/factories/own.rb

@@ -1,6 +1,6 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :own do |f|
-    f.item_id{FactoryGirl.create(:item).id}
-    f.agent_id{FactoryGirl.create(:agent).id}
+    f.item_id{FactoryBot.create(:item).id}
+    f.agent_id{FactoryBot.create(:agent).id}
   end
 end

data/spec/factories/patron_relationship.rb

@@ -1,6 +1,6 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :agent_relationship do |f|
-    f.parent_id{FactoryGirl.create(:agent).id}
-    f.child_id{FactoryGirl.create(:agent).id}
+    f.parent_id{FactoryBot.create(:agent).id}
+    f.child_id{FactoryBot.create(:agent).id}
   end
 end

data/spec/factories/patron_relationship_type.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :agent_relationship_type do |f|
     f.sequence(:name){|n| "agent_relationship_type_#{n}"}
   end

data/spec/factories/patron_type.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :agent_type do |f|
     f.sequence(:name){|n| "agent_type_#{n}"}
   end

data/spec/factories/produce.rb

@@ -1,6 +1,6 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :produce do |f|
-    f.manifestation_id{FactoryGirl.create(:manifestation).id}
-    f.agent_id{FactoryGirl.create(:agent).id}
+    f.manifestation_id{FactoryBot.create(:manifestation).id}
+    f.agent_id{FactoryBot.create(:agent).id}
   end
 end

data/spec/factories/produce_types.rb

@@ -1,6 +1,6 @@
 # Read about factories at http://github.com/thoughtbot/factory_girl
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :produce_type do
     name "mystring"
     display_name "MyText"

data/spec/factories/profile.rb

@@ -1,10 +1,10 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :profile, :class => Profile do |f|
     f.user_group_id {UserGroup.first.id}
     f.required_role_id {Role.where(name: 'User').first.id}
     f.sequence(:user_number){|n| "user_number_#{n}"}
     f.library_id 2
     f.locale "ja"
-    f.user_id {FactoryGirl.create(:user).id}
+    f.user_id {FactoryBot.create(:user).id}
   end
 end

data/spec/factories/realize.rb

@@ -1,6 +1,6 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :realize do |f|
-    f.expression_id{FactoryGirl.create(:manifestation).id}
-    f.agent_id{FactoryGirl.create(:agent).id}
+    f.expression_id{FactoryBot.create(:manifestation).id}
+    f.agent_id{FactoryBot.create(:agent).id}
   end
 end

data/spec/factories/realize_types.rb

@@ -1,6 +1,6 @@
 # Read about factories at http://github.com/thoughtbot/factory_girl
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :realize_type do
     name "mystring"
     display_name "MyText"

data/spec/factories/reserve.rb

@@ -1,12 +1,12 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :reserve do |f|
     before(:create) do |reserve|
-      profile = FactoryGirl.create(:profile)
-      user = FactoryGirl.create(:admin)
+      profile = FactoryBot.create(:profile)
+      user = FactoryBot.create(:admin)
       user.profile = profile
       reserve.user = user
     end
-    f.manifestation_id{FactoryGirl.create(:manifestation).id}
-#    f.user{FactoryGirl.create(:user)}
+    f.manifestation_id{FactoryBot.create(:manifestation).id}
+#    f.user{FactoryBot.create(:user)}
   end
 end

data/spec/factories/role.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :role, :class => Role do |f|
     f.sequence(:name) do |n|
       idx = "a"

data/spec/factories/series_has_manifestation.rb

@@ -1,6 +1,6 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :series_has_manifestation do |f|
-    f.manifestation_id{FactoryGirl.create(:manifestation).id}
-    f.series_statement_id{FactoryGirl.create(:series_statement).id}
+    f.manifestation_id{FactoryBot.create(:manifestation).id}
+    f.series_statement_id{FactoryBot.create(:series_statement).id}
   end
 end

data/spec/factories/series_statement.rb

@@ -1,10 +1,10 @@
-FactoryGirl.define do
+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}" }
-    #f.root_manifestation_id{FactoryGirl.create(:manifestation_serial).id}
+    #f.root_manifestation_id{FactoryBot.create(:manifestation_serial).id}
     f.series_master{true}
   end
 end

data/spec/factories/series_statement_merge.rb

@@ -1,6 +1,6 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :series_statement_merge do |f|
-    f.series_statement_merge_list_id{FactoryGirl.create(:series_statement_merge_list).id}
-    f.series_statement_id{FactoryGirl.create(:series_statement).id}
+    f.series_statement_merge_list_id{FactoryBot.create(:series_statement_merge_list).id}
+    f.series_statement_id{FactoryBot.create(:series_statement).id}
   end
 end

data/spec/factories/series_statement_merge_list.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :series_statement_merge_list do |f|
     f.sequence(:title){|n| "series_statement_merge_list_#{n}"}
   end

data/spec/factories/series_statement_relationship.rb

@@ -1,8 +1,8 @@
 # Read about factories at https://github.com/thoughtbot/factory_girl
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :series_statement_relationship do |f|
-    f.parent_id{FactoryGirl.create(:series_statement).id}
-    f.child_id{FactoryGirl.create(:series_statement).id}
+    f.parent_id{FactoryBot.create(:series_statement).id}
+    f.child_id{FactoryBot.create(:series_statement).id}
   end
 end

data/spec/factories/shelf.rb

@@ -1,6 +1,6 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :shelf do |f|
     f.sequence(:name){|n| "shelf_#{n}"}
-    f.library_id{FactoryGirl.create(:library).id}
+    f.library_id{FactoryBot.create(:library).id}
   end
 end

data/spec/factories/subject.rb

@@ -1,7 +1,7 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :subject do |f|
     f.sequence(:term){|n| "subject_#{n}"}
-    f.subject_heading_type_id{FactoryGirl.create(:subject_heading_type).id}
-    f.subject_type_id{FactoryGirl.create(:subject_type).id}
+    f.subject_heading_type_id{FactoryBot.create(:subject_heading_type).id}
+    f.subject_type_id{FactoryBot.create(:subject_type).id}
   end
 end

data/spec/factories/subject_heading_type.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :subject_heading_type do |f|
     f.sequence(:name){|n| "subject_heading_type_#{n}"}
   end

data/spec/factories/subject_heading_type_has_subject.rb

@@ -1,6 +1,6 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :subject_heading_type_has_subject do |f|
-    f.subject_heading_type_id{FactoryGirl.create(:subject_heading_type).id}
-    f.subject_id{FactoryGirl.create(:subject).id}
+    f.subject_heading_type_id{FactoryBot.create(:subject_heading_type).id}
+    f.subject_id{FactoryBot.create(:subject).id}
   end
 end

data/spec/factories/subject_type.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :subject_type do |f|
     f.sequence(:name){|n| "subject_type_#{n}"}
   end

data/spec/factories/user.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :admin, :class => User do |f|
     f.sequence(:username){|n| "admin_#{n}"}
     f.sequence(:email){|n| "admin_#{n}@example.jp"}

data/spec/fixtures/items.yml

@@ -303,5 +303,5 @@ item_00025:
 #  binding_item_identifier :string
 #  binding_call_number     :string
 #  binded_at               :datetime
-#  manifestation_id        :integer
+#  manifestation_id        :integer          not null
 #

data/spec/fixtures/library_groups.yml

@@ -9,7 +9,7 @@ one:
     ::/0"
   url: "http://localhost:3000/"
   position: 1
-  login_banner: "*Next-L Enju*"
+  old_login_banner: "*Next-L Enju*"
   admin_networks: "0.0.0.0/0\r\n\
     ::/0"
   user_id: 1

data/spec/models/agent_spec.rb

@@ -6,22 +6,22 @@ describe Agent do
   fixtures :all
 
   it "should set a default required_role to Guest" do
-    agent = FactoryGirl.create(:agent)
+    agent = FactoryBot.create(:agent)
     agent.required_role.should eq Role.find_by_name('Guest')
   end
 
   it "should set birth_date" do
-    agent = FactoryGirl.create(:agent, :birth_date => '2000')
+    agent = FactoryBot.create(:agent, :birth_date => '2000')
     agent.date_of_birth.should eq Time.zone.parse('2000-01-01')
   end
 
   it "should set death_date" do
-    agent = FactoryGirl.create(:agent, :death_date => '2000')
+    agent = FactoryBot.create(:agent, :death_date => '2000')
     agent.date_of_death.should eq Time.zone.parse('2000-01-01')
   end
 
   it "should not set death_date earlier than birth_date" do
-    agent = FactoryGirl.create(:agent, :birth_date => '2010', :death_date => '2000')
+    agent = FactoryBot.create(:agent, :birth_date => '2010', :death_date => '2000')
     agent.should_not be_valid
   end
 

data/spec/models/create_type_spec.rb

@@ -2,7 +2,7 @@ require 'rails_helper'
 
 describe CreateType do
   it 'should create create_type' do
-    FactoryGirl.create(:create_type)
+    FactoryBot.create(:create_type)
   end
 end
 

data/spec/models/item_spec.rb

@@ -83,5 +83,5 @@ end
 #  binding_item_identifier :string
 #  binding_call_number     :string
 #  binded_at               :datetime
-#  manifestation_id        :integer
+#  manifestation_id        :integer          not null
 #

data/spec/models/manifestation_spec.rb

@@ -8,20 +8,20 @@ describe Manifestation, :solr => true do
   end
 
   it "should set year_of_publication" do
-    manifestation = FactoryGirl.create(:manifestation, :pub_date => '2000')
+    manifestation = FactoryBot.create(:manifestation, :pub_date => '2000')
     manifestation.year_of_publication.should eq 2000
     manifestation.date_of_publication.should eq Time.zone.parse('2000-01-01')
   end
 
   it "should set date_of_publication" do
-    manifestation = FactoryGirl.create(:manifestation, :pub_date => '2000-01')
+    manifestation = FactoryBot.create(:manifestation, :pub_date => '2000-01')
     manifestation.year_of_publication.should eq 2000
     manifestation.month_of_publication.should eq 1
     manifestation.date_of_publication.should eq Time.zone.parse('2000-01-01')
   end
 
   it "should set volume_number" do
-    manifestation = FactoryGirl.create(:manifestation, :volume_number_string => '第1巻', :issue_number_string => '20号分冊1', :edition_string => '第3版')
+    manifestation = FactoryBot.create(:manifestation, :volume_number_string => '第1巻', :issue_number_string => '20号分冊1', :edition_string => '第3版')
     manifestation.volume_number.should eq 1
     manifestation.issue_number.should eq 20
     manifestation.edition.should eq 3
@@ -241,7 +241,7 @@ describe Manifestation, :solr => true do
     end
 
     it "should export edition fields" do
-      manifestation = FactoryGirl.create(:manifestation, edition: 2, edition_string: "Revised Ed.")
+      manifestation = FactoryBot.create(:manifestation, edition: 2, edition_string: "Revised Ed.")
       lines = Manifestation.export
       csv = CSV.parse(lines, headers: true, col_sep: "\t")
       expect(csv["edition"].compact).not_to be_empty
@@ -251,16 +251,26 @@ describe Manifestation, :solr => true do
       expect(m["edition_string"]).to eq "Revised Ed."
     end
     it "should export title_transcription fields" do
-      manifestation = FactoryGirl.create(:manifestation, title_transcription: "Transcripted title")
+      manifestation = FactoryBot.create(:manifestation, title_transcription: "Transcripted title")
       lines = Manifestation.export
       csv = CSV.parse(lines, headers: true, col_sep: "\t")
       expect(csv["title_transcription"].compact).not_to be_empty
       m = csv.find{|row| row["manifestation_id"].to_i == manifestation.id }
       expect(m["title_transcription"]).to eq "Transcripted title"
     end
+    it "should export volume fields" do
+      manifestation = FactoryBot.create(:manifestation, volume_number: 15, volume_number_string: "Vol.15")
+      lines = Manifestation.export
+      csv = CSV.parse(lines, headers: true, col_sep: "\t")
+      expect(csv["volume_number"].compact).not_to be_empty
+      expect(csv["volume_number_string"].compact).not_to be_empty
+      m = csv.find{|row| row["manifestation_id"].to_i == manifestation.id }
+      expect(m["volume_number"]).to eq "15"
+      expect(m["volume_number_string"]).to eq "Vol.15"
+    end
 
     it "should respect the role of the user" do
-      FactoryGirl.create(:item, bookstore_id: 1, price: 100, budget_type_id: 1)
+      FactoryBot.create(:item, bookstore_id: 1, price: 100, budget_type_id: 1)
       lines = Manifestation.export
       csv = CSV.parse(lines, headers: true, col_sep: "\t")
       expect(csv["bookstore"].compact).to be_empty
@@ -273,6 +283,20 @@ describe Manifestation, :solr => true do
       expect(csv["item_price"].compact).not_to be_empty
       expect(csv["budget_type"].compact).not_to be_empty
     end
+
+    it 'should escape LF/CR to "\n"' do
+      manifestation = FactoryBot.create(:manifestation, description: "test\ntest", note: "test\ntest")
+      item = FactoryBot.create(:item, manifestation: manifestation, note: "test\ntest")
+      lines = Manifestation.export
+      csv = CSV.parse(lines, headers: true, col_sep: "\t")
+      expect(csv["description"].compact).not_to be_empty
+      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'
+    end
   end
 
   if defined?(EnjuCirculation)

data/spec/models/produce_type_spec.rb

@@ -2,7 +2,7 @@ require 'rails_helper'
 
 describe ProduceType do
   it 'should create produce_type' do
-    FactoryGirl.create(:produce_type)
+    FactoryBot.create(:produce_type)
   end
 end
 

data/spec/models/realize_type_spec.rb

@@ -2,7 +2,7 @@ require 'rails_helper'
 
 describe RealizeType do
   it 'should create realize_type' do
-    FactoryGirl.create(:realize_type)
+    FactoryBot.create(:realize_type)
   end
 end