takuhai_status 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6444e75ae0646f3346bf5f4beb4c7c14ecd9ad1
-  data.tar.gz: 246c5e5ff61b0c66c79959d27fe73f2d80c3bb9d
+  metadata.gz: bf89da20e44e0e1a6bb3bd04a7ebb3a62262ad70
+  data.tar.gz: 395dfb1a24414c4314641277b8e1c24cf03f4c6f
 SHA512:
-  metadata.gz: 299c6f3e61ba8821c24d603533c8e966f6e44a329318a59b156bb612a464ca24bbb82b6a9e9a08621a4eef7815aed8feebb9a0617b45f9b3e6fa35f956c836bb
-  data.tar.gz: d5f7199d2de6a1cb4e011c9eba719ddfa125e27c7fbc0d7004c0d36705ccd21bc7ca129767c4d93a1a132d588ac5c9f83651d4fff4adeaf25676703318dc9cee
+  metadata.gz: 9fadbc62d29de2b0706f31f5d19ff37f6c733c2b82b89308c6921498dd26f8a29fa728e30b7566dea8dbb1980b7418211b22de6ded730dfb5c4626f86e950adb
+  data.tar.gz: 99c99ef0b39a47403646d4a5beb75bc1e63b44a131d48abbb7f761d46715d283e9eadea62df3d093e433856ba7ea16b914419b597bfa541faaad4dbbb99f17e8

data/lib/takuhai_status/fedex.rb

@@ -6,12 +6,12 @@ module TakuhaiStatus
 		attr_reader :key, :time, :state
 
 		def initialize(key)
-			@key = key.gsub(/[^0-9]/, '')
+			@key = key
 			@time, @state = check
 		end
 
 		def finish?
-			return !!(@state =~ /認可済み業者に委託/)
+			return !!(@state =~ /認可済み業者に委託|配達完了/)
 		end
 
 	private
@@ -43,29 +43,23 @@ module TakuhaiStatus
 				version: '1',
 				format: 'json'
 			})
-			begin
-				data = JSON.parse(res.body)
-				raise unless data["TrackPackagesResponse"]["successful"]
 
-				package = data["TrackPackagesResponse"]["packageList"].first
-				current = package["scanEventList"].first
+			package = JSON.parse(res.body)["TrackPackagesResponse"]
+			unless package["successful"]
+				raise NotMyKey.new(package["errorList"].first["message"])
+			end
 
-				begin
-					time = Time.parse("#{current['date']} #{current['time']}#{current['+09:00']}")
-				rescue ArgumentError
-					raise NotMyKey.new('no time status in the package');
-				end
+			current = package["packageList"].first["scanEventList"].first
 
-				state = "#{current['status']}"
-				state = "#{state}(#{current['scanDetails']})" if current['scanDetails'].size > 0
-				state = "#{state} - #{current['scanLocation']}" if current['scanLocation'].size > 0
+			t_str = "#{current['date']} #{current['time']}"
+			raise NotMyKey.new('no time status in the package') if t_str.size == 1
+			time = Time.parse("#{t_str}+09:00")
 
-				return time, state
-			rescue NotMyKey
-				raise
-			rescue
-				return (@time || Time.now), (@state || '')
-			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
 		end
 	end
 end

data/lib/takuhai_status/version.rb

@@ -1,3 +1,3 @@
 module TakuhaiStatus
-  VERSION = "1.5.2"
+  VERSION = "1.5.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: takuhai_status
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - TADA Tadashi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-29 00:00:00.000000000 Z
+date: 2016-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday