linggle 0.04.1 → 0.04.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 288f9d2334757b69761e3a59c603fdf0b0c57384
-  data.tar.gz: ac3838c6149adac131c599f31a037788a07ba8ee
+  metadata.gz: 802e94722af8ae524eba3fd6935d0613cf85c80e
+  data.tar.gz: f31502a544bcdf605d1cb4afa92ad8491a530429
 SHA512:
-  metadata.gz: 739f7b165eb9abef1f3fe054be76aa516e49ce10b2bf566b575126eb2af4666ac120ae9e47d337ff1f44eb540218a32e049c9486d986f2454857b4f891fd817a
-  data.tar.gz: 31e7582ecb61d58f60ea8853251cf52a251bfedaf125c2764402613019732e0d8b8561a3de1973520a3ad2408096dfca1dbd85d69861b563c9d522b86f1581a1
+  metadata.gz: e932afdae70f562b0cc7d64ee574ffca8c2c9a1f6925afa93f73ce728fdd942a6b23fda0bfdc5b66a3ac4523af3c0072b565ca216912d912084793ff5d1e5f5e
+  data.tar.gz: 2a05c2b614eecc4e43d71a5a140bd3f14d05b0205ea44e6602b020b1dea5303e72e5cfa85d7b579872d4b3c6cb3f038f4d622c58a228d1a61d332fa63f6351ac

data/lib/linggle.rb

@@ -14,9 +14,9 @@ module Linggle
   # Your code goes here...
   def self.execute()
     args =  parse()
-    query_str = args.join(' ')
+    return if args.nil? && args.size < 1
+    query_str = args.drop(0).join(' ')
 
-    # TODO rescue network exception, and follow redirections..
     results = Api.new.query(query_str)
 =begin
      {
@@ -33,23 +33,36 @@ module Linggle
       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
 
 
   def self.parse()
     OptionParser.new do |parser|
 
+      parser.banner = 'Linggle Command Line Interface:\n availale options: \n \n'
       if ARGV.size == 0
+        puts parser
         puts HELPS.map{|k,v| v }
         exit 0
       end
 
-      parser.on("-h", "--help") do
+      parser.on("-u", "--usage", 'Show  Usages') do
         puts HELPS.map{|k,v| v }
         exit 0
       end
 
+      parser.on("-h", "--help", 'Show This Help') do
+        puts parser
+        puts HELPS.map{|k,v| v }
+      end
+
+      parser.on('-V', '--version', 'Show Version') do
+        puts "Linggle CLI Version: #{VERSION}"
+        exit 0
+      end
+
+
+      parser
     end.parse!
 
   end

data/lib/linggle/api.rb

@@ -1,5 +1,10 @@
+require 'fileutils'
+require 'sdbm'
+require 'date'
+require 'logger'
 module Linggle
   API_BASE = 'http://linggle.com'.freeze
+  STORE_PATH = "#{ENV['HOME']}/linggle_cli".freeze
   TIMEOUT = 3
   COLORS = {
     e: :yellow, # example
@@ -11,7 +16,7 @@ module Linggle
     def initialize
       @conn = Faraday.new(url: API_BASE) do |f|
         f.request  :url_encoded
-        f.response :logger
+        f.response :logger, ::Logger.new('/dev/null')
         f.adapter  Faraday.default_adapter
       end
     end
@@ -22,33 +27,37 @@ module Linggle
     #
 
    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
 
 
+   def example
+    url = 'https://nlp-ultron.cs.nthu.edu.tw/coca/example'
+# 'https://nlp-ultron.cs.nthu.edu.tw/coca/example/' -H 'Origin: http://linggle.com' -H 'Accept-Encoding: gzip, deflate, br' -H 'Accept-Language: zh-CN,zh;q=0.9,en;q=0.8' -H 'User-Agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.132 Safari/537.36' -H 'Content-Type: application/json' -H 'Accept: application/json, text/javascript, */*; q=0.01' -H 'Referer: http://linggle.com/' -H 'Connection: keep-alive' -H 'X-CSRFToken: aCT5jTOwy93GZXnHOpPrXXmRSNIngtTN3ChZ22It0933dALsqMNnmAl9vv0J3ufG' -H 'DNT: 1' --data-binary '{"ngram":"go to school"}' --compressed
+   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']
+    FileUtils.mkdir STORE_PATH unless File.exists?(STORE_PATH)
+    SDBM.open "#{STORE_PATH}/.linggle_cli" do |db|
+      expires  = DateTime.parse(db['expires']) rescue nil
+      if expires && expires > DateTime.now && (@csrf_token = db['csrf_token'])
+        return @csrf_token
+      else
+        cookies = conn.get.env.response_headers['set-cookie'].split('; ').map {|x| x.split('=', 0) }.to_h
+        db['expires'] = cookies['expires']
+        @csrf_token = db['csrf_token'] = cookies['csrftoken']
+      end
+    end
    end
  end
 end

data/lib/linggle/version.rb

@@ -1,3 +1,3 @@
 module Linggle
-  VERSION = "0.04.1"
+  VERSION = "0.04.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linggle
 version: !ruby/object:Gem::Version
-  version: 0.04.1
+  version: 0.04.2
 platform: ruby
 authors:
 - fangxing
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-15 00:00:00.000000000 Z
+date: 2018-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler