unclekryon 0.4.10 → 0.4.11

data/lib/unclekryon/iso/region.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 'unclekryon/iso/base_iso'
 
 ##
@@ -30,24 +16,24 @@ require 'unclekryon/iso/base_iso'
 ##
 module UncleKryon
   class Region < BaseIso
-    def initialize()
+    def initialize
       super()
     end
   end
-  
+
   class Regions < BaseIsos
     DEFAULT_FILEPATH = "#{DEFAULT_DIR}/regions.yaml"
-    
-    def initialize()
+
+    def initialize
       super()
     end
-    
+
     def self.load_file(filepath=DEFAULT_FILEPATH)
-      return Regions.new().load_file(filepath)
+      return Regions.new.load_file(filepath)
     end
   end
 end
 
-if $0 == __FILE__
-  puts UncleKryon::Regions.load_file().to_s()
+if $PROGRAM_NAME == __FILE__
+  puts UncleKryon::Regions.load_file.to_s
 end

data/lib/unclekryon/iso/subregion.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) 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) 2019-2021 Jonathan Bradley Whited
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 #++
 
 
-require 'bundler/setup'
-
 require 'unclekryon/iso/base_iso'
 
 ##
@@ -30,24 +16,24 @@ require 'unclekryon/iso/base_iso'
 ##
 module UncleKryon
   class Subregion < BaseIso
-    def initialize()
+    def initialize
       super()
     end
   end
-  
+
   class Subregions < BaseIsos
     DEFAULT_FILEPATH = "#{DEFAULT_DIR}/subregions.yaml"
-    
-    def initialize()
+
+    def initialize
       super()
     end
-    
+
     def self.load_file(filepath=DEFAULT_FILEPATH)
-      return Subregions.new().load_file(filepath)
+      return Subregions.new.load_file(filepath)
     end
   end
 end
 
-if $0 == __FILE__
-  puts UncleKryon::Subregions.load_file().to_s()
+if $PROGRAM_NAME == __FILE__
+  puts UncleKryon::Subregions.load_file.to_s
 end

data/lib/unclekryon/iso/usa_state.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'
 require 'yaml'
@@ -37,68 +23,69 @@ module UncleKryon
   class UsaState < 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 UsaStates < BaseIsos
     DEFAULT_FILEPATH = "#{DEFAULT_DIR}/usa_states.yaml"
-    
-    def initialize()
+
+    def initialize
       super()
-      
+
       @id = 'USA States'
     end
-    
+
     def self.load_file(filepath=DEFAULT_FILEPATH)
-      return UsaStates.new().load_file(filepath)
+      return UsaStates.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:US
     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')
-      
-      states = UsaStates.new()
+
+      states = UsaStates.new
       i = 0
       tr = []
-      
+
       tds.each do |td|
         c = td.content
         c.gsub!(/[[:space:]]+/,' ')
-        c.strip!()
+        c.strip!
         tr.push(c)
-        
+
         if (i += 1) >= 7
           #puts tr.inspect()
           state = UsaState.new(tr)
-          raise "USA state already exists: #{state.inspect()}" if states.key?(state.code)
-          
-          states.values.each_value() do |v|
+          raise "USA state already exists: #{state.inspect}" if states.key?(state.code)
+
+          states.values.each_value do |v|
             puts "Duplicate USA state names: #{v.name}" if v.name == state.name
           end
-          
+
           states[state.code] = state
-          tr.clear()
+          tr.clear
           i = 0
         end
       end
-      
-      states.sort_keys!()
+
+      states.sort_keys!
       states.save_to_file(save_filepath)
     end
   end
 end
 
-if $0 == __FILE__
+if $PROGRAM_NAME == __FILE__
   if ARGV.length < 1
-    puts UncleKryon::UsaStates.load_file().to_s()
+    puts UncleKryon::UsaStates.load_file.to_s
   else
     UncleKryon::UsaStates.parse_and_save_to_file(ARGV[0],(ARGV.length >= 2) ? ARGV[1] :
       UncleKryon::UsaStates::DEFAULT_FILEPATH)

data/lib/unclekryon/jsoner.rb

@@ -1,33 +1,14 @@
-#!/usr/bin/env ruby
 # encoding: UTF-8
 # frozen_string_literal: true
 
 #--
 # This file is part of UncleKryon-server.
-# Copyright (c) 2020 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) 2020-2021 Jonathan Bradley Whited
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 #++
 
 
-IS_SCRIPT = $0 == __FILE__
-
-if IS_SCRIPT
-  require 'rubygems'
-  require 'bundler/setup'
-end
-
 require 'json'
 require 'yaml'
 
@@ -41,84 +22,84 @@ module UncleKryon
   class Jsoner
     def jsonify_all(pretty=false)
       json = {}
-      
+
       #jsonify_iso(json)
       jsonify_artists(json)
-      
-      return pretty ? JSON.pretty_generate(json) : json.to_json()
+
+      return pretty ? JSON.pretty_generate(json) : json.to_json
     end
-    
+
     def jsonify_artists(json)
       json['aum'] = {}
       json['scroll'] = {}
       json['vision'] = {}
       json['pic'] = {}
-      
+
       kryon = to_hash(ArtistData.load_file(File.join('hax','kryon.yaml')))
-      
+
       kryon['release'] = {}
       kryon['album'] = {}
