honyomi 0.2.0 → 1.0.0

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

@@ -0,0 +1,65 @@
+!!!
+
+.container
+  #help
+    %h1 Help
+
+    %ol
+      %li <a href="#search">Search</a>
+      %li <a href="#filter-options">Filter options</a>
+      %li <a href="#bookmark">Bookmark</a>
+
+    %h2#search Search
+
+    %h3 Keyword
+    %pre
+      :preserve
+        hello
+
+    %h3 Phrase Search
+    %pre
+      :preserve
+        "hello world"
+
+    %h3 Jump to 32 page
+    %pre
+      :preserve
+        32
+
+    %h2#filter-options Filter options
+
+    %h3 Book Id
+    %pre
+      :preserve
+        b:11 hello
+
+    %h3 Book Id (NOT)
+    %pre
+      :preserve
+        -b:11 hello
+
+    %h3 Book Title
+    %pre
+      :preserve
+        t:hello world
+
+    %h3 Page Number
+    %pre
+      :preserve
+        p:>100 p:<200  world
+
+    %h2#bookmark Bookmark
+    %ol
+      %li
+        If you click a star, you can bookmark the page
+        %br
+        %img(src="/image/bookmark-01.png")
+        %br
+        %img(src="/image/bookmark-02.png")
+        (Bookmarked)
+
+      %li
+        When you click the star again, you can write a memo
+        %br
+        %img(src="/image/bookmark-03.png")
+

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

@@ -6,12 +6,54 @@
       .header
         .title
           = @header_title
+
+        .title-form.hide
+          %form.form-horizontal(role="form")
+            .form-group
+              %label.col-sm-1.control-label(for="title-form-title")
+                Title
+              .col-sm-11
+                %input#title-form-title.form-control(type="text"  placeholder="Title of book (required)")
+            .form-group
+              %label.col-sm-1.control-label(for="title-form-author")
+                Author
+              .col-sm-11
+                %input#title-form-author.form-control(type="text" placeholder="Author of book (optional)")
+            .form-group
+              %label.col-sm-1.control-label(for="title-form-url")
+                URL
+              .col-sm-11
+                %input#title-form-url.form-control(type="text" placeholder="Website for this book (optional)")
+            .form-group
+              .pull-right
+                %input(type="submit" value="Save" id="title-form-save" class="btn btn-default")
+                or
+                %a(href="#" id="title-form-cancel")
+                  Cancel
+
         %form(class="form-inline" method="post" action="/search")
           .form-group
             %input(class="form-control" type="text" size=40 name="query" value="#{@params[:query]}")
             %input(type="hidden" name="book_id" value="#{@book_id}")
-            %input(class="btn btn-primary" type="submit" value="Search")
+            %input(type="submit" value="Search" class="btn btn-primary")
+            %input#clear(type="button" value="Clear" class="btn btn-default" onclick="click_clear_button()")
         .info
           = @header_info
+
+        #modal-bookmark-edit.modal.fade{"aria-hidden" => "true", "aria-labelledby" => "myModalLabel", :role => "dialog", :tabindex => "-1"}
+          .modal-dialog
+            .modal-content
+              .modal-header
+                %button.close{"data-dismiss" => "modal", :type => "button"}
+                  %span{"aria-hidden" => "true"} ×
+                  %span.sr-only Cancel
+                %h4#modal-bookmark-label.modal-title Modal title
+              .modal-body
+                %textarea{"rows" => 20, "cols" => 60, "placeholder" => "Ctrl+Enter: Update MEMO. The MEMO is included to the search result."}
+              .modal-footer
+                %button.btn.btn-danger.pull-left{"data-dismiss" => "modal", :type => "button"} Delete
+                %button.btn.btn-default{"data-dismiss" => "modal", :type => "button"} Cancel
+                %button.btn.btn-primary{"data-dismiss" => "modal", :type => "button"} Update
+
       .content
         = @content

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

@@ -7,8 +7,8 @@
     %meta(name="viewport" content="width=device-width, initial-scale=1.0")
     %link(rel="shortcut icon" href="/image/favicon.ico")
     %link(rel="stylesheet" href="/css/bootstrap.min.css")
