wwwjdic 15.0.0 → 16.0.0

data/lib/wwwjdic/utils/downloader.rb

@@ -1,6 +1,10 @@
+# frozen_string_literal: true
+
 #--
 # wwwjdic
+# rubocop:disable Style/AsciiComments
 # © 2014 Marco Bresciani
+# rubocop:enable Style/AsciiComments
 #
 # This file is part of wwwjdic.
 #
@@ -24,7 +28,6 @@
 
 module WWWJDic
   module Utils
-
     # This module is a simple wrapper container for Peter R. Marreck's
     # gist.
     #
@@ -32,7 +35,6 @@ module WWWJDic
     # License:: 3-clause BSD
     # Revision:: 2012-03-25 23:01:19 -0600
     module Downloader
-
       require 'net/http'
       require 'net/ftp'
       require 'openssl'
@@ -46,8 +48,7 @@ module WWWJDic
       # License:: 3-clause BSD
       # Revision:: 2012-03-25 23:01:19 -0600
       class Downloader
-
-        VERSION = '0.1.0'.freeze
+        VERSION = '0.1.0'
 
         class << self
           attr_accessor :logger, :max_ca_verify_depth, :ftp_data_chunk_size
@@ -57,7 +58,6 @@ module WWWJDic
         @max_ca_verify_depth = 5
         @ftp_data_chunk_size = 8192
 
-
         def self.download_file(url, full_path, count = 3)
           raise I18n.t('error.nil') if url.nil?
 
@@ -120,11 +120,10 @@ module WWWJDic
                 puts response
               end
             end
-
           rescue StandardError => e
-            File.unlink full_path if File.exist?(full_path) unless full_path.nil?
+            File.unlink full_path if !full_path.nil? && File.exist?(full_path)
             output "ERROR: #{e.message}"
-            raise 'Failed to download file'
+            raise "Failed to download file: #{e.message}"
           end
         end
       end

data/lib/wwwjdic/utils/raisers.rb

@@ -1,6 +1,10 @@
+# frozen_string_literal: true
+
 #--
 # wwwjdic
+# rubocop:disable Style/AsciiComments
 # © 2014 Marco Bresciani
+# rubocop:enable Style/AsciiComments
 #
 # This file is part of wwwjdic.
 #
@@ -22,11 +26,9 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 #++
 
-
 require 'i18n'
 
 module WWWJDic
-
   # This module is a simple collection of useful things and methods that
   # I prefer to keep as DRYer as possible. Just include it and use the
   # methods...
@@ -35,7 +37,6 @@ module WWWJDic
   # Copyright:: (C) 2014 Marco Bresciani
   # License:: GNU General Public License version 3
   module Utils
-
     # This module contains some utility method to raise errors according
     # to (possibly) common conditions.
     #
@@ -43,29 +44,22 @@ module WWWJDic
     # Copyright:: (C) 2014 Marco Bresciani
     # License:: GNU General Public License version 3
     module Raisers
-
       # Raises an +ArgumentError+ according to parameters, unless the
       # +array+ contains the exact +value+.
       def raiser_array(name = 'error.value', value = nil, array = nil)
-        unless value.nil?
-          raise ArgumentError, I18n.t(name, value: value) unless array.include? value
-        end
+        raise ArgumentError, I18n.t(name, value: value) if !value.nil? && !(array.include? value)
       end
 
       # Raises an +ArgumentError+ according to parameters, unless the
       # +array+ contains a downcased +value+.
       def raiser_downcase(name = 'error.value', value = nil, array = nil)
-        unless value.nil?
-          raise ArgumentError, I18n.t(name, value: value) unless array.include? value.downcase
-        end
+        raise ArgumentError, I18n.t(name, value: value) if !value.nil? && !(array.include? value.downcase)
       end
 
       # Raises an +ArgumentError+ according to parameters, unless the
       # +array+ contains the number of the +value+.
       def raiser_to_i(name = 'error.value', value = nil, array = nil)
