slg 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 138f7e46a189d5f94aec8149144f460938dff2f74e3f86650ac323874be91c3e
-  data.tar.gz: 7b5b412986a25443036a2f8dabef508d2b59242884542f443837a9389c512bda
+  metadata.gz: b05bc7815eaa79ffe25e225b5b8a1908bcfad62e90dbfec6bc81ce1f6ff3f299
+  data.tar.gz: d963e579557f017156743a2473bdba08f5be1e1f4993c326bd91c7d799a4885b
 SHA512:
-  metadata.gz: b9c3b92bad04d21f66128e0cfdd1cc6001f8a70eb3323c86b2e42dafa95756d7af2ff5e4a109c9ccc70e6876d6d50bd8ca9fd19ad176098bce6152520e35e071
-  data.tar.gz: 8e04ce6ff7b6086edcfc408587a8f451861c2a0055859da63c92f8c53d177946413f52dd2727e2a5ab2ccbdf7525096f4429f32c51544ebf44d0816a5b61fde2
+  metadata.gz: b69fe8ab127a4cbfab3edbe725f70fbcb358fe35ef77d059b1169d3bb35353453a40e28af248e311f993aa230469c1213b039e217600feb5651c0335626f799c
+  data.tar.gz: 4bd6ec8d45aa60b94c8bdabed519d15f20a122a6753376dd0d20df2b605c8558fab9387cb39d69f42b5d6054f4404b3b8988a37883a9687fc11a814398e1341d

data/lib/slg.rb

@@ -1,20 +1,16 @@
 # -*- coding: UTF-8 -*-
 
 require "uri"
-require "open-uri"
 require "nokogiri"
 
-require "ud/formatting"
-
-# Most of this code is copy/pasted from UD.
-# TODO generalize the code in UD and reuse it here.
+require "defcli"
 
 # This module provide some methods to scrape definitions from Slengo.it.
 module Slg
   class << self
     # @return [String] the current gem's version
     def version
-      "0.0.1"
+      "0.0.2"
     end
 
     WWW_ROOT = "https://slengo.it"
@@ -33,7 +29,7 @@ module Slg
     #                      are allowed.
     # @return [Nil]
     def open_url(term)
-      system open_cmd, search_url(term)
+      Defcli.open_in_browser search_url(term)
     end
 
     # Query the website and return a list of definitions for the provided term.
@@ -44,7 +40,7 @@ module Slg
     # @return [Array<Hash>]
     def query(term, opts = {})
       url = search_url(term)
-      text = OpenURI.open_uri url
+      text = Defcli.read_url url
 
       opts = { :count => 1 }.merge(opts || {})
 
@@ -53,19 +49,19 @@ module Slg
       doc = Nokogiri::HTML.parse text
 
       doc.css("article.definition-card").map do |elt|
-        examples = elt.css(".word-examples li").map(&:text).map(&:strip)
-        example = examples.join "\n\n"
+        examples = elt.css(".word-examples li").map do |ex|
+          ex.text.strip
+        end
 
         votes = elt.css(".votes-container .v-progress-linear")
         # Slengo.it uses percentages instead of number of votes
-        upvotes = votes.attr("aria-valuenow").to_s.to_i
-        downvotes = 100 - upvotes
+        ratio = votes.attr("aria-valuenow").to_s.to_f / 100.0
 
         header_p = elt.css("header p").first
 
         definition = elt.css("div.word-definition").text
         # Remove 'see also'
-        definition.gsub! /\bCfr\..+/m, ""
+        definition.gsub!(/\bCfr\..+/m, "")
         definition.strip!
 
         {
@@ -75,9 +71,8 @@ module Slg
           :word => header_p.text.strip,
           :permalink => url,
           :definition => definition,
-          :example => example,
-          :upvotes => upvotes,
-          :downvotes => downvotes,
+          :examples => examples,
+          :ratio => ratio,
           # TODO add region as well
         }
 
@@ -86,22 +81,11 @@ module Slg
 
     # Format results for output
     # @param results [Array] this must be an array of results, as returned by
-    #                        +UD.query+.
+    #                        +Slg.query+.
     # @param color [Boolean] colored output
     # @return [String]
     def format_results(results, color = true)
-      UD::Formatting.text(results, color)
-    end
-
-    def open_cmd
-      case RbConfig::CONFIG["host_os"]
-      when /darwin/
-        "open"
-      when /bsd|linux/
-        "xdg-open"
-      when /cygwin|mingw|mswin/
-        "start"
-      end
+      Defcli.format_results(results, color)
     end
   end
 end

data/tests/query_tests.rb

@@ -8,18 +8,16 @@ class Slg_Query_test < Test::Unit::TestCase
     @foo, @bar = [
       {
         :definition=>"Foo foo.",
-        :downvotes=>0,
-        :example=> "foo ex 1\n\nfoo ex 2",
+        :ratio=>1.0,
+        :examples=> ["foo ex 1", "foo ex 2"],
         :permalink=>"https://slengo.it/define/culo",
-        :upvotes=>100,
         :word=>"foo",
       },
       {
         :definition=>"Bar bar.",
-        :downvotes=>10,
-        :example=>"bar ex",
+        :ratio=>0.9,
+        :examples=>["bar ex"],
         :permalink=>"https://slengo.it/define/culo",
-        :upvotes=>90,
         :word=>"foo",
       }
     ]

data/tests/tests.rb

@@ -23,30 +23,9 @@ for t in Dir.glob( File.join( test_dir,  '*_tests.rb' ) )
 end
 
 class SlgTests < Test::Unit::TestCase
-
   def test_slg_version
     assert(Slg.version =~ /^\d+\.\d+\.\d+/)
   end
-
-  def test_slg_open_cmd
-    os = RbConfig::CONFIG["host_os"]
-
-    RbConfig::CONFIG["host_os"] = "darwin"
-    assert_equal "open", Slg.send(:open_cmd)
-
-    RbConfig::CONFIG["host_os"] = "linux"
-    assert_equal "xdg-open", Slg.send(:open_cmd)
-
-    RbConfig::CONFIG["host_os"] = "bsd"
-    assert_equal "xdg-open", Slg.send(:open_cmd)
-
-    RbConfig::CONFIG["host_os"] = "cygwin"
-    assert_equal "start", Slg.send(:open_cmd)
-
-  ensure
-    RbConfig::CONFIG["host_os"] = os
-  end
-
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slg
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Baptiste Fontaine
@@ -33,50 +33,22 @@ cert_chain:
   Qe5fflfwGHtlmT6SWZoQD48xF/ILJ+cLTpF79ardGYnWT6N7VUAI5lKp7OjZYd+q
   wwYlmlBW0Femxy5WoxzECQ==
   -----END CERTIFICATE-----
-date: 2020-03-23 00:00:00.000000000 Z
+date: 2020-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: optimist
+  name: defcli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: colored
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: ud
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement