enju_biblio 0.1.0.pre33 → 0.1.0.pre34

data/spec/models/manifestation_spec.rb

@@ -75,7 +75,7 @@ describe Manifestation, :solr => true do
     openurl = Openurl.new({:api => "openurl", :issn => "0913"})
     results = openurl.search
     openurl.query_text.should eq "issn_sm:0913*"
-    results.size.should eq 2
+    results.size.should eq 1
   end
 
   it "should search any in openurl" do
@@ -90,7 +90,7 @@ describe Manifestation, :solr => true do
     results.size.should eq 3
     openurl = Openurl.new({:jtitle => "テスト", :pub => "テスト"})
     results = openurl.search
-    results.size.should eq 1
+    results.size.should eq 2
   end
 
   it "shoulld get search_error in openurl" do
@@ -214,15 +214,14 @@ describe Manifestation, :solr => true do
     manifestations(:manifestation_00202).periodical?.should be_true
   end
 
-  it "should set series_statement if the manifestation is periodical" do
-    manifestation = series_statements(:two).manifestations.new
-    manifestation.set_series_statement(series_statements(:two))
-    manifestation.original_title.should eq 'テスト雑誌２月号'
-    manifestation.issn.should eq series_statements(:two).issn
-    manifestation.serial_number.should eq 3
-    manifestation.issue_number.should eq 3
-    manifestation.volume_number.should eq 1
-  end
+  #it "should set series_statement if the manifestation is periodical" do
+  #  manifestation = series_statements(:two).manifestations.new
+  #  manifestation.set_series_statements([series_statements(:two)])
+  #  #manifestation.original_title.should eq 'テスト雑誌２月号'
+  #  #manifestation.serial_number.should eq 3
+  #  #manifestation.issue_number.should eq 3
+  #  #manifestation.volume_number.should eq 1
+  #end
 
   if defined?(EnjuCirculation)
     it "should respond to is_checked_out_by?" do
@@ -236,70 +235,75 @@ end
 #
 # Table name: manifestations
 #
