honyomi 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2f44bb420e77ab9fbef9b1508052aca915ffbd7
-  data.tar.gz: d443c1e385c34c9f67f25cffc201070a49503dd2
+  metadata.gz: 4c387aa69369e0ac0b0c92d5ce0c56a0d6f9b782
+  data.tar.gz: 36bd6672cc22367b2a368eb913122e96bd2ff322
 SHA512:
-  metadata.gz: b9dd0c9422a025fefa25e36d64bfd20b5f0083d16595219b920acb6ce67529adda81624cefb6801714f50a51765b999024fd0b77121c1acbd3c6daedd5956c4b
-  data.tar.gz: da02decc4acb9741aae5492378f520b3c0940026f2717d3a7b4a3ed6051d84b120470f99a57807211b9446914016cb9e1b443adb3482905995a0ba7662799590
+  metadata.gz: 53df1091d9e29ba8d7fbabb7b0b4ba27d1080b74d29cc2f5af2afdb5f6947689f279094bffb0fb7c4e75d37c17b3c1eed0d324db88af83893eb6cd60890ebb99
+  data.tar.gz: 00b79ec2b4122df5b55d7c869f102f1916dbf5406bb202f073806f8e2afb61ef5d3bb3e7a74955c8adc31a41df5e8805a35d533f9bf6686958bb1ca22e732fa1

data/HISTORY.md

@@ -1,5 +1,16 @@
 # HISTORY - Honyomi
 
+## 1.1 - 2015-06-23
+
+* Add book on web
+  * Drag & drop OR Dialog
+  * If you want to disable this feature, set ENV["HONYOMI_DISABLE_WEB_ADD"]
+    * $ HONYOMI_DISABLE_WEB_ADD=1 honyomi web
+
+* Fix encode error
+  * Specify file encoding in File.read
+  * Add String#scrub
+
 ## 1.0 - 2014-11-15
 
 * Bookmark a page

data/lib/honyomi/cli.rb

@@ -110,6 +110,7 @@ module Honyomi
     end
 
     desc "list [book_id1 book_id2 ...]", "List books"
+    option :path, :type => :boolean,  :desc => 'Display path'
     option :title, :aliases => '-t', :type => :string,  :desc => 'Filter title'
     def list(*args)
       core = Core.new

data/lib/honyomi/core.rb

@@ -23,16 +23,7 @@ module Honyomi
     end
 
     def add(filename, 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
-        @database.add_book(filename, pages, options)
-      else
-        nil
-      end
+      @database.add_from_pdf(filename, options)
     end
 
     def update(book_id, options)
@@ -71,9 +62,15 @@ module Honyomi
         id_length = books.max { |book| book.id.to_s.length }
         id_length = id_length ? id_length.id.to_s.length : 0
 
-        books.map do |book|
-          # "#{book.id} #{book.title} (#{book.page_num} pages) #{book.path}"
-          "#{book.id.to_s.rjust(id_length)} #{book.title} (#{book.page_num} pages)"
+        if options[:path]
+          books.map do |book|
+            "#{book.id.to_s.rjust(id_length)} #{book.path}"
+          end
+        else
+          books.map do |book|
+            # "#{book.id} #{book.title} (#{book.page_num} pages) #{book.path}"
+            "#{book.id.to_s.rjust(id_length)} #{book.title} (#{book.page_num} pages)"
+          end
         end
       else
         results = []
@@ -135,15 +132,11 @@ EOF
 
     def home_dir
       unless @home_dir
-        @home_dir = @opts[:home_dir] || ENV['HONYOMI_DATABASE_DIR'] || File.join(default_home, '.honyomi')
+        @home_dir = @opts[:home_dir] || Util.home_dir
         FileUtils.mkdir_p(@home_dir) unless File.exist?(@home_dir)
       end
       
       @home_dir
     end
-
-    def default_home
-      File.expand_path '~'
-    end
   end
 end

data/lib/honyomi/database.rb

@@ -33,6 +33,19 @@ module Honyomi
                                )
     end
 
+    def add_from_pdf(filename, 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)
+      else
+        nil
+      end
+    end
+
     def add_book(path, pages, options = {})
       book = book_from_path(path)
 

data/lib/honyomi/pdf.rb

@@ -9,7 +9,10 @@ module Honyomi
       Dir.mktmpdir do |dir|
         outfile = File.join(dir, "pdf.txt")
         system("pdftotext", filename, outfile) # Need pdftotext (poppler, xpdf)
-        @text = File.read(outfile)
+        @text = File.read(outfile, encoding: Encoding::UTF_8)
+        if String.method_defined? :scrub
+          @text = @text.scrub('?')
+        end
       end
     end
 

data/lib/honyomi/util.rb

@@ -94,5 +94,12 @@ module Honyomi
       comment.gsub("\n", "<br/>")
     end
 
+    def home_dir
+      ENV['HONYOMI_DATABASE_DIR'] || File.join(default_home, '.honyomi')
+    end
+
+    def default_home
+      File.expand_path '~'
+    end
   end
 end

data/lib/honyomi/version.rb

@@ -1,3 +1,3 @@
 module Honyomi
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/lib/honyomi/web/app.rb

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 require 'haml'
+require 'honyomi/core'
 require 'honyomi/database'
 require 'honyomi/util'
 require 'sinatra'
@@ -31,6 +32,42 @@ get '/' do
   end
 end
 
+get '/add' do
+  if !ENV['HONYOMI_DISABLE_WEB_ADD']
+    haml :add
+  else
+    ""
+  end
+end
+
+post '/upload' do
+  return "" if ENV['HONYOMI_DISABLE_WEB_ADD']
+
+  @database = $database
+
+  if params[:files]
+    save_dir = File.join(Util.home_dir, "book")
+    FileUtils.mkdir_p(save_dir) unless File.exist?(save_dir)
+
+    params[:files].each do |file|
+      save_path = File.join(save_dir, file[:filename])
+
+      File.open(save_path, 'wb') do |f|
+        # p file[:tempfile]
+        f.write file[:tempfile].read
+      end
+
+      @database.add_from_pdf(save_path)
+    end
+
+    @message = "Upload Success"
+  else
+    @message = "Upload Failed"
+  end
+
+  redirect "/"
+end
+
 get '/help' do
   haml :help
 end

data/lib/honyomi/web/public/css/honyomi.css

@@ -126,3 +126,11 @@ input#clear {
 #help h3 {
     font-size: 120%;
 }
+
+/* add */
+
+.droparea {
+    border : solid 1px black;
+    padding : 100px;
+    background-color : #f0f0f0;
+}

data/lib/honyomi/web/public/js/honyomi.js

@@ -152,4 +152,39 @@ $(document).ready(function() {
   $("#title-form-cancel").click(function (e) {
     hideTitleForm();
   });
+
+  $(function() {
+    document.addEventListener("dragover", function(e) {
+      e.preventDefault();
+    }, true);
+
+    $('.droparea').on('drop', function(e) {
+      e.preventDefault();
+      e.stopPropagation();
+
+      var files = e.originalEvent.dataTransfer.files;
+
+      var fd = new FormData();
+
+      for (var i = 0; i < files.length; i++) {
+        fd.append("files[]", files[i]);
+      }
+
+      if (confirm("Upload?")) {
+        $.ajax({
+          url: "/upload",
+          type: "POST",
+          data: fd,
+          processData: false,
+          contentType: false,
+          success: function(msg) {
+          document.location = "/";
+        }
+        });
+      }
+
+      return false;
+    });
+  });
+
 });

data/lib/honyomi/web/views/add.haml

@@ -0,0 +1,12 @@
+!!!
+
+.container
+  %h1 Add books
+
+  .droparea
+    Drag & Drop file.
+    %form{:action => "/upload", :method => "post", :enctype => "multipart/form-data"}
+      %input{:id => "file", :type => "file", :name => "files[]", :multiple => ""}
+      %input{:type => "submit", :name => "upload"}
+
+

data/lib/honyomi/web/views/layout.haml

@@ -20,6 +20,10 @@
         %a(class="navbar-brand" href="/")
           Honyomi
       .navbar-collapse.collapse
+        -if !ENV['HONYOMI_DISABLE_WEB_ADD']
+          %ul(class="nav navbar-nav")
+            %li
+              <a href="/add">Add</a>
         %ul(class="nav navbar-nav")
           %li
             <a href="/help">Help</a>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: honyomi
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - ongaeshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-16 00:00:00.000000000 Z
+date: 2015-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grn_mini
@@ -201,6 +201,7 @@ files:
 - lib/honyomi/web/public/image/favicon.ico
 - lib/honyomi/web/public/image/star.png
 - lib/honyomi/web/public/js/honyomi.js
+- lib/honyomi/web/views/add.haml
 - lib/honyomi/web/views/help.haml
 - lib/honyomi/web/views/index.haml
 - lib/honyomi/web/views/layout.haml
@@ -234,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: e-book (pdf) search engine, command line interface, and web application