honyomi 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fd511b3f8e468cd36b890f1cd73049eac1c59da
-  data.tar.gz: c23bc62e9240d32812ec176742d818b140e0b2ef
+  metadata.gz: bf7508e7109d3ead69a143592dde4cb74b6e4487
+  data.tar.gz: 31fb3eaaf69b663b3d472e77b82042689b45d146
 SHA512:
-  metadata.gz: 710cb9e03dff64b15969ba975efc5ba2e3438f9ab0a7967c2035864baf1431b74ce263483484d8aaca63cf3372cae5867837af65fd4d0f1aab9c7be0d88af4b0
-  data.tar.gz: f786bb8bf384188f9f1bcb855218ed4c0fa7f1f55a84f4226e3e146f504b8864b1c9b87f12ee37bf18327fe69821e7175c869e2709200545786a7a12aa6835d2
+  metadata.gz: 9fea83150ee7a69e5e1655ced9eb748e6fb4b80ff216732f762225899f749d3083d98341a5aa76af89ac88ee486a7b62a9cfb7100a46248b820522d3fe23749c
+  data.tar.gz: 66252688b26270c8998b13cb348cc07a89e2a960a39fc4abe9f9375b2d1fba79cbfbe6cad11cae735eae79bf63804e08dca4b4a536e6be052993d8828f1a05e3

data/HISTORY.md

@@ -1,5 +1,12 @@
 # HISTORY - Honyomi
 
-## 0.3 - 2014-07-18
+## 0.1 - 2014-07-18
+
+* Search in book
+* Display the book list
+* Pagination (AutoPagerize)
+* Add favicon
+
+## 0.0.3 - 2014-07-18
 
 * Support file name includes parenthesis or any special characters

data/lib/honyomi/version.rb

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

data/lib/honyomi/web/app.rb

@@ -15,60 +15,101 @@ get '/' do
   @database = $database
 
   if @params[:query] && !@params[:query].empty?
-    results = @database.search(@params[:query])
+    search_home
+  else
+    home
+  end
+end
 
-    page_entries = results.paginate([["_score", :desc]], :page => 1, :size => 20)
-    snippet = results.expression.snippet([["<strong>", "</strong>"]], {html_escape: true, normalize: true, max_results: 10})
+post '/search' do
+  if params[:book_id] && !@params[:book_id].empty?
+    redirect "/v/#{@params[:book_id]}?query=#{escape(params[:query])}"
+  else
+    redirect "/?query=#{escape(params[:query])}"
+  end
+end
 
-    books = {}
+get '/v/:id' do
+  @database = $database
 
-    results.each do |page|
-      books[page.book.path] = 1
+  book = @database.books[params[:id].to_i]
+
+  if params[:raw] == '1'
+    raw_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)
+    else
+      if @params[:query] && !@params[:query].empty?
+        search_book_home(book)
+      else
+        book_home(book)
+      end
     end
+  end
+end
 
-    r = page_entries.map do |page|
-      query_plus  = escape "#{@params[:query]} book:#{page.book.id}"
-      query_minus = escape "#{@params[:query]} -book:#{page.book.id}"
+helpers do
 
+  def home
+    r = @database.books.map { |book|
       <<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="col-xs-6"><a href="/?query=#{query_plus}">Filter+</a> <a href="/?query=#{query_minus}">Filter-</a></div>
-    </div>
-    <div class="result-body">
-      #{snippet.execute(page.text).map {|segment| "<div class=\"result-body-element\">" + segment.gsub("\n", "") + "</div>"}.join("\n") }
-    </div>
-  </div>
+<li>#{book.id}: <a href="/v/#{book.id}">#{book.title}</a> (#{book.page_num}P)</li>
 EOF
-    end
+    }.reverse
 
     @content = <<EOF
-<div class="matches">#{books.size} books, #{results.size} pages</div>
+<div class="matches">#{@database.books.size} books, #{@database.pages.size} pages.</div>
+<div class="result">
+  <ul>
 #{r.join("\n")}
+  </ul>
+</div>
 EOF
-  else
-    @content = <<EOF
-<div class="result">#{@database.books.size} books, #{@database.pages.size} pages.</div>
-EOF
+
+    haml :index
   end
 
-  haml :index
-end
+  def search_home
+    search_common(@params[:query],
+                  [["_score", :desc]],
+                  true
+                  )
+  end
 
-post '/search' do
-  redirect "/?query=#{escape(params[:query])}"
-end
+  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)
 
-get '/v/:id' do
-  @database = $database
+    @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
+    haml :index
+  end
 
-  book = @database.books[params[:id].to_i]
+  def search_book_home(book)
+    @book_id = book.id
+    @navbar_href = "/v/#{book.id}"
+    @navbar_title = book.title
 
-  if params[:raw] == '1'
+    search_common(@params[:query] + " book: #{book.id}",
+                  [["page_no", :asc]],
+                  false
+                  )
+  end
+
+  def raw_all(book)
     pages = @database.book_pages(book.id)
 
-    @navbar_href = "#1"
+    @navbar_href = "/v/#{book.id}"
     @navbar_title = book.title
 
     @content = pages.map { |page|
@@ -81,27 +122,78 @@ EOF
     }.join("\n")
 
     haml :raw
-  elsif params[:pdf] == '1'
-    send_file(book.path, :disposition => 'inline')
-  elsif params[:dl] == '1'
-    send_file(book.path, :disposition => 'download')
-  else
-    @navbar_href = ""
-    @navbar_title = book.title
+  end
 
-    pages = @database.book_pages(book.id)
-    page = pages[params[:page].to_i]
-    file_mb = File.stat(page.book.path).size / (1024 * 1024)
+  def raw_page(book, page_no)
+    @navbar_href = "/v/#{book.id}"
+    @navbar_title = book.title
+    page = @database.book_pages(book.id)[page_no]
+    file_mb = File.stat(book.path).size / (1024 * 1024)
 
     @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/#{page.book.id}?dl=1">Download</a> <span class="result-file-size">(#{file_mb}M)</span>&nbsp;&nbsp;&nbsp;<a href="/v/#{page.book.id}?pdf=1#page=#{page.page_no}">Pdf</a>&nbsp;&nbsp;&nbsp;<a href="/v/#{page.book.id}?raw=1##{page.page_no}">Raw</a></div>
+  <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
   end
-end
 
+  RPAGE_SIZE = 20
+
+  def search_common(query, sort_keys, is_filter)
+    results = @database.search(query)
+
+    rpage = @params[:rpage] ? @params[:rpage].to_i : 1
+    rpage_entries = results.paginate(sort_keys, :page => rpage, :size => RPAGE_SIZE)
+    pagination_str = ""
+    if (rpage - 1) * RPAGE_SIZE + rpage_entries.count < results.count
+      pagination_str = <<EOF
+<ul class="pager">
+  <li><a href='#{url + "?query=#{escape(@params[:query])}&rpage=#{rpage + 1}"}' rel='next'>Next</a></li>
+</ul>
+EOF
+    end
+
+    snippet = results.expression.snippet([["<strong>", "</strong>"]], {html_escape: true, normalize: true, max_results: 10})
+
+    books = {}
+
+    results.each do |page|
+      books[page.book.path] = 1
+    end
+
+    r = rpage_entries.map do |page|
+      if is_filter
+        query_plus  = escape "#{query} book:#{page.book.id}"
+        query_minus = escape "#{query} -book:#{page.book.id}"
+        filter_str = "<div class=\"col-xs-6\"><a href=\"/?query=#{query_plus}\">Filter+</a> <a href=\"/?query=#{query_minus}\">Filter-</a></div>"
+      else
+        filter_str = ""
+      end
+
+      <<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">
+      #{filter_str}
+    </div>
+    <div class="result-body">
+      #{snippet.execute(page.text).map {|segment| "<div class=\"result-body-element\">" + segment.gsub("\n", "") + "</div>"}.join("\n") }
+    </div>
+  </div>
+EOF
+    end
+
+    @content = <<EOF
+<div class="matches">#{books.size} books, #{results.size} pages</div>
+<div class="autopagerize_page_element">
+#{r.join("\n")}
+</div>
+#{pagination_str}
+EOF
+
+    haml :index
+  end
+end

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

@@ -44,4 +44,15 @@
     padding: 0px 0px 10px 0px;
 }
 
+.result ul {
+    font-size: 120%;
+    list-style: none;
+    padding-left: 0px;
+}
+
+.landing-page ul {
+    font-size: 120%;
+    list-style: none;
+    padding-left: 0px;
+}
 

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

@@ -6,5 +6,6 @@
       %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

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

@@ -5,6 +5,7 @@
     %meta(charset='utf-8')
     %title Honyomi
     %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")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: honyomi
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - ongaeshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-18 00:00:00.000000000 Z
+date: 2014-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grn_mini
@@ -194,6 +194,7 @@ files:
 - 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/favicon.ico
 - lib/honyomi/web/views/index.haml
 - lib/honyomi/web/views/layout.haml
 - lib/honyomi/web/views/raw.haml