enju_ndl 0.0.27 → 0.0.29

data/db/migrate/20100129142347_create_import_requests.rb

@@ -0,0 +1,15 @@
+class CreateImportRequests < ActiveRecord::Migration
+  def change
+    create_table :import_requests do |t|
+      t.string :isbn
+      t.string :state
+      t.integer :manifestation_id
+      t.integer :user_id
+
+      t.timestamps
+    end
+    add_index :import_requests, :isbn
+    add_index :import_requests, :manifestation_id
+    add_index :import_requests, :user_id
+  end
+end

data/lib/enju_ndl.rb

@@ -3,6 +3,8 @@ require "enju_ndl/engine"
 require 'open-uri'
 require 'enju_ndl/ndl_search'
 require 'enju_ndl/crd'
+require 'lisbn'
+require 'library_stdnums'
 
 module EnjuNdl
   module ActsAsMethods

data/lib/enju_ndl/ndl_search.rb

@@ -7,13 +7,13 @@ module EnjuNdl
 
     module ClassMethods
       def import_isbn(isbn)
-        isbn = ISBN_Tools.cleanup(isbn)
-        raise EnjuNdl::InvalidIsbn unless ISBN_Tools.is_valid?(isbn)
+        lisbn = Lisbn.new(isbn)
+        raise EnjuNdl::InvalidIsbn unless lisbn.valid?
 
-        manifestation = Manifestation.find_by_isbn(isbn)
+        manifestation = Manifestation.find_by_isbn(lisbn.isbn)
         return manifestation if manifestation
 
-        doc = return_xml(isbn)
+        doc = return_xml(lisbn.isbn)
         raise EnjuNdl::RecordNotFound unless doc
         #raise EnjuNdl::RecordNotFound if doc.at('//openSearch:totalResults').content.to_i == 0
         import_record(doc)
@@ -50,8 +50,8 @@ module EnjuNdl
           language_id = 1
         end
 
-        isbn = ISBN_Tools.cleanup(doc.at('//dcterms:identifier[@rdf:datatype="http://ndl.go.jp/dcndl/terms/ISBN"]').try(:content))
-        issn_l = ISBN_Tools.cleanup(doc.at('//dcterms:identifier[@rdf:datatype="http://ndl.go.jp/dcndl/terms/ISSNL"]').try(:content))
+        isbn = Lisbn.new(doc.at('//dcterms:identifier[@rdf:datatype="http://ndl.go.jp/dcndl/terms/ISBN"]').try(:content).to_s).try(:isbn)
+        issn_l = StdNum::ISSN.normalize(doc.at('//dcterms:identifier[@rdf:datatype="http://ndl.go.jp/dcndl/terms/ISSNL"]').try(:content))
         classification_urls = doc.xpath('//dcterms:subject[@rdf:resource]').map{|subject| subject.attributes['resource'].value}
         if classification_urls
           ndc9_url = classification_urls.map{|url| URI.parse(URI.escape(url))}.select{|u| u.path.split('/').reverse[1] == 'ndc9'}.first
@@ -172,9 +172,9 @@ module EnjuNdl
 
       def normalize_isbn(isbn)
         if isbn.length == 10
-          ISBN_Tools.isbn10_to_isbn13(isbn)
+          Lisbn.new(isbn).isbn13
         else
-          ISBN_Tools.isbn13_to_isbn10(isbn)
+          Lisbn.new(isbn).isbn10
         end
       end
 

data/lib/enju_ndl/version.rb

@@ -1,3 +1,3 @@
 module EnjuNdl
-  VERSION = "0.0.27"
+  VERSION = "0.0.29"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_ndl
 version: !ruby/object:Gem::Version
-  version: 0.0.27
+  version: 0.0.29
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-30 00:00:00.000000000 Z
+date: 2012-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -155,6 +155,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: lisbn
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: library_stdnums
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -250,6 +282,7 @@ files:
 - config/locales/en.yml
 - config/locales/ja.yml
 - config/routes.rb
+- db/migrate/20100129142347_create_import_requests.rb
 - lib/enju_ndl/crd.rb
 - lib/enju_ndl/engine.rb
 - lib/enju_ndl/ndl_search.rb