chen 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25b49bb25199172cb2a0ca6adf8b412b425b962c
-  data.tar.gz: 2aadcce566c4c3ab369d72507baeee0c1443982d
+  metadata.gz: 9cc3cb5e819ae0bcf933934cd195fff4705a4db2
+  data.tar.gz: 85914f2b8af1ec0fc51dac7131a84c3fc00ff8d4
 SHA512:
-  metadata.gz: a52437fc986c9d85503ccfa5821c9782c1b8ce4bc6fa48c5b0534c7e0add4624a12a0f45b9fb366d7a20cb5f1d4c11a5816c8577ac95c5f83eb5c4d08fe45f02
-  data.tar.gz: 769b1c023b5266d22603ff79a126057900e0db998c21e0b5e4b52e459f829f7bbf82665dacb77f769f9bc540a177ef02d8f21f032b5f52c36fd4df732c398a8a
+  metadata.gz: 5b80cb404a53931435ca89c4a6548b0190a870f4cf0d528ff51e2d6ffbcec363201bf6592435c4ff2b34f1ede7874459c05d8f55bb1de8a8aa441ea34a317415
+  data.tar.gz: 8a4514a1c5add02b0310bd86d929cd011dde6b90fd9f7a735dd26a1a53c7feffe424811bdc005a2590683eb32334a1d8a115f63111ad70a62fb77e21a0db12c3

data/bin/chen-server

@@ -1,9 +1,14 @@
 #!/usr/bin/env ruby
-require 'chen.rb'
+#require_relative '../lib/chen.rb'
+require 'chen'
 require 'sinatra'
 class ChenApiServer < Sinatra::Application
   set :bind, '0.0.0.0'
-  get '/:str/:page/:number' do
+  get '/' do
+    haml :index
+  end
+  
+  get '/api/:str/:page/:number' do
     return Chen::Google.query_to_json(params[:str], params[:page].to_i, params[:number].to_i)
   end
 end

data/bin/views/index.haml

@@ -0,0 +1,17 @@
+= erb :theme
+= haml :nav_bar
+.container
+	.row
+		.col-sm-3
+		%div{class: 'col-sm-6 vertical-center'}
+			%center
+				%font{size: '100'}
+					%h1{style:"font-size:140%"}
+						Chen
+				.input-group
+					
+					%input{type:'text', class:'form-control'}
+						%span{class:'input-group-btn'}
+							%button{class:'btn btn-default', type: 'button'}
+								Search
+		.col-sm-3

data/bin/views/nav_bar.haml

@@ -0,0 +1,12 @@
+%nav{class: 'navbar navbar-inverse navbar-fixed-top', role: 'navigation'}
+	.container
+		.navbar-header
+			%a{class: 'navbar-brand'}
+				Chen
+		%p{class:'navbar-text navbar-right'}
+			Powered by Google
+		%form{class:'navbar-form navbar-left', role:'search'}
+			.form-group
+				%input{type: 'text', class: 'form-control', placeholder:'Search via Google'}
+			%button{type: 'submit', class: 'btn btn-default'}
+				Submit

data/bin/views/theme.erb

@@ -0,0 +1,24 @@
+<script src="http://cdn.bootcss.com/jquery/2.1.1/jquery.min.js"></script>
+<link href="http://cdn.bootcss.com/bootstrap/3.2.0/css/bootstrap-theme.min.css" rel="stylesheet">
+<link href="http://cdn.bootcss.com/bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet">
+<script src="http://cdn.bootcss.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
+<link href="http://cdn.bootcss.com/bootswatch/3.2.0+2/yeti/bootstrap.min.css" rel="stylesheet">
+<style>
+html,body,.container {
+height: 100%;
+}
+.container {
+display: table;
+}
+.row
+{
+height: 100%;
+display: table-row;
+}
+.vertical-center
+{
+display: table-cell;
+float: none;
+vertical-align: middle;
+}
+</style>

data/lib/chen.rb

@@ -1,12 +1,14 @@
 require 'google'
+
 require 'erb'
+require 'open-uri'
 
 module Chen; end
 
-Chen::SearchResult = Struct.new(:title, :url, :desc, :number, :estimated)
+Chen::SearchResult = Struct.new(:title, :url, :desc, :number)
 Chen::Template = <<HERE
   {
-      "estimated_results": "<%=results[0].estimated%>",
+      "estimated_results": "<%=results.estimated%>",
       "query_results": [
   		<%results.each do |r|%>
   		{
@@ -24,6 +26,29 @@ Chen::Template = <<HERE
   }
 HERE
 
+class Chen::Results < Array
+  attr_accessor :estimated
+end
+
+class Chen::RemoteQuery
+  attr_accessor  :default_host
+  def default_host
+    return @default_host || 'http://haruhi.socket.so:4567'
+  end
+  
+  def raw_query(url)
+    content = open url
+    return content.read
+  end
+  
+  def query_with_params(host, keyword, page_number = 1, size = 8)
+    if(default_host && host.empty?)
+      host = default_host
+    end
+    return raw_query("#{host}/api/#{keyword}/#{page_number}/#{size}")
+  end
+end
+
 
 
 class Chen::Google < Google
@@ -59,15 +84,15 @@ class Chen::Google < Google
     estimated_results = results['responseData']['cursor']['resultCount']
     result_array      = results['responseData']['results']
     
-    datas = []
+    datas = Chen::Results.new
+    datas.estimated = estimated_results
     result_array.each_with_index do |result, i|
       new_data = Chen::SearchResult.new
       new_data.tap do |d|
         d.title = result["titleNoFormatting"]
         d.url = result["url"]
-        d.desc = result["content"].squeeze(" ")
+        d.desc = result["content"].gsub(/<b>/, "__").gsub(/<\/b>/, "__").squeeze(" ")
         d.number = (i + query_strings[:start] + 1)
-        d.estimated = estimated_results
       end
       datas << new_data
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chen
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - LBQ
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-30 00:00:00.000000000 Z
+date: 2014-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -38,6 +38,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
 description: a quick-to-setup google search proxy
 email: liubaqiao@126.com
 executables:
@@ -46,6 +60,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/chen-server
+- bin/views/index.haml
+- bin/views/nav_bar.haml
+- bin/views/theme.erb
 - lib/chen.rb
 homepage: http://rubygems.org/gems/chen
 licenses: