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

data/lib/unclekryon/trainer.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) 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-2022 Jonathan Bradley Whited
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 #++
 
 
-require 'bundler/setup'
-
 require 'nbayes'
 
 require 'unclekryon/dev_opts'
@@ -35,197 +21,194 @@ module UncleKryon
     attr_accessor :max_tag_length
     attr_accessor :tags
     attr_accessor :trainer
-    
+
     def self.to_tokens(text)
       tokens = []
-      
-      text.split(/[[:space:]]+/).each() do |t|
+
+      text.split(/[[:space:]]+/).each do |t|
         t.gsub!(/[[:punct:][:cntrl:]]+/,'')
-        tokens.push(t) if !t.empty?()
+        tokens.push(t) if !t.empty?
       end
-      
+
       return tokens
     end
-    
+
     def initialize(tags={})
       @max_tag_id_length = 0
       @max_tag_length = 0
       @tags = tags
-      @trainer = NBayes::Base.new()
-      
-      init_lengths()
+      @trainer = NBayes::Base.new
+
+      init_lengths
     end
-    
-    def init_lengths()
+
+    def init_lengths
       @max_tag_id_length = 0
       @max_tag_length = 0
-      
+
       @tags.each do |id,tag|
         @max_tag_id_length = id.length if id.length > @max_tag_id_length
         @max_tag_length = tag.length if tag.length > @max_tag_length
       end
-      
+
       @max_tag_id_length += 2 # Indention
       @max_tag_id_length = 7 if @max_tag_id_length < 7 # For "<Enter>" option
       @max_tag_length = -@max_tag_length # Left justify
     end
-    
+
     def train(text)
-      guess_tag = self.tag(text) # Try and guess
+      guess_tag = tag(text) # Try and guess
       tokens = self.class.to_tokens(text)
-      
+
       puts '#################'
       puts '# Training Tags #'
       puts '#################'
-      
+
       tf = '%%%is = %%%is' % [@max_tag_id_length,@max_tag_length]
       @tags.each do |id,tag|
         puts tf % [id,tag]
       end
       puts "<Enter> = Guess: #{guess_tag}"
-      
+
       puts '-----------------'
       puts text
       puts '-----------------'
       print 'What is it? '
-      
+
       # Use -t/--test option
-      if DevOpts.instance.test?()
-        puts (tag_id = @tags.keys.sample()) # For testing purposes
+      if DevOpts.instance.test?
+        puts(tag_id = @tags.keys.sample) # For testing purposes
       else
-        tag_id = STDIN.gets().chomp().strip() # STDIN because app accepts args
+        tag_id = $stdin.gets.chomp.strip # $stdin because app accepts args
       end
       puts
-      
-      if tag_id.empty?()
+
+      if tag_id.empty?
         raise "Invalid guess tag[#{guess_tag}]" if !@tags.value?(guess_tag)
         tag = guess_tag
       else
         raise "Invalid tag ID[#{tag_id}]" if !@tags.include?(tag_id)
         tag = @tags[tag_id]
       end
-      
+
       @trainer.train(tokens,tag)
-      
+
       return tag
     end
-    
+
     def tag(text)
       return @trainer.classify(self.class.to_tokens(text)).max_class
     end
-    
-    def to_s()
+
+    def to_s
       s = ''
-      s << @trainer.to_yaml()
+      s << @trainer.to_yaml
       s << "\n"
-      s << @trainer.data.category_stats()
-      
+      s << @trainer.data.category_stats
+
       return s
     end
   end
-  
+
   class Trainers
     attr_accessor :filepath
     attr_accessor :trainers
-    
+
     def initialize(filepath=nil)
       @filepath = filepath
       @trainers = {}
     end
-    
-    def load_file()
-      if @filepath.nil?() || (@filepath = @filepath.strip()).empty?()
+
+    def load_file
+      if @filepath.nil? || (@filepath = @filepath.strip).empty?
         raise ArgumentError,'Training filepath cannot be empty'
       end
-      
+
       if File.exist?(@filepath)
         y = YAML.load_file(@filepath)
