iev 0.3.3 → 0.3.5

data/lib/iev/cli/command_helper.rb

@@ -3,10 +3,10 @@
 # (c) Copyright 2020 Ribose Inc.
 #
 
-module IEV
-  module CLI
+module Iev
+  module Cli
     module CommandHelper
-      include CLI::UI
+      include Cli::Ui
 
       protected
 
@@ -19,7 +19,7 @@ module IEV
         end
       end
 
-      # Note: Implementation examples here:
+      # NOTE: Implementation examples here:
       # https://www.rubydoc.info/github/luislavena/sqlite3-ruby/SQLite3/Backup
       def save_db_to_file(src_db, dbfile)
         info "Saving database to a file..."
@@ -46,21 +46,23 @@ module IEV
         $IEV_PROFILE = options[:profile]
         $IEV_PROGRESS = options.fetch(:progress, !ENV["CI"])
 
-        $IEV_DEBUG = options.to_h.
-          select { |k, _| k.to_s.start_with? "debug_" }.
-          transform_keys { |k| k.to_s.sub("debug_", "").to_sym }
+        $IEV_DEBUG = options.to_h
+          .select { |k, _| k.to_s.start_with? "debug_" }
+          .transform_keys do |k|
+          k.to_s.sub("debug_",
+                     "").to_sym
+        end
       end
 
       def filter_dataset(db, options)
         query = db[:concepts]
 
         if options[:only_concepts]
-          query = query.where(Sequel.ilike(:ievref, options[:only_concepts]))
+          query = query.where(Sequel.ilike(:ievref,
+                                           options[:only_concepts]))
         end
 
-        if options[:only_languages]
-          query = query.where(language: options[:only_languages].split(","))
-        end
+        query = query.where(language: options[:only_languages].split(",")) if options[:only_languages]
 
         query
       end

data/lib/iev/cli/ui.rb

@@ -3,13 +3,13 @@
 # (c) Copyright 2020 Ribose Inc.
 #
 
-module IEV
-  module CLI
+module Iev
+  module Cli
     # @todo
     #   Make it thread-safe.  Currently, calling UI methods from different
     #   threads may result with mangled output.  At first glance it seems like
     #   something is wrong with carriage returns, but more research is needed.
-    module UI
+    module Ui
       module_function
 
       def debug(*args)
@@ -42,11 +42,11 @@ module IEV
         module_function
 
         def clear_progress
-          $IEV_PROGRESS ? "\r#{" " * 40}\r" : ""
+          $IEV_PROGRESS ? "\r#{' ' * 40}\r" : ""
         end
 
         def cli_out(level, *args)
-          topic = Symbol === args[0] ? args.shift : nil
+          topic = args[0].is_a?(Symbol) ? args.shift : nil
           message = args.map(&:to_s).join(" ").chomp
           ui_tag = Thread.current[:iev_ui_tag]
 

data/lib/iev/cli.rb

@@ -3,20 +3,20 @@
 # (c) Copyright 2020 Ribose Inc.
 #
 
-module IEV
-  module CLI
+module Iev
+  module Cli
     def self.start(arguments)
       Signal.trap("INT") do
-        UI.info "Signal SIGINT received, quitting!"
+        Ui.info "Signal SIGINT received, quitting!"
         Kernel.exit(1)
       end
 
       Signal.trap("TERM") do
-        UI.info "Signal SIGTERM received, quitting!"
+        Ui.info "Signal SIGTERM received, quitting!"
         Kernel.exit(1)
       end
 
-      IEV::CLI::Command.start(arguments)
+      Iev::Cli::Command.start(arguments)
     end
   end
 end

data/lib/iev/converter/mathml_to_asciimath.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module IEV
+module Iev
   module Converter
     class MathmlToAsciimath
       using DataConversions
@@ -21,9 +21,7 @@ module IEV
         # any MathML or HTML formula.
         return input unless input&.match?(/<|&/)
 
