nhkore 0.3.7 → 0.3.8

data/lib/nhkore/datetime_parser.rb

@@ -1,23 +1,11 @@
-#!/usr/bin/env ruby
 # encoding: UTF-8
 # frozen_string_literal: true
 
 #--
 # This file is part of NHKore.
-# Copyright (c) 2020 Jonathan Bradley Whited (@esotericpig)
-# 
-# NHKore is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# 
-# NHKore 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 Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public License
-# along with NHKore.  If not, see <https://www.gnu.org/licenses/>.
+# Copyright (c) 2020-2021 Jonathan Bradley Whited
+#
+# SPDX-License-Identifier: LGPL-3.0-or-later
 #++
 
 
@@ -30,12 +18,12 @@ require 'nhkore/util'
 
 module NHKore
   ###
-  # @author Jonathan Bradley Whited (@esotericpig)
+  # @author Jonathan Bradley Whited
   # @since  0.3.4
   ###
   class DatetimeParser
     extend AttrBool::Ext
-    
+
     # Order matters!
     FMTS = [
       '%Y-%m-%d %H:%M',
@@ -54,13 +42,13 @@ module NHKore
       '%H:%M',
       '%d',
       '%Y',
-    ]
-    
+    ].freeze
+
     def self.guess_year(year)
       if year < 1000
         century = Util::JST_YEAR / 100 * 100 # 2120 -> 2100
         millennium = Util::JST_YEAR / 1000 * 1000 # 2120 -> 2000
-        
+
         # If year <= 23 (2022 -> 23)...
         if year <= ((Util::JST_YEAR % 100) + 1)
           # Assume this century.
@@ -71,34 +59,34 @@ module NHKore
             # Assume this millennium.
             # So if the current year is 2200, and year is 150,
             # then it will be 2000 + 150 = 2150.
-            year = millennium + year
           else
             # Assume previous millennium (2000 -> 1000),
             # so year 999 will become 1999.
             millennium -= 1000 if millennium >= 1000
-            year = millennium + year
           end
+
+          year = millennium + year
         else
           # Assume previous century (2000 -> 1900).
           century -= 100 if century >= 100
           year = century + year
         end
       end
-      
+
       return year
     end
-    
+
     def self.parse_range(value)
       # Do not use unspace_web_str(), want spaces for formats.
       value = Util.strip_web_str(Util.reduce_space(value))
       values = value.split('...',2)
-      
-      return nil if values.empty?() # For '' or '...'
-      
+
+      return nil if values.empty? # For '' or '...'
+
       # For '2020...' or '...2020'.
       if value.include?('...')
         # values.length is always 2 because of 2 in split() above.
-        
+
         # For '2020...'.
         if Util.empty_web_str?(values[1])
           values[1] = :infinity
@@ -107,81 +95,79 @@ module NHKore
           values[0] = :infinity
         end
       end
-      
+
       datetimes = [
-        DatetimeParser.new(), # "From" date time
-        DatetimeParser.new(), # "To" date time
+        DatetimeParser.new, # "From" date time
+        DatetimeParser.new, # "To" date time
       ]
-      
-      values.each_with_index() do |v,i|
+
+      values.each_with_index do |v,i|
         dt = datetimes[i]
-        
+
         # Minimum/Maximum date time for '2020...' or '...2020'.
         if v == :infinity
           # "From" date time.
           if i == 0
-            dt.min!()
+            dt.min!
           # "To" date time.
           else
-            dt.max!()
+            dt.max!
           end
         else
           v = Util.strip_web_str(v)
-          
-          FMTS.each_with_index() do |fmt,i|
-            begin
-              # If don't do this, "%d" values will be parsed using "%d %H".
-              # It seems as though strptime() ignores space.
-              raise ArgumentError if fmt.include?(' ') && !v.include?(' ')
-              
-              # If don't do this, "%y..." values will be parsed using "%d...".
-              raise ArgumentError if fmt.start_with?('%d') && v.split(' ')[0].length > 2
-              
-              dt.parse!(v,fmt)
-              
-              break # No problem; this format worked
-            rescue ArgumentError
-              # Out of formats.
-              raise if i >= (FMTS.length - 1)
-            end
+
+          FMTS.each_with_index do |fmt,j|
+            # If don't do this, "%d" values will be parsed using "%d %H".
+            # It seems as though strptime() ignores space.
+            raise ArgumentError if fmt.include?(' ') && !v.include?(' ')
+
+            # If don't do this, "%y..." values will be parsed using "%d...".
+            raise ArgumentError if fmt.start_with?('%d') && v.split(' ')[0].length > 2
+
+            dt.parse!(v,fmt)
+
+            break # No problem; this format worked
+          rescue ArgumentError
+            # Out of formats.
+            raise if j >= (FMTS.length - 1)
           end
         end
       end
-      
+
       from = datetimes[0]
       to = datetimes[1]
-      
+
       from.autofill!(:from,to)
       to.autofill!(:to,from)
-      
-      return [from.jst_time(),to.jst_time()]
+
+      return [from.jst_time,to.jst_time]
     end
-    
+
     attr_accessor :day
     attr_accessor :hour
     attr_accessor :min
     attr_accessor :month
     attr_accessor :sec
     attr_accessor :year
-    
+
     attr_accessor? :has_day
     attr_accessor? :has_hour
     attr_accessor? :has_min
     attr_accessor? :has_month
     attr_accessor? :has_sec
     attr_accessor? :has_year
-    
+
     attr_reader? :min_or_max
-    
+
     def initialize(year=nil,month=nil,day=nil,hour=nil,min=nil,sec=nil)
       super()
-      
+
       set!(year,month,day,hour,min,sec)
-      
+
       self.has = false
       @min_or_max = false
     end
-    
+
     def autofill!(type,other)
       case type
       when :from
@@ -191,15 +177,15 @@ module NHKore
       else
         raise ArgumentError,"invalid type[#{type}]"
       end
-      
+
       return self if @min_or_max
-      
+
       has_small = false
       jst_now = Util.jst_now()
-      
+
       # Must be from smallest to biggest.
-      
-      if @has_sec || other.has_sec?()
+
+      if @has_sec || other.has_sec?
         @sec = other.sec unless @has_sec
         has_small = true
       else
@@ -209,8 +195,8 @@ module NHKore
           @sec = is_from ? 0 : 59
         end
       end
-      
-      if @has_min || other.has_min?()
+
+      if @has_min || other.has_min?
         @min = other.min unless @has_min
         has_small = true
       else
@@ -220,8 +206,8 @@ module NHKore
           @min = is_from ? 0 : 59
         end
       end
-      
-      if @has_hour || other.has_hour?()
+
+      if @has_hour || other.has_hour?
         @hour = other.hour unless @has_hour
         has_small = true
       else
@@ -231,8 +217,8 @@ module NHKore
           @hour = is_from ? 0 : 23
         end
       end
-      
-      if @has_day || other.has_day?()
+
+      if @has_day || other.has_day?
         @day = other.day unless @has_day
         has_small = true
       else
@@ -242,8 +228,8 @@ module NHKore
           @day = is_from ? 1 : :last_day
         end
       end
-      
-      if @has_month || other.has_month?()
+
+      if @has_month || other.has_month?
         @month = other.month unless @has_month
         has_small = true
       else
@@ -253,10 +239,10 @@ module NHKore
           @month = is_from ? 1 : 12
         end
       end
-      
-      if @has_year || other.has_year?()
+
+      if @has_year || other.has_year?
         @year = other.year unless @has_year
-        has_small = true
+        has_small = true # rubocop:disable Lint/UselessAssignment
       else
         if has_small
           @year = jst_now.year
@@ -264,49 +250,49 @@ module NHKore
           @year = is_from ? Util::MIN_SANE_YEAR : jst_now.year
         end
       end
-      
+
       # Must be after setting @year & @month.
       if @day == :last_day
         @day = Date.new(@year,@month,-1).day
       end
-      
+
       return self
     end
-    
-    def max!()
+
+    def max!
       @min_or_max = true
-      
+
       # Ex: 2020-12-31 23:59:59
       return set!(Util::JST_YEAR,12,31,23,59,59)
     end
-    
-    def min!()
+
+    def min!
       @min_or_max = true
-      
+
       # Ex: 1924-01-01 00:00:00
       return set!(Util::MIN_SANE_YEAR,1,1,0,0,0)
     end
-    
+
     def parse!(value,fmt)
       value = Time.strptime(value,fmt,&self.class.method(:guess_year))
-      
+
       @has_day = fmt.include?('%d')
       @has_hour = fmt.include?('%H')
       @has_min = fmt.include?('%M')
       @has_month = fmt.include?('%m')
       @has_sec = fmt.include?('%S')
       @has_year = fmt.include?('%Y')
-      
+
       @day = value.day if @has_day
       @hour = value.hour if @has_hour
       @min = value.min if @has_min
       @month = value.month if @has_month
       @sec = value.sec if @has_sec
       @year = value.year if @has_year
-      
+
       return self
     end
-    
+
     def set!(year=nil,month=nil,day=nil,hour=nil,min=nil,sec=nil)
       @year = year
       @month = month
@@ -314,10 +300,10 @@ module NHKore
       @hour = hour
       @min = min
       @sec = sec
-      
+
       return self
     end
-    
+
     def has=(value)
       @has_day = value
       @has_hour = value
@@ -325,19 +311,17 @@ module NHKore
       @has_month = value
       @has_sec = value
       @has_year = value
-      
-      return self
     end
-    
-    def jst_time()
-      return Util.jst_time(time())
+
+    def jst_time
+      return Util.jst_time(time)
     end
-    
-    def time()
+
+    def time
       return Time.new(@year,@month,@day,@hour,@min,@sec)
     end
-    
-    def to_s()
+
+    def to_s
       return "#{@year}-#{@month}-#{@day} #{@hour}:#{@min}:#{@sec}"
     end
   end

data/lib/nhkore/defn.rb

@@ -1,23 +1,11 @@
-#!/usr/bin/env ruby
 # encoding: UTF-8
 # frozen_string_literal: true
 
 #--
 # This file is part of NHKore.
-# Copyright (c) 2020 Jonathan Bradley Whited (@esotericpig)
-# 
-# NHKore is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# 
-# NHKore 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 Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public License
-# along with NHKore.  If not, see <https://www.gnu.org/licenses/>.
+# Copyright (c) 2020-2021 Jonathan Bradley Whited
+#
+# SPDX-License-Identifier: LGPL-3.0-or-later
 #++
 
 
@@ -29,75 +17,80 @@ require 'nhkore/word'
 
 module NHKore
   ###
-  # @author Jonathan Bradley Whited (@esotericpig)
+  # @author Jonathan Bradley Whited
   # @since  0.2.0
   ###
   class Defn
     attr_reader :hyoukis
     attr_accessor :text
     attr_reader :words
-    
-    def initialize()
+
+    def initialize
       super()
-      
+
       @hyoukis = []
-      @text = ''.dup()
+      @text = ''.dup
       @words = []
     end
-    
+
     # If no data, don't raise errors; don't care if have a definition or not.
     def self.scrape(hash,missingno: nil,url: nil)
-      defn = Defn.new()
-      
+      defn = Defn.new
+
       hyoukis = hash['hyouki']
-      
-      if !hyoukis.nil?()
-        hyoukis.each() do |hyouki|
-          next if hyouki.nil?()
-          next if (hyouki = Util.strip_web_str(hyouki)).empty?()
-          
-          defn.hyoukis << hyouki
-        end
+
+      hyoukis&.each() do |hyouki|
+        next if hyouki.nil?
+        next if (hyouki = Util.strip_web_str(hyouki)).empty?
+
+        defn.hyoukis << hyouki
       end
-      
+
       def_str = hash['def']
-      
+
       if Util.empty_web_str?(def_str)
-        return defn.hyoukis.empty?() ? nil : defn
+        return defn.hyoukis.empty? ? nil : defn
       end
-      
+
       doc = Nokogiri::HTML(def_str)
-      doc = doc.css('body') # Auto-added by Nokogiri
-      
-      doc.children.each() do |child|
-        name = Util.unspace_web_str(child.name).downcase() if child.respond_to?(:name)
-        
+      doc = doc.css('body') # Auto-added by Nokogiri.
+
+      doc.children.each do |child|
+        name = Util.unspace_web_str(child.name).downcase if child.respond_to?(:name)
+
         is_text = false
-        word = nil
-        
+        words = []
+
         if name == 'ruby'
-          word = Word.scrape_ruby_tag(child,missingno: missingno,url: url)
-        elsif child.respond_to?(:text) # Don't do child.text?(), just want content
-          word = Word.scrape_text_node(child,url: url)
+          # Returns an array.
+          words = Word.scrape_ruby_tag(child,missingno: missingno,url: url)
+        elsif child.respond_to?(:text) # Don't do child.text?(), just want content.
+          words << Word.scrape_text_node(child,url: url)
           is_text = true
         end
-        
-        if word.nil?()
+
+        # All word-scraping methods can return nil,
+        #   so remove all nils for empty?() check.
+        words = words&.compact
+
+        if words.nil? || words.empty?
           defn.text << Util.reduce_jpn_space(child.text) if is_text
         else
-          defn.text << Util.reduce_jpn_space(word.word)
-          defn.words << word unless Util.empty_web_str?(word.word)
+          words.each do |word|
+            defn.text << Util.reduce_jpn_space(word.word)
+            defn.words << word unless Util.empty_web_str?(word.word)
+          end
         end
       end
-      
-      return nil if defn.hyoukis.empty?() && defn.words.empty?()
-      
+
+      return nil if defn.hyoukis.empty? && defn.words.empty?
+
       defn.text = Util.strip_web_str(defn.text)
-      
+
       return defn
     end
-    
-    def to_s()
+
+    def to_s
       return @text
     end
   end