nhkore 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cef37a085d0bb5b9143d8cf685729d84a4ec3665954ca6bcbdcf188ee6f43ac5
-  data.tar.gz: bf866f3c827b5a2e853133f1f62f71c76d7699df28d0cd838bef9cf5893eb556
+  metadata.gz: 445adf6e8abd4da9fd6dd25e9632d5f477b467f6ce8c3dcecae87e3f61305d98
+  data.tar.gz: ca812639ff1edd8da835f5bbb2cde403c9cb63e17568fb3ec367eec00605ec17
 SHA512:
-  metadata.gz: 583c214ed3fb70a8ee7cce7378dba5595060780d55e4111d17ccb39cecffb2aa4ae67ede3c8f8215b52f485ac967c72a96be662ec35f40a75d4ff03cef0c070e
-  data.tar.gz: 5ac717084e1e9ea92243e16266dcaa123e01bf066574ee8ae747a196bdc8d9ae96227429843f2a6a09d6a3c849c91d3373109a2657c996a558cd4b4f2954ea17
+  metadata.gz: 392607205c53aa2a5dfcde244e5fa6137483d216dc27becf06c76798209d2dcf328f17abee2026d795207d4e783a23fd108e615525445f52ca6442560600cd42
+  data.tar.gz: 7a1219623b6645bbc633ba9c94e767dcf86be8852a7228c1d5ddd3936f61b884897f680369d4c9d9db5aba8ab4561048d59aed15cecf7ba05695c1957f31b0ea

data/CHANGELOG.md

@@ -2,7 +2,22 @@
 
 Format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
-## [[Unreleased]](https://github.com/esotericpig/nhkore/compare/v0.3.5...master)
+## [[Unreleased]](https://github.com/esotericpig/nhkore/compare/v0.3.6...master)
+
+## [v0.3.6] - 2020-08-18
+
+### Added
+- `update_showcase` Rake task for development & personal site (GitHub Page)
+    - `$ bundle exec rake update_showcase`
+
+### Changed
+- Updated Gems
+
+### Fixed
+- ArticleScraper for title for specific site
+    - https://www3.nhk.or.jp/news/easy/article/disaster_earthquake_illust.html
+- Ignored `/cgi2.*enqform/` URLs from SearchScraper (Bing)
+- Added more detail to dictionary error in ArticleScraper
 
 ## [v0.3.5] - 2020-05-04
 

data/README.md

@@ -870,6 +870,10 @@ This will update *core/* for you:
     - *Raketary*: `$ raketary github_pkg`
 7. Run: `$ bundle exec rake release`
 
+Releasing new HTML file for website:
+
+1. `$ bundle exec rake update_showcase`
+
 ## License [^](#contents)
 
 [GNU LGPL v3+](LICENSE.txt)

data/Rakefile

@@ -35,7 +35,7 @@ require 'nhkore/version'
 
 PKG_DIR = 'pkg'
 
-CLEAN.exclude('.git/','stock/')
+CLEAN.exclude('{.git,core,stock}/**/*')
 CLOBBER.include('doc/',File.join(PKG_DIR,''))
 
 
@@ -59,7 +59,7 @@ Rake::TestTask.new() do |task|
   task.libs = ['lib','test']
   task.pattern = File.join('test','**','*_test.rb')
   task.description += ": '#{task.pattern}'"
-  task.verbose = true
+  task.verbose = false
   task.warning = true
 end
 
@@ -88,13 +88,28 @@ task :update_core do |task|
   next unless sh(*cmd,'sift','-e','yml' ,'ez')
 end
 
-YARD::Rake::YardocTask.new() do |task|
-  task.files = [File.join('lib','**','*.rb')]
+# @since 0.3.6
+desc 'Update showcase file for release'
+task :update_showcase do |task|
+  require 'highline'
+  
+  SHOWCASE_FILE = File.join('.','nhkore-ez.html')
+  
+  hl = HighLine.new()
   
-  task.options += ['--files','CHANGELOG.md,LICENSE.txt']
-  task.options += ['--readme','README.md']
+  next unless sh('ruby','-w','./lib/nhkore.rb',
+    'sift','ez','--no-eng',
+    '--out',SHOWCASE_FILE,
+  )
   
