ud 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: be08bba53ec9677e2382c7221afbdbe86daeeb2b
-  data.tar.gz: 2127476c4b657755e04cd5393a4bc58c852a6840
+SHA256:
+  metadata.gz: da20a8c734f36a7a31f9a27c069390bde91207d30420f4dc90d1299c1cff6fc9
+  data.tar.gz: 4b2efbe5e2cc596e6da5b4cf35d757395946a2357c4d90921262da045b5f13d2
 SHA512:
-  metadata.gz: ab2a0d140114d914a7a066219ad5e3fd2a93c8f20bb8be031900a779db2d4a5ba244f330b1d85e14a95134e7cc2213c1a8973e34f4a21f28d4dacb4234199452
-  data.tar.gz: f421052deba0e6a06f163450d1d5871c85cc68a33dabdc4234ea855dbbb006571114d336621251e2b378a9329127ebfc6cd4eba636650b7146cca418a6a16b10
+  metadata.gz: b82fbc1da03bf072abebc2afad46c9e065f082741b92435afff61fd4949b070b9b9289523fc6a65da4bc0e9838bc7945a320e3d55d4888d3afa18f24f1ab08a0
+  data.tar.gz: 26e8d65aa79a1b76a021306a3a4cb7cfabedfec3385868fee5174f1585234a7570ba5c87bb779c04065bcdad235785d59ed987a4b48432a342f815a261abfd66

data/bin/ud

@@ -4,10 +4,10 @@
 # clean interrupt
 trap("INT") { abort }
 
-require "trollop"
+require "optimist"
 require "ud"
 
-opts = Trollop.options do
+opts = Optimist.options do
   version "ud #{UD.version}"
   banner <<-EOS
 UD is a command-line tool to scrape definitions from the Urban Dictionary.
@@ -23,7 +23,7 @@ EOS
   opt :browser, "Open the results in a browser window", :short => "-b"
 end
 
-Trollop.die :count, "must be non-negative" if opts[:count] < 0
+Optimist.die :count, "must be non-negative" if opts[:count] < 0
 
 if !opts[:random] && ARGV.empty?
   puts "Error: No word provided. Use -h or --help to see the help."

data/lib/ud.rb

@@ -12,9 +12,12 @@ module UD
   class << self
     # @return [String] the current gem's version
     def version
-      "0.3.0"
+      "0.3.1"
     end
 
+    API_ROOT = "https://api.urbandictionary.com/v0"
+    WWW_ROOT = "https://www.urbandictionary.com"
+
     # Get the search URL to query for a given term.
     # @param term [String] the term to search for. It must be a string, spaces
     #                      are allowed.
@@ -24,18 +27,19 @@ module UD
       param = URI.encode_www_form("term" => term)
 
       if opts[:api] != false
-        "http://api.urbandictionary.com/v0/define?#{param}"
+        "#{API_ROOT}/define?#{param}"
       else
-        "http://www.urbandictionary.com/define.php?#{param}"
+        "#{WWW_ROOT}/define.php?#{param}"
       end
     end
 
+    # Return a URL for a random definition.
     # @param opts [Hash] options.
     def random_url(opts = {})
       if opts[:api] != false
-        "http://api.urbandictionary.com/v0/random"
+        "#{API_ROOT}/random"
       else
-        "http://www.urbandictionary.com/random.php"
+        "#{WWW_ROOT}/random.php"
       end
     end
 
@@ -63,10 +67,13 @@ module UD
       parse_response(open(search_url(term)).read, opts)
     end
 
+    # Return a random definition
+    # @param opts [Hash] options.
     def random(opts = {})
       parse_response(open(random_url).read, opts)
     end
 
+    # Parse a response from the Urban Dictionnary website.
     # @param opts [Hash] options. This is used by the command-line tool.
     #                    +:count+ is the maximum number of results to return
     # @return [Array<Hash>]

data/lib/ud/formatting.rb

@@ -11,7 +11,7 @@ module UD
       def fit(txt, width = 79)
         return [] if width < 1
 
