news2kindle 0.2.0 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b6359f3d5bd815e2288ae183bdf574a429f64318
-  data.tar.gz: 746ab24028ae050952b3b84a58d78ec8b0e7230c
+SHA256:
+  metadata.gz: '00639cc8f196c01a7dd9595b204000f4af6ec26c30b7ed268223960373cc52ea'
+  data.tar.gz: 93992dce4e4b6ca3a87e28c36323018598c19c4433a82ed9ba79c492c65bc562
 SHA512:
-  metadata.gz: 45d90ea6ee619e73aad9c61ad2cdcca1ecd5ef3493553618bb8ba79e534dc5582b5a6bd62f9c39e20a6420345537a886b1f16025b0dfa01162cce7875998d5ef
-  data.tar.gz: 4a5fc8651f8163b566191c048fe49387599db5b6e6e5c381d68762fb5ed26a6137bb368a52dd5d5eadfc6adb6bedf5d6c151958d5900073a96f4b34273dfd676
+  metadata.gz: a312cbe553b155982a92cd423eea344182e3229ad2bfe51a7131e05979936a336a7f25bfa4bd4c398c2fec34942c1a52eb626cc59c3b6052792ef86c17cbcb7c
+  data.tar.gz: fd0bf057310b395dd90590fff11a44b16c1157675312088834aaf89e805754de12372802770457a91d49ce609ef777af1354775173b9e3d344c4bcb9879cf3dc

data/.travis.yml

@@ -2,11 +2,12 @@ sudo: false
 cache: bundler
 
 before_install:
-  - gem install bundler -v 1.16.0.pre.3
+  - gem update bundler
 
 rvm:
-  - 2.3.5
-  - 2.4.2
+  - 2.6.7
+  - 2.7.3
+  - 3.0.1
 
 script: bundle exec rake
 

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    news2kindle (0.2.0)
+    news2kindle (0.2.6)
       dropbox_api
       kindlegen
       mail
       mechanize
-      mongoid (~> 6.1)
+      mongoid (>= 6.1, < 8.0)
       nokogiri
       pit
       systemu
