wwwjdic 14.0.0 → 15.0.0

data/lib/wwwjdic/locales/fr.yml

@@ -1,6 +1,6 @@
 #--
 # wwwjdic
-# Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020  Marco Bresciani
+# © 2014 Marco Bresciani
 #
 # This file is part of wwwjdic.
 #
@@ -16,7 +16,12 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with wwwjdic. If not, see <http://www.gnu.org/licenses/>.
+#
+# SPDX-FileCopyrightText: 2014 Marco Bresciani
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 #++
+
 fr:
   error:
     nil: paramètre nul pas autorisé.
@@ -25,6 +30,3 @@ fr:
     value: "Valeur %{value} n'est pas dans la plage autorisée."
   warn:
     deprecated: Cette méthode a été déconseillée.
-  test:
-    kotoba: mot
-    test: test data

data/lib/wwwjdic/locales/hu.yml

@@ -1,6 +1,6 @@
 #--
 # wwwjdic
-# Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020  Marco Bresciani
+# © 2014 Marco Bresciani
 #
 # This file is part of wwwjdic.
 #
@@ -16,7 +16,12 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with wwwjdic. If not, see <http://www.gnu.org/licenses/>.
+#
+# SPDX-FileCopyrightText: 2014 Marco Bresciani
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 #++
+
 hu:
   error:
     nil: nulla paraméter nem megengedett.
@@ -25,6 +30,3 @@ hu:
     value: "Érték %{value} nem a megengedett tartományban."
   warn:
     deprecated: Ez a módszer már elavult.
-  test:
-    kotoba:  hír
-    test: test data

data/lib/wwwjdic/locales/it.yml

@@ -1,6 +1,6 @@
 #--
 # wwwjdic
-# Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020  Marco Bresciani
+# © 2014 Marco Bresciani
 #
 # This file is part of wwwjdic.
 #
@@ -16,7 +16,12 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with wwwjdic. If not, see <http://www.gnu.org/licenses/>.
+#
+# SPDX-FileCopyrightText: 2014 Marco Bresciani
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 #++
+
 it:
   error:
     nil: Parametro nil non consentito.
@@ -25,6 +30,3 @@ it:
     value: "Il valore %{value} non è nell'intervallo previsto."
   warn:
     deprecated: Questo metodo è obsoleto.
-  test:
-    kotoba: parola
-    test: dato di prova

data/lib/wwwjdic/locales/ja.yml

@@ -1,6 +1,7 @@
 #--
 # wwwjdic
-# Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020  Marco Bresciani
+# (C) 2013  新部裕
+# © 2014 Marco Bresciani
 #
 # This file is part of wwwjdic.
 #
@@ -16,7 +17,13 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with wwwjdic. If not, see <http://www.gnu.org/licenses/>.
+#
+# SPDX-FileCopyrightText: 2013  新部裕
+# SPDX-FileCopyrightText: 2014 Marco Bresciani
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 #++
+
 ja:
   error:
     nil: nil パラメータは許されません。
@@ -25,6 +32,3 @@ ja:
     value: "値 %{value} が範囲外です。"
   warn:
     deprecated: このメソッドはすでに廃止され、推奨されていません。
-  test:
-    kotoba: 言葉
-    test: 試験データ

data/lib/wwwjdic/locales/nl.yml

@@ -1,6 +1,6 @@
 #--
 # wwwjdic
-# Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020  Marco Bresciani
+# © 2014 Marco Bresciani
 #
 # This file is part of wwwjdic.
 #
@@ -16,6 +16,10 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with wwwjdic. If not, see <http://www.gnu.org/licenses/>.
+#
+# SPDX-FileCopyrightText: 2014 Marco Bresciani
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 #++
 
 nl:
@@ -26,6 +30,3 @@ nl:
     value: "Waarde %{value} is niet in toegestane bereik."
   warn:
     deprecated: Deze methode is verouderd.
-  test:
-    kotoba: taal
-    test: test data

data/lib/wwwjdic/locales/ru.yml

@@ -1,6 +1,6 @@
 #--
 # wwwjdic
-# Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020  Marco Bresciani
+# © 2014 Marco Bresciani
 #
 # This file is part of wwwjdic.
 #
