nhkore 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ca67a215cda7c49a82aa824c1322b49285abe332f627c9ad4fae774043cbfc9
-  data.tar.gz: b62a7e518787e89a3a54bcc66c191b4d3f005a911ab76861e3b118258f31b85f
+  metadata.gz: 1db415fe5fa2d6f112fae3ef163b79ddaa88d639de565c4cb35b40fa14fb5a66
+  data.tar.gz: c535ba1f719db2c64ba6713c21c6365f51e31361efd6046064cdf700219f30ab
 SHA512:
-  metadata.gz: b4e84a07685c71400bd50b270c4ae662e6885f7149fc7ec3dec9476bf9b6b80f402d7f874ddcbef920c2b5034a1d39b44fbcb7e9ece06f3a2d517ca89e37de3d
-  data.tar.gz: 2527b477b7b7088f2612e4a05e0369b60cacb34bedb6ac59a3296643b6f59fcfce0c054ede67c68e0f4299864795bd79f04a85020d8f4c87b67f56c5a5dbeb77
+  metadata.gz: af517bada681dc850e60f1c0e275ba35d2177dc413b076612a091217fd653bba82be725c0247c52bb1e342489fe99c731ac7f5efc0b681d54cdcbb02cdb5360b
+  data.tar.gz: 579569f8c5201f3fe8b460281d585ac8b10c50c881d18ca6d6ff342fab0c178f0ad6e532df42200db117b0f8e85dbbace87846c85fcdd5c0c4eac1501f4b24e7

data/CHANGELOG.md

@@ -2,7 +2,28 @@
 
 Format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
-## [[Unreleased]](https://github.com/esotericpig/nhkore/compare/v0.3.3...master)
+## [[Unreleased]](https://github.com/esotericpig/nhkore/compare/v0.3.4...master)
+
+## [v0.3.4] - 2020-04-25
+
+### Added
+- DatetimeParser
+    - Extracted from SiftCmd into its own class
+    - Fixed some minor logic bugs from the old code
+    - Added new feature where 1 range can be empty:
+        - `sift ez -d '...2019'` (from = 1924)
+        - `sift ez -d '2019...'` (to = current year)
+        - `sift ez -d '...'` (still an error)
+- Added `update_core` rake task for dev
+    - Makes pushing a new release much easier
+    - See *Hacking.Releasing* section in *README*
+
+### Fixed
+- SiftCmd `parse_sift_datetime()` for `-d/--datetime` option
+    - Didn't work exactly right (as written in *README*) for some special inputs:
+        - `-d '2019...3'`
+        - `-d '3-3'`
+        - `-d '3'`
 
 ## [v0.3.3] - 2020-04-23
 

data/README.md

