takuhai_status 1.4.2 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca5e2767e709bd9aa9a8991009c77ac7e00afd16
-  data.tar.gz: 210a6a33b154a40ab185df723b607b3b6e138697
+  metadata.gz: c52ef367b12ed3bb07b1af389b3c3b1ea5c33380
+  data.tar.gz: e937f9c5c0a9253e8b1f382a5602aac4cbe8fbca
 SHA512:
-  metadata.gz: 196e05de9e2fcf5f1af5f3cbf32c3b78f26db4a433f0f0a75b02e69b8d72bfb5a1f9c02696a8f4826836853ed55ce04d5a9df42e222adda1c4aef2bbbd133654
-  data.tar.gz: 13aa79c96495f3186e6da4fa7e43447fe4a94bb6d586342aae6e3d154f88390031d8a336d63d4c06771355c8bc4fc3bc75edbb0fff86638699d7ce8f961f9a8f
+  metadata.gz: bd524690dd931e49e2ff04c1b2a2ae5750c4938d9a76099f00d9803d4c99d640617f9b0023d3049e6176382e6513c515cc11c71ec34a62f3b6c19eb6c38430e8
+  data.tar.gz: 1a95675c27df6a018459474f6388ba30f9c0e6af4529f8fce77844ffeb73d6250cd6b9aa285af127fa222fd726bf1bd69a9f399d7df40b18ea7938c8988dbe99

data/lib/takuhai_status.rb

@@ -4,6 +4,7 @@ require "takuhai_status/kuronekoyamato"
 require "takuhai_status/sagawa"
 require "takuhai_status/tmg_cargo"
 require "takuhai_status/ups"
+require "takuhai_status/fedex"
 
 module TakuhaiStatus
 	class NotFound < StandardError; end
@@ -19,7 +20,7 @@ module TakuhaiStatus
 	def self.scan(key)
 		services = []
 		[].tap{|threads|
-			[Sagawa, JapanPost, KuronekoYamato, TMGCargo, UPS].each do |service|
+			[Sagawa, JapanPost, KuronekoYamato, TMGCargo, UPS, FedEx].each do |service|
 				threads.push(Thread.new{service.new(key)})
 			end
 		}.each{|thread|

data/lib/takuhai_status/fedex.rb

@@ -0,0 +1,71 @@
+require 'faraday'
+require 'json'
+
+module TakuhaiStatus
+	class FedEx
+		attr_reader :key, :time, :state
+
+		def initialize(key)
+			@key = key.gsub(/[^0-9]/, '')
+			@time, @state = check
+		end
+
+		def finish?
+			return !!(@state =~ /認可済み業者に委託/)
+		end
+
+	private
+		def check
+			data = {
+				"TrackPackagesRequest": {
+					"appType": "WTRK",
+					"uniqueKey": "",
+					"processingParameters": {},
+					"trackingInfoList": [
+						{
+							"trackNumberInfo": {
+								"trackingNumber": @key,
+								"trackingQualifier": "",
+								"trackingCarrier": ""
+							}
+						}
+					]
+				}
+			}
+			conn = Faraday.new(url: 'https://www.fedex.com'){|builder|
+				builder.request :url_encoded
+				builder.adapter :net_http
+			}
+			res = conn.post('/trackingCal/track', {
+				data: data.to_json,
+				action: 'trackpackages',
+				locale: 'ja_JP',
+				version: '1',
+				format: 'json'
+			})
+			begin
+				data = JSON.parse(res.body)
+				raise unless data["TrackPackagesResponse"]["successful"]
+
+				package = data["TrackPackagesResponse"]["packageList"].first
+				current = package["scanEventList"].first
+
+				begin
+					time = Time.parse("#{current['date']} #{current['time']}#{current['+09:00']}")
+				rescue ArgumentError
+					raise NotMyKey.new('no time status in the package');
+				end
+
+				state = "#{current['status']}"
+				state = "#{state}(#{current['scanDetails']})" if current['scanDetails'].size > 0
+				state = "#{state} - #{current['scanLocation']}" if current['scanLocation'].size > 0
+
+				return time, state
+			rescue NotMyKey
+				raise
+			rescue
+				return (@time || Time.now), (@state || '')
+			end
+		end
+	end
+end

data/lib/takuhai_status/version.rb

@@ -1,3 +1,3 @@
 module TakuhaiStatus
-  VERSION = "1.4.2"
+  VERSION = "1.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: takuhai_status
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.0
 platform: ruby
 authors:
 - TADA Tadashi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-08 00:00:00.000000000 Z
+date: 2016-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -126,6 +126,7 @@ files:
 - bin/console
 - bin/setup
 - lib/takuhai_status.rb
+- lib/takuhai_status/fedex.rb
 - lib/takuhai_status/japanpost.rb
 - lib/takuhai_status/kuronekoyamato.rb
 - lib/takuhai_status/sagawa.rb
@@ -153,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: get delivery status of Takuhai-bin in Japan