enju_ndl 0.1.0.pre15 → 0.1.0.pre16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7724f941008ac6c3603488b766b17fb127ea9f36
-  data.tar.gz: 9e7be3c0896a08cb15e563c6705779608fb7392d
+  metadata.gz: d30bcd302d1a7555044730c4eaf2847a1ffc8aaf
+  data.tar.gz: 5996038247ff243245f2b2fb5d6d649b36aa985f
 SHA512:
-  metadata.gz: caaeb116d97aa59863e5e855045e706d45dc50e06d854ce1a06414f72b726eb7c4d50bf94cb5233cfd04a8cf72688dd947bdaf080bc3fdaffd567abf61a7fff1
-  data.tar.gz: 90133bc77a550346c3aeb574f60b91ab3612aa4fee8d016c8b2de62b1b9b89c9b4b21d076d4669f2c8bf119f464e8bcadc6206cc83b3cf4c633280e6c9e91e5d
+  metadata.gz: bc3164372c5764496eadefb815a60781a918ff7ae04e6c46de3456d7d8bf266bd556e43f8e42282fa575014fe320b5e310407add9210018ad4837a9a9baabf92
+  data.tar.gz: 9f57ba3ea0505c1b45da23a25940c7013fa7bd6e382907055d645b466734cf8ba4b497ce83618572c62f578e58e02f722ebb83b5e794880f2e46572946cf9be4

data/app/controllers/ndl_books_controller.rb

@@ -21,7 +21,10 @@ class NdlBooksController < ApplicationController
 
   def create
     if params[:book]
-      @manifestation = NdlBook.import_from_sru_response(params[:book][:nbn])
+      begin
+        @manifestation = NdlBook.import_from_sru_response(params[:book][:nbn])
+      rescue EnjuNdl::RecordNotFound
+      end
       respond_to do |format|
         if @manifestation.try(:save)
           flash[:notice] = t('controller.successfully_created', :model => t('activerecord.models.manifestation'))

data/lib/enju_ndl/ndl_search.rb

@@ -59,6 +59,12 @@ module EnjuNdl
           ndc9_url = classification_urls.map{|url| URI.parse(URI.escape(url))}.select{|u| u.path.split('/').reverse[1] == 'ndc9'}.first
           if ndc9_url
             ndc = ndc9_url.path.split('/').last
+            classification_type = ClassificationType.where(:name => 'ndc9').first
+            unless classification_type
+              classification_type = ClassificationType.create!(:name => 'ndc9', :display_name => 'NDC9')
+            end
+            classification = Classification.new(:category => ndc)
+            classification.classification_type = classification_type
           end
         end
 
@@ -104,8 +110,7 @@ module EnjuNdl
             :nbn => nbn,
             :start_page => extent[:start_page],
             :end_page => extent[:end_page],
-            :height => extent[:height],
-            :ndc => ndc
+            :height => extent[:height]
           )
           manifestation.carrier_type = carrier_type if carrier_type
           manifestation.manifestation_content_type = content_type if content_type
@@ -113,6 +118,7 @@ module EnjuNdl
             manifestation.publishers << publisher_patrons
             create_additional_attributes(doc, manifestation)
             create_series_statement(doc, manifestation)
+            manifestation.classifications << classification if classification
           end
         end
 
@@ -288,8 +294,7 @@ module EnjuNdl
           unless series_statement
             series_statement = SeriesStatement.new(
               :original_title => series_title[:title],
-              :title_transcription => series_title[:title_transcription],
-              :periodical => false
+              :title_transcription => series_title[:title_transcription]
             )
           end
         elsif publication_periodicity
@@ -305,11 +310,8 @@ module EnjuNdl
           end
         end
 
-        if series_statement
-          if series_statement.save
-            series_statement.manifestations << manifestation
-          end
-          #manifestation.save
+        if series_statement.try(:save)
+          manifestation.series_statements << series_statement
         end
         manifestation
       end

data/lib/enju_ndl/version.rb

@@ -1,3 +1,3 @@
 module EnjuNdl
-  VERSION = "0.1.0.pre15"
+  VERSION = "0.1.0.pre16"
 end

data/spec/dummy/db/migrate/20130421093852_add_periodical_to_manifestation.rb

@@ -0,0 +1,5 @@
+class AddPeriodicalToManifestation < ActiveRecord::Migration
+  def change
+    add_column :manifestations, :periodical, :boolean
+  end
+end

data/spec/dummy/db/migrate/20130421155019_add_creator_string_to_series_statement.rb

@@ -0,0 +1,7 @@
+class AddCreatorStringToSeriesStatement < ActiveRecord::Migration
+  def change
+    add_column :series_statements, :creator_string, :text
+    add_column :series_statements, :volume_number_string, :text
+    add_column :series_statements, :volume_number_transcription_string, :text
+  end
+end

data/spec/dummy/db/migrate/20130421164124_add_series_master_to_series_statement.rb

@@ -0,0 +1,5 @@
+class AddSeriesMasterToSeriesStatement < ActiveRecord::Migration
+  def change
+    add_column :series_statements, :series_master, :boolean
+  end
+end

data/spec/dummy/db/migrate/20130504133816_add_manifestation_id_to_subject.rb

@@ -0,0 +1,6 @@
+class AddManifestationIdToSubject < ActiveRecord::Migration
+  def change
+    add_column :subjects, :manifestation_id, :integer
+    add_index :subjects, :manifestation_id
+  end
+end

data/spec/dummy/db/migrate/20130504143515_add_manifestation_id_to_classification.rb

@@ -0,0 +1,6 @@
+class AddManifestationIdToClassification < ActiveRecord::Migration
+  def change
+    add_column :classifications, :manifestation_id, :integer
+    add_index :classifications, :manifestation_id
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20121116033446) do
+ActiveRecord::Schema.define(:version => 20130504143515) do
 
   create_table "carrier_types", :force => true do |t|
     t.string   "name",         :null => false
@@ -40,10 +40,12 @@ ActiveRecord::Schema.define(:version => 20121116033446) do
     t.datetime "updated_at",             :null => false
     t.integer  "lft"
     t.integer  "rgt"
+    t.integer  "manifestation_id"
   end
 
   add_index "classifications", ["category"], :name => "index_classifications_on_category"
   add_index "classifications", ["classification_type_id"], :name => "index_classifications_on_classification_type_id"
+  add_index "classifications", ["manifestation_id"], :name => "index_classifications_on_manifestation_id"
   add_index "classifications", ["parent_id"], :name => "index_classifications_on_parent_id"
 
   create_table "content_types", :force => true do |t|
@@ -287,6 +289,7 @@ ActiveRecord::Schema.define(:version => 20121116033446) do
     t.text     "attachment_meta"
     t.integer  "month_of_publication"
     t.string   "doi"
+    t.boolean  "periodical"
   end
 
   add_index "manifestations", ["access_address"], :name => "index_manifestations_on_access_address"
@@ -580,19 +583,23 @@ ActiveRecord::Schema.define(:version => 20121116033446) do
     t.text     "title_subseries"
     t.text     "numbering_subseries"
     t.integer  "position"
-    t.datetime "created_at",                    :null => false
-    t.datetime "updated_at",                    :null => false
+    t.datetime "created_at",                         :null => false
+    t.datetime "updated_at",                         :null => false
     t.text     "title_transcription"
     t.text     "title_alternative"
     t.string   "series_statement_identifier"
     t.string   "issn"
     t.boolean  "periodical"
-    t.integer  "root_manifestation_id"
+    t.integer  "manifestation_id"
     t.text     "note"
     t.text     "title_subseries_transcription"
+    t.text     "creator_string"
+    t.text     "volume_number_string"
+    t.text     "volume_number_transcription_string"
+    t.boolean  "series_master"
   end
 
-  add_index "series_statements", ["root_manifestation_id"], :name => "index_series_statements_on_manifestation_id"
+  add_index "series_statements", ["manifestation_id"], :name => "index_series_statements_on_manifestation_id"
   add_index "series_statements", ["series_statement_identifier"], :name => "index_series_statements_on_series_statement_identifier"
 
   create_table "subject_has_classifications", :force => true do |t|
@@ -648,8 +655,10 @@ ActiveRecord::Schema.define(:version => 20121116033446) do
     t.datetime "updated_at"
     t.datetime "deleted_at"
     t.string   "url"
+    t.integer  "manifestation_id"
   end
 
+  add_index "subjects", ["manifestation_id"], :name => "index_subjects_on_manifestation_id"
   add_index "subjects", ["parent_id"], :name => "index_subjects_on_parent_id"
   add_index "subjects", ["required_role_id"], :name => "index_subjects_on_required_role_id"
   add_index "subjects", ["subject_type_id"], :name => "index_subjects_on_subject_type_id"

data/spec/models/ndl_book_spec.rb

@@ -23,7 +23,7 @@ describe NdlBook do
       manifestation = NdlBook.import_from_sru_response('21816393')
       manifestation.manifestation_identifier.should eq 'http://iss.ndl.go.jp/books/R100000002-I000010980901-00'
       manifestation.isbn.should eq  '9784839931995'
-      manifestation.ndc.should eq "007.64"
+      manifestation.classifications.pluck(:category).should eq ["007.64"]
       manifestation.nbn.should eq "21816393"
       manifestation.language.name.should eq "Japanese"
       manifestation.creators.first.full_name.should eq '秋葉, 拓哉'
@@ -59,15 +59,15 @@ describe NdlBook do
     it "should import series_statement", :vcr => true do
       manifestation = NdlBook.import_from_sru_response('20408556')
       manifestation.original_title.should eq "ズッコケ三人組のダイエット講座"
-      manifestation.series_statement.original_title.should eq "ポプラ社文庫. ズッコケ文庫"
-      manifestation.series_statement.periodical.should be_false
+      manifestation.series_statements.first.original_title.should eq "ポプラ社文庫. ズッコケ文庫"
+      manifestation.periodical.should be_false
     end
 
     it "should import series_statement if the resource is periodical", :vcr => true do
       manifestation = NdlBook.import_from_sru_response('00010852')
       manifestation.original_title.should eq "週刊新潮"
-      manifestation.series_statement.original_title.should eq "週刊新潮"
-      manifestation.series_statement.periodical.should be_true
+      manifestation.series_statements.first.original_title.should eq "週刊新潮"
+      manifestation.periodical.should be_false
       end
 
     it "should import pud_date is nil", :vcr => true do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_ndl
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre15
+  version: 0.1.0.pre16
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-17 00:00:00.000000000 Z
+date: 2013-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -128,28 +128,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre31
+        version: 0.1.0.pre36
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre31
+        version: 0.1.0.pre36
 - !ruby/object:Gem::Dependency
   name: enju_subject
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre12
+        version: 0.1.0.pre13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre12
+        version: 0.1.0.pre13
 - !ruby/object:Gem::Dependency
   name: enju_question
   requirement: !ruby/object:Gem::Requirement
@@ -265,7 +265,6 @@ files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
-- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/001_create_patrons.rb
 - spec/dummy/db/migrate/005_create_manifestations.rb
 - spec/dummy/db/migrate/006_create_items.rb
@@ -326,7 +325,6 @@ files:
 - spec/dummy/db/migrate/20110916053430_rename_manifestation_number_list_to_number_string.rb
 - spec/dummy/db/migrate/20110916091020_add_volume_number_to_manifestation.rb
 - spec/dummy/db/migrate/20110916103953_add_manifestaiton_id_to_series_statement.rb
-- spec/dummy/db/migrate/20110918161853_rename_series_statement_manifestation_id_to_root_manifestation_id.rb
 - spec/dummy/db/migrate/20110918162329_add_note_to_series_statement.rb
 - spec/dummy/db/migrate/20111009183423_add_ndc_to_manifestation.rb
 - spec/dummy/db/migrate/20111124110059_create_create_types.rb
@@ -355,6 +353,11 @@ files:
 - spec/dummy/db/migrate/20120511072422_add_patron_identifier_to_patron.rb
 - spec/dummy/db/migrate/20120602141129_add_edit_mode_to_patron_import_file.rb
 - spec/dummy/db/migrate/20121116033446_add_doi_to_manifestation.rb
+- spec/dummy/db/migrate/20130421093852_add_periodical_to_manifestation.rb
+- spec/dummy/db/migrate/20130421155019_add_creator_string_to_series_statement.rb
+- spec/dummy/db/migrate/20130421164124_add_series_master_to_series_statement.rb
+- spec/dummy/db/migrate/20130504133816_add_manifestation_id_to_subject.rb
+- spec/dummy/db/migrate/20130504143515_add_manifestation_id_to_classification.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/public/404.html
@@ -412,7 +415,7 @@ 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_ndl plugin
@@ -466,7 +469,6 @@ test_files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
-- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/001_create_patrons.rb
 - spec/dummy/db/migrate/005_create_manifestations.rb
 - spec/dummy/db/migrate/006_create_items.rb
@@ -527,7 +529,6 @@ test_files:
 - spec/dummy/db/migrate/20110916053430_rename_manifestation_number_list_to_number_string.rb
 - spec/dummy/db/migrate/20110916091020_add_volume_number_to_manifestation.rb
 - spec/dummy/db/migrate/20110916103953_add_manifestaiton_id_to_series_statement.rb
-- spec/dummy/db/migrate/20110918161853_rename_series_statement_manifestation_id_to_root_manifestation_id.rb
 - spec/dummy/db/migrate/20110918162329_add_note_to_series_statement.rb
 - spec/dummy/db/migrate/20111009183423_add_ndc_to_manifestation.rb
 - spec/dummy/db/migrate/20111124110059_create_create_types.rb
@@ -556,6 +557,11 @@ test_files:
 - spec/dummy/db/migrate/20120511072422_add_patron_identifier_to_patron.rb
 - spec/dummy/db/migrate/20120602141129_add_edit_mode_to_patron_import_file.rb
 - spec/dummy/db/migrate/20121116033446_add_doi_to_manifestation.rb
+- spec/dummy/db/migrate/20130421093852_add_periodical_to_manifestation.rb
+- spec/dummy/db/migrate/20130421155019_add_creator_string_to_series_statement.rb
+- spec/dummy/db/migrate/20130421164124_add_series_master_to_series_statement.rb
+- spec/dummy/db/migrate/20130504133816_add_manifestation_id_to_subject.rb
+- spec/dummy/db/migrate/20130504143515_add_manifestation_id_to_classification.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/public/404.html

data/spec/dummy/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