@@ -16,6 +16,10 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with wwwjdic. If not, see <http://www.gnu.org/licenses/>.
+#
+# SPDX-FileCopyrightText: 2014 Marco Bresciani
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 #++
 
 ru:
@@ -26,6 +30,3 @@ ru:
     value: "Значение %{value} не в допустимом диапазоне."
   warn:
     deprecated: Этот метод является устаревшим.
-  test:
-    kotoba: слово
-    test: test data

data/lib/wwwjdic/locales/sl.yml

@@ -1,6 +1,6 @@
 #--
 # wwwjdic
-# Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020  Marco Bresciani
+# © 2014 Marco Bresciani
 #
 # This file is part of wwwjdic.
 #
@@ -16,6 +16,10 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with wwwjdic. If not, see <http://www.gnu.org/licenses/>.
+#
+# SPDX-FileCopyrightText: 2014 Marco Bresciani
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 #++
 
 sl:
@@ -26,6 +30,3 @@ sl:
     value: "Vrednost %{value} ni v dovoljenem obsegu."
   warn:
     deprecated: Ta metoda je bila opuščena.
-  test:
-    kotoba: beseda
-    test: test data

data/lib/wwwjdic/locales/sv.yml

@@ -1,6 +1,6 @@
 #--
 # wwwjdic
-# Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020  Marco Bresciani
+# © 2014 Marco Bresciani
 #
 # This file is part of wwwjdic.
 #
@@ -16,6 +16,10 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with wwwjdic. If not, see <http://www.gnu.org/licenses/>.
+#
+# SPDX-FileCopyrightText: 2014 Marco Bresciani
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 #++
 
 sv:
@@ -26,6 +30,3 @@ sv:
     value: "Värde %{value} är inte tillåtet intervall."
   warn:
     deprecated: Denna metod har föråldrad.
-  test:
-    kotoba: ord
-    test: test data

data/lib/wwwjdic/parser.rb

@@ -1,6 +1,6 @@
 #--
 # wwwjdic
-# Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020  Marco Bresciani
+# © 2014 Marco Bresciani
 #
 # This file is part of wwwjdic.
 #
@@ -16,6 +16,10 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with wwwjdic. If not, see <http://www.gnu.org/licenses/>.
+#
+# SPDX-FileCopyrightText: 2014 Marco Bresciani
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 #++
 
 require_relative 'constants'
@@ -26,13 +30,13 @@ module WWWJDic
   # parameters for wwwjdic.
   #
   # Author:: {Marco Bresciani}[mailto:marcobresciani_1974@libero.it]
-  # Copyright:: Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020  Marco Bresciani
+  # Copyright:: (C) 2014 Marco Bresciani
   # License:: GNU General Public License version 3
   class Parser
     attr_reader :parsers
 
     def initialize(args = {})
-      @parsers = Hash.new
+      @parsers = {}
       ALL_PARAMS.each { |param| parsers[param] = args[param] } unless args.nil?
     end
 
@@ -40,7 +44,7 @@ module WWWJDic
     def parse(method = nil, value = nil)
       a_parser = nil
       a_parser = parsers[method.to_sym] unless method.nil? or parsers.nil?
-      a_parser.parse value unless a_parser.nil?
+      a_parser&.parse value
     end
   end
 end

data/lib/wwwjdic/parsers/dict.rb

@@ -1,6 +1,6 @@
 #--
 # wwwjdic
-# Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020  Marco Bresciani
+# © 2014 Marco Bresciani
 #
 # This file is part of wwwjdic.
 #
@@ -16,6 +16,10 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with wwwjdic. If not, see <http://www.gnu.org/licenses/>.
+#
+# SPDX-FileCopyrightText: 2014 Marco Bresciani
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 #++
 
 require_relative '../constants'
@@ -32,7 +36,7 @@ module WWWJDic
     # source of one of the pages to get the full list of codes.)
     #
     # Author:: {Marco Bresciani}[mailto:marcobresciani_1974@libero.it]
-    # Copyright:: Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020  Marco Bresciani
+    # Copyright:: (C) 2014 Marco Bresciani
     # License:: GNU General Public License version 3
     class Dict
       include Utils::Raisers
