linggle 0.03 → 0.04

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b84fd307ea286cfa52eeb140f31910e346c65c1
-  data.tar.gz: 78ccfb33e517f27ddf418b34c9d373c29214d63e
+  metadata.gz: 7bac3fc9284ee9f67e5a2792391dec79770f0c19
+  data.tar.gz: 14e2ab157b3e80ca3ef9ed476ab6130266d27f04
 SHA512:
-  metadata.gz: 10426a517462bf91e688dbb510c352783538ad09f5a2eb030b6481c44816e191baf767e2427521eee7a9078f427e9b92815e05daf64ef7ab3893a0de0c2d8075
-  data.tar.gz: efa5c1709e6f0eab608e93137a4d1e7647a7c769b7419a8ce614f4e84954a80cf62ee75ce1bcd63a0afe9cdf3fd7d766083bd530d7a8f6b65cda82c951b6ce52
+  metadata.gz: 4c98cf1957b340f3d984807646b3d1dbccf07304b4e2cbe107699e6f95f47fcfe4ff57766bb3467cb324a04e735a49b03bd7503d624c039420b559c806456466
+  data.tar.gz: b7c3a663ee4202a4ea547e45ddd666b31e4030b8627053a6f8d1690ae581c25dcb7009f6d5e5014915858f81a02b4afacb7e6886f0cf8aba2f445dac3975773e

data/lib/linggle.rb

@@ -1,10 +1,11 @@
 require 'json'
-require 'open-uri'
+require 'faraday'
 require 'optionparser'
 require 'colorize'
 require "linggle/version"
 require 'linggle/api'
 require 'linggle/string'
+require 'linggle/help_doc'
 
 # resource
 # https://kpumuk.info/ruby-on-rails/colorizing-console-ruby-script-output/
@@ -14,19 +15,23 @@ module Linggle
   def self.execute()
     args =  parse()
     query_str = args.join(' ')
-    # puts "parse result #{args}"
-    
+
     # TODO rescue network exception, and follow redirections..
-    entries = query(query_str)
-    # {
-    #   "count"=>13966963,
-    #   "count_str"=>"14,000,000",
-    #   "percent"=>"54.5%",
-    #   "phrase" => 
-    #       ["very", "good"]
-    # }
-    entries = entries.take(20).map do |e|
-      "#{e['phrase'].join(' ').green}   频率: #{e['count_str'].yellow}  #{e['percent']} \n #{e['percent'].percent_line} \n \n"
+    results = Api.new.query(query_str)
+=begin
+     {
+         "query": "go ?to schoo",
+         "time": 1534167385507,
+         "ngrams": [
+             ["go to school", 667988],
+             ["go school", 6137]
+          ],
+          "total": 674125
+      }
+=end
+    entries = results['ngrams'].take(20).map do |x|
+      percent = ( (x[1].to_f/results['total']).round(2) * 100 ).to_s
+      "#{x[0].green}   Percent: #{percent.yellow}  #{x[1]} \n #{percent.percent_line} \n \n"
     end
     puts entries
   end

data/lib/linggle/api.rb

@@ -1,95 +1,54 @@
 module Linggle
-  API = 'http://linggle.com/query'.freeze
-  TIMEOUT = 10
+  API_BASE = 'http://linggle.com'.freeze
+  TIMEOUT = 3
   COLORS = {
     e: :yellow, # example
     t: :blue # title
-  } 
-
-##
-# 查询返回结果
-#
-# [
-#  {"count"=>13966963, "count_str"=>"14,000,000", "percent"=>"54.5%", "phrase"=>["very", "good"]}
-#  {"count"=>4436461, "count_str"=>"4,400,000", "percent"=>"17.3%", "phrase"=>["pretty", "good"]}
-#  {"count"=>562220, "count_str"=>"560,000", "percent"=>"2.2%", "phrase"=>["only", "good"]}
-#  {"count"=>508737, "count_str"=>"510,000", "percent"=>"2.0%", "phrase"=>["real", "good"]}
-#  {"count"=>481831, "count_str"=>"480,000", "percent"=>"1.9%", "phrase"=>["public", "good"]}
-#  {"count"=>480872, "count_str"=>"480,000", "percent"=>"1.9%", "phrase"=>["damn", "good"]}
-#  {"count"=>429867, "count_str"=>"430,000", "percent"=>"1.7%", "phrase"=>["common", "good"]}
-#  {"count"=>409578, "count_str"=>"410,000", "percent"=>"1.6%", "phrase"=>["other", "good"]}
-#  {"count"=>308328, "count_str"=>"310,000", "percent"=>"1.2%", "phrase"=>["good", "good"]}
-#  {"count"=>303609, "count_str"=>"300,000", "percent"=>"1.2%", "phrase"=>["still", "good"]}
-#  {"count"=>256591, "count_str"=>"260,000", "percent"=>"1.0%", "phrase"=>["just", "good"]}
-#  {"count"=>225266, "count_str"=>"230,000", "percent"=>"0.9%", "phrase"=>["sound", "good"]}
-#  {"count"=>207530, "count_str"=>"210,000", "percent"=>"0.8%", "phrase"=>["like", "good"]}
-#  {"count"=>191120, "count_str"=>"190,000", "percent"=>"0.7%", "phrase"=>["greater", "good"]}
-#  ...
-# ]
-
- def self.query(query_str)
-    content = open(
-      URI::encode("#{API}/#{query_str}"),
-      read_timeout: TIMEOUT
-    ).read
-
-    # puts "conent #{content}"
-    entries = JSON.parse(content)
+  }
+  class Api
+    attr_reader :conn
+
+    def initialize
+      @conn = Faraday.new(url: API_BASE) do |f|
+        f.request  :url_encoded
+        f.response :logger
+        f.adapter  Faraday.default_adapter
+      end
+    end
+    ##
+    # 查询返回结果示例
+    #
+    # {"query": "go ?to schoo", "time": 1534167385507, "ngrams": [["go to schoo", 234]], "total": 234}
+    #
+
+   def query(query_str)
+
+
+
+      # puts "conent #{content}"
+      res = conn.post '/query/', {query: query_str, time: Time.now.to_i}.to_json do |req|
+        puts csrf_token
+        req.headers['Content-Type'] = 'application/json'
+        req.headers['X-Requested-With'] = 'XMLHttpRequest'
+        req['Cookie'] = "csrftoken=#{csrf_token}"
+        req.headers['X-CSRFToken'] = csrf_token
+      end
+      puts res
+      puts res.body
+      JSON.parse(res.body)
+   end
+
+
+   private
+   def csrf_token
+    return @csrf_token if @csrf_token
+    cookies = conn.get.env.response_headers['set-cookie']
+    # TODO save token with'sdbm'
+    # File.open '.linggle_cli'
+    crsf_token_data = cookies.split('; ').map {|x| x.split('=', 0) }.to_h
+
+
+    @csrf_token = crsf_token_data['csrftoken']
+   end
  end
-
- HELPS = {
-    '_' => <<-DOC,
-    #{'查询任意一至多个词'.bold.colorize(COLORS[:t])}
-        只要在你想要插入字词的位置使用* (星号)来查询一个词，或是_ (底线)来查询零至多个词就可以了。
-
-        #{ 'present a method _
-        listen _ music'.colorize(COLORS[:e]) }
-
-
-    DOC
-
-  '?' => <<-DOC,
-    #{'使用问号查询是否需要某个字'.blue}
-        小明在报告里写了这么一句话：“I would like to discuss about the issue.”
-        回头检查时，总是觉得哪里怪怪的，他很怀疑“discuss”后面到底需不需要
-        加“about” ⋯⋯这时只要使用Linggle，在你不确定的字前加上? (问号)，Linggle就会告诉你需不需要这个字啰！
-
-        #{'discuss ?about the issue'.colorize(COLORS[:e]) }
-
-
-    DOC
-
-  '/' => <<-DOC,
-    #{'使用斜线号查询如何替换某字词'.blue}
-        介系词这么多常常搞不清楚要用哪一个吗？太多字可以用却不知道哪一个比较适合吗？
-        让Linggle来告诉你该怎么选吧！很简单，只需要在你要抉择的两个字中间加入/ (斜线号)
-        就可以了！不只是介系词，其他词性也可以！
-
-        #{ 'in/at the afternoon
-        play _ important role/part'.colorize(COLORS[:e]) }
-
-
-    DOC
-
-  'w.' => <<-DOC,
-    #{'使用任意词性查询搭配词'.blue}
-        Linggle最大的特色，就是可以使用「关键词」配合「特定词性」来查询各种搭配词。比如说，
-        可以用v. death penalty来查询“death penalty”搭配的动词，效果不逊于一般搭配词典喔！
-
-        #{ 'v. death penalty
-        acquire n.'.colorize(COLORS[:e]) }
-
-
-    DOC
-
-  'more' => <<-DOC,
-    #{'精准的搭配词查询'.blue}
-        想要更加精准的查询搭配词，我们就会建议使用复杂的查询式，例如在想要查询的动词前
-        加上一个“to”，让Linggle 不至于会错意。
-
-        #{'to v. ?prep. ?det. difficulty/difficulties'.colorize(COLORS[:e]) }
-
-
-    DOC
-  }.freeze
 end

data/lib/linggle/help_doc.rb

@@ -0,0 +1,58 @@
+module Linggle
+ HELPS = {
+    '_' => <<-DOC,
+    #{'查询任意一至多个词'.bold.colorize(COLORS[:t])}
+        只要在你想要插入字词的位置使用* (星号)来查询一个词，或是_ (底线)来查询零至多个词就可以了。
+
+        #{ 'present a method _
+        listen _ music'.colorize(COLORS[:e]) }
+
+
+    DOC
+
+  '?' => <<-DOC,
+    #{'使用问号查询是否需要某个字'.blue}
+        小明在报告里写了这么一句话：“I would like to discuss about the issue.”
+        回头检查时，总是觉得哪里怪怪的，他很怀疑“discuss”后面到底需不需要
+        加“about” ⋯⋯这时只要使用Linggle，在你不确定的字前加上? (问号)，Linggle就会告诉你需不需要这个字啰！
+
+        #{'discuss ?about the issue'.colorize(COLORS[:e]) }
+
+
+    DOC
+
+  '/' => <<-DOC,
+    #{'使用斜线号查询如何替换某字词'.blue}
+        介系词这么多常常搞不清楚要用哪一个吗？太多字可以用却不知道哪一个比较适合吗？
+        让Linggle来告诉你该怎么选吧！很简单，只需要在你要抉择的两个字中间加入/ (斜线号)
+        就可以了！不只是介系词，其他词性也可以！
+
+        #{ 'in/at the afternoon
+        play _ important role/part'.colorize(COLORS[:e]) }
+
+
+    DOC
+
+  'w.' => <<-DOC,
+    #{'使用任意词性查询搭配词'.blue}
+        Linggle最大的特色，就是可以使用「关键词」配合「特定词性」来查询各种搭配词。比如说，
+        可以用v. death penalty来查询“death penalty”搭配的动词，效果不逊于一般搭配词典喔！
+
+        #{ 'v. death penalty
+        acquire n.'.colorize(COLORS[:e]) }
+
+
+    DOC
+
+  'more' => <<-DOC,
+    #{'精准的搭配词查询'.blue}
+        想要更加精准的查询搭配词，我们就会建议使用复杂的查询式，例如在想要查询的动词前
+        加上一个“to”，让Linggle 不至于会错意。
+
+        #{'to v. ?prep. ?det. difficulty/difficulties'.colorize(COLORS[:e]) }
+
+
+    DOC
+  }.freeze
+
+end

data/lib/linggle/string.rb

@@ -34,7 +34,8 @@ class String
   # 55.6%
   Strips = '|' * 100
   def percent_line
-    count = (self[/\d+\.?\d+/].to_f).round 
-    "[#{ Strips[0..count].red } #{ ' ' * (100 - count) }]" 
+    count = self.to_i
+    puts count
+    "[#{ Strips[0..count].red } #{ ' ' * (100 - count) }]"
   end
 end

data/lib/linggle/version.rb

@@ -1,3 +1,3 @@
 module Linggle
-  VERSION = "0.03"
+  VERSION = "0.04"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linggle
 version: !ruby/object:Gem::Version
-  version: '0.03'
+  version: '0.04'
 platform: ruby
 authors:
 - fangxing
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-27 00:00:00.000000000 Z
+date: 2018-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: faraday
+  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'
 description: use linggle in your command line
 email:
 - fangxing204@gmail.com
@@ -79,7 +93,7 @@ files:
 - bin/linggle-console
 - lib/linggle.rb
 - lib/linggle/api.rb
-- lib/linggle/prints.rb
+- lib/linggle/help_doc.rb
 - lib/linggle/string.rb
 - lib/linggle/version.rb
 - spec/linggle_spec.rb
@@ -104,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: http://linggle.com/ in cli

data/lib/linggle/prints.rb

@@ -1,5 +0,0 @@
-module Linggle
-  def self.percents_str
-    
-  end
-end