-        
-        y.each() do |id,trainer|
+
+        y.each do |id,trainer|
           if !@trainers.key?(id)
             @trainers[id] = trainer
           else
             @trainers[id].tags = trainer.tags.merge(@trainers[id].tags)
             @trainers[id].trainer = trainer.trainer
           end
-          
-          @trainers[id].trainer.reset_after_import()
-          @trainers[id].init_lengths()
+
+          @trainers[id].trainer.reset_after_import
+          @trainers[id].init_lengths
         end
       end
     end
-    
-    def save_to_file()
-      if @filepath.nil?() || (@filepath = @filepath.strip()).empty?()
+
+    def save_to_file
+      if @filepath.nil? || (@filepath = @filepath.strip).empty?
         raise ArgumentError,'Training filepath cannot be empty'
       end
-      
+
       Util.mk_dirs_from_filepath(@filepath)
-      
-      File.open(@filepath,'w') do |f|
-        f.write(to_s())
-      end
+      File.write(@filepath,to_s)
     end
-    
+
     def [](id)
       @trainers[id]
     end
-    
+
     def []=(id,trainer)
       @trainers[id] = trainer
     end
-    
-    def to_s()
+
+    def to_s
       return YAML.dump(@trainers)
     end
   end
 end
 
-if $0 == __FILE__
+if $PROGRAM_NAME == __FILE__
   fp = 'test.yaml'
   ts = UncleKryon::Trainers.new(fp)
-  
+
   ctx = ['dark black bitter',
          'double espresso steamed milk foam',
          'espresso steamed milk']
   ttx = ['no withering and oxidation',
          'broom-like, South Africa',
          'young, minimal']
-  
+
   if File.exist?(fp)
-    ts.load_file()
+    ts.load_file
     puts ts
     puts
-    
+
     puts '[Coffee]'
     ctx.each do |v|
       puts "'#{v}' => #{ts['coffee'].tag(v)}"
     end
     puts
-    
+
     puts '[Tea]'
     ttx.each do |v|
       puts "'#{v}' => #{ts['tea'].tag(v)}"
     end
     puts
-    
+
     puts 'What kind of drink would you like?'
-    txt = STDIN.gets().chomp().strip()
+    txt = $stdin.gets.chomp.strip
     puts "coffee => #{ts['coffee'].tag(txt)}"
     puts "tea    => #{ts['tea'].tag(txt)}"
   else
     ts['coffee'] = UncleKryon::Trainer.new(
-      {'b'=>'black','c'=>'cappuccino','l'=>'latte'})
+      {'b' => 'black','c' => 'cappuccino','l' => 'latte'})
     ts['tea'] = UncleKryon::Trainer.new(
-      {'g'=>'green','r'=>'red','w'=>'white'})
-    
+      {'g' => 'green','r' => 'red','w' => 'white'})
+
     ctx.each do |v|
       ts['coffee'].train(v)
     end
     ttx.each do |v|
       ts['tea'].train(v)
     end
-    
-    ts.save_to_file()
+
+    ts.save_to_file
   end
 end

data/lib/unclekryon/uploader.rb

@@ -1,29 +1,20 @@
-#!/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-2022 Jonathan Bradley Whited
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 #++
 
 
-require 'bundler/setup'
-
 module UncleKryon
   class Uploader
+    # TODO: uploader
   end
 end
+
+#if $PROGRAM_NAME == __FILE__
+#  # Test here.
+#end

data/lib/unclekryon/util.rb

@@ -1,30 +1,18 @@
-#!/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
 #++
 
 
+require 'cgi'
 require 'date'
 require 'fileutils'
 require 'uri'
-
 require 'net/http'
 
 require 'unclekryon/dev_opts'
@@ -34,71 +22,71 @@ module UncleKryon
   module Util
     DATE_FORMAT = '%F'
     DATETIME_FORMAT = '%F %T'
-    
+
     def self.add_trail_slash(url)
       #url = url + '/' if url !~ /\/\z/
       #return url
-      
+
       return File.join(url,'')
     end
-    
+
     def self.clean_charset(str)
       return str.encode('utf-8','MacRoman',universal_newline: true) # X-MAC-ROMAN
     end
-    
+
     def self.clean_data(str)
       # Have to use "[[:space:]]" for "&nbsp;" and "<br/>"
       # This is necessary for "<br />\s+" (see 2015 "KRYON IN LIMA, PERU (2)")
-      str = str.clone()
+      str = str.clone
       str.gsub!(/[[:space:]]+/,' ') # Replace all spaces with one space
-      str.strip!()
+      str.strip!
       return clean_charset(str)
     end
-    
+
     def self.clean_link(url,link)
-      if url !~ /\/\z/
+      if url !~ %r{/\z}
         # Don't know if the end is a filename or a dirname, so just assume it is a filename and chop it off
         url = File.dirname(url)
         url = add_trail_slash(url)
       end
-      
+
       # 1st, handle "/" (because you won't have "/../filename", which is invalid)
-      slash_regex = /\A(\/+\.*\/*)+/
-      
+      slash_regex = %r{\A(/+\.*/*)+}
+
       if link =~ slash_regex
         link = link.gsub(slash_regex,'')
         link = get_top_link(url) + link # get_top_link(...) adds a slash
-        
+
         return link # Already handles "../" or "./" in the regex
       end
-      
+
       # 2nd, handle "../" (and potentially "../././/" or "..//")
       # - Ignores "./" if has it
-      dotdot_regex = /\A(\.\.\/)((\.\/)*(\/)*)*/ # \A (../) ( (./)* (/)* )*
+      dotdot_regex = %r{\A(\.\./)((\./)*(/)*)*} # \A (../) ( (./)* (/)* )*
       num_dirs = 0 # Could be a boolean; left as int because of legacy code
-      
+
       while link =~ dotdot_regex
-        num_dirs = num_dirs + 1
+        num_dirs += 1
         link = link.gsub(dotdot_regex,'')
         url = File.dirname(url)
       end
-      
+
       if num_dirs > 0
         link = add_trail_slash(url) + link
-        
+
         return link # Already handled "./" in the regex
       end
-      
+
       # 3rd, handle "./"
-      dot_regex = /\A(\.\/+)+/
-      
+      dot_regex = %r{\A(\./+)+}
+
       if link =~ dot_regex
         link = link.gsub(dot_regex,'')
         link = url + link # Slash already added at top of method
-        
+
         return link
       end
-      
+
       # 4th, handle no path
       #if link !~ /#{get_top_link(url)}/i
       if link !~ /\Ahttps?:/i
@@ -106,123 +94,123 @@ module UncleKryon
       else
         link = link.sub(/\Ahttp:/i,'https:')
       end
-      
+
       return link
     end
-    
+
     def self.empty_s?(str)
-      return str.nil?() || str.gsub(/[[:space:]]+/,'').empty?()
+      return str.nil? || str.gsub(/[[:space:]]+/,'').empty?
     end
-    
+
     def self.fix_link(url)
       # If we do URI.escape(), then if it's already "%20",
       # then it will convert it to "%2520"
-      
+
       url = url.gsub(/[[:space:]]/,'%20')
-      
+
       return url
     end
-    
+
     def self.fix_shortwith_text(text)
-      if text =~ /w\/[[:alnum:]]/i
+      if text =~ %r{w/[[:alnum:]]}i
         # I think it looks better with a space, personally.
         #  Some grammar guides say no space, but the Chicago style guide says there should be a space when it
         #    is a word by itself.
-        text = text.gsub(/w\//i,'w/ ')
+        text = text.gsub(%r{w/}i,'w/ ')
       end
-      
+
       return text
     end
-    
+
     def self.format_date(date)
-      return date.nil?() ? nil : date.strftime(DATE_FORMAT)
+      return date.nil? ? nil : date.strftime(DATE_FORMAT)
     end
-    
+
     def self.format_datetime(datetime)
-      return datetime.nil?() ? nil : datetime.strftime(DATETIME_FORMAT)
+      return datetime.nil? ? nil : datetime.strftime(DATETIME_FORMAT)
     end
-    
+
     def self.get_top_link(url)
-      raise "No top link: #{url}" if DevOpts.instance.dev?() && url !~ /\Ahttps?\:/i
-      
+      raise "No top link: #{url}" if DevOpts.instance.dev? && url !~ /\Ahttps?\:/i
+
       http_regex = /\Ahttps?\:|\A\./i # Check '.' to prevent infinite loop
-      
+
       while File.basename(File.dirname(url)) !~ http_regex
-        url = File.dirname(url).strip()
-        
-        break if url == '.' || url.empty?()
+        url = File.dirname(url).strip
+
+        break if url == '.' || url.empty?
       end
-      
+
       return add_trail_slash(url)
     end
-    
+
     def self.get_url_header_data(url)
       uri = URI(url)
       r = {}
-      
+
       Net::HTTP.start(uri.host,uri.port) do |http|
         resp = http.request_head(uri)
-        r = resp.to_hash()
+        r = resp.to_hash
       end
-      
+
       return r
     end
-    
+
     def self.hash_def(hash,keys,value)
       v = hash
-      
-      for i in 0..keys.length-2
+
+      (0..keys.length - 2).each do |i|
         v = v[keys[i]]
       end
-      
-      v[keys[keys.length-1]] = value if v[keys[keys.length-1]].nil?()
-      return v[keys[keys.length-1]]
+
+      v[keys[keys.length - 1]] = value if v[keys[keys.length - 1]].nil?
+      return v[keys[keys.length - 1]]
     end
-    
+
     def self.hash_def_all(hash,keys,value)
       v = hash
-      
-      for i in 0..keys.length-2
-        if v[keys[i]].nil?()
+
+      (0..keys.length - 2).each do |i|
+        if v[keys[i]].nil?
           v[keys[i]] = {}
           v = v[keys[i]]
         end
       end
-      
-      v[keys[keys.length-1]] = value if v[keys[keys.length-1]].nil?()
-      return v[keys[keys.length-1]]
+
+      v[keys[keys.length - 1]] = value if v[keys[keys.length - 1]].nil?
+      return v[keys[keys.length - 1]]
     end
-    
+
     def self.mk_dirs_from_filepath(filepath)
       dirname = File.dirname(filepath)
-      
-      if !dirname.nil?()
-        raise "Spaces around dirname: '#{dirname}'" if dirname != dirname.strip()
-        
+
+      if !dirname.nil?
+        raise "Spaces around dirname: '#{dirname}'" if dirname != dirname.strip
+
         if !Dir.exist?(dirname)
           Log.instance.info("Making dirs: '#{dirname}'...")
           FileUtils.mkdir_p(dirname)
         end
       end
     end
-    
+
     def self.parse_date_s(str)
-      return self.empty_s?(str) ? nil : Date.strptime(str,DATE_FORMAT)
+      return empty_s?(str) ? nil : Date.strptime(str,DATE_FORMAT)
     end
-    
+
     def self.parse_datetime_s(str)
-      return self.empty_s?(str) ? nil : DateTime.strptime(str,DATETIME_FORMAT)
+      return empty_s?(str) ? nil : DateTime.strptime(str,DATETIME_FORMAT)
     end
-    
+
     def self.parse_url_filename(url)
       uri = URI.parse(url)
       r = File.basename(uri.path)
-      r = URI.unescape(r)
-      return r.strip()
+      r = CGI.unescape(r)
+      return r.strip
     end
-    
+
     def self.safe_max(a,b)
-      return a.nil?() ? b : (b.nil?() ? a : ((a > b) ? a : b))
+      return a.nil? ? b : (b.nil? ? a : ((a > b) ? a : b))
     end
   end
 end

data/lib/unclekryon/version.rb

@@ -1,26 +1,14 @@
-#!/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
 #++
 
 
 module UncleKryon
-  VERSION = '0.4.9-alpha'
+  VERSION = '0.4.12-alpha'
 end