honyomi 0.2.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68f371dc5130aa8dc7f02f3464902d28628ba38a
-  data.tar.gz: dceceb65a54d4944993a91ae8d8a75b7576d9a0e
+  metadata.gz: e2f44bb420e77ab9fbef9b1508052aca915ffbd7
+  data.tar.gz: d443c1e385c34c9f67f25cffc201070a49503dd2
 SHA512:
-  metadata.gz: 7ca2111c247ee0bea1a11e74a3b6d57479e361bd148b76fb8f3873c3e349c079fbf39e3c14ceb6744053b1007b5cb2e6b0e287edbaf2dd7d8a825f2a3bc17ebd
-  data.tar.gz: c733a8d9b8420a5b92fb0df4b317931a10ac1bd03cf336bf265e4521ab08abbd26ff1d6711a812cefdbf5b4977dd05c7150921cedef13ebe8a51bb7f07fb330e
+  metadata.gz: b9dd0c9422a025fefa25e36d64bfd20b5f0083d16595219b920acb6ce67529adda81624cefb6801714f50a51765b999024fd0b77121c1acbd3c6daedd5956c4b
+  data.tar.gz: da02decc4acb9741aae5492378f520b3c0940026f2717d3a7b4a3ed6051d84b120470f99a57807211b9446914016cb9e1b443adb3482905995a0ba7662799590

data/HISTORY.md

@@ -1,5 +1,30 @@
 # HISTORY - Honyomi
 
+## 1.0 - 2014-11-15
+
+* Bookmark a page
+  * Click star
+  * Is also attached comments
+    * Link page no (P111)
+    * Auto link http://...
+    * Ctrl+Enter: Shortcut to Update
+
+* Edit a book information on web
+  * Title, Author, URL
+
+* Convenient search query
+  * `123`: Jump to page
+  * `b:11 hello`: Book Id
+  * `-b:11 hello`: Book Id (NOT)
+  * `t:hello world`: Book Title
+  * `p:>100 p:<200  world`: Page Number
+
+* Help
+
+* Clear Button
+
+* Impliment Util.highlight_keywords using Groonga::PatriciaTrie#tag_keys instead of Pure Ruby
+
 ## 0.2 - 2014-10-07
 
 * Improve search result

data/lib/honyomi/cli.rb

@@ -62,6 +62,8 @@ module Honyomi
 
     desc "edit book_id [options]", "Edit book info"
     option :title, :aliases => '-t', :type => :string,  :desc => 'Change title'
+    option :author, :aliases => '-a', :type => :string,  :desc => 'Change author'
+    option :url, :aliases => '-u', :type => :string,  :desc => 'Change url'
     option :path,  :type => :string,  :desc => 'Change file path'
     option :strip, :type => :boolean, :desc => 'Remove spaces'
     option :no_strip, :type => :boolean, :desc => 'Not remove spaces'
@@ -70,9 +72,14 @@ module Honyomi
       core = Core.new
       core.load_database
 
-      book_id = args[0].to_i
-      core.edit(book_id, options)
-      puts core.list([book_id])
+      begin 
+        book_id = args[0].to_i
+        core.edit(book_id, options)
+        puts core.list([book_id])
+      rescue HonyomiError => e
+        puts e
+        exit -1
+      end
     end
 
     desc "remove book_id1 [book_id2 ...]", "Remove books"
@@ -91,8 +98,7 @@ module Honyomi
       core = Core.new
       core.load_database
 
-      results = core.search(args.join(" "))
-      snippet = GrnMini::Util.text_snippet_from_selection_results(results)
+      results, snippet = core.search(args.join(" "))
 
       puts "#{results.size} matches"
       results.map do |page|

data/lib/honyomi/core.rb

@@ -41,6 +41,8 @@ module Honyomi
     def edit(book_id, options)
       opts = {}
       opts[:title]     = options[:title]                 if options[:title]
+      opts[:author]    = options[:author]                if options[:author]
+      opts[:url]       = options[:url]                   if options[:url]
       opts[:path]      = options[:path]                  if options[:path]
       opts[:timestamp] = Time.parse(options[:timestamp]) if options[:timestamp]
 
@@ -58,7 +60,7 @@ module Honyomi
     end
 
     def search(query)
-      @database.search(query)
+      @database.search(Query.new(query), cli: true)
     end
 
     def list(args = [], options = {})
@@ -81,6 +83,8 @@ module Honyomi
             results << <<EOF
 id:        #{book.id.to_s}
 title:     #{book.title}
+author:    #{book.author}
+url:       #{book.url}
 path:      #{book.path}
 pages:     #{book.page_num}
 timestamp: #{book.timestamp}