-        unless input.include?("<math>")
-          return html_to_asciimath(input)
-        end
+        return html_to_asciimath(input) unless input.include?("<math>")
 
         # puts "GOING TO MATHML MATH"
         # puts input
@@ -107,7 +105,7 @@ module IEV
           to_asciimath
             .children.to_s
             .gsub(/\]stem:\[/, "")
-            .gsub(/<\/?[uo]l>/, ""),
+            .gsub(%r{</?[uo]l>}, ""),
         )
       end
 
@@ -116,81 +114,81 @@ module IEV
       end
 
       def html_entities_to_asciimath(input)
-        input.gsub("&alpha;", "alpha").
-          gsub("&beta;", "beta").
-          gsub("&gamma;", "gamma").
-          gsub("&Gamma;", "Gamma").
-          gsub("&delta;", "delta").
-          gsub("&Delta;", "Delta").
-          gsub("&epsilon;", "epsilon").
-          gsub("&varepsilon;", "varepsilon").
-          gsub("&zeta;", "zeta").
-          gsub("&eta;", "eta").
-          gsub("&theta;", "theta").
-          gsub("&Theta;", "Theta").
-          gsub("&vartheta;", "vartheta").
-          gsub("&iota;", "iota").
-          gsub("&kappa;", "kappa").
-          gsub("&lambda;", "lambda").
-          gsub("&Lambda;", "Lambda").
-          gsub("&mu;", "mu").
-          gsub("&nu;", "nu").
-          gsub("&xi;", "xi").
-          gsub("&Xi;", "Xi").
-          gsub("&pi;", "pi").
-          gsub("&Pi;", "Pi").
-          gsub("&rho;", "rho").
-          gsub("&beta;", "beta").
-          gsub("&sigma;", "sigma").
-          gsub("&Sigma;", "Sigma").
-          gsub("&tau;", "tau").
-          gsub("&upsilon;", "upsilon").
-          gsub("&phi;", "phi").
-          gsub("&Phi;", "Phi").
-          gsub("&varphi;", "varphi").
-          gsub("&chi;", "chi").
-          gsub("&psi;", "psi").
-          gsub("&Psi;", "Psi").
-          gsub("&omega;", "omega")
+        input.gsub("&alpha;", "alpha")
+          .gsub("&beta;", "beta")
+          .gsub("&gamma;", "gamma")
+          .gsub("&Gamma;", "Gamma")
+          .gsub("&delta;", "delta")
+          .gsub("&Delta;", "Delta")
+          .gsub("&epsilon;", "epsilon")
+          .gsub("&varepsilon;", "varepsilon")
+          .gsub("&zeta;", "zeta")
+          .gsub("&eta;", "eta")
+          .gsub("&theta;", "theta")
+          .gsub("&Theta;", "Theta")
+          .gsub("&vartheta;", "vartheta")
+          .gsub("&iota;", "iota")
+          .gsub("&kappa;", "kappa")
+          .gsub("&lambda;", "lambda")
+          .gsub("&Lambda;", "Lambda")
+          .gsub("&mu;", "mu")
+          .gsub("&nu;", "nu")
+          .gsub("&xi;", "xi")
+          .gsub("&Xi;", "Xi")
+          .gsub("&pi;", "pi")
+          .gsub("&Pi;", "Pi")
+          .gsub("&rho;", "rho")
+          .gsub("&beta;", "beta")
+          .gsub("&sigma;", "sigma")
+          .gsub("&Sigma;", "Sigma")
+          .gsub("&tau;", "tau")
+          .gsub("&upsilon;", "upsilon")
+          .gsub("&phi;", "phi")
+          .gsub("&Phi;", "Phi")
+          .gsub("&varphi;", "varphi")
+          .gsub("&chi;", "chi")
+          .gsub("&psi;", "psi")
+          .gsub("&Psi;", "Psi")
+          .gsub("&omega;", "omega")
       end
 
       def html_entities_to_stem(input)
-        input.gsub("&alpha;", "stem:[alpha]").
-          gsub("&beta;", "stem:[beta]").
-          gsub("&gamma;", "stem:[gamma]").
-          gsub("&Gamma;", "stem:[Gamma]").
-          gsub("&delta;", "stem:[delta]").
-          gsub("&Delta;", "stem:[Delta]").
-          gsub("&epsilon;", "stem:[epsilon]").
-          gsub("&varepsilon;", "stem:[varepsilon]").
-          gsub("&zeta;", "stem:[zeta]").
-          gsub("&eta;", "stem:[eta]").
-          gsub("&theta;", "stem:[theta]").
-          gsub("&Theta;", "stem:[Theta]").
-          gsub("&vartheta;", "stem:[vartheta]").
-          gsub("&iota;", "stem:[iota]").
-          gsub("&kappa;", "stem:[kappa]").
-          gsub("&lambda;", "stem:[lambda]").
-          gsub("&Lambda;", "stem:[Lambda]").
-          gsub("&mu;", "stem:[mu]").
-          gsub("&nu;", "stem:[nu]").
-          gsub("&xi;", "stem:[xi]").
-          gsub("&Xi;", "stem:[Xi]").
-          gsub("&pi;", "stem:[pi]").
-          gsub("&Pi;", "stem:[Pi]").
-          gsub("&rho;", "stem:[rho]").
-          gsub("&beta;", "stem:[beta]").
-          gsub("&sigma;", "stem:[sigma]").
-          gsub("&Sigma;", "stem:[Sigma]").
-          gsub("&tau;", "stem:[tau]").
-          gsub("&upsilon;", "stem:[upsilon]").
-          gsub("&phi;", "stem:[phi]").
-          gsub("&Phi;", "stem:[Phi]").
-          gsub("&varphi;", "stem:[varphi]").
-          gsub("&chi;", "stem:[chi]").
-          gsub("&psi;", "stem:[psi]").
-          gsub("&Psi;", "stem:[Psi]").
-          gsub("&omega;", "stem:[omega]")
+        input.gsub("&alpha;", "stem:[alpha]")
+          .gsub("&beta;", "stem:[beta]")
+          .gsub("&gamma;", "stem:[gamma]")
+          .gsub("&Gamma;", "stem:[Gamma]")
+          .gsub("&delta;", "stem:[delta]")
+          .gsub("&Delta;", "stem:[Delta]")
+          .gsub("&epsilon;", "stem:[epsilon]")
+          .gsub("&varepsilon;", "stem:[varepsilon]")
+          .gsub("&zeta;", "stem:[zeta]")
+          .gsub("&eta;", "stem:[eta]")
+          .gsub("&theta;", "stem:[theta]")
+          .gsub("&Theta;", "stem:[Theta]")
+          .gsub("&vartheta;", "stem:[vartheta]")
+          .gsub("&iota;", "stem:[iota]")
+          .gsub("&kappa;", "stem:[kappa]")
+          .gsub("&lambda;", "stem:[lambda]")
+          .gsub("&Lambda;", "stem:[Lambda]")
+          .gsub("&mu;", "stem:[mu]")
+          .gsub("&nu;", "stem:[nu]")
+          .gsub("&xi;", "stem:[xi]")
+          .gsub("&Xi;", "stem:[Xi]")
+          .gsub("&pi;", "stem:[pi]")
+          .gsub("&Pi;", "stem:[Pi]")
+          .gsub("&rho;", "stem:[rho]")
+          .gsub("&beta;", "stem:[beta]")
+          .gsub("&sigma;", "stem:[sigma]")
+          .gsub("&Sigma;", "stem:[Sigma]")
+          .gsub("&tau;", "stem:[tau]")
+          .gsub("&upsilon;", "stem:[upsilon]")
+          .gsub("&phi;", "stem:[phi]")
+          .gsub("&Phi;", "stem:[Phi]")
+          .gsub("&varphi;", "stem:[varphi]")
+          .gsub("&chi;", "stem:[chi]")
+          .gsub("&psi;", "stem:[psi]")
+          .gsub("&Psi;", "stem:[Psi]")
+          .gsub("&omega;", "stem:[omega]")
       end
     end
   end

data/lib/iev/converter.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-module IEV
+module Iev
   module Converter
     def self.mathml_to_asciimath(input)
-      IEV::Converter::MathmlToAsciimath.convert(input)
+      Iev::Converter::MathmlToAsciimath.convert(input)
     end
   end
 end

data/lib/iev/data_conversions.rb

@@ -3,7 +3,7 @@
 # (c) Copyright 2020 Ribose Inc.
 #
 
-module IEV
+module Iev
   module DataConversions
     refine String do
       def decode_html!
@@ -18,9 +18,9 @@ module IEV
       # Normalize various encoding anomalies like `\uFEFF` in strings
       def sanitize!
         unicode_normalize!
-        gsub!("\uFEFF", "")
-        gsub!("\u2011", "-")
-        gsub!("\u00a0", " ")
+        delete!("\uFEFF")
+        tr!("\u2011", "-")
+        tr!("\u00a0", " ")
         gsub!(/[\u2000-\u2006]/, " ")
         strip!
         nil
@@ -32,7 +32,7 @@ module IEV
       end
 
       def to_three_char_code
-        IEV::Iso639Code.three_char_code(self).first
+        Iev::Iso639Code.three_char_code(self).first
       end
     end
   end

data/lib/iev/db.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 # require 'pstore'
 require_relative "db_cache"
 
-module IEV
+module Iev
   # Cache class.
   class Db
     # @param global_cache [String] filename of global DB
@@ -43,12 +45,12 @@ module IEV
 
     # @return [Hash]
     def new_bib_entry(code, lang)
-      IEV.get(code, lang)
+      Iev.get(code, lang)
     end
 
     # @param dir [String] DB dir
     # @param global [TrueClass, FalseClass]
-    # @return [IEV::DbCache, nil]
+    # @return [Iev::DbCache, nil]
     def open_cache_biblio(dir, global: true)
       return nil if dir.nil?
 

data/lib/iev/db_cache.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require "fileutils"
 
-module IEV
+module Iev
   class DbCache
     # @return [String]
     attr_reader :dir
@@ -8,7 +10,7 @@ module IEV
     # @param dir [String] DB directory
     def initialize(dir)
       @dir = dir
-      FileUtils::mkdir_p @dir
+      FileUtils.mkdir_p @dir
       file_version = "#{@dir}/version"
       File.exist? file_version or
         File.write file_version, VERSION, encoding: "utf-8"
@@ -21,7 +23,7 @@ module IEV
       return if value.nil?
 
       prefix_dir = "#{@dir}/#{prefix(key)}"
-      FileUtils::mkdir_p prefix_dir
+      FileUtils.mkdir_p prefix_dir
       File.write filename(key), value, encoding: "utf-8"
     end
 
@@ -73,7 +75,7 @@ module IEV
     end
 
     # Set version of the DB to the gem version.
-    # @return [IEV::DbCache]
+    # @return [Iev::DbCache]
     def set_version
       File.write "#{@dir}/version", VERSION, encoding: "utf-8"
       self
@@ -100,7 +102,7 @@ module IEV
       # if prefcode
       #   "#{@dir}/#{prefcode[:prefix]}/#{prefcode[:code].gsub(/[-:\s\/]/, '_')}.xml"
       # else
-      "#{@dir}/#{key.gsub(/[-:\s\/]/, '_')}.xml"
+      "#{@dir}/#{key.gsub(%r{[-:\s/]}, '_')}.xml"
       # end
     end
 

