kindai 1.6.0 → 1.6.1

data/VERSION

@@ -1 +1 @@
-1.6.0
+1.6.1

data/kindai.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kindai}
-  s.version = "1.6.0"
+  s.version = "1.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["hitode909"]
-  s.date = %q{2011-02-26}
+  s.date = %q{2011-04-28}
   s.default_executable = %q{kindai.rb}
   s.description = %q{kindai.rb is kindai digital library downloader.}
   s.email = %q{hitode909@gmail.com}

data/lib/kindai/book.rb

@@ -2,12 +2,14 @@
 module Kindai
   class Book
     attr_accessor :permalink_uri
+    attr_accessor :trimming
 
     # ----- constructor -----
-    def self.new_from_permalink(permalink_uri)
+    def self.new_from_permalink(permalink_uri, trimming = {})
       raise "not info:ndljp" unless permalink_uri.match(/info\:ndljp/)
       me = new
       me.permalink_uri = permalink_uri
+      me.trimming = trimming
       return me
     end
 
@@ -46,7 +48,12 @@ module Kindai
 
           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'
-#           uri += "&ref=" + [@trimming[:x], @trimming[:y], @trimming[:w], @trimming[:h], 5000, 5000, 0, 0].join(',') if @trimming
+          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

data/lib/kindai/util/database.rb

@@ -15,6 +15,7 @@ module Kindai::Util::Database
         OpenStruct.new(hash)
       rescue => error
         Kindai::Util.logger.warn error
+        nil
       end
     }.compact
   end

data/spec/book_spec.rb

@@ -37,3 +37,30 @@ describe Kindai::Book, 'with series' do
     @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
+  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
+
+
+
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kindai
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-02-26 00:00:00.000000000 +09:00
+date: 2011-04-28 00:00:00.000000000 +09:00
 default_executable: kindai.rb
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2152615900 !ruby/object:Gem::Requirement
+  requirement: &2153140460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152615900
+  version_requirements: *2153140460
 - !ruby/object:Gem::Dependency
   name: rmagick
-  requirement: &2152614660 !ruby/object:Gem::Requirement
+  requirement: &2153138480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152614660
+  version_requirements: *2153138480
 - !ruby/object:Gem::Dependency
   name: zipruby
-  requirement: &2152613680 !ruby/object:Gem::Requirement
+  requirement: &2153136680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152613680
+  version_requirements: *2153136680
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152612200 !ruby/object:Gem::Requirement
+  requirement: &2153134480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *2152612200
+  version_requirements: *2153134480
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152611260 !ruby/object:Gem::Requirement
+  requirement: &2153130260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2152611260
+  version_requirements: *2153130260
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2152605260 !ruby/object:Gem::Requirement
+  requirement: &2153129020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *2152605260
+  version_requirements: *2153129020
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2152604380 !ruby/object:Gem::Requirement
+  requirement: &2153128220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,7 +88,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152604380
+  version_requirements: *2153128220
 description: kindai.rb is kindai digital library downloader.
 email: hitode909@gmail.com
 executables:
@@ -145,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1870768052266429891
+      hash: 437047170026144001
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: