enju_biblio 0.1.0.pre56 → 0.1.0.pre57

data/spec/dummy/tmp/pids/redis-test.pid

@@ -1 +1 @@
-32844
+14408

data/spec/fixtures/agent_import_results.yml

@@ -4,14 +4,12 @@ one:
   id: 1
   agent_import_file_id: 1
   agent_id: 1
-  user_id: 1
   body: MyText
 
 two:
   id: 2
   agent_import_file_id: 1
   agent_id: 1
-  user_id: 1
   body: MyText
 
 # == Schema Information
@@ -21,7 +19,6 @@ two:
 #  id                   :integer          not null, primary key
 #  agent_import_file_id :integer
 #  agent_id             :integer
-#  user_id              :integer
 #  body                 :text
 #  created_at           :datetime         not null
 #  updated_at           :datetime         not null

data/spec/fixtures/carrier_types.yml

@@ -1,17 +1,7 @@
 --- 
-carrier_type_00004: 
-  name: file
-  display_name: file
-  updated_at: 2007-12-24 01:30:50.637433 +09:00
-  id: 4
-  note: !binary |
-    44Kz44Oz44OU44Ol44O844K/44Gu44OV44Kh44Kk44Or44Gn44GZ44CC
-
-  created_at: 2007-12-24 01:30:50.637433 +09:00
-  position: 4
 carrier_type_00001: 
-  name: print
-  display_name: print
+  name: volume
+  display_name: Volume
   updated_at: 2007-11-20 16:04:29.853828 +09:00
   id: 1
   note: !binary |
@@ -20,21 +10,31 @@ carrier_type_00001:
   created_at: 2007-11-20 15:47:03.641530 +09:00
   position: 1
 carrier_type_00002: 
-  name: cd
-  display_name: CD
+  name: audio_disc
+  display_name: Audio disc
   updated_at: 2007-12-19 01:45:26.040674 +09:00
   id: 2
   note: "\xE9\x9F\xB3\xE6\xA5\xBDCD\xE3\x81\xA7\xE3\x81\x99\xE3\x80\x82"
   created_at: 2007-12-19 01:45:26.040674 +09:00
   position: 2
 carrier_type_00003: 
-  name: dvd
-  display_name: DVD
+  name: videodisc
+  display_name: Video disc
   updated_at: 2007-12-23 04:24:23.151410 +09:00
   id: 3
   note: "DVD\xE3\x81\xA7\xE3\x81\x99\xE3\x80\x82"
   created_at: 2007-12-23 04:24:23.151410 +09:00
   position: 3
+carrier_type_00004: 
+  name: online_resource
+  display_name: online_resource
+  updated_at: 2007-12-24 01:30:50.637433 +09:00
+  id: 4
+  note: !binary |
+    44Kz44Oz44OU44Ol44O844K/44Gu44OV44Kh44Kk44Or44Gn44GZ44CC
+
+  created_at: 2007-12-24 01:30:50.637433 +09:00
+  position: 4
 
 # == Schema Information
 #

data/spec/fixtures/content_types.yml

@@ -1,36 +1,85 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-
-one:
+--- 
+content_type_00001:
   id: 1
   name: text
-  display_name: text
-  note: MyText
+  display_name: "en: text\r\n\
+    ja: 文字"
+  note: 
   position: 1
-
-two:
+content_type_00002:
   id: 2
-  name: Cartographic Dataset
-  display_name: Cartographic Dataset
-  note: MyText
+  name: performed_music
+  display_name: "en: Performed music\r\n\
+    ja: 音楽"
+  note: 曲の演奏など
   position: 2
-
-three:
+content_type_00003:
   id: 3
-  name: Cartographic Image
-  display_name: Cartographic Image
-  note: MyText
+  name: two_dimensional_moving_image
+  display_name: "en: Two-dimensional moving image\r\n\
+    ja: 動画"
+  note: 
   position: 3
-
-# == Schema Information
-#
-# Table name: content_types
-#
-#  id           :integer          not null, primary key
-#  name         :string(255)      not null
-#  display_name :text
-#  note         :text
-#  position     :integer
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
-#
-
+content_type_00004:
+  id: 4
+  name: tactile_text
+  display_name: "en: Tactile text\r\n\
+    ja: 点字など"
+  note: 触ることのできる文字
+  position: 4
+content_type_00005:
+  id: 5
+  name: still_image
+  display_name: "en: Still image\r\n\
+    ja: 画像"
+  note: 静止画像
+  position: 5
+content_type_00006:
+  id: 6
+  name: cartographic_image
+  display_name: "en: Cartographic image\r\n\
+    ja: 地図"
+  note: 
+  position: 6
+content_type_00007:
+  id: 7
+  name: spoken_word
+  display_name: "en: Spoken word\r\n\
+    ja: 音声"
+  note: 読み上げ音声など
+  position: 7
+content_type_00008:
+  id: 8
+  name: sounds
+  display_name: "en: Sounds\r\n\
+    ja: 音"
+  note: 波音など
+  position: 8
+content_type_00009:
+  id: 9
+  name: notated_music
+  display_name: "en: Notated music\r\n\
+    ja: 楽譜"
+  note: 
+  position: 9
+content_type_00010:
+  id: 10
+  name: three_dimensional_moving_image
+  display_name: "en: Three-dimensional moving image\r\n\
+    ja: 3D動画"
+  note: 
+  position: 10
+content_type_00011:
+  id: 11
+  name: other
+  display_name: "en: Other\r\n\
+    ja: その他"
+  note: LCMARCに由来
+  position: 11
+content_type_00012:
+  id: 12
+  name: unspecified
+  display_name: "en: Unspecified\r\n\
+    ja: 不明"
+  note: LCMARCに由来
+  position: 12

data/spec/fixtures/frequencies.yml

@@ -1,85 +1,55 @@
 --- 
-frequency_00006: 
-  name: bimonthly
-  display_name: !binary |
-    5pes5YiK
-
-  updated_at: 2007-12-31 21:40:49.776669 +09:00
-  id: 6
-  created_at: 2007-12-31 21:40:49.776669 +09:00
-  position: 6
-frequency_00007: 
-  name: yearly
-  display_name: !binary |
-    5bm05YiK
-
-  updated_at: 2007-12-31 21:41:03.004736 +09:00
-  id: 7
-  created_at: 2007-12-31 21:41:03.004736 +09:00
-  position: 7
 frequency_00001: 
-  name: not refularly
-  display_name: !binary |
-    5pel5YiK
-
-  updated_at: 2007-12-31 21:39:45.737531 +09:00
+  name: unknown
+  display_name: "en: unknown\r\n\
+    ja: 不明・不定期刊"
   id: 1
-  created_at: 2007-12-31 21:39:45.737531 +09:00
   position: 1
 frequency_00002: 
   name: daily
-  display_name: !binary |
-    6YCx5YiK
-
-  updated_at: 2007-12-31 21:39:54.980787 +09:00
+  display_name: "en: daily\r\n\
+    ja: 日刊"
   id: 2
-  created_at: 2007-12-31 21:39:54.980787 +09:00
   position: 2
 frequency_00003: 
   name: weekly
-  display_name: !binary |
-    6ZqU6YCx5YiK
-
-  updated_at: 2007-12-31 21:40:11.112040 +09:00
+  display_name: "en: weekly\r\n\
+    ja: 週刊"
   id: 3
-  created_at: 2007-12-31 21:40:11.112040 +09:00
   position: 3
 frequency_00004: 
   name: biweekly
-  display_name: !binary |
-    5pyI5YiK
-
-  updated_at: 2007-12-31 21:40:18.803661 +09:00
+  display_name: "en: biweekly\r\n\
+    ja: 隔週刊"
   id: 4
-  created_at: 2007-12-31 21:40:18.803661 +09:00
   position: 4
 frequency_00005: 
   name: monthly
-  display_name: !binary |
-    6ZqU5pyI5YiK
-
-  updated_at: 2007-12-31 21:40:31.247081 +09:00
+  display_name: "en: monthly\r\n\
+    ja: 月刊"
   id: 5
-  created_at: 2007-12-31 21:40:31.247081 +09:00
   position: 5
 frequency_00006: 
-  name: other
-  display_name: Other
-  updated_at: 2007-12-31 21:40:31.247081 +09:00
+  name: bimonthly
+  display_name: "en: bimonthly\r\n\
+    ja: 隔月刊"
   id: 6
-  created_at: 2007-12-31 21:40:31.247081 +09:00
   position: 6
-
-# == Schema Information
-#
-# Table name: frequencies
-#
-#  id           :integer          not null, primary key
-#  name         :string(255)      not null
-#  display_name :text
-#  note         :text
-#  position     :integer
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
-#
-
+frequency_00007: 
+  name: quarterly
+  display_name: "en: quarterly\r\n\
+    ja: 季刊"
+  id: 7
+  position: 7
+frequency_00008: 
+  name: yearly
+  display_name: "en: yearly\r\n\
+    ja: 年刊"
+  id: 8
+  position: 8
+frequency_00009: 
+  name: biyearly
+  display_name: "en: biyearly\r\n\
+    ja: 隔年刊"
+  id: 9
+  position: 9

data/spec/fixtures/manifestations.yml

@@ -1875,8 +1875,8 @@ manifestation_00216:
 #  attachment_meta                 :text
 #  month_of_publication            :integer
 #  fulltext_content                :boolean
-#  doi                             :string(255)
 #  periodical                      :boolean
 #  statement_of_responsibility     :text
 #  publication_place               :text
+#  extent_of_text                  :text
 #

data/spec/models/agent_import_result_spec.rb

@@ -13,9 +13,7 @@ end
 #  id                   :integer          not null, primary key
 #  agent_import_file_id :integer
 #  agent_id             :integer
-#  user_id              :integer
 #  body                 :text
 #  created_at           :datetime         not null
 #  updated_at           :datetime         not null
 #
-

data/spec/models/manifestation_spec.rb

@@ -290,8 +290,8 @@ end
 #  attachment_meta                 :text
 #  month_of_publication            :integer
 #  fulltext_content                :boolean
-#  doi                             :string(255)
 #  periodical                      :boolean
 #  statement_of_responsibility     :text
 #  publication_place               :text
+#  extent_of_text                  :text
 #

data/spec/models/resource_import_file_spec.rb

@@ -32,8 +32,8 @@ describe ResourceImportFile do
         manifestation_101.series_statements.count.should eq 1
         manifestation_101.series_statements.first.original_title.should eq '主シリーズ'
         manifestation_101.series_statements.first.title_transcription.should eq 'しゅしりーず'
-        manifestation_101.series_statements.first.title_subseries.should eq '副シリーズ 1'
-        manifestation_101.series_statements.first.title_subseries_transcription.should eq 'ふくしりーず いち'
+        manifestation_101.series_statements.first.title_subseries.should eq '副シリーズ'
+        manifestation_101.series_statements.first.title_subseries_transcription.should eq 'ふくしりーず'
 
         item_10101 = Item.where(item_identifier: '10101').first
         item_10101.manifestation.creators.size.should eq 2
@@ -53,10 +53,23 @@ describe ResourceImportFile do
         item_10101.binded_at.should eq Time.zone.parse('2014-08-16')
         item_10101.manifestation.publication_place.should eq '東京'
         item_10101.include_supplements.should eq true
+        item_10101.note.should eq 'カバーなし'
+        item_10101.url.should eq 'http://example.jp/item/1'
+        item_10101.manifestation.carrier_type.name.should eq 'volume'
+        item_10101.manifestation.manifestation_content_type.name.should eq 'text'
+        item_10101.manifestation.frequency.name.should eq 'monthly'
+        item_10101.manifestation.extent_of_text.should eq 'xv, 213 pages'
 
         item_10102 = Item.where(item_identifier: '10102').first
         item_10102.manifestation.date_of_publication.should eq Time.zone.parse('2001-01-01')
         item_10102.manifestation.language.name.should eq 'Japanese'
+        item_10102.manifestation.height.should eq 257
+        item_10102.manifestation.width.should eq 182
+        item_10102.manifestation.depth.should eq 12
+        item_10102.manifestation.start_page.should eq 1
+        item_10102.manifestation.end_page.should eq 200
+        item_10102.manifestation.series_statements.first.creator_string.should eq 'シリーズの著者'
+        item_10102.manifestation.series_statements.first.volume_number_string.should eq 'シリーズ1号'
 
         Manifestation.where(:manifestation_identifier => '103').first.original_title.should eq 'ダブル"クォート"を含む資料'
         item = Item.where(item_identifier: '11111').first
@@ -74,6 +87,20 @@ describe ResourceImportFile do
         item_10104.budget_type.name.should eq 'Public fund'
         item_10104.bookstore.should be_nil
         item_10104.call_number.should eq '007|A'
+        item_10104.manifestation.carrier_type.name.should eq 'online_resource'
+        item_10104.manifestation.manifestation_content_type.name.should eq 'still_image'
+        item_10104.manifestation.frequency.name.should eq 'unknown'
+        item_10104.manifestation.volume_number_string.should eq '第3巻'
+        item_10104.manifestation.volume_number.should eq 3
+        item_10104.manifestation.issue_number_string.should eq '第10号'
+        item_10104.manifestation.issue_number.should eq 10
+        item_10104.manifestation.edition_string.should eq '初版'
+        item_10104.manifestation.edition.should eq 1
+        item_10104.manifestation.serial_number.should eq 120
+        item_10104.manifestation.identifier_contents(:doi).should eq ['example/2014.08.18']
+        item_10104.manifestation.height.should be_nil
+        item_10104.manifestation.width.should be_nil
+        item_10104.manifestation.depth.should be_nil
 
         manifestation_104 = Manifestation.where(:manifestation_identifier => '104').first
         manifestation_104.identifier_contents(:isbn).should eq ['9784797327038']
@@ -88,7 +115,7 @@ describe ResourceImportFile do
         @file.error_message.should eq "The follwing column(s) were ignored: invalid"
       end
 
-      it "should send message when import is completed" do
+      it "should send message when import is completed", vcr: true do
         old_message_count = Message.count
         @file.import_start
         Message.count.should eq old_message_count + 1

data/spec/views/manifestations/show.html.erb_spec.rb

@@ -4,7 +4,7 @@ describe "manifestations/show" do
   fixtures :all
 
   before(:each) do
-    @manifestation = assign(:manifestation, FactoryGirl.create(:manifestation))
+    assign(:manifestation, FactoryGirl.create(:manifestation))
     @ability = Object.new
     @ability.extend(CanCan::Ability)
     controller.stub(:current_ability) { @ability }