honyomi 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f785777fac05f71e8de95f2a030a5da69b791a4d
-  data.tar.gz: fbe61872b4dff870f4699de33df9a1278fbaa8e9
+  metadata.gz: 6ad0374652cee2d4647368aa26cd8bd5111793af
+  data.tar.gz: 65dad1ff0f27924e91e440d2ba6e48baa7742a66
 SHA512:
-  metadata.gz: dfbec7c05b178b935ae27189c276382b9f7f67e1f46cf519609cb1b47a73f99dc08b45e1dffc68e734a59b6610fe511a0ef68fc8b7663d9c626f2a7481c121bc
-  data.tar.gz: 11d2d1af46f7515451e04c8bfd90983cca3c11245889423979ca13d9f055eb989bf4c3dad31be50686eb5881a953301738798b1077684cff16b483e241db07d3
+  metadata.gz: 5a90676167abf1530f3decc4280fdbced75cce1c5dfd723845b5e3682e6292aa243820032382a730bff97ed692d97af4dbbec14486acd19005464c61e6c16398
+  data.tar.gz: fbc928917670e98ad08970850f9ce133bd70339a8f5a896768508acdc08624087cbf3cee4b3491a899fc9ab102f47edcf83e45a7da2aed39ed76a84eb1fabb1a

data/HISTORY.md

@@ -1,5 +1,13 @@
 # HISTORY - Honyomi
 
+## 1.3 - 2015-07-24
+
+- Run the image command with the add command if there is 'pdftoppm'
+  - Also when you add from web
+- Reduce the movement amount when you press the 'Prev' button (5 -> 1)
+- Support docker container
+  - [ongaeshi/honyomi Repository | Docker Hub Registry](https://registry.hub.docker.com/u/ongaeshi/honyomi/)
+
 ## 1.2 - 2015-07-03
 
 * Add image command

data/README.md

@@ -10,6 +10,12 @@ Honyomi is "本読み". "Read a book" is meaning.
 
 ## Installation
 
+You can use the Docker container.
+
+- [ongaeshi/honyomi Repository | Docker Hub Registry](https://registry.hub.docker.com/u/ongaeshi/honyomi/)
+
+or
+
     $ gem install honyomi
 
 When you faild to install Rroonga, Please refer.
@@ -44,6 +50,17 @@ $ honyomi add /path/to/this_is_book.pdf
 A 1 this_is_book (10 pages)
 ```
 
+### Add book's image
+
+You can be inline display of the page on the browser.
+
+Need `pdftoppm` command.
+
+```
+$ honyomi image 1
+Generated images to '/Users/ongaeshi/.honyomi/image/1'
+```
+
 ### Edit book
 
 Change title. Specify book id.

data/honyomi.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'sinatra'
   spec.add_dependency 'thin', "< 1.7"
   spec.add_dependency 'thor'
+  spec.add_dependency 'whichr', '~> 0.3'
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/lib/honyomi/core.rb

@@ -23,7 +23,9 @@ module Honyomi
     end
 
     def add(filename, options = {})
-      @database.add_from_pdf(filename, options)
+      book, status = @database.add_from_pdf(filename, home_dir, options)
+
+      return book, status
     end
 
     def update(book_id, options)
@@ -121,9 +123,7 @@ EOF
     end
 
     def image(id, options = {})
-      pdf = Pdf.new(@database.books[id].path)
-      output_dir = File.join(image_dir, id.to_s)
-      pdf.generate_images(output_dir)
+      output_dir = @database.add_image(id, home_dir)
       puts "Generated images to '#{output_dir}'" if options[:verbose]
     end
 
@@ -145,9 +145,5 @@ EOF
       
       @home_dir
     end
-
-    def image_dir
-      File.join(home_dir, "image")
-    end
   end
 end

data/lib/honyomi/database.rb

@@ -33,19 +33,32 @@ module Honyomi
                                )
     end
 
-    def add_from_pdf(filename, options = {})
+    def add_from_pdf(filename, home_dir, options = {})
       if File.exist?(filename)
         filename = File.expand_path(filename)
         options = options.dup
         pages = Pdf.new(filename).pages
         pages = pages.map { |page| Util.strip_page(page) } if options[:strip]
         options[:timestamp] = File.stat(filename).mtime
-        add_book(filename, pages, options)
+        book, status = add_book(filename, pages, options)
+
+        add_image(book.id, home_dir) if Util.exist_command?('pdftoppm')
+
+        return book, status
       else
         nil
       end
     end
 
+    def add_image(id, home_dir)
+      output_dir = File.join(home_dir, "image", id.to_s)
+
+      pdf = Pdf.new(books[id].path)
+      pdf.generate_images(output_dir)
+
+      output_dir
+    end
+
     def add_book(path, pages, options = {})
       book = book_from_path(path)
 

data/lib/honyomi/util.rb

@@ -1,4 +1,5 @@
 require 'kconv'
+require 'whichr'
 
 module Honyomi
   module Util
@@ -110,5 +111,9 @@ module Honyomi
       zerofill = format("%0#{count_digit(page.book.page_num)}d", page.page_no)
       "#{home_dir}/image/#{page.book.id}/book-#{zerofill}.jpg"
     end
+
+    def exist_command?(command)
+      !(RubyWhich.new.which(command).empty?)
+    end
   end
 end

data/lib/honyomi/version.rb

@@ -1,3 +1,3 @@
 module Honyomi
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/lib/honyomi/web/app.rb

@@ -57,7 +57,7 @@ post '/upload' do
         f.write file[:tempfile].read
       end
 
-      @database.add_from_pdf(save_path)
+      @database.add_from_pdf(save_path, Util.home_dir)
     end
 
     @message = "Upload Success"
@@ -221,7 +221,7 @@ EOF
     if page_index > 0
       prev_link = <<EOF
 <ul class="pager">
-  <li><a href='#{url + "?page=#{[page_no - PAGE_SIZE, 1].max}"}' >Prev</a></li>
+  <li><a href='#{url + "?page=#{[page_no - 1, 1].max}"}' >Prev</a></li>
 </ul>
 EOF
     end

data/test/test_util.rb

@@ -17,4 +17,9 @@ class TestUtil < MiniTest::Test
     assert_equal 3, Util::count_digit(100)
     assert_equal 4, Util::count_digit(9999)
   end
+
+  def test_exist_command?
+    assert_equal true, Util::exist_command?('pdftotext')
+    assert_equal false, Util::exist_command?('pdftotexts')
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: honyomi
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - ongaeshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-02 00:00:00.000000000 Z
+date: 2015-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grn_mini
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: whichr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement