kindai 1.5.1 → 1.6.0

data/VERSION

@@ -1 +1 @@
-1.5.1
+1.6.0

data/kindai.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kindai}
-  s.version = "1.5.1"
+  s.version = "1.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["hitode909"]
-  s.date = %q{2011-02-11}
+  s.date = %q{2011-02-26}
   s.default_executable = %q{kindai.rb}
   s.description = %q{kindai.rb is kindai digital library downloader.}
   s.email = %q{hitode909@gmail.com}
@@ -38,6 +38,7 @@ Gem::Specification.new do |s|
     "lib/kindai/spread.rb",
     "lib/kindai/spread_downloader.rb",
     "lib/kindai/util.rb",
+    "lib/kindai/util/database.rb",
     "publish.rb",
     "spec/book_downloader_spec.rb",
     "spec/book_spec.rb",

data/lib/kindai/book.rb

@@ -8,7 +8,13 @@ module Kindai
       raise "not info:ndljp" unless permalink_uri.match(/info\:ndljp/)
       me = new
       me.permalink_uri = permalink_uri
-      me
+      return me
+    end
+
+    def self.new_from_local_directory(path)
+      metadata = File.join(path, 'metadata')
+      permalink = open(metadata).read.chomp
+      return self.new_from_permalink(permalink)
     end
 
     # ----- metadata -----

data/lib/kindai/book_downloader.rb

@@ -15,8 +15,9 @@ module Kindai
     end
 
     def download
-      return false if self.has_file?
       create_directory
+      write_metadata
+      return false if self.has_file?
       download_spreads
       return true
     end
@@ -36,6 +37,16 @@ module Kindai
       return success
     end
 
+    def write_metadata
+      open(metadata_path, 'w') {|f|
+        f.puts book.permalink_uri
+      }  unless File.exists?(metadata_path)
+    end
+
+    def metadata_path
+      File.join(book_path, 'metadata')
+    end
+
     def has_file?
       File.directory?(self.book_path) && self.spread_downloaders.all?(&:has_file?)
     end

data/lib/kindai/interface.rb

@@ -13,6 +13,7 @@ module Kindai::Interface
     downloader.download
 
     publisher = Kindai::Publisher.new_from_path downloader.book_path
+    publisher.book = book
     publisher.publish_auto
   end
 

data/lib/kindai/publisher.rb

@@ -2,6 +2,7 @@
 module Kindai
   class Publisher
     attr_accessor :root_path
+    attr_accessor :book
 
     def self.new_from_path(root_path)
       me = self.new
@@ -41,6 +42,7 @@ module Kindai
     def publish
       Kindai::Util.logger.info("publish #{root_path}, #{config(:name)}")
       raise "no name" unless config(:name)
+      self.ensure_book
       if seems_finished?
         Kindai::Util.logger.info("already published")
         return
@@ -56,10 +58,16 @@ module Kindai
     end
 
     def publish_auto
+      self.ensure_book
       self.clone.trim.resize(1280, 960).trim.zip.name('iphone').publish
       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
+    end
+
     # ------------------------------------
     protected
 
@@ -90,7 +98,8 @@ module Kindai
 
     def trim!(source_path)
       return trim_path if files(source_path).length == files(trim_path).length
-      info = config(:trim).kind_of?(Hash) ? config(:trim) : Kindai::Util.trim_info_by_files(original_files)
+      info = config(:trim).kind_of?(Hash) ? config(:trim) : Kindai::Util.trim_info_auto(book, original_files)
+      Kindai::Util.logger.info "trim position: #{info}"
       files(source_path).each{|file|
         dst = File.join(trim_path, File.basename(file))
         Kindai::Util.trim_file_to(file, dst, info)

data/lib/kindai/util/database.rb

@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+require 'open-uri'
+require 'net/http'
+require 'json'
+require 'ostruct'
+
+module Kindai::Util::Database
+  ENDPOINT = URI.parse 'http://gigaschema.appspot.com/hitode909/kindai.json'
+
+  def self.items
+    @items ||= JSON.parse(open(ENDPOINT).read)['data'].map{|item|
+      begin
+        hash = JSON.parse(item['value'])
+        self.validate(hash)
+        OpenStruct.new(hash)
+      rescue => error
+        Kindai::Util.logger.warn error
+      end
+    }.compact
+  end
+
+  def self.item_for_book(book)
+    self.items.find{|item| item.uri == book.permalink_uri}
+  end
+
+  def self.save_item(book, info)
+    previous_item = self.item_for_book(book)
+    if previous_item and previous_item.version >= Kindai::VERSION
+      Kindai::Util.logger.warn "Database has newer version of #{book.title}. To save, delete it first."
+      return false
+    end
+
+    send_data = {
+      'uri'     => book.permalink_uri,
+      'title'   => book.title,
+      'author'  => book.author,
+      'x'       => info[:x],
+      'y'       => info[:y],
+      'width'   => info[:width],
+      'height'  => info[:height],
+      'version' => Kindai::VERSION
+    }
+    self.validate(send_data)
+
+    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})
+      http.request(request)
+    }
+    case res.code
+    when '200'
+      JSON.parse(res.body)
+    else
+      raise res
+    end
+  end
+
+  def self.validate(info)
+    %w{uri title author}.each{|key|
+      raise "key #{key} is required" unless info.has_key? key
+      raise "key #{key} must be kind of String" unless info[key].kind_of? String
+    }
+
+    %w{x y width height version}.each{|key|
+      raise "key #{key} is required" unless info.has_key? key
+      raise "key #{key} must be kind of Numeric" unless info[key].kind_of? Numeric
+    }
+  end
+end

data/lib/kindai/util.rb

@@ -115,8 +115,30 @@ module Kindai::Util
     return got
   end
 
+  def self.trim_info_auto(book, files)
+    info = nil
+    item = Kindai::Util::Database.item_for_book(book)
+    if item
+      self.logger.info "found trimming info"
+      return {
+        :x      => item.x,
+        :y      => item.y,
+        :width  => item.width,
+        :height => item.height,
+      }
+    end
+
+    info = self.trim_info_by_files(files)
+    self.logger.info "save trimming info"
+    Kindai::Util::Database.save_item(book, info)
+    return info
+  rescue => error
+    self.logger.error "#{error.class}: #{error.message}"
+    info || self.trim_info_by_files(files)
+  end
+
   def self.trim_info_by_files(files)
-    Kindai::Util.logger.info "get trim info"
+    Kindai::Util.logger.info "get trimming info"
     positions = {:x => [], :y => [], :width => [], :height => []}
     files.each{|file|
       pos = trim_info(file)
@@ -132,7 +154,6 @@ module Kindai::Util
     [:x, :y, :width, :height].each{|key|
       good_pos[key] = average(positions[key])
     }
-    Kindai::Util.logger.info "trim position #{good_pos}"
     good_pos
   end
 

data/lib/kindai.rb

@@ -10,10 +10,11 @@ require 'pathname'
 require 'fileutils'
 
 module Kindai
-  VERSION = File.read(File.join(File.dirname(__FILE__), '../VERSION')).strip
+  VERSION = File.read(File.join(File.dirname(__FILE__), '../VERSION')).strip.to_f
 
   require 'kindai/cli'
   require 'kindai/util'
+  require 'kindai/util/database'
   require 'kindai/book'
   require 'kindai/spread'
   require 'kindai/book_downloader'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kindai
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-02-11 00:00:00.000000000 +09:00
+date: 2011-02-26 00:00:00.000000000 +09:00
 default_executable: kindai.rb
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2152665880 !ruby/object:Gem::Requirement
+  requirement: &2152615900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152665880
+  version_requirements: *2152615900
 - !ruby/object:Gem::Dependency
   name: rmagick
-  requirement: &2152664980 !ruby/object:Gem::Requirement
+  requirement: &2152614660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152664980
+  version_requirements: *2152614660
 - !ruby/object:Gem::Dependency
   name: zipruby
-  requirement: &2152664280 !ruby/object:Gem::Requirement
+  requirement: &2152613680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152664280
+  version_requirements: *2152613680
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152663320 !ruby/object:Gem::Requirement
+  requirement: &2152612200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *2152663320
+  version_requirements: *2152612200
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152662500 !ruby/object:Gem::Requirement
+  requirement: &2152611260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2152662500
+  version_requirements: *2152611260
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2152661560 !ruby/object:Gem::Requirement
+  requirement: &2152605260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *2152661560
+  version_requirements: *2152605260
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2152660740 !ruby/object:Gem::Requirement
+  requirement: &2152604380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,7 +88,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152660740
+  version_requirements: *2152604380
 description: kindai.rb is kindai digital library downloader.
 email: hitode909@gmail.com
 executables:
@@ -117,6 +117,7 @@ files:
 - lib/kindai/spread.rb
 - lib/kindai/spread_downloader.rb
 - lib/kindai/util.rb
+- lib/kindai/util/database.rb
 - publish.rb
 - spec/book_downloader_spec.rb
 - spec/book_spec.rb
@@ -144,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1731474605592743609
+      hash: 1870768052266429891
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: