kindai 2.7.0 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cf9e500aa2a37a7d5f47beb679c48a7d453f34a
-  data.tar.gz: 3918213cea5033faddd958e39b3dbc6e438a5f0a
+  metadata.gz: a54936e0a98b3c7fb26c231f0edd5c54cb96902c
+  data.tar.gz: 7b58e03c66062af64918e186f2568d2d801930c8
 SHA512:
-  metadata.gz: 17c2f6379ab404154c112fd9d134146641eb8b4b732ca54ad99156ad97df2842ae41706d8e0c26fd0ae710ebee84daed55a156f448b0331820b53400cf65466a
-  data.tar.gz: a88dd14f6ece1e8c8f2e581bc40dc885f7681d06be0c427f2a863eb148651666fc54e201bb12012e21f06c37b3e6c859b1081d6035ab630fbdb51a367820f1d6
+  metadata.gz: ba93eedc3b58aae9a7e353d8eb7ca722aa8c486628b86815234af493f9fa18357c034c833398cef62fe64c1492dc7a9f12630a9fc2d12ac5d46e8c6c12d91e2a
+  data.tar.gz: 7b170249b7f5c2fb369e897ead0c085a9fa8529e19c6792a9b725efb898ad636e7a09a2efd29f35f7e785bbe58d7ca9e2278334a87c405788f662bb432b9822c

data/.travis.yml

@@ -1,8 +1,4 @@
 language: ruby
 rvm:
-  - 2.2.2
-  - 2.1.4
-  - 2.1.3
-  - 2.1.2
-  - 2.1.1
+  - 2.2.4
   - 2.0.0

data/Gemfile

@@ -7,7 +7,6 @@ gem 'json', '>= 1.4'
 
 group :development do
   gem "rspec", ">= 2.13.3"
-  gem "bundler", ">= 1.6.2"
-  gem "jeweler", ">= 2.0.1"
+  gem "bundler", ">= 1.13.6"
+  gem "jeweler", ">= 2.1.2"
 end
-

data/Gemfile.lock

@@ -1,14 +1,15 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.3.6)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
     builder (3.2.2)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
-    faraday (0.9.0)
+    faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    git (1.2.6)
+    git (1.3.0)
     github_api (0.11.3)
       addressable (~> 2.3)
       descendants_tracker (~> 0.0.1)
@@ -17,36 +18,36 @@ GEM
       multi_json (>= 1.7.5, < 2.0)
       nokogiri (~> 1.6.0)
       oauth2
-    hashie (2.1.1)
-    highline (1.6.21)
-    jeweler (2.0.1)
+    hashie (3.4.6)
+    highline (1.7.8)
+    jeweler (2.1.2)
       builder
       bundler (>= 1.0)
       git (>= 1.2.5)
-      github_api
+      github_api (~> 0.11.0)
       highline (>= 1.6.15)
       nokogiri (>= 1.5.10)
       rake
       rdoc
+      semver
     json (1.8.1)
-    jwt (0.1.13)
-      multi_json (>= 1.5)
+    jwt (1.5.6)
     mini_portile (0.6.0)
-    multi_json (1.10.0)
+    multi_json (1.12.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     nokogiri (1.6.2.1)
       mini_portile (= 0.6.0)
-    oauth2 (0.9.3)
+    oauth2 (1.2.0)
       faraday (>= 0.8, < 0.10)
-      jwt (~> 0.1.8)
+      jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (~> 1.2)
-    rack (1.5.2)
-    rake (10.3.2)
-    rdoc (4.1.1)
-      json (~> 1.4)
+      rack (>= 1.2, < 3)
+    public_suffix (2.0.3)
+    rack (2.0.1)
+    rake (11.3.0)
+    rdoc (5.0.0)
     rmagick (2.15.4)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
@@ -56,15 +57,16 @@ GEM
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
-    thread_safe (0.3.3)
+    semver (1.0.1)
+    thread_safe (0.3.5)
     zipruby (0.3.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (>= 1.6.2)
-  jeweler (>= 2.0.1)
+  bundler (>= 1.13.6)
+  jeweler (>= 2.1.2)
   json (>= 1.4)
   nokogiri
   rmagick (>= 2.13.3)
@@ -72,4 +74,4 @@ DEPENDENCIES
   zipruby
 
 BUNDLED WITH
-   1.10.6
+   1.13.6

data/README.md

@@ -1,8 +1,8 @@
 # kindai.rb [![Build Status](https://travis-ci.org/hitode909/kindairb.png?branch=master)](https://travis-ci.org/hitode909/kindairb)
 
-## 概要
+## 近デジダウンローダー
 
-近代デジタルライブラリーから画像をダウンロードします．
+国立国会図書館デジタルコレクションから画像をダウンロードします．
 
 ## インストール
 
@@ -19,7 +19,7 @@ gemをインストールすると，kindai.rbというコマンドがインス
 起動時の引数に，ダウンロードしたい本の URL を指定します．スペース区切りで複数指定できます．
 
 ```
-kindai.rb http://kindai.ndl.go.jp/info:ndljp/pid/922693
+kindai.rb http://dl.ndl.go.jp/info:ndljp/pid/922693
 ```
 
 URL の代わりに検索ワードを指定すると，ヒットした本をまとめてダウンロードします．AND検索もできます．
@@ -32,7 +32,7 @@ kindai.rb "松茸 調理"
 --output オプションで，保存先を指定できます．指定したディレクトリの下に，書名のディレクトリができます．
 
 ```
-kindai.rb http://kindai.ndl.go.jp/info:ndljp/pid/922693 --output ~/Documents/
+kindai.rb http://dl.ndl.go.jp/info:ndljp/pid/922693 --output ~/Documents/
 ```
 
 ## 本の加工(自動)
@@ -91,6 +91,9 @@ kindai.rb publish --position 2905x2510+270+190 "~/Documents/正義熱血社 -
 brew install ruby imagemagick
 ```
 
+## 歴史
+
+国立国会図書館デジタルコレクションは，その昔，近代デジタルライブラリーでした．
 
 ## Copyright
 

data/VERSION

@@ -1 +1 @@
-2.7.0
+2.8.0

data/kindai.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: kindai 2.7.0 ruby lib
+# stub: kindai 2.8.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "kindai"
-  s.version = "2.7.0"
+  s.version = "2.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["hitode909"]
-  s.date = "2016-02-15"
+  s.date = "2016-11-06"
   s.description = "kindai.rb is kindai digital library downloader."
   s.email = "hitode909@gmail.com"
   s.executables = ["kindai.rb"]
@@ -53,7 +53,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/hitode909/kindairb"
   s.licenses = ["MIT"]
   s.rdoc_options = ["--main", "README.rdoc", "--exclude", "spec"]
-  s.rubygems_version = "2.2.2"
+  s.rubygems_version = "2.4.5.1"
   s.summary = "kindai digital library downloader"
 
   if s.respond_to? :specification_version then
@@ -65,16 +65,16 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<zipruby>, [">= 0"])
       s.add_runtime_dependency(%q<json>, [">= 1.4"])
       s.add_development_dependency(%q<rspec>, [">= 2.13.3"])
-      s.add_development_dependency(%q<bundler>, [">= 1.6.2"])
-      s.add_development_dependency(%q<jeweler>, [">= 2.0.1"])
+      s.add_development_dependency(%q<bundler>, [">= 1.13.6"])
+      s.add_development_dependency(%q<jeweler>, [">= 2.1.2"])
     else
       s.add_dependency(%q<nokogiri>, [">= 0"])
       s.add_dependency(%q<rmagick>, [">= 2.13.3"])
       s.add_dependency(%q<zipruby>, [">= 0"])
       s.add_dependency(%q<json>, [">= 1.4"])
       s.add_dependency(%q<rspec>, [">= 2.13.3"])
-      s.add_dependency(%q<bundler>, [">= 1.6.2"])
-      s.add_dependency(%q<jeweler>, [">= 2.0.1"])
+      s.add_dependency(%q<bundler>, [">= 1.13.6"])
+      s.add_dependency(%q<jeweler>, [">= 2.1.2"])
     end
   else
     s.add_dependency(%q<nokogiri>, [">= 0"])
@@ -82,8 +82,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<zipruby>, [">= 0"])
     s.add_dependency(%q<json>, [">= 1.4"])
     s.add_dependency(%q<rspec>, [">= 2.13.3"])
-    s.add_dependency(%q<bundler>, [">= 1.6.2"])
-    s.add_dependency(%q<jeweler>, [">= 2.0.1"])
+    s.add_dependency(%q<bundler>, [">= 1.13.6"])
+    s.add_dependency(%q<jeweler>, [">= 2.1.2"])
   end
 end
 

data/lib/kindai/book.rb

@@ -7,7 +7,7 @@ module Kindai
       raise "not info:ndljp: #{permalink_uri}" unless permalink_uri.match(/info\:ndljp/)
       me = new
       me.instance_eval {
-        @permalink_uri = permalink_uri
+        @permalink_uri = Kindai::Util.normalize_permalink_uri permalink_uri
       }
       return me
     end

data/lib/kindai/searcher.rb

@@ -37,14 +37,14 @@ module Kindai
     def result_for keyword, page = 1
       page = Nokogiri Kindai::Util.fetch_uri(uri_for(keyword, page))
       page.search('a.item-link').map{ |item|
-        'http://kindai.ndl.go.jp' + item.attr('href')
+        'http://dl.ndl.go.jp' + item.attr('href')
       }
     end
 
     def uri_for keyword, page = 1
       rows = 100
-      params = { :SID => 'kindai', :searchWord => keyword, :pageNo => page, :rows => rows }
-      root = URI.parse("http://kindai.ndl.go.jp/search/searchResult")
+      params = { :SID => 'kindai', :viewRestricted => 0, :searchWord => keyword, :pageNo => page, :rows => rows }
+      root = URI.parse("http://dl.ndl.go.jp/search/searchResult")
       query = '?' + Kindai::Util.expand_params(params)
       root + query
     end

data/lib/kindai/spread.rb

@@ -22,7 +22,7 @@ module Kindai
         :contentNo => spread_number,
         :outputScale => 1,
       }
-      "http://kindai.ndl.go.jp/view/jpegOutput?" + Kindai::Util.expand_params(params)
+      "http://dl.ndl.go.jp/view/jpegOutput?" + Kindai::Util.expand_params(params)
     end
 
     # protected

data/lib/kindai/util.rb

@@ -5,6 +5,7 @@ require 'digest/sha1'
 require 'rmagick'
 require 'zipruby'
 require 'net/http'
+require 'uri'
 
 module Kindai::Util
   def self.logger
@@ -93,6 +94,12 @@ module Kindai::Util
     Dir.chdir(from)
   end
 
+  def self.normalize_permalink_uri(uri_string)
+    uri = URI.parse(uri_string)
+    uri.host = 'dl.ndl.go.jp'
+    uri.to_s
+  end
+
   def self.fetch_uri(uri, rich = false)
     uri = URI.parse(uri) unless uri.kind_of? URI
     self.logger.debug "fetch_uri #{uri}"

data/spec/book_spec.rb

@@ -30,6 +30,27 @@ describe Kindai::Book do
     @book.spreads.should have_exactly(@book.total_spread).spreads
   end
 
+  it 'normalizes permalink to canonical uri' do
+    @book.permalink_uri.should == 'http://dl.ndl.go.jp/info:ndljp/pid/922693'
+  end
+end
+
+describe Kindai::Book, '国会図書館デジタルコレクション' do
+  before do
+    @book = Kindai::Book.new_from_permalink('http://dl.ndl.go.jp/info:ndljp/pid/922693')
+  end
+
+  it 'has static permalink_uri' do
+    @book.permalink_uri.should == 'http://dl.ndl.go.jp/info:ndljp/pid/922693'
+  end
+
+  it 'has key' do
+    @book.key.should == "922693"
+  end
+
+  it 'has title' do
+    @book.title.should == '正義の叫'
+  end
 end
 
 describe Kindai::Book, 'with series' do

data/spec/spread_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe Kindai::Spread do
   before do
-    @book = Kindai::Book.new_from_permalink('http://kindai.ndl.go.jp/info:ndljp/pid/922693')
+    @book = Kindai::Book.new_from_permalink('http://dl.ndl.go.jp/info:ndljp/pid/922693')
     @spread = @book.spreads[4]
   end
 
@@ -16,11 +16,11 @@ describe Kindai::Spread do
   end
 
   it 'has uri' do
-    @spread.uri.should == 'http://kindai.ndl.go.jp/info:ndljp/pid/922693/5'
+    @spread.uri.should == 'http://dl.ndl.go.jp/info:ndljp/pid/922693/5'
   end
 
   it 'has image_uri' do
-    @spread.image_uri.should == "http://kindai.ndl.go.jp/view/jpegOutput?itemId=info%3Andljp%2Fpid%2F922693&contentNo=5&outputScale=1"
+    @spread.image_uri.should == "http://dl.ndl.go.jp/view/jpegOutput?itemId=info%3Andljp%2Fpid%2F922693&contentNo=5&outputScale=1"
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kindai
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.8.0
 platform: ruby
 authors:
 - hitode909
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-15 00:00:00.000000000 Z
+date: 2016-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -86,28 +86,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: 1.13.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: 1.13.6
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.1.2
 description: kindai.rb is kindai digital library downloader.
 email: hitode909@gmail.com
 executables:
@@ -170,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: kindai digital library downloader