-      
+
       jsonify_artist_data(json,kryon,File.join('hax','kryon_aums_2002-2005.yaml'))
-      
+
       json['artist'] = {
         kryon['id'] => kryon
       }
     end
-    
+
     def jsonify_artist_data(json,artist,file)
       data = ArtistDataData.load_file(file)
-      
-      data.albums.each() do |album_id,album|
-        album.aums.each() do |aum_id,aum|
+
+      data.albums.each do |album_id,album|
+        album.aums.each do |aum_id,aum|
           json[ArtistDataData::AUMS_ID][aum_id] = to_hash(aum)
         end
         album.aums = album.aums.keys
-        
-        album.pics.each() do |pic_id,pic|
+
+        album.pics.each do |pic_id,pic|
           json[ArtistDataData::PICS_ID][pic_id] = to_hash(pic)
         end
         album.pics = album.pics.keys
       end
-      
+
       artist[ArtistDataData::ALBUMS_ID] = to_hash(data.albums)
-      
+
       #attr_accessor :scrolls
       #attr_accessor :visions
     end
-    
+
     def jsonify_iso(json)
       json['iso'] = to_hash(Iso.iso)
-      json['can_proter'] = to_hash(Iso.can_provs_terrs.values)
+      json['can_proterr'] = to_hash(Iso.can_provs_terrs.values)
       json['country'] = to_hash(Iso.countries.values)
       json['language'] = to_hash(Iso.languages.values)
       json['region'] = to_hash(Iso.regions.values)
       json['subregion'] = to_hash(Iso.subregions.values)
       json['usa_state'] = to_hash(Iso.usa_states.values)
     end
-    
+
     def to_hash(obj)
       hash = {}
-      
+
       if obj.respond_to?(:instance_variables) && obj.instance_variables.length > 0
-        obj.instance_variables.each() do |var|
-          hash[var.to_s().delete('@')] = to_hash(obj.instance_variable_get(var))
+        obj.instance_variables.each do |var|
+          hash[var.to_s.delete('@')] = to_hash(obj.instance_variable_get(var))
         end
       elsif obj.is_a?(Hash)
-        obj.each() do |k,v|
+        obj.each do |k,v|
           hash[k] = to_hash(v)
         end
       else
-        return Util.empty_s?(obj.to_s()) ? nil : obj
+        return Util.empty_s?(obj.to_s) ? nil : obj
       end
-      
+
       return hash
     end
   end
 end
 
-if IS_SCRIPT
-  j = UncleKryon::Jsoner.new()
-  
+if $PROGRAM_NAME == __FILE__
+  j = UncleKryon::Jsoner.new
+
   puts j.jsonify_all(true)
 end

data/lib/unclekryon/log.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) 2017-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) 2017-2021 Jonathan Bradley Whited
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 #++
 
 
@@ -27,83 +15,83 @@ require 'singleton'
 module UncleKryon
   class UncleKryonLogger < Logger
     def initialize
-      super(STDOUT)
-      
-      @progname = self.class.to_s()
+      super($stdout)
+
+      @progname = self.class.to_s
     end
-    
+
     def build_message(message,error: nil,**options)
       # Don't use mutable methods
-      message += error.backtrace().map(){|e| "\n  > " + e}.join('') if !error.nil?
-      
+      message += error.backtrace.map{|e| "\n  > " + e}.join('') if !error.nil?
+
       return message
     end
-    
+
     def error(message,error: nil,**options)
       super(build_message(message,error: error,**options))
     end
-    
+
     def fatal(message,error: nil,**options)
       super(build_message(message,error: error,**options))
     end
-    
+
     def unknown(message,error: nil,**options)
       super(build_message(message,error: error,**options))
     end
-    
+
     def warn(message,error: nil,**options)
       super(build_message(message,error: error,**options))
     end
   end
-  
+
   # Global for non-class use
   class Log < UncleKryonLogger
     include Singleton
-    
+
     # Do NOT define vars here; had problems with @dev/@test breaking this class
   end
-  
+
   # Mixin for class use
   module Logging
-    def init_log()
+    def init_log
     end
-    
-    def log()
+
+    def log
       if !@log
-        @log = UncleKryonLogger.new()
-        @log.progname = self.class.to_s()
-        
-        init_log()
+        @log = UncleKryonLogger.new
+        @log.progname = self.class.to_s
+
+        init_log
       end
       return @log
     end
   end
 end
 
-if $0 == __FILE__
+if $PROGRAM_NAME == __FILE__
   class Tester
     include UncleKryon::Logging
-    
-    def init_log()
-      @log.progname.prepend("[Risky]")
+
+    def init_log
+      @log.progname.prepend('[Risky]')
     end
-    
-    def take_risk()
+
+    def take_risk
       log.fatal('Risky! Risky! Risky!')
     end
   end
-  
+
   begin
-    t = Tester.new()
-    t.take_risk()
-    
+    t = Tester.new
+    t.take_risk
+
     raise 'Oops!'
   rescue StandardError => e
     UncleKryon::Log.instance.error(e.message,error: e)
     UncleKryon::Log.instance.fatal(e.message,error: e)
     UncleKryon::Log.instance.unknown(e.message,error: e)
     UncleKryon::Log.instance.warn(e.message,error: e)
-    
+
     UncleKryon::Log.instance.warn("Don't Worry") do
       'This still works'
     end