@@ -26,6 +26,8 @@ This is similar to a [core word/vocabulary list](https://www.fluentin3months.com
         - [News Command](#news-command-)
 - [Using the Library](#using-the-library-)
 - [Hacking](#hacking-)
+    - [Updating](#updating-)
+    - [Releasing](#releasing-)
 - [License](#license-)
 
 ## For Non-Power Users [^](#contents)
@@ -525,7 +527,7 @@ doc = ss.html_doc()
 doc.css('a').each() do |anchor|
   link = anchor['href']
   
-  next if ss.ignore_link?(link)
+  next if ss.ignore_link?(link,cleaned: false)
   
   if link.include?('https://www3.nhk')
     puts link
@@ -564,6 +566,7 @@ end
 
 ```Ruby
 require 'nhkore/article_scraper'
+require 'time'
 
 as = NHKore::ArticleScraper.new(
   'https://www3.nhk.or.jp/news/easy/k10011862381000/k10011862381000.html',
@@ -687,6 +690,7 @@ end
 `Sifter` will sift & sort the `News` data into a single file. The data is sorted by frequency in descending order (i.e., most frequent words first).
 
 ```Ruby
+require 'nhkore/datetime_parser'
 require 'nhkore/news'
 require 'nhkore/sifter'
 require 'time'
@@ -698,7 +702,8 @@ sifter = NHKore::Sifter.new(news)
 sifter.caption = 'Sakura Fields Forever!'
 
 # Filter the data.
-#sifter.filter_by_datetime(Time.new(2019,12,5))
+sifter.filter_by_datetime(NHKore::DatetimeParser.parse_range('2019-12-4...7'))
+sifter.filter_by_datetime([Time.new(2019,12,4),Time.new(2019,12,7)])
 sifter.filter_by_datetime(
   from: Time.new(2019,12,4),to: Time.new(2019,12,7)
 )
@@ -727,13 +732,14 @@ if !File.exist?(file)
 end
 ```
 
-### Util & UserAgents
+### Util, UserAgents, & DatetimeParser
 
 These provide a variety of useful methods/constants.
 
 Here are some of the most useful ones:
 
 ```Ruby
+require 'nhkore/datetime_parser'
 require 'nhkore/user_agents'
 require 'nhkore/util'
 
@@ -759,14 +765,16 @@ puts
 puts '========'
 puts '[ Time ]'
 puts '========'
-puts "JST now:   #{Util.jst_now}"
+puts "JST now:   #{Util.jst_now()}"
 # Drops in JST_OFFSET, does not change hour/min.
 puts "JST time:  #{Util.jst_time(Time.now)}"
 puts "JST year:  #{Util::JST_YEAR}"
 puts "1999 sane? #{Util.sane_year?(1999)}" # true
 puts "1776 sane? #{Util.sane_year?(1776)}" # false
-puts "Guess 5:   #{Util.guess_year(5)}"    # 2005
-puts "Guess 99:  #{Util.guess_year(99)}"   # 1999
+puts "Guess 5:   #{DatetimeParser.guess_year(5)}"  # 2005
+puts "Guess 99:  #{DatetimeParser.guess_year(99)}" # 1999
+# => [2020-12-01 00:00:00 +0900, 2020-12-31 23:59:59 +0900]
+puts "Parse:     #{DatetimeParser.parse_range('2020-12')}"
 puts
 puts "JST timezone offset:        #{Util::JST_OFFSET}"
 puts "JST timezone offset hour:   #{Util::JST_OFFSET_HOUR}"
@@ -792,9 +800,9 @@ def fmt_jpn()
 end
 
 puts "          #{fmt_jpn{|x| x}}"
-puts "Hiragana? #{fmt_jpn{|x| !!Util.hiragana?(x)}}"
-puts "Kana?     #{fmt_jpn{|x| !!Util.kana?(x)}}"
-puts "Kanji?    #{fmt_jpn{|x| !!Util.kanji?(x)}}"
+puts "Hiragana? #{fmt_jpn{|x| Util.hiragana?(x)}}"
+puts "Kana?     #{fmt_jpn{|x| Util.kana?(x)}}"
+puts "Kanji?    #{fmt_jpn{|x| Util.kanji?(x)}}"
 puts "Reduce:   #{Util.reduce_jpn_space("'     '")}"
 puts
 
@@ -842,9 +850,25 @@ You can make some changes/fixes to the code and then install your local version:
 
 `$ bundle exec rake install:local`
 
-### Releasing/Publishing
+### Updating [^](#contents)
+
+This will update *core/* for you:
+
+`$ bundle exec rake update_core`
+
+### Releasing [^](#contents)
 
-`$ bundle exec rake release`
+1. Update *CHANGELOG.md*, *version.rb*, & *Gemfile.lock*
+    - *Raketary*: `$ raketary bump -v`
+    - Run: `$ bundle update`
+2. Run: `$ bundle exec rake update_core`
+3. Run: `$ bundle exec rake clobber pkg_core`
+4. Create a new release & tag
+    - Add `pkg/nhkore-core.zip`
+5. Run: `$ git pull`
+6. Upload GitHub package
+    - *Raketary*: `$ raketary github_pkg`
+7. Run: `$ bundle exec rake release`
 
 ## License [^](#contents)
 

data/Rakefile

@@ -63,6 +63,31 @@ Rake::TestTask.new() do |task|
   task.warning = true
 end
 
+# If you need to run a part after the 1st part,
+# just type 'n' to not overwrite the file and then 'y' for continue.
+desc "Update '#{File.join(NHKore::Util::CORE_DIR,'')}' files for release"
+task :update_core do |task|
+  require 'highline'
+  
+  CONTINUE_MSG = "\nContinue (y/n)? "
+  
+  cmd = ['ruby','-w','./lib/nhkore.rb','-t','300','-m','10']
+  hl = HighLine.new()
+  
+  next unless sh(*cmd,'se','ez','bing')
+  next unless hl.agree(CONTINUE_MSG)
+  puts
+  
+  next unless sh(*cmd,'news','-s','100','ez')
+  next unless hl.agree(CONTINUE_MSG)
+  puts
+  
+  next unless sh(*cmd,'sift','-e','csv' ,'ez')
+  next unless sh(*cmd,'sift','-e','html','ez')
+  next unless sh(*cmd,'sift','-e','json','ez')
+  next unless sh(*cmd,'sift','-e','yml' ,'ez')
+end
+
 YARD::Rake::YardocTask.new() do |task|
   task.files = [File.join('lib','**','*.rb')]
   

data/lib/nhkore/cli/news_cmd.rb

@@ -23,6 +23,7 @@
 
 require 'time'
 
+require 'nhkore/datetime_parser'
 require 'nhkore/error'
 require 'nhkore/missingno'
 require 'nhkore/news'
@@ -57,7 +58,7 @@ module CLI
           date time to use as a fallback in cases when an article doesn't have one;
           format: YYYY-mm-dd H:M; example: 2020-03-30 15:30
         EOD
-          value = Time.strptime(value,'%Y-%m-%d %H:%M',&Util.method(:guess_year))
+          value = Time.strptime(value,'%Y-%m-%d %H:%M',&DatetimeParser.method(:guess_year))
           value = Util.jst_time(value)
           value
         end

data/lib/nhkore/cli/search_cmd.rb

@@ -83,7 +83,7 @@ module CLI
             key = key.to_s()
             
             if key.include?('show')
-              raise CLIError.new("must specify a sub command for option[#{key}]")
+              raise CLIError,"must specify a sub command for option[#{key}]"
             end
           end
           
@@ -283,7 +283,7 @@ module CLI
         puts "> Easy:    #{BingScraper.build_url(SearchScraper::YASASHII_SITE,count: count)}"
         puts "> Regular: #{BingScraper.build_url(SearchScraper::FUTSUU_SITE,count: count)}"
       else
-        raise CLIError.new('must specify a sub command for option[show-urls]')
+        raise CLIError,'must specify a sub command for option[show-urls]'
       end
       
       return true

data/lib/nhkore/cli/sift_cmd.rb

@@ -24,6 +24,7 @@
 require 'date'
 require 'time'
 
+require 'nhkore/datetime_parser'
 require 'nhkore/news'
 require 'nhkore/sifter'
 require 'nhkore/util'
@@ -41,26 +42,6 @@ module CLI
     DEFAULT_SIFT_YASASHII_FILE = "#{Sifter::DEFAULT_YASASHII_FILE}{search.criteria}{file.ext}"
     SIFT_EXTS = [:csv,:htm,:html,:json,:yaml,:yml]
     
-    # Order matters.
-    SIFT_DATETIME_FMTS = [
-      '%Y-%m-%d %H:%M',
-      '%Y-%m-%d %H',
-      '%Y-%m-%d',
-      '%m-%d %H:%M',
-      '%Y-%m %H:%M',
-      '%m-%d %H',
-      '%Y-%m %H',
-      '%m-%d',
-      '%Y-%m',
-      '%d %H:%M',
-      '%y %H:%M',
-      '%d %H',
-      '%Y %H',
-      '%H:%M',
-      '%d',
-      '%Y'
-    ]
-    
     attr_accessor :sift_datetime_text
     attr_accessor :sift_search_criteria
     
@@ -90,7 +71,11 @@ module CLI
           '9' (9th of Current Year & Month)
         EOD
           app.sift_datetime_text = value # Save the original value for the file name
-          value = app.parse_sift_datetime(value)
+          
+          value = DatetimeParser.parse_range(value)
+          
+          app.check_empty_opt(:datetime,value) if value.nil?()
+          
           value
         end
         option :e,:ext,<<-EOD,argument: :required,default: DEFAULT_SIFT_EXT,transform: -> (value) do
@@ -211,96 +196,6 @@ module CLI
       return filename
     end
     
-    # TODO: This should probably be moved into its own class, into Util, or into Sifter?
-    def parse_sift_datetime(value)
-      value = Util.reduce_space(value).strip() # Don't use unspace_web_str(), want spaces for formats
-      value = value.split('...',2)
-      
-      check_empty_opt(:datetime,nil) if value.empty?() # For ''
-      
-      # Make a "to" and a "from" date time range.
-      value << value[0].dup() if value.length == 1
-      
-      to_day = nil
-      to_hour = 23
-      to_minute = 59
-      to_month = 12
-      to_year = Util::MAX_SANE_YEAR
-      
-      value.each_with_index() do |v,i|
-        v = check_empty_opt(:datetime,v) # For '...', '12-25...', or '...12-25'
-        
-        has_day = false
-        has_hour = false
-        has_minute = false
-        has_month = false
-        has_year = false
-        
-        SIFT_DATETIME_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 !v.include?(' ') && fmt.include?(' ')
-            
-            # If don't do this, "%y" values will be parsed using "%d".
-            raise ArgumentError if fmt == '%d' && v.length > 2
-            
-            v = Time.strptime(v,fmt,&Util.method(:guess_year))
-            
-            has_day = fmt.include?('%d')
-            has_hour = fmt.include?('%H')
-            has_minute = fmt.include?('%M')
-            has_month = fmt.include?('%m')
-            has_year = fmt.include?('%Y')
-            
-            break # No problem; this format worked
-          rescue ArgumentError
-            # Out of formats.
-            raise if i >= (SIFT_DATETIME_FMTS.length - 1)
-          end
-        end
-        
-        # "From" date time.
-        if i == 0
-          # Set these so that "2012-7-4...7-9" will use the appropriate year
-          #   of "2012" for "7-9".
-          to_day = v.day if has_day
-          to_hour = v.hour if has_hour
-          to_minute = v.min if has_minute
-          to_month = v.month if has_month
-          to_year = v.year if has_year
-          
-          v = Time.new(
-            has_year ? v.year : Util::MIN_SANE_YEAR,
-            has_month ? v.month : 1,
-            has_day ? v.day : 1,
-            has_hour ? v.hour : 0,
-            has_minute ? v.min : 0
-          )
-        # "To" date time.
-        else
-          to_hour = v.hour if has_hour
-          to_minute = v.min if has_minute
-          to_month = v.month if has_month
-          to_year = v.year if has_year
-          
-          if has_day
-            to_day = v.day
-          # Nothing passed from the "from" date time?
-          elsif to_day.nil?()
-            # Last day of month.
-            to_day = Date.new(to_year,to_month,-1).day
-          end
-          
-          v = Time.new(to_year,to_month,to_day,to_hour,to_minute)
-        end
-        
-        value[i] = v
-      end
-      
-      return value
-    end
-    
     def run_sift_cmd(type)
       news_name = nil
       

data/lib/nhkore/datetime_parser.rb

@@ -0,0 +1,342 @@
+#!/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/>.
+#++
+
+
+require 'attr_bool'
+require 'date'
+require 'time'
+
+require 'nhkore/util'
+
+
+module NHKore
+  ###
+  # @author Jonathan Bradley Whited (@esotericpig)
+  # @since  0.3.4
+  ###
+  class DatetimeParser
+    # Order matters!
+    FMTS = [
+      '%Y-%m-%d %H:%M',
+      '%Y-%m-%d %H',
+      '%Y-%m-%d',
+      '%m-%d %H:%M',
+      '%Y-%m %H:%M',
+      '%m-%d %H',
+      '%Y-%m %H',
+      '%m-%d',
+      '%Y-%m',
+      '%d %H:%M',
+      '%y %H:%M',
+      '%d %H',
+      '%Y %H',
+      '%H:%M',
+      '%d',
+      '%Y',
+    ]
+    
+    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.
+          year = century + year
+        elsif year >= 100
+          # If (2000 + 150) <= 2201 (if current year is 2200)...
+          if (millennium + year) <= (Util::JST_YEAR + 1)
+            # 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
+        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 '...'
+      
+      # 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
+        # For '...2020'.
+        elsif Util.empty_web_str?(values[0])
+          values[0] = :infinity
+        end
+      end
+      
+      datetimes = [
+        DatetimeParser.new(), # "From" date time
+        DatetimeParser.new(), # "To" date time
+      ]
+      
+      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!()
+          # "To" date time.
+          else
+            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
+          end
+        end
+      end
+      
+      from = datetimes[0]
+      to = datetimes[1]
+      
+      from.autofill!(:from,to)
+      to.autofill!(:to,from)
+      
+      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
+        is_from = true
+      when :to
+        is_from = false
+      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?()
+        @sec = other.sec unless @has_sec
+        has_small = true
+      else
+        if has_small
+          @sec = jst_now.sec
+        else
+          @sec = is_from ? 0 : 59
+        end
+      end
+      
+      if @has_min || other.has_min?()
+        @min = other.min unless @has_min
+        has_small = true
+      else
+        if has_small
+          @min = jst_now.min
+        else
+          @min = is_from ? 0 : 59
+        end
+      end
+      
+      if @has_hour || other.has_hour?()
+        @hour = other.hour unless @has_hour
+        has_small = true
+      else
+        if has_small
+          @hour = jst_now.hour
+        else
+          @hour = is_from ? 0 : 23
+        end
+      end
+      
+      if @has_day || other.has_day?()
+        @day = other.day unless @has_day
+        has_small = true
+      else
+        if has_small
+          @day = jst_now.day
+        else
+          @day = is_from ? 1 : :last_day
+        end
+      end
+      
+      if @has_month || other.has_month?()
+        @month = other.month unless @has_month
+        has_small = true
+      else
+        if has_small
+          @month = jst_now.month
+        else
+          @month = is_from ? 1 : 12
+        end
+      end
+      
+      if @has_year || other.has_year?()
+        @year = other.year unless @has_year
+        has_small = true
+      else
+        if has_small
+          @year = jst_now.year
+        else
+          @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!()
+      @min_or_max = true
+      
+      # Ex: 2020-12-31 23:59:59
+      return set!(Util::JST_YEAR,12,31,23,59,59)
+    end
+    
+    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
+      @day = day
+      @hour = hour
+      @min = min
+      @sec = sec
+      
+      return self
+    end
+    
+    def has=(value)
+      @has_day = value
+      @has_hour = value
+      @has_min = value
+      @has_month = value
+      @has_sec = value
+      @has_year = value
+      
+      return self
+    end
+    
+    def jst_time()
+      return Util.jst_time(time())
+    end
+    
+    def time()
+      return Time.new(@year,@month,@day,@hour,@min,@sec)
+    end
+    
+    def to_s()
+      return "#{@year}-#{@month}-#{@day} #{@hour}:#{@min}:#{@sec}"
+    end
+  end
+end

data/lib/nhkore/lib.rb

@@ -24,6 +24,7 @@
 require 'nhkore/article'
 require 'nhkore/article_scraper'
 require 'nhkore/cleaner'
+require 'nhkore/datetime_parser'
 require 'nhkore/defn'
 require 'nhkore/dict'
 require 'nhkore/dict_scraper'

data/lib/nhkore/util.rb

@@ -108,23 +108,6 @@ module NHKore
       return !str.match?(/[\/\\]/)
     end
     
-    def self.guess_year(year)
-      if year < 100
-        # 2021 -> 2000.
-        millennium = JST_YEAR / 100 * 100
-        
-        # If year <= (2021 -> 21), assume this century.
-        if year <= (JST_YEAR % 100)
-          year = millennium + year
-        else
-          # Assume previous century (2000 -> 1900).
-          year = (millennium - 100) + year
-        end
-      end
-      
-      return year
-    end
-    
     def self.hiragana?(str)
       return HIRAGANA_REGEX =~ str
     end

data/lib/nhkore/version.rb

@@ -22,5 +22,5 @@
 
 
 module NHKore
-  VERSION = '0.3.3'
+  VERSION = '0.3.4'
 end

data/nhkore.gemspec

@@ -67,7 +67,7 @@ Gem::Specification.new() do |spec|
   spec.add_runtime_dependency 'http-cookie'          ,'~> 1.0'  # For parsing/setting cookies (BingScraper/Scraper)
   spec.add_runtime_dependency 'japanese_deinflector' ,'~> 0.0'  # For unconjugating Japanese words (plain/dictionary form)
   spec.add_runtime_dependency 'nokogiri'             ,'~> 1.10' # For scraping/hacking
-  spec.add_runtime_dependency 'psychgus'             ,'~> 1.2'  # For styling Psych YAML
+  spec.add_runtime_dependency 'psychgus'             ,'~> 1.3'  # For styling Psych YAML
   spec.add_runtime_dependency 'public_suffix'        ,'~> 4.0'  # For parsing URL domain names
   spec.add_runtime_dependency 'rainbow'              ,'~> 3.0'  # For CLI color output
   spec.add_runtime_dependency 'rubyzip'              ,'~> 2.3'  # For extracting Zip files (GetCmd)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nhkore
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Jonathan Bradley Whited (@esotericpig)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-23 00:00:00.000000000 Z
+date: 2020-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: attr_bool
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: public_suffix
   requirement: !ruby/object:Gem::Requirement
@@ -357,6 +357,7 @@ files:
 - lib/nhkore/cli/news_cmd.rb
 - lib/nhkore/cli/search_cmd.rb
 - lib/nhkore/cli/sift_cmd.rb
+- lib/nhkore/datetime_parser.rb
 - lib/nhkore/defn.rb
 - lib/nhkore/dict.rb
 - lib/nhkore/dict_scraper.rb
@@ -389,7 +390,7 @@ metadata:
   changelog_uri: https://github.com/esotericpig/nhkore/blob/master/CHANGELOG.md
   homepage_uri: https://github.com/esotericpig/nhkore
   source_code_uri: https://github.com/esotericpig/nhkore
-post_install_message: "  \n  NHKore v0.3.3\n  \n  You can now use [nhkore] on the
+post_install_message: "  \n  NHKore v0.3.4\n  \n  You can now use [nhkore] on the
   command line.\n  \n  Homepage:  https://github.com/esotericpig/nhkore\n  \n  Code:
   \     https://github.com/esotericpig/nhkore\n  Changelog: https://github.com/esotericpig/nhkore/blob/master/CHANGELOG.md\n
   \ Bugs:      https://github.com/esotericpig/nhkore/issues\n  \n"