data/lib/iev/db_writer.rb

@@ -3,9 +3,9 @@
 # (c) Copyright 2020 Ribose Inc.
 #
 
-module IEV
+module Iev
   class DbWriter
-    include CLI::UI
+    include Cli::Ui
     using DataConversions
 
     attr_reader :db
@@ -27,6 +27,7 @@ module IEV
         loop do
           row = row_enumerator.next
           next if row.empty?
+
           data = prepare_data(row, symbolized_title_row)
           display_progress(data)
           insert_data(data)

data/lib/iev/iso_639_code.rb

@@ -3,7 +3,7 @@
 # (c) Copyright 2020 Ribose Inc.
 #
 
-module IEV
+module Iev
   # @todo This needs to be rewritten.
   class Iso639Code
     COUNTRY_CODES = YAML.load(IO.read(File.join(__dir__, "iso_639_2.yaml")))
@@ -11,12 +11,12 @@ module IEV
 
     def initialize(two_char_code)
       @code = case two_char_code.length
-      when 2
-        two_char_code
-      else
-        # This is to handle code "nl BE" in the IEV sheet
-        two_char_code.split(" ").first
-      end
+        when 2
+          two_char_code
+        else
+          # This is to handle code "nl BE" in the Iev sheet
+          two_char_code.split(" ").first
+        end
     end
 
     def find(code_type)
@@ -24,9 +24,7 @@ module IEV
         key if value["iso_639_1"] == @code.to_s && value[code_type]
       end
 
-      if code.nil?
-        raise StandardError.new("Iso639Code not found for '#{@code}'!")
-      end
+      raise StandardError, "Iso639Code not found for '#{@code}'!" if code.nil?
 
       code
     end
@@ -41,7 +39,5 @@ module IEV
     def country_codes
       COUNTRY_CODES
     end
-
   end
 end
-

data/lib/iev/profiler.rb

@@ -3,12 +3,12 @@
 # (c) Copyright 2020 Ribose Inc.
 #
 
-module IEV
+module Iev
   class Profiler
     attr_reader :bench, :dir, :prefix, :profile
 
-    def self.measure(prefix = nil, &block)
-      new(prefix).run(&block)
+    def self.measure(prefix = nil, &)
+      new(prefix).run(&)
     end
 
     def initialize(prefix, dir: "profile")
@@ -16,15 +16,15 @@ module IEV
       @dir = dir
     end
 
-    def run(&block)
-      profiler_enabled? ? run!(&block) : block.call
+    def run(&)
+      profiler_enabled? ? run!(&) : yield
     end
 
-    def run!(&block)
+    def run!
       retval = nil
       @profile = RubyProf.profile allow_exceptions: true do
         @bench = Benchmark.measure do
-          retval = block.call
+          retval = yield
         end
       end
       retval

data/lib/iev/relaton_db.rb

@@ -5,11 +5,11 @@
 
 require "singleton"
 
-module IEV
+module Iev
   # Relaton cach singleton.
   class RelatonDb
     include Singleton
-    include CLI::UI
+    include Cli::Ui
 
     def initialize
       info "Initializing Relaton..."
@@ -33,15 +33,12 @@ module IEV
 
       begin
         yield
+      rescue StandardError
+        raise unless curr_attempt <= attempts
 
-      rescue
-        if curr_attempt <= attempts
-          sleep(2 ** curr_attempt * 0.1)
-          curr_attempt += 1
-          retry
-        else
-          raise
-        end
+        sleep(2**curr_attempt * 0.1)
+        curr_attempt += 1
+        retry
       end
     end
 
@@ -52,11 +49,10 @@ module IEV
 
       begin
         yield
-
       ensure
         $stdout = original_stdout
         $stderr = original_stderr
-        debug(:relaton, fake_out.string) if fake_out.pos > 0
+        debug(:relaton, fake_out.string) if fake_out.pos.positive?
       end
     end
   end