data/lib/honyomi/database.rb

@@ -1,25 +1,36 @@
 require 'honyomi'
+require 'honyomi/query'
 require 'grn_mini'
 
 module Honyomi
+  class HonyomiError < Exception ; end
+
   class Database
     attr_reader :books
     attr_reader :pages
+    attr_reader :bookmarks
 
     def initialize
       @books = GrnMini::Array.new("Books")
       @pages = GrnMini::Hash.new("Pages")
+      @bookmarks = GrnMini::Hash.new("Bookmarks")
 
       @books.setup_columns(path:     "",
                            title:    "",
                            author:   "",
+                           url:      "",
                            page_num: 0,
                            timestamp: Time.new,
                            )
       @pages.setup_columns(book:    @books,
                            text:    "",
                            page_no: 0,
+                           bookmark: @bookmarks,
                            )
+      @bookmarks.setup_columns(page:    @pages,
+                               comment: "",
+                               timestamp: Time.new,
+                               )
     end
 
     def add_book(path, pages, options = {})
@@ -40,6 +51,8 @@ module Honyomi
 
         book = @books.add(path: path,
                           title: title,
+                          author: "",
+                          url:    "",
                           page_num: pages.size,
                           timestamp: timestamp,
                           )
@@ -54,8 +67,11 @@ module Honyomi
 
     def change_book(book_id, options = {})
       book = @books[book_id]
+      raise HonyomiError, "Invalid book id: #{book_id}" unless book.valid_id?
       
       book.title = options[:title] if options[:title]
+      book.author = options[:author] if options[:author]
+      book.url = options[:url] if options[:url]
       book.path  = options[:path]  if options[:path]
       book.timestamp = options[:timestamp] if options[:timestamp]
 
@@ -83,8 +99,26 @@ module Honyomi
       book.delete
     end
 
-    def search(query)
-      @pages.select(query, default_column: "text")
+    def search(query, options = {})
+      match_pages = @pages.select(query.page_query, default_column: "text")
+
+      if options[:cli]
+        snippet = match_pages.expression.snippet([ ['<<',
+                                                    '>>'] ],
+                                                 {normalize: true})
+      else
+        snippet = match_pages.expression.snippet([["<span class=\"highlight\">", "</span>"]], {html_escape: true, normalize: true, max_results: 5})
+      end
+
+      match_bookmarks = @bookmarks.select do |record|
+        record.match(query.bookmark_query) do |target|
+          target.comment * 10
+        end
+      end
+
+      group_by_page = match_bookmarks.group("page")
+
+      return group_by_page.union!(match_pages), snippet
     end
 
     def book_pages(book_id)
@@ -100,5 +134,32 @@ module Honyomi
         nil
       end
     end
+
+    def add_bookmark(page)
+      @bookmarks["#{page.book.id}:#{page.page_no}"] = { page: page, timestamp: Time.now }
+    end
+
+    def delete_bookmark(page)
+      @bookmarks.delete { |bookmark| bookmark.page == page }
+    end
+
+    def update_bookmark_comment(id, page_no, comment)
+      bm = @bookmarks["#{id}:#{page_no}"]
+      bm.comment = comment
+      bm.timestamp = Time.now
+      bm
+    end
+
+    def bookmark?(page)
+      @bookmarks["#{page.book.id}:#{page.page_no}"]
+    end
+
+    def bookmark_from_page(page)
+      @bookmarks["#{page.book.id}:#{page.page_no}"]
+    end
+
+    def books_bookmark(book)
+      @bookmarks.select { |record| record.page.book == book }
+    end
   end
 end

data/lib/honyomi/query.rb

@@ -0,0 +1,92 @@
+# -*- coding: utf-8 -*-
+
+module Honyomi
+  class Query
+    attr_reader :src
+    attr_reader :page_query
+    attr_reader :bookmark_query
+    attr_reader :jump_page_no
+    attr_reader :key
+    
+    OPTIONS = [
+               ['book'  , 'b'],
+               ['title' , 't'],
+               ['page'  , 'p'],
+              ]
+
+    def initialize(src)
+      @src = src
+      init_hash
+      parse
+    end
+
+    private
+
+    def init_hash
+      @key = {}
+
+      OPTIONS.flatten.each do |key|
+        @key[key] = []
+      end
+    end
+
+    def parse
+      kp = OPTIONS.flatten.join('|')
+      parts = @src.scan(/(-)?(?:(#{kp}):)?(?:"(.+)"|(\S+))/)
+
+      page_query = []
+      bookmark_query = []
+
+      parts.each do |minus, key, quoted_value, value|
+        if quoted_value
+          text = %Q|"#{quoted_value}"|
+        else
+          text = value
+        end
+
+        unless (key)
+          begin
+            @jump_page_no = Integer(text)
+            page_query     << make_query(minus, text, "page_no")
+            bookmark_query << make_query(minus, text, "page.page_no")
+          rescue ArgumentError
+            page_query     << make_query(minus, text)
+            bookmark_query << make_query(minus, text)
+          end
+        else
+          case key
+          when 'book', 'b'
+            @key['book']   << text
+            page_query     << make_query(minus, text, "book")
+            bookmark_query << make_query(minus, text, "page.book")
+          when 'title', 't'
+            @key['title']  << text
+            page_query     << make_query(minus, text, "book.title:@")
+            bookmark_query << make_query(minus, text, "page.book.title:@")
+          when 'page', 'p'
+            @key['page']   << text
+            page_query     << make_query(minus, text, "page_no")
+            bookmark_query << make_query(minus, text, "page.book.page_no")
+          end
+        end
+      end
+
+      @page_query = page_query.join(" ")
+      @bookmark_query = bookmark_query.join(" ")
+    end
+
+    def make_query(minus, text, key = nil)
+      m = minus ? "-" : ""
+
+      if key
+        if key[/@$/]
+         "#{m}#{key}#{text}"
+        else
+         "#{m}#{key}:#{text}"
+        end
+      else
+        "#{m}#{text}"
+      end
+    end
+  end
+end

data/lib/honyomi/util.rb

@@ -39,60 +39,28 @@ module Honyomi
     end
 
     def highlight_keywords(src, keywords, css_class)
-      # Init highlight_map
-      hightlight_map = Array.new(src.length, nil)
-
-      keywords.each do |keyword|
-        pos = 0
-
-        loop do
-          r = src.match(/#{Regexp.escape(keyword)}/i, pos) do |m|
-            s = m.begin(0)
-            l = keyword.length
-            e = s+l
-            (s...e).each {|i| hightlight_map[i] = 1 }
-            pos = e
-          end
+      return "" if src.nil?
+      return src if keywords.nil?
 
-          break if r.nil?
-        end
-      end
-
-      # Delete html tag
-      index = 0
-      in_tag = false
-      src.each_char do |char|
-        in_tag = true               if char == '<'
-        hightlight_map[index] = nil if in_tag
-        in_tag = false              if char == '>'
-        index += 1
+      words = nil
+      if Groonga::VERSION[0] >= 3
+        words = Groonga::PatriciaTrie.create(key_type: "ShortText", normalizer: "NormalizerAuto")
+      else
+        words = Groonga::PatriciaTrie.create(key_type: "ShortText", key_normalize: true)
       end
+      keywords.each { |keword| words.add(keword) }
 
-      # Output
-      result = ""
+      other_text_handler = Proc.new { |string| ERB::Util.h(string) }
+      options = { other_text_handler: other_text_handler }
 
-      index = 0
-      prev = nil
-      src.each_char do |char|
-        current = hightlight_map[index]
-
-        if prev.nil? && current
-          result += "<span class='#{css_class}'>"
-        elsif prev && current.nil?
-          result += "</span>"
-        end
-
-        result += char
-
-        index += 1
-        prev = current
+      words.tag_keys(src, options) do |record, word|
+        "<span class='#{css_class}'>#{ERB::Util.h(word)}</span>"
       end
-      result += "</span>" if prev
-
-      result
     end
 
     def extract_keywords(query)
+      return [] if query.nil?
+
       query.split.reduce([]) do |a, e|
         e = e.gsub(/^\(|\)|AND|OR$/, "")
 
@@ -103,9 +71,28 @@ module Honyomi
         elsif e =~ /:/
           a
         else
-          a + [e]
+          if e.empty?
+            a
+          else
+            a + [e]
+          end
+        end
+      end
+    end
+
+    def render_bookmark_comment_to_html(bookmark)
+      comment = CGI.escape_html(bookmark.comment || "")
+
+      URI.extract(comment, %w{http https}).uniq.each do |uri|
+        unless uri.match(/(\.jpg|\.jpeg|\.png)/)
+          comment.gsub!(uri, %Q{<a href="#{uri}">#{uri}</a>})
         end
       end
+
+      comment.gsub!(/P([1-9][0-9]*)/, %Q(<a href="/v/#{bookmark.page.book.id}?page=\\1">P\\1</a>))
+
+      comment.gsub("\n", "<br/>")
     end
+
   end
 end

data/lib/honyomi/version.rb

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