takuhai_status 1.8.9 → 1.8.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f6ac61ac18877912736c4c2c53a9c3ff34403477ada3d8ed2e0ac7844e0c545
-  data.tar.gz: c272dab2cc9f290cbd510c9f9d7c471c53188dde6188b61638acdff469c8b82b
+  metadata.gz: 36f48bde6e33990a902c142f1192bda4863273d829531f7bc74056970885efd8
+  data.tar.gz: 3ad6b113e5fab07e35116336cebabdf399f8193508f526f33cb626272969ced7
 SHA512:
-  metadata.gz: 854508184c8f05885867d3a227437d9e388622480a9f10e299918e6c68c37c001422fbdfa900b8df841dc0a41da3dbc309e0919ccc29552bca80518fc9824d3f
-  data.tar.gz: a956f50442f3d675e7fb7605292e93572cae82e9c71be3ac842850567a26700be0d69a8546b1198c50fcf010f9323cd4928f35f04ab39cc23d37208b3a6b6e73
+  metadata.gz: aa31f2d5002fbc425de03b4d5b918013752516a18e54a3ac23eca4d274856cefe5b08495ee610bf6677b32d2bad0b4484db38d10f217db4b065499e87c1a8a37
+  data.tar.gz: 3c7c6dd8805774d67ca45cb8ae52075d52f33aee7b40eea25f19d10b4ec07b7d628cc52e32098e7580683e37edc7fb981c3dcec16ae3f4bea4c6faf47836cac1

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.8.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: takuhai_status
 version: !ruby/object:Gem::Version
-  version: 1.8.9
+  version: 1.8.10
 platform: ruby
 authors:
 - TADA Tadashi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-14 00:00:00.000000000 Z
+date: 2019-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -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.0.3
 signing_key: 
 specification_version: 4
 summary: get delivery status of Takuhai-bin in Japan