unclekryon 0.4.9.pre.alpha → 0.4.12.pre.alpha

data/lib/unclekryon/iso/base_iso.rb

@@ -1,23 +1,11 @@
-#!/usr/bin/env ruby
 # encoding: UTF-8
 # frozen_string_literal: true
 
 #--
 # This file is part of UncleKryon-server.
-# Copyright (c) 2018-2019 Jonathan Bradley Whited (@esotericpig)
-# 
-# UncleKryon-server is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# 
-# UncleKryon-server is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with UncleKryon-server.  If not, see <https://www.gnu.org/licenses/>.
+# Copyright (c) 2018-2021 Jonathan Bradley Whited
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 #++
 
 
@@ -32,120 +20,120 @@ module UncleKryon
   class BaseIso < BaseData
     attr_reader :name
     attr_reader :code
-    
-    def initialize()
+
+    def initialize
       super()
-      
+
       @name = nil
       @code = nil
     end
-    
+
     def self.fix_name(name)
-      return self.flip_word_order(self.simplify_name(name))
+      return flip_word_order(simplify_name(name))
     end
-    
+
     def self.flip_word_order(word)
       # e.g., change 'English, Old' to 'Old English'
-      return word.gsub(/([^\,\;]+)[[:space:]]*[\,\;]+[[:space:]]*([^\,\;]+)/,'\\2 \\1').strip()
+      return word.gsub(/([^\,\;]+)[[:space:]]*[\,\;]+[[:space:]]*([^\,\;]+)/,'\\2 \\1').strip
     end
-    
+
     def self.simplify_code(code)
       # e.g., remove 'US-' from 'US-AL'
-      return code.gsub(/[[:alnum:][:space:]]+\-[[:space:]]*/,'').strip()
+      return code.gsub(/[[:alnum:][:space:]]+\-[[:space:]]*/,'').strip
     end
-    
+
     def self.simplify_name(name)
       # e.g., remove '(the)' from 'United States of America (the)'
-      return name.gsub(/[[:space:]]*\([^\)]*\)[[:space:]]*/,'').strip()
+      return name.gsub(/[[:space:]]*\([^\)]*\)[[:space:]]*/,'').strip
     end
-    
-    def ==(y)
-      return @name == y.name && @code == y.code
+
+    def ==(other)
+      return @name == other.name && @code == other.code
     end
-    
-    def to_s()
+
+    def to_s
       return %Q(["#{@name}",#{@code}])
     end
   end
-  
+
   class BaseIsos
     include Logging
-    
+
     DEFAULT_DIR = 'iso'
-    
+
     attr_reader :id
     attr_reader :values
-    
-    def initialize()
+
+    def initialize
       super()
-      
+
       @id = self.class.get_class_name(self)
       @values = {}
     end
-    
+
     def find(text)
       lang = find_by_name(text)
-      return lang unless lang.nil?()
-      
+      return lang unless lang.nil?
+
       lang = find_by_code(text)
       return lang
     end
-    
+
     def find_by_code(code)
-      code = code.gsub(/[[:space:]]+/,'').downcase()
-      
-      @values.each() do |k,v|
+      code = code.gsub(/[[:space:]]+/,'').downcase
+
+      @values.each do |k,v|
         codes = nil
-        
+
         if v.respond_to?(:codes)
           codes = v.codes()
         elsif v.respond_to?(:code)
-          codes = [v.code()]
+          codes = [v.code]
         else
           raise "No codes()/code() method for class #{v.class.name}"
         end
-        
-        codes.each() do |c|
-          next if c.nil?()
-          c = c.gsub(/[[:space:]]+/,'').downcase()
+
+        codes.each do |c|
+          next if c.nil?
+          c = c.gsub(/[[:space:]]+/,'').downcase
           return v if c == code
         end
       end
-      
+
       return nil
     end
-    
+
     def find_by_name(name)
-      name = name.gsub(/[[:space:]]+/,'').downcase()
-      
-      @values.each() do |k,v|
+      name = name.gsub(/[[:space:]]+/,'').downcase
+
+      @values.each do |k,v|
         names = nil
-        
+
         if v.respond_to?(:names)
           names = v.names()
         elsif v.respond_to?(:name)
-          names = [v.name()]
+          names = [v.name]
         else
           raise "No names()/name() method for class #{v.class.name}"
         end
-        
-        names.each() do |n|
-          next if n.nil?()
-          n = n.gsub(/[[:space:]]+/,'').downcase()
+
+        names.each do |n|
+          next if n.nil?
+          n = n.gsub(/[[:space:]]+/,'').downcase
           return v if n == name
         end
       end
-      
+
       return nil
     end
-    
+
     def load_file(filepath)
       y = YAML.load_file(filepath)
       @values.merge!(y[@id])
-      
+
       return self
     end
-    
+
     def save_to_file(filepath)
       File.open(filepath,'w') do |f|
         v = {}
@@ -153,43 +141,43 @@ module UncleKryon
         YAML.dump(v,f)
       end
     end
-    
-    def sort_keys!()
+
+    def sort_keys!
       # Old way: @values = @values.sort().to_h()
-      
+
       new_values = {}
-      
-      @values.keys().sort().each() do |code|
+
+      @values.keys.sort.each do |code|
         new_values[code] = @values[code]
       end
-      
+
       @values = new_values
       return self
     end
-    
+
     def [](code)
       @values[code]
     end
-    
+
     def []=(code,value)
       @values[code] = value
     end
-    
+
     def self.get_class_name(class_var)
       return class_var.class.name.split('::').last
     end
-    
+
     def key?(code)
       @values.key?(code)
     end
-    
-    def to_s()
-      s = ''.dup()
-      
-      @values.each() do |code,value|
+
+    def to_s
+      s = ''.dup
+
+      @values.each do |code,value|
         s << "#{code}: #{value}\n"
       end
-      
+
       return s
     end
   end

data/lib/unclekryon/iso/can_prov_terr.rb

@@ -1,28 +1,14 @@
-#!/usr/bin/env ruby
 # encoding: UTF-8
 # frozen_string_literal: true
 
 #--
 # This file is part of UncleKryon-server.
-# Copyright (c) 2018-2019 Jonathan Bradley Whited (@esotericpig)
-# 
-# UncleKryon-server is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# 
-# UncleKryon-server is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with UncleKryon-server.  If not, see <https://www.gnu.org/licenses/>.
+# Copyright (c) 2018-2021 Jonathan Bradley Whited
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 #++
 
 
-require 'bundler/setup'
-
 require 'nokogiri'
 require 'open-uri'
 
@@ -36,76 +22,77 @@ module UncleKryon
   class CanProvTerr < BaseIso
     def initialize(row=nil)
       super()
-      
+
       if row.is_a?(Array)
         @name = self.class.simplify_name(row[2])
         @code = self.class.simplify_code(row[1])
       end
     end
   end
-  
+
   class CanProvsTerrs < BaseIsos
     DEFAULT_FILEPATH = "#{DEFAULT_DIR}/can_provs_terrs.yaml"
-    
-    def initialize()
+
+    def initialize
       super()
-      
+
       @id = 'CAN Provinces & Territories'
     end
-    
+
     def self.load_file(filepath=DEFAULT_FILEPATH)
-      return CanProvsTerrs.new().load_file(filepath)
+      return CanProvsTerrs.new.load_file(filepath)
     end
-    
-    # @param parse_filepath [String] use web browser's developer tools to copy & paste table HTML into local file
+
+    # @param parse_filepath [String] use web browser's developer tools to copy & paste table HTML
+    #                                into local file
     # @param save_filepath  [String] local file to save YAML to
     # @see   https://www.iso.org/obp/ui/#iso:code:3166:CA
     def self.parse_and_save_to_file(parse_filepath,save_filepath=DEFAULT_FILEPATH)
-      doc = Nokogiri::HTML(open(parse_filepath),nil,'utf-8')
+      doc = Nokogiri::HTML(URI(parse_filepath).open,nil,'utf-8')
       trs = doc.css('tr')
-      
-      provs_terrs = CanProvsTerrs.new()
-      
-      trs.each() do |tr|
+
+      provs_terrs = CanProvsTerrs.new
+
+      trs.each do |tr|
         tds = tr.css('td')
-        
+
         # Skip French; we just want English
-        next if tds[4].content.gsub(/[[:space:]]+/,' ').strip().downcase() == 'fr'
-        
+        next if tds[4].content.gsub(/[[:space:]]+/,' ').strip.downcase == 'fr'
+
         i = 0
         tr = []
-        
-        tds.each() do |td|
+
+        tds.each do |td|
           c = td.content
           c.gsub!(/[[:space:]]+/,' ')
-          c.strip!()
+          c.strip!
           tr.push(c)
-          
+
           if (i += 1) >= 7
             #puts tr.inspect()
             prov_terr = CanProvTerr.new(tr)
-            raise "CAN prov/terr already exists: #{prov_terr.inspect()}" if provs_terrs.key?(prov_terr.code)
-            
-            provs_terrs.values.each_value() do |v|
+            raise "CAN prov/terr already exists: #{prov_terr.inspect}" if provs_terrs.key?(prov_terr.code)
+
+            provs_terrs.values.each_value do |v|
               puts "Duplicate CAN prov/terr names: #{v.name}" if v.name == prov_terr.name
             end
-            
+
             provs_terrs[prov_terr.code] = prov_terr
-            tr.clear()
+            tr.clear
             i = 0
           end
         end
       end
-      
-      provs_terrs.sort_keys!()
+
+      provs_terrs.sort_keys!
       provs_terrs.save_to_file(save_filepath)
     end
   end
 end
 
-if $0 == __FILE__
+if $PROGRAM_NAME == __FILE__
   if ARGV.length < 1
-    puts UncleKryon::CanProvsTerrs.load_file().to_s()
+    puts UncleKryon::CanProvsTerrs.load_file.to_s
   else
     UncleKryon::CanProvsTerrs.parse_and_save_to_file(ARGV[0],(ARGV.length >= 2) ? ARGV[1] :
       UncleKryon::CanProvsTerrs::DEFAULT_FILEPATH)

data/lib/unclekryon/iso/country.rb

@@ -1,28 +1,14 @@
-#!/usr/bin/env ruby
 # encoding: UTF-8
 # frozen_string_literal: true
 
 #--
 # This file is part of UncleKryon-server.
-# Copyright (c) 2018-2019 Jonathan Bradley Whited (@esotericpig)
-# 
-# UncleKryon-server is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# 
-# UncleKryon-server is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with UncleKryon-server.  If not, see <https://www.gnu.org/licenses/>.
+# Copyright (c) 2018-2022 Jonathan Bradley Whited
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 #++
 
 
-require 'bundler/setup'
-
 require 'nokogiri'
 require 'open-uri'
 require 'yaml'
@@ -42,90 +28,87 @@ module UncleKryon
     attr_reader :alpha2_code
     attr_reader :alpha3_code
     attr_reader :region
-    
+
     def initialize(row=nil)
       super()
-      
+
       @names = nil
       @codes = nil
       @alpha2_code = nil
       @alpha3_code = nil
       @region = nil
-      
+
       if row.is_a?(Array)
         @name = self.class.simplify_name(row[0])
         @alpha2_code = row[2]
         @alpha3_code = row[3]
-        
+
         @names = @name
         @code = @alpha3_code
-        @codes = [@alpha3_code,@alpha2_code].compact().uniq()
+        @codes = [@alpha3_code,@alpha2_code].compact.uniq
       end
     end
-    
-    def to_s()
-      s = '['.dup()
+
+    def to_s
+      s = '['.dup
       s << %Q("#{@name}","#{@names.join(';')}")
       s << %Q(,#{@code},"#{@codes.join(';')}",#{@alpha2_code},#{@alpha3_code})
-      s << %Q(,#{@region})
+      s << ",#{@region}"
       s << ']'
-      
+
       return s
     end
   end
-  
+
   class Countries < BaseIsos
     DEFAULT_FILEPATH = "#{DEFAULT_DIR}/countries.yaml"
-    
-    def initialize()
-      super()
-    end
-    
+
     def self.load_file(filepath=DEFAULT_FILEPATH)
-      return Countries.new().load_file(filepath)
+      return Countries.new.load_file(filepath)
     end
-    
-    # @param parse_filepath [String] use web browser's developer tools to copy & paste table HTML into local file
+
+    # @param parse_filepath [String] use web browser's developer tools to copy & paste table HTML
+    #                                into local file
     # @param save_filepath  [String] local file to save YAML to
     # @see   https://www.iso.org/obp/ui/#search/code/
     def self.parse_and_save_to_file(parse_filepath,save_filepath=DEFAULT_FILEPATH)
-      doc = Nokogiri::HTML(open(parse_filepath),nil,'utf-8')
+      doc = Nokogiri::HTML(URI(parse_filepath).open,nil,'utf-8')
       tds = doc.css('td')
-      
-      countries = Countries.new()
+
+      countries = Countries.new
       i = 0
       tr = []
-      
+
       tds.each do |td|
         c = td.content
         c.gsub!(/[[:space:]]+/,' ')
-        c.strip!()
+        c.strip!
         tr.push(c)
-        
+
         if (i += 1) >= 5
           #puts tr.inspect()
           country = Country.new(tr)
-          raise "Country already exists: #{country.inspect()}" if countries.key?(country.code)
-          
-          countries.values.each_value() do |v|
+          raise "Country already exists: #{country.inspect}" if countries.key?(country.code)
+
+          countries.values.each_value do |v|
             puts "Duplicate country names: #{v.name}" if v.name == country.name
           end
-          
+
           countries[country.code] = country
-          tr.clear()
+          tr.clear
           i = 0
         end
       end
-      
-      countries.sort_keys!()
+
+      countries.sort_keys!
       countries.save_to_file(save_filepath)
     end
   end
 end
 
-if $0 == __FILE__
+if $PROGRAM_NAME == __FILE__
   if ARGV.length < 1
-    puts UncleKryon::Countries.load_file().to_s()
+    puts UncleKryon::Countries.load_file.to_s
   else
     UncleKryon::Countries.parse_and_save_to_file(ARGV[0],(ARGV.length >= 2) ? ARGV[1] :
       UncleKryon::Countries::DEFAULT_FILEPATH)