-  task.options << '--protected' # Show protected methods
+  next unless hl.agree("\nMove the file (y/n)? ")
+  puts
+  next unless sh('mv','-iv',SHOWCASE_FILE,
+    File.join('..','esotericpig.github.io','showcase',''),
+  )
+end
+
+YARD::Rake::YardocTask.new() do |task|
   task.options += ['--template-path',File.join('yard','templates')]
   task.options += ['--title',"NHKore v#{NHKore::VERSION} Doc"]
 end

data/lib/nhkore/article_scraper.rb

@@ -291,7 +291,7 @@ module NHKore
           
           retry
         else
-          raise e.exception("could not scrape dictionary at URL[#{dict_url}]: #{e}")
+          raise e.exception("could not scrape dictionary URL[#{dict_url}] at URL[#{@url}]: #{e}")
         end
       end
       
@@ -481,19 +481,24 @@ module NHKore
     
     def scrape_title(doc,article)
       tag = doc.css('h1.article-main__title')
+      tag_name = nil
+      
+      if tag.length < 1
+        # - https://www3.nhk.or.jp/news/easy/article/disaster_earthquake_illust.html
+        tag_name = 'h1.article-eq__title'
+        tag = doc.css(tag_name)
+      end
       
       if tag.length < 1 && !@strict
         # This shouldn't be used except for select sites.
         # - https://www3.nhk.or.jp/news/easy/tsunamikeihou/index.html
-        
         tag_name = 'div#main h2'
-        
-        Util.warn("using [#{tag_name}] for title at URL[#{@url}]")
-        
         tag = doc.css(tag_name)
       end
       
       if tag.length > 0
+        Util.warn("using [#{tag_name}] for title at URL[#{@url}]") unless tag_name.nil?()
+        
         result = scrape_and_add_words(tag,article)
         title = result.text
         

data/lib/nhkore/search_scraper.rb

@@ -61,6 +61,7 @@ module NHKore
       return true if link =~ /\/movieplayer\.html?/ # https://www3.nhk.or.jp/news/easy/movieplayer.html?id=k10038422811_1207251719_1207251728.mp4&teacuprbbs=4feb73432045dbb97c283d64d459f7cf
       return true if link =~ /\/audio\.html?/ # https://www3.nhk.or.jp/news/easy/player/audio.html?id=k10011555691000
       return true if link =~ /\/news\/easy\/index\.html?/ # http://www3.nhk.or.jp/news/easy/index.html
+      return true if link =~ /cgi2.*enqform/ # https://cgi2.nhk.or.jp/news/easy/easy_enq/bin/form/enqform.html?id=k10011916321000&title=日本の会社が作った鉄道の車両「あずま」がイギリスで走る
       
       return false
     end

data/lib/nhkore/version.rb

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

data/nhkore.gemspec

@@ -49,15 +49,19 @@ Gem::Specification.new() do |spec|
   spec.bindir        = 'bin'
   spec.executables   = [spec.name]
   
-  spec.files = Dir.glob(File.join("{#{spec.require_paths.join(',')}}",'**','*.{erb,rb}')) +
-               Dir.glob(File.join(spec.bindir,'*')) +
-               Dir.glob(File.join('{test,yard}','**','*.{erb,rb}')) +
-               %W( Gemfile #{spec.name}.gemspec Rakefile ) +
-               %w( CHANGELOG.md LICENSE.txt README.md )
+  spec.files = [
+    Dir.glob(File.join("{#{spec.require_paths.join(',')}}",'**','*.{erb,rb}')),
+    Dir.glob(File.join(spec.bindir,'*')),
+    Dir.glob(File.join('{test,yard}','**','*.{erb,rb}')),
+    %W( Gemfile #{spec.name}.gemspec Rakefile ),
+    %w( CHANGELOG.md LICENSE.txt README.md ),
+  ].flatten()
   
   spec.required_ruby_version = '>= 2.4'
   
-  spec.requirements << 'Nokogiri: https://www.nokogiri.org/tutorials/installing_nokogiri.html'
+  spec.requirements = [
+    'Nokogiri: https://www.nokogiri.org/tutorials/installing_nokogiri.html',
+  ]
   
   spec.add_runtime_dependency 'attr_bool'            ,'~> 0.1'  # For attr_accessor?/attr_reader?
   spec.add_runtime_dependency 'bimyou_segmenter'     ,'~> 1.2'  # For splitting Japanese sentences into words

metadata

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