wwwjdic 14.0.0 → 15.0.0

data/lib/wwwjdic/utils/raisers.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
 #++
 
 
@@ -28,7 +32,7 @@ module WWWJDic
   # methods...
   #
   # 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
   module Utils
 
@@ -36,7 +40,7 @@ module WWWJDic
     # to (possibly) common conditions.
     #
     # 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
     module Raisers
 

data/lib/wwwjdic/utils/splitter.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 'i18n'
@@ -27,7 +31,7 @@ module WWWJDic
   # This class is a simple API to interact with WWWJDic Backboor
   # Entry/API.
   # 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 Splitter
     # Creates a +Splitter+ object.
@@ -39,20 +43,21 @@ module WWWJDic
     end
 
     def title
-      $1 if /<TITLE>(.*)<\/TITLE>/.match @translation
+      Regexp.last_match(1) if %r{<TITLE>(.*)</TITLE>}.match @translation
     end
 
     def translation
-      $1.strip if /<pre>(.*)<\/pre>/m.match @translation
+      Regexp.last_match(1).strip if %r{<pre>(.*)</pre>}m.match @translation
     end
 
     def message
-      return $1.strip if /<p>(.*)<p>/m.match @translation unless @translation.nil?
-      $1 if /<p>(.*)<pre>/m.match @translation if @translation.nil?
+      return Regexp.last_match(1).strip unless @translation.nil? || !/<p>(.*)<p>/m.match(@translation)
+
+      Regexp.last_match(1) if @translation.nil? && /<p>(.*)<pre>/m.match(@translation)
     end
 
     def lines
-      result = Array.new
+      result = []
       translation.each_line do |a_line|
         stripped_line = a_line.strip
         result.push stripped_line unless stripped_line.empty?
@@ -60,18 +65,19 @@ module WWWJDic
       result unless result.empty?
     end
 
+    # @return [Array] the arrays of elements containing the answer
     def content
-      result = Array.new
+      result = []
       lines.each do |a_line|
-        inner = Hash.new
+        inner = {}
         if /(.*)\[/m.match a_line
-          inner[:word] = $1.strip
-          inner[:kana] = $1.strip if /\[(.*)\]/m.match a_line
-          inner[:text] = $1.strip if /\] \/(.*)\//m.match a_line
+          inner[:word] = Regexp.last_match(1).strip
+          inner[:kana] = Regexp.last_match(1).strip if /\[(.*)\]/m.match a_line
+          inner[:text] = Regexp.last_match(1).strip if %r{\] /(.*)/}m.match a_line
         else
-          inner[:kana] = $1.strip if /^(.*)(\s)\//m.match a_line
+          inner[:kana] = Regexp.last_match(1).strip if %r{^(.*)(\s)/}m.match a_line
           inner[:word] = inner[:kana]
-          inner[:text] = $1.strip if /\/(.*)\//m.match a_line
+          inner[:text] = Regexp.last_match(1).strip if %r{/(.*)/}m.match a_line
         end
         inner[:meanings] = inner[:text].split('/') if inner[:text].include? '/'
         result.push inner unless inner.empty?

data/lib/wwwjdic/version.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.
 #
@@ -18,11 +18,7 @@
 # along with wwwjdic. If not, see <http://www.gnu.org/licenses/>.
 #++
 
-require 'digest/md5'
-require 'i18n'
-require 'uri'
-
 module WWWJDic
   # Current version number for WWWJDic gem.
-  VERSION = '14.0.0'
+  VERSION = '15.0.0'.freeze
 end

data/test/test_helper.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 'simplecov'

data/test/test_wwwjdic.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,13 +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 'test_helper'
 
 describe WWWJDic::WWWJDic do
   describe 'when created' do
-    subject { WWWJDic::breener }
+    subject { WWWJDic.breener }
 
     it 'must create a wwwjdic object' do
       _(subject).wont_be_nil

data/test/wwwjdic/locales/de.yml

@@ -1,5 +1,6 @@
+#--
 # wwwjdic
-# Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020  Marco Bresciani
+# © 2014 Marco Bresciani
 #
 # This file is part of wwwjdic.
 #
@@ -15,6 +16,11 @@
 #
 # 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
+#++
 
 de:
   test:

data/test/wwwjdic/locales/en.yml

@@ -1,5 +1,6 @@
+#--
 # wwwjdic
-# Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020  Marco Bresciani
+# © 2014 Marco Bresciani
 #
 # This file is part of wwwjdic.
 #
@@ -15,6 +16,11 @@
 #
 # 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
+#++
 
 en:
   test:

data/test/wwwjdic/locales/es.yml

@@ -1,5 +1,6 @@
+#--
 # wwwjdic
-# Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020  Marco Bresciani
+# © 2014 Marco Bresciani
 #
 # This file is part of wwwjdic.
 #
@@ -15,6 +16,11 @@
 #
 # 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
+#++
 
 es:
   test:

data/test/wwwjdic/locales/fr.yml

@@ -1,5 +1,6 @@
+#--
 # wwwjdic
-# Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020  Marco Bresciani
+# © 2014 Marco Bresciani
 #
 # This file is part of wwwjdic.
 #
@@ -15,6 +16,11 @@
 #
 # 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:
   test:

data/test/wwwjdic/locales/hu.yml

@@ -1,5 +1,6 @@
+#--
 # wwwjdic
-# Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020  Marco Bresciani
+# © 2014 Marco Bresciani
 #
 # This file is part of wwwjdic.
 #
@@ -15,6 +16,11 @@
 #
 # 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:
   test:

data/test/wwwjdic/locales/it.yml

@@ -1,5 +1,6 @@
+#--
 # wwwjdic
-# Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020  Marco Bresciani
+# © 2014 Marco Bresciani
 #
 # This file is part of wwwjdic.
 #
@@ -15,7 +16,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: 2014 Marco Bresciani
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+#++
 
 it:
-  kotoba: parola
-  test: dato di prova
+  test:
+    kotoba: parola
+    test: dato di prova

data/test/wwwjdic/locales/ja.yml

@@ -1,6 +1,7 @@
+#--
 # wwwjdic
-# Copyright © 2013  新部裕
-# Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020  新部裕, Marco Bresciani
+# © 2013  新部裕
+# © 2014 Marco Bresciani
 #
 # This file is part of wwwjdic.
 #
@@ -16,6 +17,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: 2013  新部裕
+# SPDX-FileCopyrightText: 2014 Marco Bresciani
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+#++
 
 ja:
   test:

data/test/wwwjdic/locales/nl.yml

@@ -1,5 +1,6 @@
+#--
 # wwwjdic
-# Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020  Marco Bresciani
+# © 2014 Marco Bresciani
 #
 # This file is part of wwwjdic.
 #
@@ -15,6 +16,11 @@
 #
 # 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:
   test:

data/test/wwwjdic/locales/ru.yml

@@ -1,5 +1,6 @@
+#--
 # wwwjdic
-# Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020  Marco Bresciani
+# © 2014 Marco Bresciani
 #
 # This file is part of wwwjdic.
 #
@@ -15,6 +16,11 @@
 #
 # 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:
   test:

data/test/wwwjdic/locales/sl.yml

@@ -1,5 +1,6 @@
+#--
 # wwwjdic
-# Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020  Marco Bresciani
+# © 2014 Marco Bresciani
 #
 # This file is part of wwwjdic.
 #
@@ -15,6 +16,11 @@
 #
 # 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:
   test:

data/test/wwwjdic/locales/sv.yml

@@ -1,5 +1,6 @@
+#--
 # wwwjdic
-# Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020  Marco Bresciani
+# © 2014 Marco Bresciani
 #
 # This file is part of wwwjdic.
 #
@@ -15,6 +16,11 @@
 #
 # 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:
   test:

data/test/wwwjdic/locales/test_locales.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,15 +16,18 @@
 #
 # 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 '../../test_helper'
 
+RELATIVE_PATH = './'.freeze
+
 describe WWWJDic::WWWJDic do
   describe 'when using I18N' do
-
-    RELATIVE_PATH = '/../../../lib/wwwjdic/locales/'
-
     before do
       I18n.load_path = Dir[File.join(File.dirname(__FILE__), RELATIVE_PATH, '*.yml')]
     end
@@ -43,22 +46,22 @@ describe WWWJDic::WWWJDic do
 
     it 'shall contain a test.test signpost for each available locale' do
       def load_yaml_file(locale)
-        filename = File::join(File::dirname(__FILE__), RELATIVE_PATH, "#{locale}.yml")
-        filename = File::expand_path filename
-        YAML::load(File::open "#{filename}")
+        filename = File.join(File.dirname(__FILE__), RELATIVE_PATH, "#{locale}.yml")
+        filename = File.expand_path filename
+        YAML.safe_load(File.open(filename.to_s))
       end
 
       subject.each do |locale|
         I18n.locale = locale
 
         translation = load_yaml_file(locale)
-        _(translation["#{locale}"]['test']['test']).wont_be_nil
+        _(translation[locale.to_s]['test']['test']).wont_be_nil
 
         a_string = I18n.t('test.test')
         _(a_string).wont_be_nil
         _(a_string).wont_be_empty
         _(a_string).wont_include 'translation missing'
-        _(a_string).must_equal translation["#{locale}"]['test']['test']
+        _(a_string).must_equal translation[locale.to_s]['test']['test']
       end
     end
   end