kindai 1.9.0 → 2.0.0

data/VERSION

@@ -1 +1 @@
-1.9.0
+2.0.0

data/kindai.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kindai}
-  s.version = "1.9.0"
+  s.version = "2.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{hitode909}]
-  s.date = %q{2011-12-23}
+  s.date = %q{2012-05-19}
   s.description = %q{kindai.rb is kindai digital library downloader.}
   s.email = %q{hitode909@gmail.com}
   s.executables = [%q{kindai.rb}]

data/lib/kindai/book.rb

@@ -1,15 +1,14 @@
 # -*- coding: utf-8 -*-
 module Kindai
   class Book
-    attr_accessor :permalink_uri
-    attr_accessor :trimming
 
     # ----- constructor -----
-    def self.new_from_permalink(permalink_uri, trimming = {})
-      raise "not info:ndljp" unless permalink_uri.match(/info\:ndljp/)
+    def self.new_from_permalink(permalink_uri)
+      raise "not info:ndljp: #{permalink_uri}" unless permalink_uri.match(/info\:ndljp/)
       me = new
-      me.permalink_uri = permalink_uri
-      me.trimming = trimming
+      me.instance_eval {
+        @permalink_uri = permalink_uri
+      }
       return me
     end
 
@@ -19,52 +18,58 @@ module Kindai
       return self.new_from_permalink(permalink)
     end
 
+    def self.new_from_search_result_uri(search_result_uri)
+      raise "not iss.ndl.go.jp: #{search_result_uri}" unless search_result_uri.match(/iss\.ndl\.go\.jp/)
+      me = new
+      me.instance_eval {
+        @search_result_uri = search_result_uri
+      }
+      me
+    end
+
     # ----- metadata -----
 
+    def permalink_uri
+      @permalink_uri ||=
+        begin
+          get_permalink_from_search_result_uri
+        end
+    end
+
     def key
       permalink_uri.match(/\d+$/)[0]
     end
 
     def title
-      title_container = control_page.at('.titlehead')
-      subtitle_container = control_page.at('.headmenu')
-      title_string = title_container.content.strip
-      title_string += subtitle_container.content.strip if subtitle_container
-      title_string
+      main = metadata_like 'title'
+
+      sub = metadata_like('volumeTranscription').to_i.to_s rescue nil
+      sub ? main + sub : main
     end
 
     def author
-      metadata['著者標目']
+      metadata_like 'creator:NDLNH'
     end
 
     def total_spread
-      self.spread_at(1).page.search('select#dlPages option').length
+      permalink_page.search('#sel-content-no option').length
     end
 
     def spreads
       @spreads ||= 1.upto(self.total_spread).map{|i| self.spread_at(i) }
     end
 
-    def base_uri
-      @base_uri ||=
-        begin
-          Kindai::Util.logger.debug "fetch permalink page"
-          page_uri = URI.parse(permalink_uri) + permalink_page.at('frame[name="W_BODY"]')['src']
-
-          page_base_uri = Kindai::Util.get_redirected_uri page_uri.to_s
-          uri = page_base_uri.to_s + '&vs=10000,10000,0,0,0,0,0,0'
-          unless self.trimming.keys.empty?
-            %w{x y w h resize_w resize_h}.map(&:to_sym).each{ |key|
-              self.trimming[key] ||= 0
-            }
-            uri += "&ref=" + [self.trimming[:x], self.trimming[:y], self.trimming[:w], self.trimming[:h], self.trimming[:resize_w], self.trimming[:resize_h], 0, 0].join(',')
-          end
-          uri
-        end
-    end
-
     protected
 
+    def metadata_like query
+      query_regexp = Regexp.new(Regexp.quote("(#{ query })"))
+      key = metadata.keys.find{ |key|
+        key =~ query_regexp
+      }
+      raise "metadata like #{query} not found" unless key
+      metadata[key]
+    end
+
     def spread_at(spread_number)
       Kindai::Spread.new_from_book_and_spread_number(self, spread_number)
     end
@@ -72,14 +77,12 @@ module Kindai
     def metadata
       @metadata ||=
         begin
-          metadata_table = detail_page.search('table').find{ |table|
-            table.at('td').text == 'タイトル'
+          dts = permalink_page.search('dl.detail-metadata-list dt').map{ |tag| tag.text }
+          dds = permalink_page.search('dl.detail-metadata-list dd').map{ |tag| tag.text }
+          dts.zip(dds).inject({ }) { |table, tupple|
+            table[tupple.first.strip] = tupple.last.strip
+            table
         }
-          metadata_table.search('tr').inject({ }) { |prev, tr|
-            key, _, value = *tr.search('td').map{ |elem| elem.text }
-            prev[key] = value
-            prev
-          }
         end
     end
 
@@ -93,35 +96,11 @@ module Kindai
         end
     end
 
-    def detail_uri
-      root = URI.parse('http://kindai.ndl.go.jp/BIBibDetail.php')
-      params = { }
-      control_page.search('input').each{ |input|
-        params[input['name']] = input['value'] if input['value']
-      }
-      path = '?' + params.each_pair.map{ |k, v| [URI.escape(k), URI.escape(v)].join('=')}.join('&')
-      root + path
-    end
-
-    def detail_page
-      @detail_page ||=
-        begin
-          Kindai::Util.logger.debug "fetch detail page"
-          page = Kindai::Util.fetch_uri detail_uri rescue Kindai::Util.fetch_uri URI.escape(detail_uri)
-          Nokogiri page
-        end
-    end
-
-    def control_uri
-      URI.parse(permalink_uri) + permalink_page.at('frame[name="W_CONTROL"]')['src']
-    end
-
-    def control_page
-      @control_page ||=
-        begin
-          Kindai::Util.logger.debug "fetch permalink page"
-          Nokogiri Kindai::Util.fetch_uri control_uri
-        end
+    def get_permalink_from_search_result_uri
+      "search_result_uri is required" unless @search_result_uri
+      page = Nokogiri Kindai::Util.fetch_uri @search_result_uri
+      a = page.at "#reviewsites a[href^='http://kindai.da.ndl.go.jp/info:ndljp/pid/']"
+      a['href']
     end
 
   end

data/lib/kindai/book_downloader.rb

@@ -64,9 +64,14 @@ module Kindai
     end
 
     def download_spreads
-      self.spread_downloaders.each{|dl|
+      is_first = true
+      self.spread_downloaders.each{ |dl|
+        next if dl.has_file?
+        sleep 30 unless is_first
+        is_first = false
         dl.download
       }
+
       return true
     end
   end

data/lib/kindai/searcher.rb

@@ -20,7 +20,7 @@ module Kindai
         uris = result_for(@keyword, page)
         return if uris.empty?
         uris.each{ |uri|
-          yield Kindai::Book.new_from_permalink(uri)
+          yield Kindai::Book.new_from_search_result_uri(uri)
         }
       }
     end
@@ -42,9 +42,9 @@ module Kindai
     end
 
     def uri_for keyword, page = 0
-      count = 10
+      count = 100
       params = { :any => keyword, :dpid => 'kindai', :idx => page * count + 1, :cnt => count}
-      root = URI.parse("http://api.porta.ndl.go.jp/servicedp/opensearch")
+      root = URI.parse("http://iss.ndl.go.jp/api/opensearch")
       path = '?' + Kindai::Util.expand_params(params)
       root + path
     end

data/lib/kindai/spread.rb

@@ -13,20 +13,16 @@ module Kindai
     end
 
     def uri
-      book.base_uri.gsub(/koma=(\d+)/) { "koma=#{spread_number}" }
+      "#{book.permalink_uri}/#{spread_number.to_s}"
     end
 
     def image_uri
-      image = page.at("img#imMain")
-      raise "not exists" unless image
-      image['src']
-    end
-
-
-    def has_local_file?
-    end
-
-    def local_file_path
+      params = {
+        :itemId => "info:ndljp/pid/#{book.key}",
+        :contentNo => spread_number,
+        :outputScale => 1,
+      }
+      "http://kindai.ndl.go.jp/view/jpegOutput?" + Kindai::Util.expand_params(params)
     end
 
     # protected

data/lib/kindai/spread_downloader.rb

@@ -56,7 +56,7 @@ module Kindai
 
         Kindai::Util.logger.info "sleep and retry"
         failed_count += 1
-        sleep 10
+        sleep 30
         retry
       end
     end

data/lib/kindai/util.rb

@@ -54,7 +54,7 @@ module Kindai::Util
   # input:  {:a => 'a', :b => 'bbb'}
   # output: 'a=a&b=bbb
   def self.expand_params(params)
-    params.each_pair.map{ |k, v| [URI.escape(k.to_s), URI.escape(v.to_s)].join('=')}.join('&')
+    URI.encode_www_form(params)
   end
 
   def self.append_suffix(path, suffix)

data/spec/book_spec.rb

@@ -1,6 +1,24 @@
 # -*- coding: utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
+describe Kindai::Book, 'from search result uri' do
+  before do
+    @book = Kindai::Book.new_from_search_result_uri('http://iss.ndl.go.jp/books/R000000008-I000162417-00')
+  end
+
+  it 'is a book' do
+    @book.should be_kind_of Kindai::Book
+  end
+
+  it 'has permalink' do
+    @book.permalink_uri.should == 'http://kindai.da.ndl.go.jp/info:ndljp/pid/922693'
+  end
+
+  it 'has key' do
+    @book.key.should == "922693"
+  end
+end
+
 describe Kindai::Book do
   before do
     @book = Kindai::Book.new_from_permalink('http://kindai.ndl.go.jp/info:ndljp/pid/922693')
@@ -26,10 +44,6 @@ describe Kindai::Book do
     @book.spreads.should have_exactly(@book.total_spread).spreads
   end
 
-  it 'has base_uri' do
-    @book.base_uri.should == "http://kindai.da.ndl.go.jp/scrpt/ndlimageviewer-rgc.aspx?pid=info%3Andljp%2Fpid%2F922693&jp=42016454&vol=10010&koma=1&vs=10000,10000,0,0,0,0,0,0"
-  end
-
 end
 
 describe Kindai::Book, 'with series' do
@@ -38,33 +52,13 @@ describe Kindai::Book, 'with series' do
   end
 
   it 'has title' do
-    @book.title.should == '講談日露戦争記［第３冊］第3編'
+    @book.title.should == '講談日露戦争記3'
   end
 end
 
-describe Kindai::Book, 'with trimming' do
-  before do
-
-    @trimming = {:x => 342, :y => 190, :w => 2829, :h => 2485, :resize_w => 900, :resize_h => 900}
-    @book = Kindai::Book.new_from_permalink('http://kindai.ndl.go.jp/info:ndljp/pid/922693', @trimming)
-    @book_normal = Kindai::Book.new_from_permalink('http://kindai.ndl.go.jp/info:ndljp/pid/922693')
-  end
-
-  it 'has trimming' do
-    @book.trimming.should be_kind_of Hash
-    @book.trimming.should == @trimming
+describe Kindai::Book, 'from without any uri' do
+  it 'will die' do
+    empty_book = Kindai::Book.new
+    lambda { empty_book.permalink_uri }.should raise_error Exception
   end
-
-  it 'has base uri including trimming info' do
-    @book.base_uri.should match(/2485/)
-  end
-
-  it 'has different image uri' do
-    @book.spreads.first.uri.should_not == @book_normal.spreads.first.uri
-  end
-
 end
-
-
-
-

data/spec/spread_spec.rb

@@ -16,11 +16,11 @@ describe Kindai::Spread do
   end
 
   it 'has uri' do
-    @spread.uri.should == "http://kindai.da.ndl.go.jp/scrpt/ndlimageviewer-rgc.aspx?pid=info%3Andljp%2Fpid%2F922693&jp=42016454&vol=10010&koma=5&vs=10000,10000,0,0,0,0,0,0"
+    @spread.uri.should == 'http://kindai.ndl.go.jp/info:ndljp/pid/922693/5'
   end
 
   it 'has image_uri' do
-    @spread.image_uri.should match /http:\/\/kindai.da.ndl.go.jp\/JPEG\/\w+\.jpg/
+    @spread.image_uri.should == "http://kindai.ndl.go.jp/view/jpegOutput?itemId=info%3Andljp%2Fpid%2F922693&contentNo=5&outputScale=1"
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kindai
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-23 00:00:00.000000000Z
+date: 2012-05-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2179443420 !ruby/object:Gem::Requirement
+  requirement: &70335097974460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2179443420
+  version_requirements: *70335097974460
 - !ruby/object:Gem::Dependency
   name: rmagick
-  requirement: &2179442720 !ruby/object:Gem::Requirement
+  requirement: &70335097973980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2179442720
+  version_requirements: *70335097973980
 - !ruby/object:Gem::Dependency
   name: zipruby
-  requirement: &2179442240 !ruby/object:Gem::Requirement
+  requirement: &70335097973500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2179442240
+  version_requirements: *70335097973500
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2179441740 !ruby/object:Gem::Requirement
+  requirement: &70335097973020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *2179441740
+  version_requirements: *70335097973020
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2179441040 !ruby/object:Gem::Requirement
+  requirement: &70335097972540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *2179441040
+  version_requirements: *70335097972540
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2179440540 !ruby/object:Gem::Requirement
+  requirement: &70335097972060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2179440540
+  version_requirements: *70335097972060
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2179440060 !ruby/object:Gem::Requirement
+  requirement: &70335097971580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *2179440060
+  version_requirements: *70335097971580
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2179439340 !ruby/object:Gem::Requirement
+  requirement: &70335097971100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2179439340
+  version_requirements: *70335097971100
 description: kindai.rb is kindai digital library downloader.
 email: hitode909@gmail.com
 executables:
@@ -154,7 +154,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1373734152558500671
+      hash: 1619067764939517805
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: