honyomi 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf7508e7109d3ead69a143592dde4cb74b6e4487
-  data.tar.gz: 31fb3eaaf69b663b3d472e77b82042689b45d146
+  metadata.gz: 68f371dc5130aa8dc7f02f3464902d28628ba38a
+  data.tar.gz: dceceb65a54d4944993a91ae8d8a75b7576d9a0e
 SHA512:
-  metadata.gz: 9fea83150ee7a69e5e1655ced9eb748e6fb4b80ff216732f762225899f749d3083d98341a5aa76af89ac88ee486a7b62a9cfb7100a46248b820522d3fe23749c
-  data.tar.gz: 66252688b26270c8998b13cb348cc07a89e2a960a39fc4abe9f9375b2d1fba79cbfbe6cad11cae735eae79bf63804e08dca4b4a536e6be052993d8828f1a05e3
+  metadata.gz: 7ca2111c247ee0bea1a11e74a3b6d57479e361bd148b76fb8f3873c3e349c079fbf39e3c14ceb6744053b1007b5cb2e6b0e287edbaf2dd7d8a825f2a3bc17ebd
+  data.tar.gz: c733a8d9b8420a5b92fb0df4b317931a10ac1bd03cf336bf265e4521ab08abbd26ff1d6711a812cefdbf5b4977dd05c7150921cedef13ebe8a51bb7f07fb330e

data/HISTORY.md

@@ -1,6 +1,21 @@
 # HISTORY - Honyomi
 
-## 0.1 - 2014-07-18
+## 0.2 - 2014-10-07
+
+* Improve search result
+  * Highlight keywords
+  * Take over the search query
+* Improve text mode
+  * Rename from 'raw' to 'text'
+  * Highlight keywords
+  * Take over the search query
+  * Change rendering tag from <pre> to <div>
+  * Change background color
+* Change Navbar to static
+* Add link to honyomi-web
+* Refactor page tag
+
+## 0.1 - 2014-10-02
 
 * Search in book
 * Display the book list

data/README.md

@@ -18,6 +18,9 @@ When you faild to install Rroonga, Please refer.
 And need external tools.
 * pdftotext - For reading pdf (poppler, xpdf)
 
+## Install to server
+* [ongaeshi/honyomi-web](https://github.com/ongaeshi/honyomi-web)
+
 ## Usage
 
 ### Create a database

data/lib/honyomi/util.rb

@@ -37,5 +37,75 @@ module Honyomi
     def strip_page(page)
       page.gsub(/[ \t]/, "")
     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
+
+          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
+      end
+
+      # Output
+      result = ""
+
+      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
+      end
+      result += "</span>" if prev
+
+      result
+    end
+
+    def extract_keywords(query)
+      query.split.reduce([]) do |a, e|
+        e = e.gsub(/^\(|\)|AND|OR$/, "")
+
+        if e =~ /^"(.+)"$/
+          a  + [$1]
+        elsif e =~ /^-/
+          a
+        elsif e =~ /:/
+          a
+        else
+          a + [e]
+        end
+      end
+    end
   end
 end

data/lib/honyomi/version.rb

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

data/lib/honyomi/web/app.rb

@@ -1,5 +1,6 @@
 require 'haml'
 require 'honyomi/database'
+require 'honyomi/util'
 require 'sinatra'
 require 'sinatra/reloader' if ENV['SINATRA_RELOADER']
 
@@ -34,15 +35,15 @@ get '/v/:id' do
 
   book = @database.books[params[:id].to_i]
 
-  if params[:raw] == '1'
-    raw_all(book)
+  if params[:text] == '1'
+    text_all(book)
   elsif params[:pdf] == '1'
     send_file(book.path, :disposition => 'inline')
   elsif params[:dl] == '1'
     send_file(book.path, :disposition => 'download')
   else
     if params[:page]
-      raw_page(book, params[:page].to_i)
+      text_page(book, params[:page].to_i)
     else
       if @params[:query] && !@params[:query].empty?
         search_book_home(book)
@@ -56,6 +57,8 @@ end
 helpers do
 
   def home
+    @header_info = %Q|#{@database.books.size} books, #{@database.pages.size} pages.|
+
     r = @database.books.map { |book|
       <<EOF
 <li>#{book.id}: <a href="/v/#{book.id}">#{book.title}</a> (#{book.page_num}P)</li>
@@ -63,12 +66,9 @@ EOF
     }.reverse
 
     @content = <<EOF
-<div class="matches">#{@database.books.size} books, #{@database.pages.size} pages.</div>
-<div class="result">
-  <ul>
+<ul>
 #{r.join("\n")}
-  </ul>
-</div>
+</ul>
 EOF
 
     haml :index
@@ -83,22 +83,15 @@ EOF
 
   def book_home(book)
     @book_id = book.id
-    @navbar_href = "/v/#{book.id}"
-    @navbar_title = book.title
-    file_mb = File.stat(book.path).size / (1024 * 1024)
-
-    @content = <<EOF
-<div class="result">
-  <div class="matches">#{book.page_num} pages. <a href="/v/#{book.id}?dl=1">Download</a> <span class="result-file-size">(#{file_mb}M)</span>&nbsp;&nbsp;&nbsp;<a href="/v/#{book.id}?pdf=1">Pdf</a>&nbsp;&nbsp;&nbsp;<a href="/v/#{book.id}?raw=1">Raw</a></div>
-</div>
-EOF
+    @header_title = header_title_book(book, @params[:query])
+    @header_info = header_info_book(book, @params[:query])
+    @content = ""
     haml :index
   end
 
   def search_book_home(book)
     @book_id = book.id
-    @navbar_href = "/v/#{book.id}"
-    @navbar_title = book.title
+    @header_title = header_title_book(book, @params[:query])
 
     search_common(@params[:query] + " book: #{book.id}",
                   [["page_no", :asc]],
@@ -106,38 +99,32 @@ EOF
                   )
   end
 
-  def raw_all(book)
-    pages = @database.book_pages(book.id)
+  def text_all(book)
+    @book_id = book.id
+    @header_title = header_title_book(book, @params[:query])
+    @header_info = header_info_book(book, @params[:query])
 
-    @navbar_href = "/v/#{book.id}"
-    @navbar_title = book.title
+    pages = @database.book_pages(book.id)
+    keywords = Util.extract_keywords(@params[:query])
 
     @content = pages.map { |page|
-      <<EOF
-<div class="raw-page" id="#{page.page_no}">
-  <div class="raw-page-no"><i class="fa fa-file-text-o"></i> <a href="##{page.page_no}">P#{page.page_no}</a></div>
-  <pre>#{escape_html page.text}</pre>
-</div>
-EOF
+      render_page(page, keywords: keywords, with_number: true)
     }.join("\n")
 
-    haml :raw
+    haml :index
   end
 
-  def raw_page(book, page_no)
-    @navbar_href = "/v/#{book.id}"
-    @navbar_title = book.title
+  def text_page(book, page_no)
     page = @database.book_pages(book.id)[page_no]
-    file_mb = File.stat(book.path).size / (1024 * 1024)
+    keywords = Util.extract_keywords(@params[:query])
 
-    @content = <<EOF
-<div class="landing-page" id="#{page.page_no}">
-  <div class="landing-page-no"><i class="fa fa-file-text-o"></i> P#{page.page_no} &nbsp;&nbsp;&nbsp;
-  <a href="/v/#{book.id}?dl=1">Download</a> <span class="result-file-size">(#{file_mb}M)</span>&nbsp;&nbsp;&nbsp;<a href="/v/#{book.id}?pdf=1#page=#{page.page_no}">Pdf</a>&nbsp;&nbsp;&nbsp;<a href="/v/#{book.id}?raw=1##{page.page_no}">Raw</a></div>
-  <pre>#{escape_html page.text}</pre>
-</div>
-EOF
-    haml :raw
+    @book_id = book.id
+    @header_title = header_title_book(book, @params[:query])
+    @header_info = header_info_book(book, @params[:query], page)
+
+    @content = render_page(page, keywords: keywords)
+
+    haml :index
   end
 
   RPAGE_SIZE = 20
@@ -156,7 +143,7 @@ EOF
 EOF
     end
 
-    snippet = results.expression.snippet([["<strong>", "</strong>"]], {html_escape: true, normalize: true, max_results: 10})
+    snippet = results.expression.snippet([["<span class=\"highlight\">", "</span>"]], {html_escape: true, normalize: true, max_results: 5})
 
     books = {}
 
@@ -164,6 +151,8 @@ EOF
       books[page.book.path] = 1
     end
 
+    @header_info = %Q|#{books.size} books, #{results.size} pages|
+
     r = rpage_entries.map do |page|
       if is_filter
         query_plus  = escape "#{query} book:#{page.book.id}"
@@ -175,11 +164,11 @@ EOF
 
       <<EOF
   <div class="result">
-    <div class="result-header"><a href="/v/#{page.book.id}?page=#{page.page_no}">#{page.book.title}</a> (P#{page.page_no})</div>
-    <div class="row result-sub-header">
+    <div class="title"><a href="/v/#{page.book.id}?query=#{escape(@params[:query])}&page=#{page.page_no}">#{page.book.title}</a> (P#{page.page_no})</div>
+    <div class="row info">
       #{filter_str}
     </div>
-    <div class="result-body">
+    <div class="main">
       #{snippet.execute(page.text).map {|segment| "<div class=\"result-body-element\">" + segment.gsub("\n", "") + "</div>"}.join("\n") }
     </div>
   </div>
@@ -187,7 +176,6 @@ EOF
     end
 
     @content = <<EOF
-<div class="matches">#{books.size} books, #{results.size} pages</div>
 <div class="autopagerize_page_element">
 #{r.join("\n")}
 </div>
@@ -196,4 +184,37 @@ EOF
 
     haml :index
   end
+
+  def header_title_book(book, query)
+    query = query ? "?query=#{query}" : ""
+    "<a href='/#{query}'>HOME</a> &gt; <a href='/v/#{book.id}#{query}'>#{book.title}</a>"
+  end
+
+  def header_info_book(book, query, page = nil)
+    query = query ? "&query=#{query}" : ""
+    file_mb = File.stat(book.path).size / (1024 * 1024)
+
+    if page.nil?
+      %Q|#{book.page_num} pages. <a href="/v/#{book.id}?dl=1">Download</a> <span class="file-size">(#{file_mb}M)</span>&nbsp;&nbsp;&nbsp;<a href="/v/#{book.id}?pdf=1">Pdf</a>&nbsp;&nbsp;&nbsp;<a href="/v/#{book.id}?text=1#{query}">Text</a>|
+    else
+      %Q|<i class="fa fa-file-text-o"></i> P#{page.page_no} &nbsp;&nbsp;&nbsp;<a href="/v/#{book.id}?dl=1">Download</a> <span class="file-size">(#{file_mb}M)</span>&nbsp;&nbsp;&nbsp;<a href="/v/#{book.id}?pdf=1#page=#{page.page_no}">Pdf</a>&nbsp;&nbsp;&nbsp;<a href="/v/#{book.id}?text=1#{query}##{page.page_no}">Text</a>|
+    end
+  end
+
+  def render_page(page, options = {})
+    with_number = options[:with_number] ? %Q|<div class="no"><i class="fa fa-file-text-o"></i> <a href="##{page.page_no}">P#{page.page_no}</a></div>| : ""
+
+    text = escape_html(page.text)
+    text = Util.highlight_keywords(text, options[:keywords], 'highlight') if options[:keywords]
+    text = text.gsub("\n\n", "<br/><br/>")
+
+<<EOF
+<div class="page" id="#{page.page_no}">
+  #{with_number}
+  <div class="main">
+    #{text}
+  </div>
+</div>
+EOF
+  end
 end

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

@@ -1,58 +1,72 @@
-.search-header {
+/* header */
+.header {
+}
+
+.header .title {
+    font-size: 130%;
     margin: 0px 0px 10px 0px;
 }
 
-.matches {
+.header .info {
     margin: 10px 0px 0px 5px;
 }
 
-.result {
+/* content */
+.content {
     margin: 10px 0px 0px 5px;
 }
 
-.result-header {
+/* .content .home */
+.content ul {
     font-size: 120%;
+    list-style: none;
+    padding-left: 0px;
 }
 
-.result-sub-header {
-    /* margin: 5px 0px 0px 0px; */
-    font-size: 100%;
+/* .content .result */
+.result .title {
+    margin: 10px 0px 0px 0px;
 }
 
-.result-file-size {
-    font-size: 95%;
+.result .title {
+    font-size: 120%;
 }
 
-.result-body {
+.result .info {
+    /* margin: 5px 0px 0px 0px; */
+    font-size: 100%;
+}
+
+.result .main {
     margin: 5px 0px 0px 0px;
     font-size: 95%;
 }
 
-.raw-page {
-    margin: 0px 20px;
-}
+/* .content .text */
 
-.raw-page-no {
-    padding: 60px 0px 10px 0px;
+.page {
+    /* margin: 0px 0px; */
 }
 
-.landing-page {
-    margin: 0px 20px;
+.page .no {
+    padding: 20px 0px 10px 0px;
 }
 
-.landing-page-no {
-    padding: 0px 0px 10px 0px;
+.page .main {
+    background-color: #fbfbfb;
+    border: solid 1px #d0d0d0;
+    font-size: 95%;
 }
 
-.result ul {
-    font-size: 120%;
-    list-style: none;
-    padding-left: 0px;
+/* common */
+.file-size {
+    font-size: 95%;
 }
 
-.landing-page ul {
-    font-size: 120%;
-    list-style: none;
-    padding-left: 0px;
+.highlight {
+    /* background-color: #B4D5FF; */
+    /* background-color: #FFF17A; */
+    background-color: #FEEFA2;
+    font-weight: bold;
 }
 

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

@@ -3,9 +3,15 @@
 .container
   .row
     .col-md-12
-      %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")
-      = @content
+      .header
+        .title
+          = @header_title
+        %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")
+        .info
+          = @header_info
+      .content
+        = @content

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

@@ -10,8 +10,8 @@
     %link(rel="stylesheet" href="/css/honyomi.css")
     %link(rel="stylesheet" href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css")
     
-  %body(style="padding-top:70px;")
-    .navbar.navbar-default.navbar-fixed-top
+  %body
+    .navbar.navbar-default.navbar-static-top
       .navbar-header
         %button(type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse")
           %span(class="icon-bar")
@@ -22,7 +22,7 @@
       .navbar-collapse.collapse
         %ul(class="nav navbar-nav")
           %li
-            <a href="#{@navbar_href}">#{@navbar_title}</a>
+            <a href="/help">Help</a>
 
     != yield
     %script(src="https://code.jquery.com/jquery.js")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: honyomi
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - ongaeshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-02 00:00:00.000000000 Z
+date: 2014-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grn_mini
@@ -197,7 +197,6 @@ files:
 - lib/honyomi/web/public/image/favicon.ico
 - lib/honyomi/web/views/index.haml
 - lib/honyomi/web/views/layout.haml
-- lib/honyomi/web/views/raw.haml
 - test/minitest_helper.rb
 - test/test.pdf
 - test/test2.pdf

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

@@ -1,3 +0,0 @@
-!!!
-
-= @content