@@ -46,11 +50,9 @@ module WWWJDic
         if value.length == 1
           raiser_array('error.param', value, DICTIONARY_CODES)
           value
-        else
-          if value.length > 1
-            raiser_array('error.param', value, DICTIONARY_NAMES)
-            DICTS_BY_NAMES[value]
-          end
+        elsif value.length > 1
+          raiser_array('error.param', value, DICTIONARY_NAMES)
+          DICTS_BY_NAMES[value]
         end
       end
     end

data/lib/wwwjdic/parsers/display.rb

@@ -1,6 +1,6 @@
 #--
 # wwwjdic
-# Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020  Marco Bresciani
+# © 2014 Marco Bresciani
 #
 # This file is part of wwwjdic.
 #
@@ -16,6 +16,10 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with wwwjdic. If not, see <http://www.gnu.org/licenses/>.
+#
+# SPDX-FileCopyrightText: 2014 Marco Bresciani
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 #++
 
 require_relative '../constants'
@@ -31,7 +35,7 @@ module WWWJDic
     # dictionary display)
     #
     # Author:: {Marco Bresciani}[mailto:marcobresciani_1974@libero.it]
-    # Copyright:: Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020  Marco Bresciani
+    # Copyright:: (C) 2014 Marco Bresciani
     # License:: GNU General Public License version 3
     class Display
       include Utils::Raisers

data/lib/wwwjdic/parsers/key.rb

@@ -1,6 +1,6 @@
 #--
 # wwwjdic
-# Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020  Marco Bresciani
+# © 2014 Marco Bresciani
 #
 # This file is part of wwwjdic.
 #
@@ -16,12 +16,17 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with wwwjdic. If not, see <http://www.gnu.org/licenses/>.
+#
+# SPDX-FileCopyrightText: 2014 Marco Bresciani
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 #++
 
 require_relative '../constants'
 
 module WWWJDic
   module Parsers
+
     # This class is an implementation of the Parsable duck type that
     # checks the display type. The only needed parameter is the word to
     # translate.
@@ -56,13 +61,13 @@ module WWWJDic
     # displayed.
     #
     # Author:: {Marco Bresciani}[mailto:marcobresciani_1974@libero.it]
-    # Copyright:: Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020  Marco Bresciani
+    # Copyright:: (C) 2014 Marco Bresciani
     # License:: GNU General Public License version 3
     class Key
       include Utils::Raisers
 
       # The parsable duck type interface to every parser usage.
-      def parse(value = :exact)
+      def parse(value = :english)
         raise ArgumentError, I18n.t('error.nil') if value.nil?
         raise ArgumentError, I18n.t('error.param', value: value) unless value.is_a? Symbol
 

data/lib/wwwjdic/parsers/search.rb

@@ -1,6 +1,6 @@
 #--
 # wwwjdic
-# Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020  Marco Bresciani
+# © 2014 Marco Bresciani
 #
 # This file is part of wwwjdic.
 #
@@ -16,6 +16,10 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with wwwjdic. If not, see <http://www.gnu.org/licenses/>.
+#
+# SPDX-FileCopyrightText: 2014 Marco Bresciani
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 #++
 
 module WWWJDic
@@ -47,12 +51,13 @@ module WWWJDic
     # * for example sentence lookups using a regular expression, use T.
     #
     # Author:: {Marco Bresciani}[mailto:marcobresciani_1974@libero.it]
-    # Copyright:: Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020  Marco Bresciani
+    # Copyright:: (C) 2014 Marco Bresciani
     # License:: GNU General Public License version 3
     class Search
       # The parsable duck type interface to every parser usage.
       def parse(value = '')
-        return 'D' if value == CGI::escape(value).to_s
+        return 'D' if value == CGI.escape(value).to_s
+
         'U'
       end
     end

data/lib/wwwjdic/parsers/server.rb

@@ -1,6 +1,6 @@
 #--
 # wwwjdic
-# Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020  Marco Bresciani
+# © 2014 Marco Bresciani
 #
 # This file is part of wwwjdic.
 #
@@ -16,6 +16,10 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with wwwjdic. If not, see <http://www.gnu.org/licenses/>.
+#
+# SPDX-FileCopyrightText: 2014 Marco Bresciani
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 #++
 
 require_relative '../constants'
