takuhai_status 1.8.9 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f6ac61ac18877912736c4c2c53a9c3ff34403477ada3d8ed2e0ac7844e0c545
-  data.tar.gz: c272dab2cc9f290cbd510c9f9d7c471c53188dde6188b61638acdff469c8b82b
+  metadata.gz: e522f263b0eb304f8608b2a75f409e56fa82bf189df9e16526be9078287612d2
+  data.tar.gz: e51c2802c0b787e2d8cee70808f70110afbe4d85604a62085f04a12cc81c6691
 SHA512:
-  metadata.gz: 854508184c8f05885867d3a227437d9e388622480a9f10e299918e6c68c37c001422fbdfa900b8df841dc0a41da3dbc309e0919ccc29552bca80518fc9824d3f
-  data.tar.gz: a956f50442f3d675e7fb7605292e93572cae82e9c71be3ac842850567a26700be0d69a8546b1198c50fcf010f9323cd4928f35f04ab39cc23d37208b3a6b6e73
+  metadata.gz: bf3f2e9f09a240136aca68ccc4daf6482af80509c8c388392982b36832c72cab04c461ebf4efe0c5375415421ad4c0a19d6b253e2d71724a821ce07a8704b288
+  data.tar.gz: 593cc21411fe24e2eb91689a751a39336251b872c220b358d6c4013619323fc622efa8764b8e1a2b67b8bc2ee40906b46ef6af8cdf630552313745c61c866d74

data/.travis.yml

@@ -4,9 +4,9 @@ cache: bundler
 before_install:
   - gem install bundler -v '> 1.5.0'
 rvm:
-  - 2.4.5
-  - 2.5.2
-  - 2.6.0
+  - 2.5.8
+  - 2.6.6
+  - 2.7.1
 deploy:
   provider: rubygems
   api_key:

data/lib/takuhai_status/japanpost.rb

@@ -19,7 +19,7 @@ module TakuhaiStatus
 	private
 		def check
 			uri = "https://trackings.post.japanpost.jp/services/srv/search/direct?reqCodeNo1=#{@key}"
-			doc = Nokogiri(open(uri, &:read))
+			doc = Nokogiri(URI.open(uri, &:read))
 
 			begin
 				begin

data/lib/takuhai_status/kuronekoyamato.rb

@@ -20,22 +20,21 @@ module TakuhaiStatus
 		def check
 			conn = Faraday.new(url: 'http://toi.kuronekoyamato.co.jp/')
 			res = conn.post('/cgi-bin/tneko', {number00: '1', number01: @key})
-			doc = Nokogiri(res.body)
+			doc = Nokogiri(res.body.force_encoding('UTF-8'))
 
 			begin
-				tr = doc.css('.meisai')[0].css('tr').last
-				state = tr.css('td')[1].text
-				sday = tr.css('td')[2].text
-				stime = tr.css('td')[3].text
-				time = Time.parse("#{sday} #{stime}")
+				current = doc.css('.tracking-invoice-block-detail ol li').last
+				state = "#{current.css('.item').text} [#{current.css('.name').text}]"
+				month, day, hour, minute = current.css('.date').text.split(/[^\d]+/)
+				time = Time.local(Time.now.year, month, day, hour, minute)
 
-				if state == '国内到着'
-					begin
-						time, state = global_state(doc)
-					rescue
-						$stderr.puts "error in yamato global, about #{key}"
-					end
-				end
+				#if state == '国内到着'
+				#	begin
+				#		time, state = global_state(doc)
+				#	rescue
+				#		$stderr.puts "error in yamato global, about #{key}"
+				#	end
+				#end
 
 				return time, state
 			rescue NoMethodError

data/lib/takuhai_status/sagawa.rb

@@ -1,5 +1,4 @@
-require 'faraday'
-require 'nokogiri'
+require 'mechanize'
 
 module TakuhaiStatus
 	class Sagawa
@@ -13,31 +12,34 @@ module TakuhaiStatus
 		end
 
 		def finish?
-			return !!(@state =~ /営業所へお問い合わせ下さい。|配達は終了致しました。$|^配達完了|引渡完了/)
+			return !!(@state =~ /営業所へお問い合わせください。|配達は終了致しました。$|^配達完了|引渡完了/)
 		end
 
 	private
 		def check
-			conn = Faraday.new(url: 'http://k2k.sagawa-exp.co.jp')
-			res = conn.post('/p/web/okurijosearch.do', {okurijoNo: @key})
-			doc = Nokogiri(res.body)
+			agent = Mechanize.new
+			page = agent.get('https://k2k.sagawa-exp.co.jp/p/sagawa/web/okurijoinput.jsp')
+			form = page.form_with('main')
+			form['main:no1'] = @key
+			button = form.button_with('main:toiStart')
+			result = agent.submit(form, button)
 
 			begin
-				cells = doc.css('.table_okurijo_detail2').css('tr').last.css('td')
-				state = "#{cells[0].text.strip} [#{cells[2].text.strip}]".sub(/^./, '')
-				time = Time.parse(cells[1].text.strip) rescue Time.now
-				return time, state
-			rescue NoMethodError # detail2 table not found, use detail table
-				begin
+				row = result.css('#detail1 tr')
+				cells = row[row.size - 1].css('td')
+				if cells.size == 3 #has detail
+					state = "#{cells[0].text.strip[1,100]} [#{cells[2].text.strip}]"
+					time = Time.parse(cells[1].text.strip) rescue Time.now
+				else # finished?
+					state = cells[0].text.strip
 					time = Time.now
-					state = doc.css('.table_okurijo_detail').first.css('tr').last.css('td').text.strip
-					if state =~ /恐れ入りますが、お問い合せ送り状NOをお確かめください。|お荷物データが登録されておりません。/
-						raise NotMyKey.new('invalid key')
-					end
-					return time, state
-				rescue NoMethodError
-					raise NotMyKey.new('invalid response')
 				end
+				if state =~ /恐れ入りますが、お問い合せ送り状NOをお確かめください。|お荷物データが登録されておりません。/
+					raise NotMyKey.new('invalid key')
+				end
+				return time, state
+			rescue NoMethodError
+				raise NotMyKey.new('invalid response')
 			rescue ArgumentError
 				return Time.now, ''
 			end

data/lib/takuhai_status/version.rb

@@ -1,3 +1,3 @@
 module TakuhaiStatus
-  VERSION = "1.8.9"
+  VERSION = "1.9.2"
 end

data/lib/takuhai_status.rb

@@ -14,13 +14,23 @@ module TakuhaiStatus
 
 	# loading plugins
 	@@services = []
-	def self.add_service(service_name)
-		@@services << service_name
+	# service_class as class
+	def self.add_service(service_class)
+		@@services << service_class
 	end
 	Dir.glob("#{File.dirname(__FILE__)}/takuhai_status/*.rb") do |plugin|
 		require plugin
 	end
 
+	# service_name as symbol, cf. :USPS
+	def self.ignore_service(service_name)
+		begin
+			@@services.delete(TakuhaiStatus.const_get(service_name))
+		rescue NameError
+			return nil
+		end
+	end
+
 	def self.scan(key, timeout: 10, logger: Logger.new(nil))
 		services = []
 		[].tap{|threads|

data/takuhai_status.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "faraday_middleware"
 
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "travis"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: takuhai_status
 version: !ruby/object:Gem::Version
-  version: 1.8.9
+  version: 1.9.2
 platform: ruby
 authors:
 - TADA Tadashi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-14 00:00:00.000000000 Z
+date: 2021-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -180,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: get delivery status of Takuhai-bin in Japan