kindai 1.7.0 → 1.7.1

data/VERSION

@@ -1 +1 @@
-1.7.0
+1.7.1

data/kindai.gemspec

@@ -5,15 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kindai}
-  s.version = "1.7.0"
+  s.version = "1.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["hitode909"]
-  s.date = %q{2011-05-24}
-  s.default_executable = %q{kindai.rb}
+  s.authors = [%q{hitode909}]
+  s.date = %q{2011-10-23}
   s.description = %q{kindai.rb is kindai digital library downloader.}
   s.email = %q{hitode909@gmail.com}
-  s.executables = ["kindai.rb"]
+  s.executables = [%q{kindai.rb}]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -48,10 +47,10 @@ Gem::Specification.new do |s|
     "spec/spread_spec.rb"
   ]
   s.homepage = %q{http://github.com/hitode909/kindairb}
-  s.licenses = ["MIT"]
-  s.rdoc_options = ["--main", "README.rdoc", "--exclude", "spec"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
+  s.licenses = [%q{MIT}]
+  s.rdoc_options = [%q{--main}, %q{README.rdoc}, %q{--exclude}, %q{spec}]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.6}
   s.summary = %q{kindai digital library downloader}
   s.test_files = [
     "spec/book_downloader_spec.rb",

data/lib/kindai/book.rb

@@ -51,8 +51,8 @@ module Kindai
           Kindai::Util.logger.debug "fetch permalink page"
           page_uri = URI.parse(permalink_uri) + permalink_page.at('frame[name="W_BODY"]')['src']
 
-          page_file = Kindai::Util.fetch_uri page_uri.to_s
-          uri = page_file.base_uri.to_s + '&vs=10000,10000,0,0,0,0,0,0'
+          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

data/lib/kindai/util.rb

@@ -4,6 +4,7 @@ require 'tempfile'
 require 'digest/sha1'
 require 'RMagick'
 require 'zipruby'
+require 'net/http'
 
 module Kindai::Util
   def self.logger
@@ -115,6 +116,17 @@ module Kindai::Util
     return got
   end
 
+  def self.get_redirected_uri(uri)
+    uri = URI.parse(uri) unless uri.kind_of? URI
+    self.logger.debug "get_redirected_uri #{uri}"
+
+    response = nil
+    Net::HTTP.start(uri.host, uri.port) {|http|
+      response = http.head(uri.request_uri)
+    }
+    response['Location']
+  end
+
   def self.trim_info_auto(book, files)
     info = nil
     item = Kindai::Util::Database.item_for_book(book)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kindai
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-24 00:00:00.000000000 +09:00
-default_executable: kindai.rb
+date: 2011-10-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2156017080 !ruby/object:Gem::Requirement
+  requirement: &70353209086680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156017080
+  version_requirements: *70353209086680
 - !ruby/object:Gem::Dependency
   name: rmagick
-  requirement: &2156014800 !ruby/object:Gem::Requirement
+  requirement: &70353209086100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156014800
+  version_requirements: *70353209086100
 - !ruby/object:Gem::Dependency
   name: zipruby
-  requirement: &2156013420 !ruby/object:Gem::Requirement
+  requirement: &70353209085380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156013420
+  version_requirements: *70353209085380
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2156012280 !ruby/object:Gem::Requirement
+  requirement: &70353209084740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +54,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *2156012280
+  version_requirements: *70353209084740
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156011420 !ruby/object:Gem::Requirement
+  requirement: &70353209084220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +65,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *2156011420
+  version_requirements: *70353209084220
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156010180 !ruby/object:Gem::Requirement
+  requirement: &70353209083580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +76,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2156010180
+  version_requirements: *70353209083580
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2156008360 !ruby/object:Gem::Requirement
+  requirement: &70353209080900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +87,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *2156008360
+  version_requirements: *70353209080900
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2156004900 !ruby/object:Gem::Requirement
+  requirement: &70353209072700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156004900
+  version_requirements: *70353209072700
 description: kindai.rb is kindai digital library downloader.
 email: hitode909@gmail.com
 executables:
@@ -136,7 +135,6 @@ files:
 - spec/spec_helper.rb
 - spec/spread_downloader_spec.rb
 - spec/spread_spec.rb
-has_rdoc: true
 homepage: http://github.com/hitode909/kindairb
 licenses:
 - MIT
@@ -156,7 +154,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4261753351778255770
+      hash: 3219370653941978797
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -165,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: kindai digital library downloader