kindai 1.7.4 → 1.8.0

data/README.rdoc

@@ -29,8 +29,14 @@ URL の代わりに検索ワードを指定すると，ヒットした本をま
 
 == 本の加工(自動)
 
-ダウンロードされた本は読みやすいように加工され， iPhone 用と Kindle 用のファイルが作られます．
-以下のようなファイル構成になります．
+ダウンロードした本は自動的にトリミングされ，trim/ディレクトリに格納されます．トリミング情報は自動的に共有され，次に同じ本をダウンロードしたときや，他のひとが同じ本をダウンロードしたときに再利用されます．
+
+起動時の引数で，ダウンロードした本を iPhone 用と Kindle 用に加工することができます．
+
+--publish_iphone オプションで，iPhone用のファイルを作ります．
+--publish_kindle オプションで，Kindle用のファイルを作ります．
+
+両方指定すると，以下のようなファイル構成になります．
 
     正義熱血社 - 正義の叫
     ├── original
@@ -53,6 +59,8 @@ URL の代わりに検索ワードを指定すると，ヒットした本をま
 * _iphone.zipは，iPhoneの画面サイズ(1280x960)にリサイズされた見開き画像のzipファイルです．Comic Glassで読むのに適しています．
 * _kindle.zipは，Kindle3の画面サイズ(600x800)にリサイズされ，1ページずつに裁断された画像のzipファイルです．
 
+--no_trimmingオプションが指定されたときは，ダウンロードだけを行い，トリミングや加工を行いません．
+
 == 本の加工(手動)
 
 トリミング位置は自動的に決められますが，ダウンロード後に，ずれていることが分かった場合は，kindai.rb publishを使ってトリミング位置を指定できます．

data/VERSION

@@ -1 +1 @@
-1.7.4
+1.8.0

data/kindai.gemspec

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

data/lib/kindai/cli.rb

@@ -38,6 +38,15 @@ EOF
         opt.on('--retry TIMES', 'retry times (default is 30)') {|v|
           config[:retry_count] = v.to_i
         }
+        opt.on('--publish_iphone', 'publish for iphone') {|v|
+          config[:publish_iphone] = true
+        }
+        opt.on('--publish_kindle', 'publish for kindle') {|v|
+          config[:publish_kindle] = true
+        }
+        opt.on('--no_trimming', "don't trimming") {|v|
+          config[:no_trimming] = true
+        }
         opt.parse!(arguments)
       }
 

data/lib/kindai/interface.rb

@@ -14,7 +14,16 @@ module Kindai::Interface
 
     publisher = Kindai::Publisher.new_from_path downloader.book_path
     publisher.book = book
-    publisher.publish_auto
+
+    if config[:no_trimming]
+      return
+    elsif config[:publish_iphone] || config[:publish_kindle]
+      publisher.publish_for_iphone if config[:publish_iphone]
+      publisher.publish_for_kindle if config[:publish_kindle]
+    else
+      publisher.publish_default
+    end
+
   end
 
   def self.download_keyword(keyword, config = { })

data/lib/kindai/publisher.rb

@@ -63,6 +63,21 @@ module Kindai
       self.clone.trim.resize(600, 800).divide.zip.name('kindle').publish
     end
 
+    def publish_default
+      self.ensure_book
+      self.clone.trim.name('default').publish
+    end
+
+    def publish_for_iphone
+      self.ensure_book
+      self.clone.trim.resize(1280, 960).trim.zip.name('iphone').publish
+    end
+
+    def publish_for_kindle
+      self.ensure_book
+      self.clone.trim.resize(600, 800).divide.zip.name('kindle').publish
+    end
+
     def ensure_book
       @book ||= Kindai::Book.new_from_local_directory(root_path)
       true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kindai
 version: !ruby/object:Gem::Version
-  version: 1.7.4
+  version: 1.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-24 00:00:00.000000000Z
+date: 2011-11-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70227034236620 !ruby/object:Gem::Requirement
+  requirement: &70237853272140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70227034236620
+  version_requirements: *70237853272140
 - !ruby/object:Gem::Dependency
   name: rmagick
-  requirement: &70227034236000 !ruby/object:Gem::Requirement
+  requirement: &70237853271480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70227034236000
+  version_requirements: *70237853271480
 - !ruby/object:Gem::Dependency
   name: zipruby
-  requirement: &70227034235440 !ruby/object:Gem::Requirement
+  requirement: &70237853270860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70227034235440
+  version_requirements: *70237853270860
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70227034234780 !ruby/object:Gem::Requirement
+  requirement: &70237853270200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70227034234780
+  version_requirements: *70237853270200
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70227034234140 !ruby/object:Gem::Requirement
+  requirement: &70237853269560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *70227034234140
+  version_requirements: *70237853269560
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70227034233520 !ruby/object:Gem::Requirement
+  requirement: &70237853268940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70227034233520
+  version_requirements: *70237853268940
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70227034232860 !ruby/object:Gem::Requirement
+  requirement: &70237853268320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *70227034232860
+  version_requirements: *70237853268320
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70227034232200 !ruby/object:Gem::Requirement
+  requirement: &70237853267720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70227034232200
+  version_requirements: *70237853267720
 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: -1306729881967033791
+      hash: 3450572323135900502
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: