wwwjdic 15.0.0 → 16.0.0

data/lib/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.
 #
@@ -34,7 +38,6 @@ require_relative 'wwwjdic/parsers/server'
 # Copyright:: (C) 2014 Marco Bresciani
 # License:: GNU General Public License version 3
 module WWWJDic
-
   # Creates a new WWWJDic object (from the verb 'to Breen'... :) ).
   #
   # Usage::
@@ -46,9 +49,9 @@ module WWWJDic
 
   # Provides the parameters' parsers object.
   def self.parser
-    parsers = {dict: Parsers::Dict.new, display: Parsers::Display.new,
-               key: Parsers::Key.new, search: Parsers::Search.new,
-               server: Parsers::Server.new}
+    parsers = { dict: Parsers::Dict.new, display: Parsers::Display.new,
+                key: Parsers::Key.new, search: Parsers::Search.new,
+                server: Parsers::Server.new }
 
     Parser.new parsers
   end

data/lib/wwwjdic/application.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.
 #
@@ -36,7 +40,6 @@ module WWWJDic
   # Copyright:: (C) 2014 Marco Bresciani
   # License:: GNU General Public License version 3
   class WWWJDic
-
     # Creates a +WWWJDic+ object. This constructor should be used
     # through the WWWJDic::breener method only.
     #
@@ -57,20 +60,15 @@ module WWWJDic
     def uri(word = nil, args = {})
       raise ArgumentError, I18n.t('error.nil') if word.nil?
       raise ArgumentError, I18n.t('error.param', value: word) if word.empty?
-      raise ArgumentError, I18n.t('error.param', value: args) unless args.keys.to_set.proper_subset? Set.new(ALLOWED_PARAMS)
-
-      params = {}
-      params[:search] = word
-      @defaults[:search] = word
 
-      unless args.nil?
-        ALL_PARAMS.each do |param_name|
-          params[param_name] = @parser.parse(param_name.to_s, args.fetch(param_name, @defaults[param_name]))
-        end
+      unless args.keys.to_set.proper_subset? Set.new(ALLOWED_PARAMS)
+        raise ArgumentError,
+              I18n.t('error.param', value: args)
       end
 
-      a_wwwjdic = URIS[params[:server]] + params[:dict] + DISPLAY[params[:display]] + params[:search] + KEYS[params[:key]]
-      a_wwwjdic + CGI::escape(word).to_s
+      params = parse_params(args, word)
+
+      build_uri(params, word)
     end
 
     # Create the reference uri for a +word+ translation, according to
@@ -123,19 +121,7 @@ module WWWJDic
     def json_translate(word = nil, args = {}, filename = nil)
       translation = translate(word, args)
 
-      a_hash = {}
-      a_hash[word.to_sym] = raw_uri(word, args)
-
-      the_splitter = Splitter.new translation
-
-      a_hash[:title] = the_splitter.title
-      a_hash[:translation] = the_splitter.translation
-      a_hash[:message] = the_splitter.message
-
-      unless a_hash[:translation].nil?
-        a_hash[:lines] = the_splitter.lines
-        a_hash[:content] = the_splitter.content
-      end
+      a_hash = build_hash(args, translation, word)
 
       result = a_hash.to_json
 
@@ -207,7 +193,9 @@ module WWWJDic
       # romaji conversion if the key is not in Japanese coding (UTF-8,
       # EUC or Shift_JIS.) If you want to look up using "sensei" it has
       # to be a J. For anything else the value of J doesn't matter much.
+      # rubocop:disable Style/AsciiComments
       # 1MUJ齧歯 and 1MUE齧歯 will both find 齧歯. 1MUJgesshi does too,
+      # rubocop:enable Style/AsciiComments
       # but 1MUEgesshi won't.
       #
       # I think you have missed a key point I made in my previous email:
@@ -235,5 +223,44 @@ module WWWJDic
     def to_s
       @wwwjdic.to_s
     end
+
+    private
+
+    def build_hash(args, translation, word)
+      the_splitter = Splitter.new translation
+
+      a_hash = { word.to_sym => raw_uri(word, args),
+                 title: the_splitter.title,
+                 translation: the_splitter.translation,
+                 message: the_splitter.message }
+
+      unless a_hash[:translation].nil?
+        a_hash[:lines] = the_splitter.lines
+        a_hash[:content] = the_splitter.content
+      end
+      a_hash
+    end
+
+    def build_uri(params, word)
+      a_wwwjdic = URIS[params[:server]] +
+                  params[:dict] +
+                  DISPLAY[params[:display]] +
+                  params[:search] +
+                  KEYS[params[:key]]
+      a_wwwjdic + CGI.escape(word).to_s
+    end
+
+    def parse_params(args, word)
+      params = {}
+      params[:search] = word
+      @defaults[:search] = word
+
+      unless args.nil?
+        ALL_PARAMS.each do |param_name|
+          params[param_name] = @parser.parse(param_name.to_s, args.fetch(param_name, @defaults[param_name]))
+        end
+      end
+      params
+    end
   end
 end

data/lib/wwwjdic/constants.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.
 #
@@ -32,7 +36,33 @@ module WWWJDic
   DICTIONARY_CODES = [('1'..'9').to_a, ('A'..'R').to_a].flatten
 
   # Naming for all supported dictionaries
-  DICTIONARY_NAMES = ['Jpn-Eng General (EDICT)', 'Japanese Names (ENAMDICT)', 'Computing/Telecomms', 'Life Sciences/Bio-Med', 'Legal Terms', 'Finance/Marketing', 'Buddhism', 'Miscellaneous', 'Special Text-glossing', 'Engineering/Science', 'Linguistics', 'River & Water Systems', 'Automobile Industry', 'Japanese Wordnet', 'Work-in-progress File', 'Japanese-German (WaDoku)', 'Japanese-French', 'Japanese-Russian', 'Japanese-Swedish', 'Japanese-Hungarian', 'Japanese-Spanish', 'Japanese-Dutch', 'Japanese-Slovenian', 'Japanese-Italian', 'Untranslated', 'Combined Jpn-Eng', 'Expanded Text-glossing'].freeze
+  DICTIONARY_NAMES = ['Jpn-Eng General (EDICT)',
+                      'Japanese Names (ENAMDICT)',
+                      'Computing/Telecomms',
+                      'Life Sciences/Bio-Med',
+                      'Legal Terms',
+                      'Finance/Marketing',
+                      'Buddhism',
+                      'Miscellaneous',
+                      'Special Text-glossing',
+                      'Engineering/Science',
+                      'Linguistics',
+                      'River & Water Systems',
+                      'Automobile Industry',
+                      'Japanese Wordnet',
+                      'Work-in-progress File',
+                      'Japanese-German (WaDoku)',
+                      'Japanese-French',
+                      'Japanese-Russian',
+                      'Japanese-Swedish',
+                      'Japanese-Hungarian',
+                      'Japanese-Spanish',
+                      'Japanese-Dutch',
+                      'Japanese-Slovenian',
+                      'Japanese-Italian',
+                      'Untranslated',
+                      'Combined Jpn-Eng',
+                      'Expanded Text-glossing'].freeze
 
   # Mapping between dictionaries names with codes
   DICTS_BY_CODES = Hash[DICTIONARY_CODES.zip(DICTIONARY_NAMES)]
@@ -111,10 +141,10 @@ module WWWJDic
                      henshall: 'E', pinyin: 'Y' }.freeze
 
   # Reference URI for Backdoor Entry/API
-  URI_DEFAULT = 'http://www.edrdg.org/cgi-bin/wwwjdic/wwwjdic.cgi?'.freeze
+  URI_DEFAULT = 'http://www.edrdg.org/cgi-bin/wwwjdic/wwwjdic.cgi?'
 
   # Monash URI for Backdoor Entry/API
-  URI_OLD = 'http://nihongo.monash.edu/cgi-bin/wwwjdic?'.freeze
+  URI_OLD = 'http://nihongo.monash.edu/cgi-bin/wwwjdic?'
 
   # URIs for Backdoor Entry/API
   URIS = { edrdg: URI_DEFAULT, monash: URI_OLD }.freeze

data/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/wwwjdic/locales/ja.yml

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

data/lib/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/lib/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/lib/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/lib/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/lib/wwwjdic/parser.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.
 #
@@ -25,7 +29,6 @@
 require_relative 'constants'
 
 module WWWJDic
-
   # This class is a simple utility that is used to parse and filter
   # parameters for wwwjdic.
   #
@@ -41,10 +44,10 @@ module WWWJDic
     end
 
     # Provides the duck type for a generic parsing object.
-    def parse(method = nil, value = nil)
+    def parse(method = nil, params = nil)
       a_parser = nil
-      a_parser = parsers[method.to_sym] unless method.nil? or parsers.nil?
-      a_parser&.parse value
+      a_parser = parsers[method.to_sym] unless method.nil? || parsers.nil?
+      a_parser&.parse params
     end
   end
 end

data/lib/wwwjdic/parsers/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.
 #
@@ -27,7 +31,6 @@ require_relative '../utils/raisers'
 
 module WWWJDic
   module Parsers
-
     # This class is an implementation of the Parsable duck type that
     # checks the dictionary type. The only needed parameter is a valid
     # dictionary.

data/lib/wwwjdic/parsers/display.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.
 #
@@ -26,7 +30,6 @@ 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 a boolean,
     # with +true+ for regular.

data/lib/wwwjdic/parsers/key.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.
 #
@@ -26,7 +30,6 @@ 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.

data/lib/wwwjdic/parsers/search.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/lib/wwwjdic/parsers/server.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.
 #
@@ -26,7 +30,6 @@ 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 a boolean,
     # with +true+ for regular.