@@ -14,97 +14,109 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.1.4)
-      activesupport (= 5.1.4)
-    activesupport (5.1.4)
+    activemodel (6.1.3.1)
+      activesupport (= 6.1.3.1)
+    activesupport (6.1.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    bson (4.2.2)
-    coderay (1.1.2)
-    concurrent-ruby (1.0.5)
-    diff-lcs (1.3)
-    domain_name (0.5.20170404)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    bson (4.12.0)
+    concurrent-ruby (1.1.8)
+    connection_pool (2.2.5)
+    diff-lcs (1.4.4)
+    domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    dropbox_api (0.1.10)
-      faraday (~> 0.9, ~> 0.8)
+    dropbox_api (0.1.19)
+      faraday (~> 1.0)
       oauth2 (~> 1.1)
-    faraday (0.12.2)
+    faraday (1.4.1)
+      faraday-excon (~> 1.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
       multipart-post (>= 1.2, < 3)
+      ruby2_keywords (>= 0.0.4)
+    faraday-excon (1.1.0)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.1.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    i18n (0.9.1)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    jwt (1.5.6)
-    kindlegen (3.0.3)
+    jwt (2.2.3)
+    kindlegen (3.1.1)
       rake
       rubyzip
-    mail (2.7.0)
+    mail (2.7.1)
       mini_mime (>= 0.1.1)
-    mechanize (2.7.5)
-      domain_name (~> 0.5, >= 0.5.1)
-      http-cookie (~> 1.0)
-      mime-types (>= 1.17.2)
-      net-http-digest_auth (~> 1.1, >= 1.1.1)
-      net-http-persistent (~> 2.5, >= 2.5.2)
-      nokogiri (~> 1.6)
-      ntlm-http (~> 0.1, >= 0.1.1)
-      webrobots (>= 0.0.9, < 0.2)
-    method_source (0.9.0)
-    mime-types (3.1)
+    mechanize (2.8.0)
+      addressable (~> 2.7)
+      domain_name (~> 0.5, >= 0.5.20190701)
+      http-cookie (~> 1.0, >= 1.0.3)
+      mime-types (~> 3.0)
+      net-http-digest_auth (~> 1.4, >= 1.4.1)
+      net-http-persistent (>= 2.5.2, < 5.0.dev)
+      nokogiri (~> 1.11, >= 1.11.2)
+      rubyntlm (~> 0.6, >= 0.6.3)
+      webrick (~> 1.7)
+      webrobots (~> 0.1.2)
+    mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_mime (1.0.0)
-    mini_portile2 (2.3.0)
-    minitest (5.10.3)
-    mongo (2.4.3)
-      bson (>= 4.2.1, < 5.0.0)
-    mongoid (6.2.1)
-      activemodel (~> 5.1)
-      mongo (>= 2.4.1, < 3.0.0)
-    multi_json (1.12.2)
+    mime-types-data (3.2021.0225)
+    mini_mime (1.1.0)
+    minitest (5.14.4)
+    mongo (2.14.0)
+      bson (>= 4.8.2, < 5.0.0)
+    mongoid (7.2.2)
+      activemodel (>= 5.1, < 6.2)
+      mongo (>= 2.10.5, < 3.0.0)
+    multi_json (1.15.0)
     multi_xml (0.6.0)
-    multipart-post (2.0.0)
+    multipart-post (2.1.1)
     net-http-digest_auth (1.4.1)
-    net-http-persistent (2.9.4)
-    nokogiri (1.8.1)
-      mini_portile2 (~> 2.3.0)
-    ntlm-http (0.1.1)
-    oauth2 (1.4.0)
-      faraday (>= 0.8, < 0.13)
-      jwt (~> 1.0)
+    net-http-persistent (4.0.1)
+      connection_pool (~> 2.2)
+    nokogiri (1.11.3-x86_64-linux)
+      racc (~> 1.4)
+    oauth2 (1.4.7)
+      faraday (>= 0.8, < 2.0)
+      jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
     pit (0.0.7)
-    pry (0.11.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    rack (2.0.3)
-    rake (12.2.1)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.0)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    public_suffix (4.0.6)
+    racc (1.5.2)
+    rack (2.2.3)
+    rake (13.0.3)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.0)
-    rubyzip (1.2.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    ruby2_keywords (0.0.4)
+    rubyntlm (0.6.3)
+    rubyzip (2.3.0)
     systemu (2.6.5)
-    thread_safe (0.3.6)
-    tzinfo (1.2.4)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.4)
+    unf_ext (0.0.7.7)
+    webrick (1.7.0)
     webrobots (0.1.2)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -112,9 +124,8 @@ PLATFORMS
 DEPENDENCIES
   bundler
   news2kindle!
-  pry
   rake
   rspec
 
 BUNDLED WITH
-   1.16.0.pre.3
+   2.2.15

data/lib/news2kindle/generator/internet-watch.rb

@@ -31,9 +31,9 @@ module News2Kindle
 				now = opts[:now]
 				items = []
 				
-				rdf_file = "http://rss.rssad.jp/rss/internetwatch/internet.rdf"
+				rdf_file = "https://internet.watch.impress.co.jp/data/rss/1.0/iw/feed.rdf"
 				rdf = retry_loop( 5 ) do
-					Nokogiri(open(rdf_file, 'r:utf-8', &:read))
+					Nokogiri(URI.open(rdf_file, 'r:utf-8', &:read))
 				end
 				(rdf / 'item' ).each do |item|
 					uri = URI( item.attr( 'rdf:about' ).to_s )
@@ -63,7 +63,7 @@ module News2Kindle
 								next if org =~ /^http/ # skip images on other servers
 								begin
 									img_file = retry_loop( 5 ) do
-										open( "#{TOP}#{org}", &:read )
+										URI.open( "#{TOP}#{org}", &:read )
 									end
 									cache = "#{org.gsub( /\//, '_' ).sub( /^_/, '' )}"
 									open( "#{@dst_dir}/#{cache}", 'w' ){|f| f.write img_file}
@@ -205,7 +205,7 @@ module News2Kindle
 				rescue Errno::ENOENT
 					#puts "getting article: #{uri.path}".encode( Encoding::default_external )
 					html = retry_loop( 5 ) do
-						open( uri, &:read )
+						URI.open( uri, &:read )
 					end
 					open( cache, 'w' ){|f| f.write html }
 				end

data/lib/news2kindle/generator/nikkei-paid.rb

@@ -13,7 +13,6 @@ module News2Kindle
 			class IllegalPage < StandardError; end
 
 			TOP = 'https://www.nikkei.com'
-			LOGIN = "#{TOP}/etc/accounts/login?dps=3&amp;pageflag=top&amp;url=http%3A%2F%2Fwww.nikkei.com%2F"
 
 			def initialize( tmpdir )
 				@nikkei_id, @nikkei_pw = auth
@@ -34,28 +33,31 @@ module News2Kindle
 				@now_str = @now.strftime '%Y-%m-%d %H:%M'
 
 				agent = Mechanize::new
+				agent.user_agent_alias = "Windows Chrome"
 				agent.set_proxy( *ENV['HTTP_PROXY'].split( /:/ ) ) if ENV['HTTP_PROXY']
 
 				toc = []
 				if @nikkei_id and @nikkei_pw
-					agent.get('https://regist.nikkei.com/ds/etc/accounts/logout')
-					agent.get( LOGIN )
-					agent.page.form_with( :name => 'autoPostForm' ).submit
-					agent.page.form_with( :name => 'LA7010Form01' ) do |form|
-						form['LA7010Form01:LA7010Email'] = @nikkei_id
-						form['LA7010Form01:LA7010Password'] = @nikkei_pw
+					agent.get('https://id.nikkei.com/lounge/li/main/')
+					agent.page.form_with(name: 'LA0120Form01') do |form|
+						form['LA0120Form01:LA0120Email'] = @nikkei_id
+						form['LA0120Form01:LA0120Password'] = @nikkei_pw
 						form.click_button
 					end
-					agent.page.forms.first.submit
+					begin # skip the confirmation page if exist
+						agent.get(TOP)
+						agent.page.form_with(name: 'autoPostForm').click_button
+					rescue NoMethodError
+					end
 				else
-					agent.get( TOP )
+					agent.get(TOP)
 				end
 
 				#
 				# scraping top news
 				#
 				toc_top = ['TOP NEWS']
-				(agent.page / '#JSID_baseRefreshNxTop2 h3 a').each do |a|
+				(agent.page / 'div.m-miM11_box h3 a').each do |a|
 					uri = a.attr('href')
 					next if News2Kindle::DupChecker.dup?(uri)
 					toc_top << [canonical(a.text.strip), uri]

data/lib/news2kindle/generator/tdiary.rb

@@ -21,7 +21,7 @@ module News2Kindle
 				html = title = author = now_str = nil
 				begin
 					retry_loop( 5 ) do
-						html = Nokogiri(open("#{@top}?date=#{now.strftime '%m%d'}", 'r:utf-8', &:read))
+						html = Nokogiri(URI.open("#{@top}?date=#{now.strftime '%m%d'}", 'r:utf-8', &:read))
 						title = (html / 'head title').text
 						author = (html / 'head meta[name="author"]')[0]['content']
 						now_str = now.strftime( '%m-%d' )
@@ -124,7 +124,7 @@ module News2Kindle
 				file_name = "#{SecureRandom.hex}#{uri.to_s.scan(/\.[^\.]+$/)[0]}"
 				begin
 					open("#{@current_dir}/#{file_name}", 'w') do |f|
-						f.write open(uri, &:read)
+						f.write URI.open(uri, &:read)
 					end
 				rescue OpenURI::HTTPError, RuntimeError, Errno::ENOENT
 					News2Kindle.logger.warn "#$!: #{uri}"

data/lib/news2kindle/version.rb

@@ -1,3 +1,3 @@
 module News2Kindle
-  VERSION = "0.2.0"
+  VERSION = "0.2.6"
 end

data/news2kindle.gemspec

@@ -28,10 +28,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'nokogiri'
   spec.add_dependency 'pit'
   spec.add_dependency 'dropbox_api'
-  spec.add_dependency 'mongoid', '~> 6.1'
+  spec.add_dependency 'mongoid', '>= 6.1', '< 8.0'
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "pry"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: news2kindle
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.6
 platform: ruby
 authors:
 - TADA Tadashi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-14 00:00:00.000000000 Z
+date: 2021-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kindlegen
@@ -112,16 +112,22 @@ dependencies:
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -164,20 +170,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: scrape some news site and deliver to kindle
 email:
 - t@tdtds.jp
@@ -188,7 +180,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".tachikoma.yml"
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
@@ -237,8 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: scrape some news site and deliver to kindle

data/.tachikoma.yml

@@ -1 +0,0 @@
-strategy: 'bundler'