@@ -28,7 +32,7 @@ module WWWJDic
     # with +true+ for regular.
     #
     # Author:: {Marco Bresciani}[mailto:marcobresciani_1974@libero.it]
-    # Copyright:: Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020  Marco Bresciani
+    # Copyright:: (C) 2014 Marco Bresciani
     # License:: GNU General Public License version 3
     class Server
       include Utils::Raisers

data/lib/wwwjdic/utils/downloader.rb

@@ -1,6 +1,6 @@
 #--
 # wwwjdic
-# Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020  Marco Bresciani
+# © 2014 Marco Bresciani
 #
 # This file is part of wwwjdic.
 #
@@ -16,6 +16,10 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with wwwjdic. If not, see <http://www.gnu.org/licenses/>.
+#
+# SPDX-FileCopyrightText: 2012 Jon Maken
+#
+# SPDX-License-Identifier: BSD-3-Clause
 #++
 
 module WWWJDic
@@ -35,8 +39,6 @@ module WWWJDic
       require 'fileutils'
       require 'tempfile'
 
-      #!/usr/bin/env ruby
-      #
       # An HTTP/HTTPS/FTP file downloader library/CLI based upon
       # MiniPortile's HTTP implementation.
       #
@@ -45,45 +47,42 @@ module WWWJDic
       # Revision:: 2012-03-25 23:01:19 -0600
       class Downloader
 
-        VERSION = '0.1.0'
+        VERSION = '0.1.0'.freeze
 
         class << self
           attr_accessor :logger, :max_ca_verify_depth, :ftp_data_chunk_size
         end
 
-        @logger = STDOUT.binmode
+        @logger = $stdout.binmode
         @max_ca_verify_depth = 5
         @ftp_data_chunk_size = 8192
 
 
         def self.download_file(url, full_path, count = 3)
-          raise RuntimeError, I18n.t('error.nil') if url.nil?
-          # return if File.exist?(full_path)
+          raise I18n.t('error.nil') if url.nil?
 
           http_download(url, full_path, count)
         end
 
-        private
-
-        def self.message(text)
+        private_class_method def self.message(text)
           @logger.print text
           @logger.flush
         end
 
-        def self.output(text = '')
+        private_class_method def self.output(text = '')
           @logger.puts text
           @logger.flush
         end
 
-        def self.http_download(url, full_path, count)
+        private_class_method def self.http_download(url, full_path, count)
           uri = URI.parse(url)
 
           begin
             filename = File.basename(uri.path)
 
             if ENV['HTTP_PROXY']
-              #protocol,
-              userinfo, proxy_host, proxy_port = URI::split(ENV['HTTP_PROXY'])
+              # protocol,
+              userinfo, proxy_host, proxy_port = URI.split(ENV['HTTP_PROXY'])
               proxy_user, proxy_pass = userinfo.split(/:/) if userinfo
               http = Net::HTTP.new(uri.host, uri.port, proxy_host, proxy_port, proxy_user, proxy_pass)
             else
@@ -102,6 +101,7 @@ module WWWJDic
 
               when Net::HTTPRedirection
                 raise 'Too many redirections, halting.' if count <= 0
+
                 url = response['location']
                 return http_download(url, full_path, count - 1)
 
@@ -111,25 +111,23 @@ module WWWJDic
                 temp_file << response.body
                 temp_file.close
 
-                if full_path.nil?
-                  return response.body
-                else
-                  File.unlink full_path if File.exist?(full_path)
-                  FileUtils.mkdir_p File.dirname(full_path)
-                  FileUtils.mv temp_file.path, full_path, :force => true
-                end
+                return response.body if full_path.nil?
+
+                File.unlink full_path if File.exist?(full_path)
+                FileUtils.mkdir_p File.dirname(full_path)
+                FileUtils.mv temp_file.path, full_path, force: true
               else
                 puts response
               end
             end
 
-          rescue Exception => e
+          rescue StandardError => e
             File.unlink full_path if File.exist?(full_path) unless full_path.nil?
             output "ERROR: #{e.message}"
             raise 'Failed to download file'
           end
         end
-      end # Downloader
+      end
     end
   end
 end