takuhai_status 1.5.4 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f14c1d5a4218cae9a9f0bb85cf852eae84487bc
-  data.tar.gz: a888a2055a49d8d3eee4a59e3db6519aaf6cf68d
+  metadata.gz: 9be075febbf69c7a73c761d80ccf7d8589315d2c
+  data.tar.gz: f40577194d5dcff9daea8ae4b656904161d8205c
 SHA512:
-  metadata.gz: 9264f0d3ab1cd3caa844a2f0a36d28f300d90fd9da0bb06708ef3d3f6cfdc70e237ffa751dee38ea8c5482be769fa37f256eddb837c6869d1968e74b2abc8b41
-  data.tar.gz: e7b0a57618383160667333d964a1bd1188dfe49ab71bfd18f59d49c69afedd9e01ea64cabfff324fb0dd9c97083a8dc904ddca7a9a92a7fb111245399b9896d9
+  metadata.gz: ebcc0043195c97a5311a047b32f20620c1336dc330d606ad372e9c8652542d1421fb715dfc44a63e2627f4ed847f5d36db84dc97efa3cc20f131e37a53f49cc3
+  data.tar.gz: d372dca2d79255b2ec66ecf9e521cff2c655924e8219e2f3ac2842c7c533c50afe02ffbad0b12862d814a3fa6c7bed69d049e674b486d9dbdb9483cb13e2cd42

data/lib/takuhai_status/ups.rb

@@ -1,9 +1,11 @@
 require 'open-uri'
+require 'faraday'
 require 'nokogiri'
 
 module TakuhaiStatus
 	class UPS
 		attr_reader :key, :time, :state
+		@@conn = nil
 
 		def initialize(key)
 			@key = key.gsub(/[^a-zA-Z0-9]/, '')
@@ -16,18 +18,26 @@ module TakuhaiStatus
 
 	private
 		def check
-			uri = "https://www.ups.com/WebTracking/processInputRequest?loc=ja_JP&Requester=NES&tracknum=#{@key}"
-			html = open(uri, &:read)
-			# HTML中に謎の大量ヌル文字が含まれていてnokogiriのパースが止まる対策
-			html.gsub!(/\u0000/,'')
-			doc = Nokogiri::HTML.parse(html, uri, "utf-8")
+			@@conn = Faraday.new(url: 'https://wwwapps.ups.com/'){|builder|
+				builder.use :cookie_jar
+				builder.request :url_encoded
+				builder.adapter :net_http
+			} unless @@conn
+			@@conn.get('/WebTracking/track?loc=ja_JP') # once access to set cookie
+			res = @@conn.post('/WebTracking/track?loc=ja_JP', {
+				HTMLVersion: '5.0',
+				loc: 'ja',
+				trackNums: @key,
+				'track.x' => 'Track'
+			})
+			doc = Nokogiri::HTML.parse(res.body)
 
 			begin
 				state = doc.css('.newstatus h3')[0].text.strip
 				begin
-					time = "#{doc.css('.secHead ul li')[0].text.match(/\d{4}\/\d\d\/\d\d \d{1,2}:\d\d/)[0]}+0500)"
+					time = "#{doc.css('#fontControlButtons li li').text.match(/\d{4}\/\d\d\/\d\d \d{1,2}:\d\d/)[0]}+0500)"
 				rescue NoMethodError
-					time = "#{doc.css('.secHead ul li')[0].text.match(/\d{4}\/\d\d\/\d\d/)[0]} 00:00:00+0500)"
+					time = "#{doc.css('#fontControlButtons li').text.match(/\d{4}\/\d\d\/\d\d/)[0]} 00:00:00+0500)"
 				end
 				return Time.parse(time).localtime, state
 			rescue NoMethodError

data/lib/takuhai_status/version.rb

@@ -1,3 +1,3 @@
 module TakuhaiStatus
-  VERSION = "1.5.4"
+  VERSION = "1.5.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: takuhai_status
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.5
 platform: ruby
 authors:
 - TADA Tadashi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-30 00:00:00.000000000 Z
+date: 2017-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: get delivery status of Takuhai-bin in Japan