nhkore 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1db415fe5fa2d6f112fae3ef163b79ddaa88d639de565c4cb35b40fa14fb5a66
-  data.tar.gz: c535ba1f719db2c64ba6713c21c6365f51e31361efd6046064cdf700219f30ab
+  metadata.gz: cef37a085d0bb5b9143d8cf685729d84a4ec3665954ca6bcbdcf188ee6f43ac5
+  data.tar.gz: bf866f3c827b5a2e853133f1f62f71c76d7699df28d0cd838bef9cf5893eb556
 SHA512:
-  metadata.gz: af517bada681dc850e60f1c0e275ba35d2177dc413b076612a091217fd653bba82be725c0247c52bb1e342489fe99c731ac7f5efc0b681d54cdcbb02cdb5360b
-  data.tar.gz: 579569f8c5201f3fe8b460281d585ac8b10c50c881d18ca6d6ff342fab0c178f0ad6e532df42200db117b0f8e85dbbace87846c85fcdd5c0c4eac1501f4b24e7
+  metadata.gz: 583c214ed3fb70a8ee7cce7378dba5595060780d55e4111d17ccb39cecffb2aa4ae67ede3c8f8215b52f485ac967c72a96be662ec35f40a75d4ff03cef0c070e
+  data.tar.gz: 5ac717084e1e9ea92243e16266dcaa123e01bf066574ee8ae747a196bdc8d9ae96227429843f2a6a09d6a3c849c91d3373109a2657c996a558cd4b4f2954ea17

data/CHANGELOG.md

@@ -2,7 +2,17 @@
 
 Format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