-    %link(rel="stylesheet" href="/css/honyomi.css")
     %link(rel="stylesheet" href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css")
+    %link(rel="stylesheet" href="/css/honyomi.css")
     
   %body
     .navbar.navbar-default.navbar-static-top
@@ -27,6 +27,7 @@
     != yield
     %script(src="https://code.jquery.com/jquery.js")
     %script(src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js")
+    %script(src='/js/honyomi.js')
               
           
 

data/test/test_database.rb

@@ -113,13 +113,13 @@ class TestDatabase < MiniTest::Test
       db.add_book("/path/to/book2.pdf", ["2aa", "2bb"])
       db.add_book("/path/to/book3.pdf", ["3aa", "3bb", "3cc"])
 
-      results = db.search("1aa")
+      results, _ = db.search(Honyomi::Query.new("1aa"))
       assert_equal 1, results.size
 
-      results = db.search("aa")
+      results, _ = db.search(Honyomi::Query.new("aa"))
       assert_equal 3, results.size
 
-      results = db.search("bb OR cc")
+      results, _ = db.search(Honyomi::Query.new("bb OR cc"))
       assert_equal 3, results.size
     end
   end

data/test/test_query.rb

@@ -0,0 +1,79 @@
+require 'minitest_helper'
+require 'honyomi/query'
+
+module Honyomi
+  class TestQuery < MiniTest::Test
+    def test_simple
+      q = Query.new("aaa")
+      assert_equal "aaa", q.page_query
+      assert_equal nil, q.jump_page_no
+    end
+
+    def test_jump_page_no
+      q = Query.new("111")
+      assert_equal "page_no:111", q.page_query
+      assert_equal 111, q.jump_page_no
+      
+      q = Query.new("111 123")
+      assert_equal "page_no:111 page_no:123", q.page_query
+      assert_equal 123, q.jump_page_no
+
+      q = Query.new("aaa 222")
+      assert_equal "aaa page_no:222", q.page_query
+      assert_equal 222, q.jump_page_no
+    end
+
+    def test_phrase
+      q = Query.new("aaa \"bbb ccc\" ddd")
+      assert_equal "aaa \"bbb ccc\" ddd", q.page_query
+    end
+
+    def test_book
+      q = Query.new("b:22 bbb")
+      assert_equal "book:22 bbb", q.page_query
+    end
+
+    def test_book_title
+      q = Query.new("t:\"aaa bbb\" ccc")
+      assert_equal "book.title:@\"aaa bbb\" ccc", q.page_query
+    end
+
+    def test_page_no
+      q = Query.new("p:11 t:\"aaa bbb\"")
+      assert_equal "page_no:11 book.title:@\"aaa bbb\"", q.page_query
+    end
+
+    def test_and_or
+      q = Query.new("aaa + bbb")
+      assert_equal "aaa + bbb", q.page_query
+
+      q = Query.new("aaa OR bbb")
+      assert_equal "aaa OR bbb", q.page_query
+
+      q = Query.new("aaa (\"ddd bbb\" OR t:CCC)")
+      assert_equal "aaa (\"ddd bbb\" OR book.title:@CCC)", q.page_query
+    end
+
+    def test_bookmark_query
+      q = Query.new("aaa")
+      assert_equal "aaa", q.bookmark_query
+
+      q = Query.new("aaa t:bbb")
+      assert_equal "aaa page.book.title:@bbb", q.bookmark_query
+
+      q = Query.new("aaa b:11")
+      assert_equal "aaa page.book:11", q.bookmark_query
+
+      q = Query.new("aaa p:12")
+      assert_equal "aaa page.book.page_no:12", q.bookmark_query
+
+      q = Query.new("aaa (\"ddd bbb\" OR t:CCC)")
+      assert_equal "aaa (\"ddd bbb\" OR page.book.title:@CCC)", q.bookmark_query
+    end
+
+    def test_minus
+      q = Query.new("aaa -book:10")
+      assert_equal "aaa -page.book:10", q.bookmark_query
+    end
+  end
+end

data/test/test_util.rb

@@ -0,0 +1,13 @@
+require 'minitest_helper'
+
+class TestUtil < MiniTest::Test
+  include Honyomi
+  
+  def test_extract_keywords
+    assert_equal [], Util::extract_keywords(nil)
+    assert_equal %w(AA BB), Util::extract_keywords("AA BB")
+    assert_equal %w(aa bb cc), Util::extract_keywords("aa AND (bb OR cc)")
+    assert_equal %w(aa), Util::extract_keywords("aa -bb a:c")
+  end
+
+end

metadata

@@ -1,167 +1,167 @@
 --- !ruby/object:Gem::Specification
 name: honyomi
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors:
 - ongaeshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-06 00:00:00.000000000 Z
+date: 2014-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grn_mini
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra-reloader
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: honyomi is a e-book (pdf) search engine. It have command line interface
@@ -173,8 +173,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - AUTHORS
 - Gemfile
 - HISTORY.md
@@ -188,13 +188,20 @@ files:
 - lib/honyomi/core.rb
 - lib/honyomi/database.rb
 - lib/honyomi/pdf.rb
+- lib/honyomi/query.rb
 - lib/honyomi/util.rb
 - lib/honyomi/version.rb
 - lib/honyomi/web/app.rb
 - lib/honyomi/web/config.ru
 - lib/honyomi/web/public/css/bootstrap.min.css
 - lib/honyomi/web/public/css/honyomi.css
+- lib/honyomi/web/public/image/bookmark-01.png
+- lib/honyomi/web/public/image/bookmark-02.png
+- lib/honyomi/web/public/image/bookmark-03.png
 - 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/help.haml
 - lib/honyomi/web/views/index.haml
 - lib/honyomi/web/views/layout.haml
 - test/minitest_helper.rb
@@ -205,6 +212,8 @@ files:
 - test/test_database.rb
 - test/test_honyomi.rb
 - test/test_pdf.rb
+- test/test_query.rb
+- test/test_util.rb
 homepage: ''
 licenses:
 - MIT
@@ -215,17 +224,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: e-book (pdf) search engine, command line interface, and web application
@@ -238,3 +247,5 @@ test_files:
 - test/test_database.rb
 - test/test_honyomi.rb
 - test/test_pdf.rb
+- test/test_query.rb
+- test/test_util.rb