-        unless value.nil?
-          raise ArgumentError, I18n.t(name, value: value) unless array.include? value.to_i
-        end
+        raise ArgumentError, I18n.t(name, value: value) if !value.nil? && !(array.include? value.to_i)
       end
     end
   end

data/lib/wwwjdic/utils/splitter.rb

@@ -1,6 +1,10 @@
+# frozen_string_literal: true
+
 #--
 # wwwjdic
+# rubocop:disable Style/AsciiComments
 # © 2014 Marco Bresciani
+# rubocop:enable Style/AsciiComments
 #
 # This file is part of wwwjdic.
 #
@@ -70,15 +74,7 @@ module WWWJDic
       result = []
       lines.each do |a_line|
         inner = {}
-        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] = Regexp.last_match(1).strip if %r{^(.*)(\s)/}m.match a_line
-          inner[:word] = inner[:kana]
-          inner[:text] = Regexp.last_match(1).strip if %r{/(.*)/}m.match a_line
-        end
+        fill_inner_data(a_line, inner)
         inner[:meanings] = inner[:text].split('/') if inner[:text].include? '/'
         result.push inner unless inner.empty?
       end
@@ -86,5 +82,18 @@ module WWWJDic
       result unless result.empty?
     end
 
+    private
+
+    def fill_inner_data(a_line, inner)
+      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] = Regexp.last_match(1).strip if %r{^(.*)(\s)/}m.match a_line
+        inner[:word] = inner[:kana]
+        inner[:text] = Regexp.last_match(1).strip if %r{/(.*)/}m.match a_line
+      end
+    end
   end
 end

data/lib/wwwjdic/version.rb

@@ -1,6 +1,10 @@
+# frozen_string_literal: true
+
 #--
 # wwwjdic
+# rubocop:disable Style/AsciiComments
 # © 2014 Marco Bresciani
+# rubocop:enable Style/AsciiComments
 #
 # This file is part of wwwjdic.
 #
@@ -20,5 +24,5 @@
 
 module WWWJDic
   # Current version number for WWWJDic gem.
-  VERSION = '15.0.0'.freeze
+  VERSION = '16.0.0'
 end

data/test/test_helper.rb

@@ -1,6 +1,10 @@
+# frozen_string_literal: true
+
 #--
 # wwwjdic
+# rubocop:disable Style/AsciiComments
 # © 2014 Marco Bresciani
+# rubocop:enable Style/AsciiComments
 #
 # This file is part of wwwjdic.
 #

data/test/test_wwwjdic.rb

@@ -1,6 +1,10 @@
+# frozen_string_literal: true
+
 #--
 # wwwjdic
+# rubocop:disable Style/AsciiComments
 # © 2014 Marco Bresciani
+# rubocop:enable Style/AsciiComments
 #
 # This file is part of wwwjdic.
 #

data/test/wwwjdic/locales/de.yml

@@ -1,6 +1,8 @@
 #--
 # wwwjdic
+# rubocop:disable Style/AsciiComments
 # © 2014 Marco Bresciani
+# rubocop:enable Style/AsciiComments
 #
 # This file is part of wwwjdic.
 #

data/test/wwwjdic/locales/en.yml

@@ -1,6 +1,8 @@
 #--
 # wwwjdic
+# rubocop:disable Style/AsciiComments
 # © 2014 Marco Bresciani
+# rubocop:enable Style/AsciiComments
 #
 # This file is part of wwwjdic.
 #

data/test/wwwjdic/locales/es.yml

@@ -1,6 +1,8 @@
 #--
 # wwwjdic
+# rubocop:disable Style/AsciiComments
 # © 2014 Marco Bresciani
+# rubocop:enable Style/AsciiComments
 #
 # This file is part of wwwjdic.
 #

data/test/wwwjdic/locales/fr.yml

@@ -1,6 +1,8 @@
 #--
 # wwwjdic
+# rubocop:disable Style/AsciiComments
 # © 2014 Marco Bresciani
+# rubocop:enable Style/AsciiComments
 #
 # This file is part of wwwjdic.
 #

data/test/wwwjdic/locales/hu.yml

@@ -1,6 +1,8 @@
 #--
 # wwwjdic
+# rubocop:disable Style/AsciiComments
 # © 2014 Marco Bresciani
+# rubocop:enable Style/AsciiComments
 #
 # This file is part of wwwjdic.
 #

data/test/wwwjdic/locales/it.yml

@@ -1,6 +1,8 @@
 #--
 # wwwjdic
+# rubocop:disable Style/AsciiComments
 # © 2014 Marco Bresciani
+# rubocop:enable Style/AsciiComments
 #
 # This file is part of wwwjdic.
 #

data/test/wwwjdic/locales/ja.yml

@@ -1,7 +1,9 @@
 #--
 # wwwjdic
 # © 2013  新部裕
+# rubocop:disable Style/AsciiComments
 # © 2014 Marco Bresciani
+# rubocop:enable Style/AsciiComments
 #
 # This file is part of wwwjdic.
 #

data/test/wwwjdic/locales/nl.yml

@@ -1,6 +1,8 @@
 #--
 # wwwjdic
+# rubocop:disable Style/AsciiComments
 # © 2014 Marco Bresciani
+# rubocop:enable Style/AsciiComments
 #
 # This file is part of wwwjdic.
 #

data/test/wwwjdic/locales/ru.yml

@@ -1,6 +1,8 @@
 #--
 # wwwjdic
+# rubocop:disable Style/AsciiComments
 # © 2014 Marco Bresciani
+# rubocop:enable Style/AsciiComments
 #
 # This file is part of wwwjdic.
 #

data/test/wwwjdic/locales/sl.yml

@@ -1,6 +1,8 @@
 #--
 # wwwjdic
+# rubocop:disable Style/AsciiComments
 # © 2014 Marco Bresciani
+# rubocop:enable Style/AsciiComments
 #
 # This file is part of wwwjdic.
 #

data/test/wwwjdic/locales/sv.yml

@@ -1,6 +1,8 @@
 #--
 # wwwjdic
+# rubocop:disable Style/AsciiComments
 # © 2014 Marco Bresciani
+# rubocop:enable Style/AsciiComments
 #
 # This file is part of wwwjdic.
 #

data/test/wwwjdic/locales/test_locales.rb

@@ -1,6 +1,10 @@
+# frozen_string_literal: true
+
 #--
 # wwwjdic
+# rubocop:disable Style/AsciiComments
 # © 2014 Marco Bresciani
+# rubocop:enable Style/AsciiComments
 #
 # This file is part of wwwjdic.
 #
@@ -24,7 +28,29 @@
 
 require_relative '../../test_helper'
 
-RELATIVE_PATH = './'.freeze
+RELATIVE_PATH = './'
+
+def test_one_locale
+  it 'shall return at least one available locale' do
+    _(subject).wont_be_nil
+    _(subject).wont_be_empty
+  end
+end
+
+def test_en_it
+  it 'shall contain at least English and Italiano' do
+    _(subject).must_include :en
+    _(subject).must_include :it
+  end
+end
+
+def test_translation(locale, translation)
+  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.to_s]['test']['test']
+end
 
 describe WWWJDic::WWWJDic do
   describe 'when using I18N' do
@@ -34,34 +60,24 @@ describe WWWJDic::WWWJDic do
 
     subject { I18n.available_locales }
 
-    it 'shall return at least one available locale' do
-      _(subject).wont_be_nil
-      _(subject).wont_be_empty
-    end
+    test_one_locale
 
-    it 'shall contain at least English and Italiano' do
-      _(subject).must_include :en
-      _(subject).must_include :it
+    test_en_it
+
+    def load_yaml_file(locale)
+      filename = File.join(File.dirname(__FILE__), RELATIVE_PATH, "#{locale}.yml")
+      filename = File.expand_path filename
+      YAML.safe_load(File.open(filename.to_s))
     end
 
     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.safe_load(File.open(filename.to_s))
-      end
-
       subject.each do |locale|
         I18n.locale = locale
 
         translation = load_yaml_file(locale)
         _(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.to_s]['test']['test']
+        test_translation(locale, translation)
       end
     end
   end

data/test/wwwjdic/parsers/test_dict.rb

@@ -1,6 +1,10 @@
+# frozen_string_literal: true
+
 #--
 # wwwjdic
+# rubocop:disable Style/AsciiComments
 # © 2014 Marco Bresciani
+# rubocop:enable Style/AsciiComments
 #
 # This file is part of wwwjdic.
 #
@@ -24,54 +28,76 @@
 
 require_relative '../../test_helper'
 
-describe WWWJDic::WWWJDic do
-  describe 'when using a parser' do
-    include WWWJDic::ParsableDuckType
+def test_raise_error_param(param)
+  it "shall raise and error for parameter '#{param}'" do
+    assert_raises ArgumentError do
+      subject.parse param
+    end
+  end
+end
 
-    before do
-      @parser = subject
-      I18n.load_path = Dir[File.join(File.dirname(__FILE__), '../locales/', '*.yml')]
+def test_wrong_name
+  it 'shall raise an error when wrong dictionary name' do
+    assert_raises ArgumentError do
+      subject.parse 'test'
     end
+  end
+end
 
-    subject { WWWJDic::Parsers::Dict.new }
+def test_wrong_code
+  it 'shall raise an error when wrong dictionary code' do
+    assert_raises ArgumentError do
+      subject.parse 'Z'
+    end
+  end
+end
 
-    describe 'when provided and invalid parameter' do
-      [nil, '', 42].each do |param|
-        it "shall raise and error for parameter '#{param}'" do
-          assert_raises ArgumentError do
-            subject.parse param
-          end
-        end
-      end
+def test_invalid_param
+  describe 'when provided and invalid parameter' do
+    [nil, '', 42].each(&method(:test_raise_error_param))
 
-      it 'shall raise an error when wrong dictionary name' do
-        assert_raises ArgumentError do
-          subject.parse 'test'
-        end
-      end
+    test_wrong_name
+
+    test_wrong_code
+  end
+end
 
-      it 'shall raise an error when wrong dictionary code' do
-        assert_raises ArgumentError do
-          subject.parse 'Z'
-        end
+def test_dictionary_code
+  describe 'when using the dictionary code/number' do
+    WWWJDic::DICTIONARY_CODES.each do |value|
+      it "shall return '#{value}' when parameter is '#{value}'" do
+        _(subject.parse(value)).must_equal value
       end
     end
+  end
+end
 
-    describe 'when using the dictionary code/number' do
-      WWWJDic::DICTIONARY_CODES.each do |value|
-        it "shall return '#{value}' when parameter is '#{value}'" do
-          _(subject.parse(value)).must_equal value
-        end
+def test_dictionary_name
+  describe 'when using the dictionary name' do
+    WWWJDic::DICTIONARY_NAMES.each do |value|
+      translated = WWWJDic::DICTS_BY_NAMES[value]
+      it "shall return '#{translated}' when parameter is '#{value}'" do
+        _(subject.parse(value)).must_equal translated
       end
     end
+  end
+end
 
-    describe 'when using the dictionary name' do
-      WWWJDic::DICTIONARY_NAMES.each do |value|
-        translated = WWWJDic::DICTS_BY_NAMES[value]
-        it "shall return '#{translated}' when parameter is '#{value}'" do
-          _(subject.parse(value)).must_equal translated
-        end
-      end
+describe WWWJDic::WWWJDic do
+  describe 'when using a parser' do
+    include WWWJDic::ParsableDuckType
+
+    before do
+      @parser = subject
+      I18n.load_path = Dir[File.join(File.dirname(__FILE__), '../locales/', '*.yml')]
     end
+
+    subject { WWWJDic::Parsers::Dict.new }
+
+    test_invalid_param
+
+    test_dictionary_code
+
+    test_dictionary_name
   end
 end