-## [[Unreleased]](https://github.com/esotericpig/nhkore/compare/v0.3.4...master)
+## [[Unreleased]](https://github.com/esotericpig/nhkore/compare/v0.3.5...master)
+
+## [v0.3.5] - 2020-05-04
+
+### Added
+- Added check for environment var `NO_COLOR`
+    - [https://no-color.org/](https://no-color.org/)
+
+### Fixed
+- Fixed URLs stored in YAML data to always be of type String (not URI)
+    - This initially caused a problem in DictScraper.parse_url() from ArticleScraper, but fixed it for all data
 
 ## [v0.3.4] - 2020-04-25
 

data/lib/nhkore/app.rb

@@ -152,7 +152,8 @@ module NHKore
       end
       
       if color.nil?()
-        color = ($stdout.tty?() && ENV['TERM'] != 'dumb')
+        # - https://no-color.org/
+        color = ($stdout.tty?() && ENV['TERM'] != 'dumb' && !ENV.key?('NO_COLOR'))
       end
       
       enable_color(color)

data/lib/nhkore/article.rb

@@ -33,11 +33,11 @@ module NHKore
   # @since  0.2.0
   ###
   class Article
-    attr_accessor :datetime
-    attr_accessor :futsuurl
+    attr_reader :datetime
+    attr_reader :futsuurl
     attr_accessor :sha256
     attr_accessor :title
-    attr_accessor :url
+    attr_reader :url
     attr_reader :words
     
     def initialize()
@@ -79,19 +79,18 @@ module NHKore
       
       coder[:datetime] = @datetime.nil?() ? @datetime : @datetime.iso8601()
       coder[:title] = @title
-      coder[:url] = @url
-      coder[:futsuurl] = @futsuurl
+      coder[:url] = @url.nil?() ? nil : @url.to_s()
+      coder[:futsuurl] = @futsuurl.nil?() ? nil : @futsuurl.to_s()
       coder[:sha256] = @sha256
       coder[:words] = @words
     end
     
     def self.load_data(key,hash)
-      datetime = hash[:datetime]
       words = hash[:words]
       
       article = Article.new()
       
-      article.datetime = Util.empty_web_str?(datetime) ? nil : Time.iso8601(datetime)
+      article.datetime = hash[:datetime]
       article.futsuurl = hash[:futsuurl]
       article.sha256 = hash[:sha256]
       article.title = hash[:title]
@@ -107,6 +106,24 @@ module NHKore
       return article
     end
     
+    def datetime=(value)
+      if value.is_a?(Time)
+        @datetime = value
+      else
+        @datetime = Util.empty_web_str?(value) ? nil : Time.iso8601(value)
+      end
+    end
+    
+    def futsuurl=(value)
+      # Don't store URI, store String.
+      @futsuurl = value.nil?() ? nil : value.to_s()
+    end
+    
+    def url=(value)
+      # Don't store URI, store String.
+      @url = value.nil?() ? nil : value.to_s()
+    end
+    
     def to_s(mini: false)
       s = ''.dup()
       

data/lib/nhkore/dict_scraper.rb

@@ -44,7 +44,7 @@ module NHKore
     end
     
     def self.parse_url(url,basename: nil)
-      url = Util.strip_web_str(url)
+      url = Util.strip_web_str(url.to_s())
       
       raise ParseError,"cannot parse dictionary URL from URL[#{url}]" if url.empty?()
       

data/lib/nhkore/news.rb

@@ -49,7 +49,10 @@ module NHKore
     end
     
     def add_article(article,key: nil,overwrite: false)
-      key = article.url if key.nil?()
+      url = article.url
+      url = url.to_s() unless url.nil?()
+      
+      key = key.nil?() ? url : key.to_s()
       
       if !overwrite
         raise ArgumentError,"duplicate article[#{key}] in articles" if @articles.key?(key)
@@ -57,7 +60,7 @@ module NHKore
       end
       
       @articles[key] = article
-      @sha256s[article.sha256] = article.url
+      @sha256s[article.sha256] = url
       
       return self
     end
@@ -91,16 +94,20 @@ module NHKore
     end
     
     def update_article(article,url)
+      url = url.to_s() unless url.nil?()
+      
       # Favor https.
-      return if article.url =~ FAVORED_URL
+      return if article.url.to_s() =~ FAVORED_URL
       return if url !~ FAVORED_URL
       
-      @articles.delete(article.url)
+      @articles.delete(article.url) # Probably no to_s() here
       @articles[url] = article
       article.url = url
     end
     
     def article(key)
+      key = key.to_s() unless key.nil?()
+      
       return @articles[key]
     end
     
@@ -119,6 +126,8 @@ module NHKore
     end
     
     def article?(key)
+      key = key.to_s() unless key.nil?()
+      
       return @articles.key?(key)
     end
     

data/lib/nhkore/search_link.rb

@@ -34,12 +34,12 @@ module NHKore
   # @since  0.2.0
   ###
   class SearchLink
-    attr_accessor :datetime
-    attr_accessor :futsuurl
+    attr_reader :datetime
+    attr_reader :futsuurl
     attr_accessor? :scraped
     attr_accessor :sha256
     attr_accessor :title
-    attr_accessor :url
+    attr_reader :url
     
     def initialize(url,scraped: false)
       super()
@@ -49,29 +49,27 @@ module NHKore
       @scraped = scraped
       @sha256 = sha256
       @title = nil
-      @url = url
+      self.url = url
     end
     
     def encode_with(coder)
       # Order matters.
       
-      coder[:url] = @url
+      coder[:url] = @url.nil?() ? nil : @url.to_s()
       coder[:scraped] = @scraped
-      coder[:datetime] = @datetime.nil?() ? @datetime : @datetime.iso8601()
+      coder[:datetime] = @datetime.nil?() ? nil : @datetime.iso8601()
       coder[:title] = @title
-      coder[:futsuurl] = @futsuurl
+      coder[:futsuurl] = @futsuurl.nil?() ? nil : @futsuurl.to_s()
       coder[:sha256] = @sha256
     end
     
     def self.load_data(key,hash)
-      datetime = hash[:datetime]
-      
       slink = SearchLink.new(
         hash[:url],
-        scraped: hash[:scraped]
+        scraped: hash[:scraped],
       )
       
-      slink.datetime = Util.empty_web_str?(datetime) ? nil : Time.iso8601(datetime)
+      slink.datetime = hash[:datetime]
       slink.futsuurl = hash[:futsuurl]
       slink.sha256 = hash[:sha256]
       slink.title = hash[:title]
@@ -82,13 +80,31 @@ module NHKore
     def update_from_article(article)
       # Don't update the url, as it may be different (e.g., http vs https).
       
-      @datetime = article.datetime if @datetime.nil?()
-      @futsuurl = article.futsuurl if Util.empty_web_str?(@futsuurl)
+      self.datetime = article.datetime if @datetime.nil?()
+      self.futsuurl = article.futsuurl if Util.empty_web_str?(@futsuurl)
       @scraped = true # If we have an article, it's been scraped
       @sha256 = article.sha256 if Util.empty_web_str?(@sha256)
       @title = article.title if Util.empty_web_str?(@title)
     end
     
+    def datetime=(value)
+      if value.is_a?(Time)
+        @datetime = value
+      else
+        @datetime = Util.empty_web_str?(value) ? nil : Time.iso8601(value)
+      end
+    end
+    
+    def futsuurl=(value)
+      # Don't store URI, store String.
+      @futsuurl = value.nil?() ? nil : value.to_s()
+    end
+    
+    def url=(value)
+      # Don't store URI, store String.
+      @url = value.nil?() ? nil : value.to_s()
+    end
+    
     def to_s(mini: false)
       s = ''.dup()
       
@@ -136,9 +152,11 @@ module NHKore
     end
     
     def add_link(link)
-      return self if @links.key?(link.url)
+      url = link.url.nil?() ? nil : link.url.to_s()
+      
+      return self if @links.key?(url)
       
-      @links[link.url] = link
+      @links[url] = link
       
       return self
     end
@@ -162,7 +180,7 @@ module NHKore
       
       if !links.nil?()
         links.each() do |key,hash|
-          key = key.to_s() # Change from a symbol
+          key = key.to_s() unless key.nil?()
           slinks.links[key] = SearchLink.load_data(key,hash)
         end
       end
@@ -172,6 +190,7 @@ module NHKore
     
     def [](url)
       url = url.url if url.respond_to?(:url)
+      url = url.to_s() unless url.nil?()
       
       return @links[url]
     end

data/lib/nhkore/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nhkore
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Jonathan Bradley Whited (@esotericpig)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-25 00:00:00.000000000 Z
+date: 2020-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: attr_bool
@@ -390,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.4\n  \n  You can now use [nhkore] on the
+post_install_message: "  \n  NHKore v0.3.5\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"