kindai 1.6.2 → 1.7.0

data/VERSION

@@ -1 +1 @@
-1.6.2
+1.7.0

data/kindai.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kindai}
-  s.version = "1.6.2"
+  s.version = "1.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["hitode909"]
-  s.date = %q{2011-05-19}
+  s.date = %q{2011-05-24}
   s.default_executable = %q{kindai.rb}
   s.description = %q{kindai.rb is kindai digital library downloader.}
   s.email = %q{hitode909@gmail.com}
@@ -51,7 +51,7 @@ Gem::Specification.new do |s|
   s.licenses = ["MIT"]
   s.rdoc_options = ["--main", "README.rdoc", "--exclude", "spec"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.2}
   s.summary = %q{kindai digital library downloader}
   s.test_files = [
     "spec/book_downloader_spec.rb",
@@ -63,7 +63,6 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/kindai/book.rb

@@ -20,6 +20,11 @@ module Kindai
     end
 
     # ----- metadata -----
+
+    def key
+      permalink_uri.match(/\d+$/)[0]
+    end
+
     def title
       title_container = control_page.at('.titlehead')
       subtitle_container = control_page.at('.headmenu')

data/lib/kindai/util/database.rb

@@ -7,6 +7,7 @@ require 'ostruct'
 module Kindai::Util::Database
   ENDPOINT = URI.parse 'http://gigaschema.appspot.com/hitode909/kindai.json'
 
+  # XXX: deprecated, page 1 only
   def self.items
     @items ||= JSON.parse(open(ENDPOINT).read)['data'].map{|item|
       begin
@@ -21,7 +22,17 @@ module Kindai::Util::Database
   end
 
   def self.item_for_book(book)
-    self.items.find{|item| item.uri == book.permalink_uri}
+    path = ENDPOINT + "?group=#{book.key}"
+    JSON.parse(open(path).read)['data'].map{|item|
+      begin
+        hash = JSON.parse(item['value'])
+        self.validate(hash)
+        OpenStruct.new(hash)
+      rescue => error
+        Kindai::Util.logger.warn error
+        nil
+      end
+    }.compact.first
   end
 
   def self.save_item(book, info)
@@ -45,7 +56,7 @@ module Kindai::Util::Database
 
     res = Net::HTTP.start(ENDPOINT.host, ENDPOINT.port){|http|
       request = Net::HTTP::Post.new(ENDPOINT.path)
-      request.set_form_data({:value => send_data.to_json})
+      request.set_form_data({:value => send_data.to_json, :group => book.key})
       http.request(request)
     }
     case res.code

data/spec/book_spec.rb

@@ -6,6 +6,10 @@ describe Kindai::Book do
     @book = Kindai::Book.new_from_permalink('http://kindai.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

metadata

@@ -1,152 +1,114 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: kindai
-version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: false
-  segments: 
-  - 1
-  - 6
-  - 2
-  version: 1.6.2
+version: !ruby/object:Gem::Version
+  version: 1.7.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - hitode909
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-19 00:00:00 +09:00
+date: 2011-05-24 00:00:00.000000000 +09:00
 default_executable: kindai.rb
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
+dependencies:
+- !ruby/object:Gem::Dependency
   name: nokogiri
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2156017080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
+  version_requirements: *2156017080
+- !ruby/object:Gem::Dependency
   name: rmagick
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &2156014800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
+  version_requirements: *2156014800
+- !ruby/object:Gem::Dependency
   name: zipruby
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &2156013420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
+  version_requirements: *2156013420
+- !ruby/object:Gem::Dependency
   name: json
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &2156012280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        version: "1.4"
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  type: :development
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :runtime
   prerelease: false
+  version_requirements: *2156012280
+- !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &2156011420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.3.0
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
+  version_requirements: *2156011420
+- !ruby/object:Gem::Dependency
   name: bundler
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &2156010180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
+  version_requirements: *2156010180
+- !ruby/object:Gem::Dependency
   name: jeweler
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &2156008360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 5
-        - 2
+      - !ruby/object:Gem::Version
         version: 1.5.2
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
+  version_requirements: *2156008360
+- !ruby/object:Gem::Dependency
   name: rcov
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: &2156004900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id008
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2156004900
 description: kindai.rb is kindai digital library downloader.
 email: hitode909@gmail.com
-executables: 
+executables:
 - kindai.rb
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -176,42 +138,38 @@ files:
 - spec/spread_spec.rb
 has_rdoc: true
 homepage: http://github.com/hitode909/kindairb
-licenses: 
+licenses:
 - MIT
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.rdoc
 - --exclude
 - spec
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 4261753351778255770
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: kindai digital library downloader
-test_files: 
+test_files:
 - spec/book_downloader_spec.rb
 - spec/book_spec.rb
 - spec/searcher_spec.rb