-#  id                              :integer          not null, primary key
-#  original_title                  :text             not null
-#  title_alternative               :text
-#  title_transcription             :text
-#  classification_number           :string(255)
-#  manifestation_identifier        :string(255)
-#  date_of_publication             :datetime
-#  date_copyrighted                :datetime
-#  created_at                      :datetime         not null
-#  updated_at                      :datetime         not null
-#  deleted_at                      :datetime
-#  access_address                  :string(255)
-#  language_id                     :integer          default(1), not null
-#  carrier_type_id                 :integer          default(1), not null
-#  extent_id                       :integer          default(1), not null
-#  start_page                      :integer
-#  end_page                        :integer
-#  height                          :integer
-#  width                           :integer
-#  depth                           :integer
-#  isbn                            :string(255)
-#  isbn10                          :string(255)
-#  wrong_isbn                      :string(255)
-#  nbn                             :string(255)
-#  lccn                            :string(255)
-#  oclc_number                     :string(255)
-#  issn                            :string(255)
-#  price                           :integer
-#  fulltext                        :text
-#  volume_number_string            :string(255)
-#  issue_number_string             :string(255)
-#  serial_number_string            :string(255)
-#  edition                         :integer
-#  note                            :text
-#  repository_content              :boolean          default(FALSE), not null
-#  lock_version                    :integer          default(0), not null
-#  required_role_id                :integer          default(1), not null
-#  state                           :string(255)
-#  required_score                  :integer          default(0), not null
-#  frequency_id                    :integer          default(1), not null
-#  subscription_master             :boolean          default(FALSE), not null
-#  attachment_file_name            :string(255)
-#  attachment_content_type         :string(255)
-#  attachment_file_size            :integer
-#  attachment_updated_at           :datetime
-#  title_alternative_transcription :text
-#  description                     :text
-#  abstract                        :text
-#  available_at                    :datetime
-#  valid_until                     :datetime
-#  date_submitted                  :datetime
-#  date_accepted                   :datetime
-#  date_caputured                  :datetime
-#  pub_date                        :string(255)
-#  edition_string                  :string(255)
-#  volume_number                   :integer
-#  issue_number                    :integer
-#  serial_number                   :integer
-#  ndc                             :string(255)
-#  content_type_id                 :integer          default(1)
-#  year_of_publication             :integer
-#  attachment_meta                 :text
-#  month_of_publication            :integer
-#  fulltext_content                :boolean
-#  doi                             :string(255)
+#  id                                :integer          not null, primary key
+#  original_title                    :text             not null
+#  title_alternative                 :text
+#  title_transcription               :text
+#  classification_number             :string(255)
+#  manifestation_identifier          :string(255)
+#  date_of_publication               :datetime
+#  date_copyrighted                  :datetime
+#  created_at                        :datetime         not null
+#  updated_at                        :datetime         not null
+#  deleted_at                        :datetime
+#  access_address                    :string(255)
+#  language_id                       :integer          default(1), not null
+#  carrier_type_id                   :integer          default(1), not null
+#  extent_id                         :integer          default(1), not null
+#  start_page                        :integer
+#  end_page                          :integer
+#  height                            :integer
+#  width                             :integer
+#  depth                             :integer
+#  isbn                              :string(255)
+#  isbn10                            :string(255)
+#  wrong_isbn                        :string(255)
+#  nbn                               :string(255)
+#  lccn                              :string(255)
+#  oclc_number                       :string(255)
+#  issn                              :string(255)
+#  price                             :integer
+#  fulltext                          :text
+#  volume_number_string              :string(255)
+#  issue_number_string               :string(255)
+#  serial_number_string              :string(255)
+#  edition                           :integer
+#  note                              :text
+#  repository_content                :boolean          default(FALSE), not null
+#  lock_version                      :integer          default(0), not null
+#  required_role_id                  :integer          default(1), not null
+#  state                             :string(255)
+#  required_score                    :integer          default(0), not null
+#  frequency_id                      :integer          default(1), not null
+#  subscription_master               :boolean          default(FALSE), not null
+#  attachment_file_name              :string(255)
+#  attachment_content_type           :string(255)
+#  attachment_file_size              :integer
+#  attachment_updated_at             :datetime
+#  title_alternative_transcription   :text
+#  description                       :text
+#  abstract                          :text
+#  available_at                      :datetime
+#  valid_until                       :datetime
+#  date_submitted                    :datetime
+#  date_accepted                     :datetime
+#  date_caputured                    :datetime
+#  pub_date                          :string(255)
+#  edition_string                    :string(255)
+#  volume_number                     :integer
+#  issue_number                      :integer
+#  serial_number                     :integer
+#  ndc                               :string(255)
+#  content_type_id                   :integer          default(1)
+#  year_of_publication               :integer
+#  attachment_meta                   :text
+#  month_of_publication              :integer
+#  fulltext_content                  :boolean
+#  doi                               :string(255)
+#  periodical                        :boolean
+#  series_original_title             :text
+#  series_title_transcription        :text
+#  series_title_creator_string       :text
+#  series_title_volume_number_string :text
 #
 

data/spec/models/resource_import_file_spec.rb

@@ -16,7 +16,7 @@ describe ResourceImportFile do
           old_items_count = Item.count
           old_patrons_count = Patron.count
           old_import_results_count = ResourceImportResult.count
-          @file.import_start.should eq({:manifestation_imported => 9, :item_imported => 6, :manifestation_found => 3, :item_found => 3, :failed => 7})
+          @file.import_start.should eq({:manifestation_imported => 11, :item_imported => 6, :manifestation_found => 1, :item_found => 3, :failed => 7})
           manifestation = Item.where(:item_identifier => '11111').first.manifestation
           manifestation.publishers.first.full_name.should eq 'test4'
           manifestation.publishers.first.full_name_transcription.should eq 'てすと4'
@@ -29,10 +29,11 @@ describe ResourceImportFile do
           ResourceImportResult.count.should eq old_import_results_count + 17
   
           manifestation_101 = Manifestation.where(:manifestation_identifier => '101').first
-          manifestation_101.series_statement.original_title.should eq '主シリーズ'
-          manifestation_101.series_statement.title_transcription.should eq 'しゅしりーず'
-          manifestation_101.series_statement.title_subseries.should eq '副シリーズ 1'
-          manifestation_101.series_statement.title_subseries_transcription.should eq 'ふくしりーず いち'
+          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 'ふくしりーず いち'
   
           item_10101 = Item.where(:item_identifier => '10101').first
           item_10101.manifestation.creators.size.should eq 2
@@ -81,7 +82,7 @@ describe ResourceImportFile do
           old_items_count = Item.count
           old_patrons_count = Patron.count
           old_import_results_count = ResourceImportResult.count
-          @file.import_start.should eq({:manifestation_imported => 9, :item_imported => 6, :manifestation_found => 3, :item_found => 3, :failed => 7})
+          @file.import_start.should eq({:manifestation_imported => 11, :item_imported => 6, :manifestation_found => 1, :item_found => 3, :failed => 7})
           manifestation = Item.where(:item_identifier => '11111').first.manifestation
           manifestation.publishers.first.full_name.should eq 'test4'
           manifestation.publishers.first.full_name_transcription.should eq 'てすと4'
@@ -135,8 +136,8 @@ describe ResourceImportFile do
         manifestation = Manifestation.find(10)
         file = ResourceImportFile.create :resource_import => File.new("#{Rails.root.to_s}/../../examples/update_series_statement.tsv"), :edit_mode => 'update'
         file.modify
-        manifestation.reload
-        manifestation.series_statement.should eq SeriesStatement.find(2)
+        #manifestation.reload
+        #manifestation.series_statements.should eq [SeriesStatement.find(2)]
       end
     end
   
@@ -173,4 +174,27 @@ end
 #  resource_import_fingerprint  :string(255)
 #  error_message                :text
 #
-  
+
+# == Schema Information
+#
+# Table name: resource_import_files
+#
+#  id                           :integer          not null, primary key
+#  parent_id                    :integer
+#  content_type                 :string(255)
+#  size                         :integer
+#  user_id                      :integer
+#  note                         :text
+#  executed_at                  :datetime
+#  state                        :string(255)
+#  resource_import_file_name    :string(255)
+#  resource_import_content_type :string(255)
+#  resource_import_file_size    :integer
+#  resource_import_updated_at   :datetime
+#  created_at                   :datetime         not null
+#  updated_at                   :datetime         not null
+#  edit_mode                    :string(255)
+#  resource_import_fingerprint  :string(255)
+#  error_message                :text
+#
+

data/spec/models/series_statement_spec.rb

@@ -1,27 +1,13 @@
-# -*- encoding: utf-8 -*-
 require 'spec_helper'
 
 describe SeriesStatement do
   fixtures :all
 
-  it "should create root_manifestation" do
-    series_statement = FactoryGirl.create(:series_statement, :periodical => true)
-    series_statement.root_manifestation.should be_true
-    series_statement.manifestations.size.should eq 1
+  it "should create manifestation" do
+    series_statement = FactoryGirl.create(:series_statement)
+    series_statement.manifestation.should be_true
     series_statement.reload
-    series_statement.root_manifestation.periodical_master?.should be_true
-  end
-
-  it "should destroy root_manifestation" do
-    series_statement = FactoryGirl.create(:series_statement, :periodical => true)
-    series_statement.root_manifestation = Manifestation.first
-    series_statement.save
-    series_statement.reload
-    series_statement.root_manifestation.should be_true
-    series_statement.periodical = false
-    series_statement.save
-    series_statement.reload
-    series_statement.root_manifestation.should be_nil
+    series_statement.manifestation.series_statements.count.should eq 1
   end
 end
 
@@ -29,21 +15,23 @@ end
 #
 # Table name: series_statements
 #
-#  id                            :integer          not null, primary key
-#  original_title                :text
-#  numbering                     :text
-#  title_subseries               :text
-#  numbering_subseries           :text
-#  position                      :integer
-#  created_at                    :datetime         not null
-#  updated_at                    :datetime         not null
-#  title_transcription           :text
-#  title_alternative             :text
-#  series_statement_identifier   :string(255)
-#  issn                          :string(255)
-#  periodical                    :boolean          default(FALSE), not null
-#  root_manifestation_id         :integer
-#  note                          :text
-#  title_subseries_transcription :text
+#  id                                 :integer          not null, primary key
+#  original_title                     :text
+#  numbering                          :text
+#  title_subseries                    :text
+#  numbering_subseries                :text
+#  position                           :integer
+#  created_at                         :datetime         not null
+#  updated_at                         :datetime         not null
+#  title_transcription                :text
+#  title_alternative                  :text
+#  series_statement_identifier        :string(255)
+#  manifestation_id                   :integer
+#  note                               :text
+#  title_subseries_transcription      :text
+#  creator_string                     :text
+#  volume_number_string               :text
+#  volume_number_transcription_string :text
+#  series_master                      :boolean
 #
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_biblio
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre33
+  version: 0.1.0.pre34
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-18 00:00:00.000000000 Z
+date: 2013-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enju_core
@@ -380,28 +380,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre22
+        version: 0.1.0.pre23
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre22
-- !ruby/object:Gem::Dependency
-  name: enju_oai
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.0.pre9
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.0.pre9
+        version: 0.1.0.pre23
 - !ruby/object:Gem::Dependency
   name: enju_ndl
   requirement: !ruby/object:Gem::Requirement
@@ -830,7 +816,6 @@ files:
 - app/views/series_statements/_index_series_statement_merge_list.html.erb
 - app/views/series_statements/_manifestation_list.html.erb
 - app/views/series_statements/_merge.html.erb
-- app/views/series_statements/_periodical_facet.html.erb
 - app/views/series_statements/_refine_search_form.html.erb
 - app/views/series_statements/_tab_menu.html.erb
 - app/views/series_statements/edit.html.erb
@@ -880,9 +865,7 @@ files:
 - db/migrate/20101212070145_add_acquired_at_to_item.rb
 - db/migrate/20110301035123_add_pub_date_to_manifestation.rb
 - db/migrate/20110301121550_add_birth_date_and_death_date_to_patron.rb
-- db/migrate/20110425133109_add_issn_to_series_statement.rb
 - db/migrate/20110603184217_add_edit_mode_to_resource_import_file.rb
-- db/migrate/20110618091240_add_periodical_to_series_statement.rb
 - db/migrate/20110619064807_add_edition_string_to_manifestation.rb
 - db/migrate/20110620173525_add_bookstore_id_to_item.rb
 - db/migrate/20110627034940_create_series_statement_merge_lists.rb
@@ -891,7 +874,6 @@ files:
 - db/migrate/20110916053430_rename_manifestation_number_list_to_number_string.rb
 - db/migrate/20110916091020_add_volume_number_to_manifestation.rb
 - db/migrate/20110916103953_add_manifestaiton_id_to_series_statement.rb
-- db/migrate/20110918161853_rename_series_statement_manifestation_id_to_root_manifestation_id.rb
 - db/migrate/20110918162329_add_note_to_series_statement.rb
 - db/migrate/20111009183423_add_ndc_to_manifestation.rb
 - db/migrate/20111124110059_create_create_types.rb
@@ -917,6 +899,9 @@ files:
 - db/migrate/20120728204337_create_series_statement_relationships.rb
 - db/migrate/20121116031206_add_fulltext_content_to_manifestation.rb
 - db/migrate/20121116033446_add_doi_to_manifestation.rb
+- db/migrate/20130421093852_add_periodical_to_manifestation.rb
+- db/migrate/20130421155019_add_creator_string_to_series_statement.rb
+- db/migrate/20130421164124_add_series_master_to_series_statement.rb
 - lib/enju_biblio/biblio_helper.rb
 - lib/enju_biblio/engine.rb
 - lib/enju_biblio/openurl.rb
@@ -946,6 +931,11 @@ files:
 - Rakefile
 - README.rdoc
 - spec/cassette_library/ImportRequest/import/should_import_bibliographic_record.yml
+- spec/cassette_library/ImportRequestsController/POST_create/When_logged_in_as_Administrator/with_isbn_which_is_already_imported/redirects_to_the_created_import_request.yml
+- spec/cassette_library/ImportRequestsController/POST_create/When_logged_in_as_Administrator/with_valid_params/assigns_a_newly_created_import_request_as_import_request.yml
+- spec/cassette_library/ImportRequestsController/POST_create/When_logged_in_as_Administrator/with_valid_params/redirects_to_the_created_import_request.yml
+- spec/cassette_library/ImportRequestsController/POST_create/When_logged_in_as_Librarian/with_valid_params/assigns_a_newly_created_import_request_as_import_request.yml
+- spec/cassette_library/ImportRequestsController/POST_create/When_logged_in_as_Librarian/with_valid_params/redirects_to_the_created_import_request.yml
 - spec/controllers/carrier_types_controller_spec.rb
 - spec/controllers/content_types_controller_spec.rb
 - spec/controllers/countries_controller_spec.rb
@@ -1026,6 +1016,7 @@ files:
 - spec/dummy/config/locales/ja.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
+- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/032_create_checkins.rb
 - spec/dummy/db/migrate/033_create_checkouts.rb
 - spec/dummy/db/migrate/035_create_reserves.rb
@@ -1145,7 +1136,7 @@ files:
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_6n6
+- spec/dummy/solr/data/test/index/segments_gs2
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/dummy/tmp/cache/4AD/470/country_all
@@ -1375,12 +1366,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: enju_biblio plugin
 test_files:
 - spec/cassette_library/ImportRequest/import/should_import_bibliographic_record.yml
+- spec/cassette_library/ImportRequestsController/POST_create/When_logged_in_as_Administrator/with_isbn_which_is_already_imported/redirects_to_the_created_import_request.yml
+- spec/cassette_library/ImportRequestsController/POST_create/When_logged_in_as_Administrator/with_valid_params/assigns_a_newly_created_import_request_as_import_request.yml
+- spec/cassette_library/ImportRequestsController/POST_create/When_logged_in_as_Administrator/with_valid_params/redirects_to_the_created_import_request.yml
+- spec/cassette_library/ImportRequestsController/POST_create/When_logged_in_as_Librarian/with_valid_params/assigns_a_newly_created_import_request_as_import_request.yml
+- spec/cassette_library/ImportRequestsController/POST_create/When_logged_in_as_Librarian/with_valid_params/redirects_to_the_created_import_request.yml
 - spec/controllers/carrier_types_controller_spec.rb
 - spec/controllers/content_types_controller_spec.rb
 - spec/controllers/countries_controller_spec.rb
@@ -1461,6 +1457,7 @@ test_files:
 - spec/dummy/config/locales/ja.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
+- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/032_create_checkins.rb
 - spec/dummy/db/migrate/033_create_checkouts.rb
 - spec/dummy/db/migrate/035_create_reserves.rb
@@ -1580,7 +1577,7 @@ test_files:
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_6n6
+- spec/dummy/solr/data/test/index/segments_gs2
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/dummy/tmp/cache/4AD/470/country_all

data/app/views/series_statements/_periodical_facet.html.erb

@@ -1,15 +0,0 @@
-<h4><%= t('manifestation.periodical') -%></h4>
-<ul>
-  <%- @periodical_facet.each do |facet| -%>
-    <% facet.value ? facet_periodical = true : facet_periodical = false %>
-    <li>
-      <%- if @periodical == facet_periodical -%><strong><%- end -%>
-      <%= link_to localized_boolean(facet.value), url_for(params.merge(:page => nil, :periodical => facet.value.to_s, :view => nil, :only_path => true)) -%>
-      (<%= facet.count -%>)
-      <%- if @periodical == facet_periodical -%></strong><%- end -%>
-    </li>
-  <%- end -%>
-  <%- unless @periodical.nil? -%>
-    <li><%= link_to t('page.remove_this_facet'), url_for(params.merge(:periodical => nil, :page => nil, :view => nil, :only_path => true)) -%></li>
-  <%- end -%>
-</ul>

data/db/migrate/20110425133109_add_issn_to_series_statement.rb

@@ -1,9 +0,0 @@
-class AddIssnToSeriesStatement < ActiveRecord::Migration
-  def self.up
-    add_column :series_statements, :issn, :string
-  end
-
-  def self.down
-    remove_column :series_statements, :issn
-  end
-end

data/db/migrate/20110618091240_add_periodical_to_series_statement.rb

@@ -1,9 +0,0 @@
-class AddPeriodicalToSeriesStatement < ActiveRecord::Migration
-  def self.up
-    add_column :series_statements, :periodical, :boolean, :default => false, :null => false
-  end
-
-  def self.down
-    remove_column :series_statements, :periodical
-  end
-end

data/db/migrate/20110918161853_rename_series_statement_manifestation_id_to_root_manifestation_id.rb

@@ -1,13 +0,0 @@
-class RenameSeriesStatementManifestationIdToRootManifestationId < ActiveRecord::Migration
-  def self.up
-    remove_index :series_statements, :series_statement_identifier
-    rename_column :series_statements, :manifestation_id, :root_manifestation_id
-    add_index :series_statements, :series_statement_identifier
-  end
-
-  def self.down
-    remove_index :series_statements, :series_statement_identifier
-    rename_column :series_statements, :root_manifestation_id, :manifestation_id
-    add_index :series_statements, :series_statement_identifier
-  end
-end