-        # from http://stackoverflow.com/a/7567210/735926
+        # from https://stackoverflow.com/a/7567210/735926
         r = /(.{1,#{width}})(?:\s|$)/m
         txt.split("\n").map { |l| l.scan(r) }.flatten
       end

data/tests/query_tests.rb

@@ -5,15 +5,15 @@ require File.dirname(__FILE__) + '/fake_responses'
 
 class UD_Query_test < Test::Unit::TestCase
 
-  API_URL = 'http://api.urbandictionary.com/v0/define'
-  ROOT_URL = 'http://www.urbandictionary.com/define.php'
+  API_URL = 'https://api.urbandictionary.com/v0/define'
+  ROOT_URL = 'https://www.urbandictionary.com/define.php'
 
   def setup
     @foo, @bar = [
       {
         :id => 1,
         :author => 'a1',
-        :permalink => 'http://example.com/1',
+        :permalink => 'https://example.com/1',
         :word => 'foo',
         :definition => 'A',
         :example => 'AA',
@@ -24,7 +24,7 @@ class UD_Query_test < Test::Unit::TestCase
       {
         :id => 2,
         :author => 'a2',
-        :permalink => 'http://example.com/2',
+        :permalink => 'https://example.com/2',
         :word => 'bar',
         :definition => 'B',
         :example => 'BB',
@@ -59,7 +59,7 @@ class UD_Query_test < Test::Unit::TestCase
   # == UD#random_url == #
 
   def test_random_url
-    assert_equal("http://api.urbandictionary.com/v0/random", UD.random_url)
+    assert_equal("https://api.urbandictionary.com/v0/random", UD.random_url)
   end
 
   # == UD#query == #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ud
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Baptiste Fontaine
@@ -10,56 +10,46 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDaDCCAlCgAwIBAgIBATANBgkqhkiG9w0BAQUFADA9MRAwDgYDVQQDDAdiYXRp
-  Zm9uMRUwEwYKCZImiZPyLGQBGRYFeWFob28xEjAQBgoJkiaJk/IsZAEZFgJmcjAe
-  Fw0xNTEyMjMwMTExMTZaFw0xNjEyMjIwMTExMTZaMD0xEDAOBgNVBAMMB2JhdGlm
-  b24xFTATBgoJkiaJk/IsZAEZFgV5YWhvbzESMBAGCgmSJomT8ixkARkWAmZyMIIB
-  IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0en8u9i10EQtkp3SUnXnXo0W
-  UISZyvp2kS22c2/FXYg566dtfkp3pwBOZi3gvRYAKpmXAwbynOANdm2bfzQiG+Br
-  0966dfY0SIbFuhaueJ8JUm5o/nxxCiKxuvCFs5899SJxyzmD3NNVzjTdrSU6UTgx
-  Q7K/r2MRYxBmPBbi8wdxyP1Ko36o9BJdLNrUiAVec1VXOlqA9Iw8CyrlG3V1snNl
-  efNVzZ+sMCkR73IyxRRwRgPws2jo2/8LfKcL+J3mz4ekBs4PoyOCWCnPlpBjAwkx
-  OzzDCjpxYbn/SYNHC8MxVdgap7jEX75ogkfpGOrAEdiPASnc2nFKqbJNxX7hCQID
-  AQABo3MwcTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU2BKQg2pq
-  izVT9CkLdQo+nHNlvpQwGwYDVR0RBBQwEoEQYmF0aWZvbkB5YWhvby5mcjAbBgNV
-  HRIEFDASgRBiYXRpZm9uQHlhaG9vLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQBkPKEW
-  urPeZb+IHuqWMqpzL/42fU4QuVUYDswLq+V0tXwnHo+okAq00Xh0yr0OaDBvm0mW
-  al9ZGC0RzaSQa+9mPd0t39oaWdtY7TOxQX3OC3vxdZ794gqyQgNxOmajFl22NY01
-  vxMAeZOu+IC5s2pQyUG0Gsq2sRbquW1mj8OC8KI3WWcECqGFOIOdXYTsqVqhwcN1
-  OpgZkC/pnOJanbP2ex2OHjlwFlpQ2PPAhoIG3mU1HEYXBZuP7+DUgNNgpopX83A5
-  0df+9hsqme8UngbwGqM1XgU4dUlXNaoHejAm/d9IrRPvqE2oFsS9ytHShth2bC43
-  LPBfw/xSG5R4RjMC
+  MIIEPDCCAqSgAwIBAgIBATANBgkqhkiG9w0BAQsFADAkMSIwIAYDVQQDDBliL0RD
+  PXB0aXN0ZWZvbnRhaW5lL0RDPWZyMB4XDTE4MTIwODAwMDU0MFoXDTE5MTIwODAw
+  MDU0MFowJDEiMCAGA1UEAwwZYi9EQz1wdGlzdGVmb250YWluZS9EQz1mcjCCAaIw
+  DQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAKdjTwN/gnJ3WHxKeusaRN1o902Q
+  BmIRgdtbhpsHtgUruKNujutEBpmhG1fka8+mujhqh885blckeC8hXgqpHGK1MsJU
+  tgsNB2F2Nvof/uGBzi+OZ76HPLmfvJFb/KUiwrh08jTbFftMBCmuekbxBajt2N2F
+  shF6DFEqO2hl/itVt5UeIZhpIZvO7qSZ9FtLRXs0q2O27h4QfAv6XobNDwH5TBs5
+  z+EYufgTtupf26xW0v6z2NDG6z36Eap7QAwoivuPCuXO+IPgxhubtGvFYSo7ygP4
+  RbYsaGucRneCCzezTD+i1LnhGt9TCbQjdvidgM+i616JC/HRXglM0apgBZSjayoI
+  XHoajIajnU+570cu01Wsa+SF9m4stKao0hLnCUMeYybmA/Ilk58nJ2xZJWMULu76
+  7Ttzead1Ah25ZdWefKG5FIGkpezEp4z/YihGEJt+hxS7Aa2xYiIlnYFwUno530/8
+  So5Ibqdd3pMKJDUQJvGIBhsQIXF4Iogk4txoPwIDAQABo3kwdzAJBgNVHRMEAjAA
+  MAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUsV1eKnEFtVRwyz6/nTuharH3G+UwHgYD
+  VR0RBBcwFYETYkBwdGlzdGVmb250YWluZS5mcjAeBgNVHRIEFzAVgRNiQHB0aXN0
+  ZWZvbnRhaW5lLmZyMA0GCSqGSIb3DQEBCwUAA4IBgQBm1mthI2xc/jfKApZigdhO
+  j2X3h5wnBKu/EPU1be0RuFigUGlZCMaM4S8nk5pBJxRv1FHUtR4utP7vcqEWGaE1
+  9RklitOhNSXOeFfFukjUzZXFGUrcSe68BW9dh/KhIt84li13pdDLSNRmO0TzaRdb
+  G7ZRTVIhGqBCY3KJrMwrbjnOH/VK5XwO0hzFZ2/ClWeK+VuJ98bKWpiu2ZSHZCgK
+  nkcbCuzmx0/6UwqUhPEl4i+QLTVr8+Gk3jdxYSBBEUMXyNF6fPM6JJdIui/WjJIx
+  gtCh7AePlEbyxbx4d+oDvo/uzNFfHNNuI4TfkuBNDGLstPbJfyHgk7oPyfvD5dlO
+  yxO7L6A6ZNC1bI3P8tQq+qgDNpkRJ8pqynfF7DxMVOzvlhO5qhV23if7tYaRjqV5
+  T1ACML6wkYk8FexGDaL0txwG/y+b+3sHyUArpv8/rLGqpo+g2TYlqJhdwuA10W2k
+  H0Dpo4eQ8PCwqU7AgGTli19gHcox4Ne0O+6QaiB4eSw=
   -----END CERTIFICATE-----
-date: 2016-11-27 00:00:00.000000000 Z
+date: 2018-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: json
+  name: optimist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
-- !ruby/object:Gem::Dependency
-  name: trollop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
@@ -117,19 +107,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.5'
 - !ruby/object:Gem::Dependency
-  name: fakeweb
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -145,7 +135,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.7'
 description: Get words' definitions from Urban Dictionary on the command-line.
-email: batifon@yahoo.fr
+email: b@ptistefontaine.fr
 executables:
 - ud
 extensions: []
@@ -177,12 +167,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Urban Dictionary unofficial scrapper
 test_files:
-- tests/formatting_tests.rb
-- tests/query_tests.rb
 - tests/tests.rb
-has_rdoc: 
+- tests/query_tests.rb
+- tests/formatting_tests.rb