takuhai_status 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 473252d7c70aa15e6532dc81cddc276cb46c87a6
-  data.tar.gz: f86a202b6778ccce2858cd220fa9b94b1129f8b8
+  metadata.gz: 41c1c118ffc27f4ee1d7d49d814d1c32bd1b8918
+  data.tar.gz: 5e0cb11bb1733ef54ea1bb49705d185f1ad45011
 SHA512:
-  metadata.gz: c0da30d82d4806c36bd3e43c2b81363c50f63b75e0218cc01187ece57ece4d6a574a01bc5de861279f566123793407add16e3a26a7273723f482dc93824a223c
-  data.tar.gz: 974bd36f497878136fbd3eee89c5450baf9a0d6de7af644100e6c6720a5d09e7b17cc709928ba5c273aa08811b95642c1c48eafbd9a4deb8ece1d18383d2c20c
+  metadata.gz: 1bc7dc093158478be889ce62bad9a50d401521376a47c87893382b9200d3eca907dcffa6d83c870fe73e236b24930fd2e64e97f64c1dd4909d1ad148bc4dee9b
+  data.tar.gz: da5240397fc3f8833e58abb7358b06b0eb0c633dae14600b0bdec90543f6705565288f6a8284e96e0cc2494ac9ed76f2dbb2c3ba34812425d6c8a1a24e560752

data/lib/takuhai_status/sagawa.rb

@@ -11,7 +11,7 @@ module TakuhaiStatus
 		end
 
 		def finish?
-			return !!(@state =~ /営業所へお問い合わせ下さい。|配達は終了致しました。$/)
+			return !!(@state =~ /営業所へお問い合わせ下さい。|配達は終了致しました。$|^配達完了/)
 		end
 
 	private
@@ -21,28 +21,21 @@ module TakuhaiStatus
 			doc = Nokogiri(res.body)
 
 			begin
-				table = doc.css('#detail-1 table').first
-				state_line = table.css('tr td')[7].children.map(&:text).first
-				if state_line == 'お問い合わせNo.をお確かめ下さい。'
-					raise NotMyKey.new('invalid key')
-				end
-				if state_line == 'お問い合わせのデータは登録されておりません。'
-					raise NotMyKey.new('not entry yet')
-				end
-
-				state = state_line.split(/[ \u{a0}]+/).last
-
-				begin
-					s = state_line.sub(/^[^0-9]+/, '')
-					s = state_line if s.empty?
-					time = Time.parse(s.gsub(/[^0-9 :]/, '-'))
-				rescue ArgumentError
-					ship = table.css('tr td')[1].text.strip.gsub(/[^0-9]/, '-')
-					time = Time.parse(ship) rescue Time.now
-				end
+				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)
 				return time, state
 			rescue NoMethodError
-				raise NotMyKey.new('invalid response')
+				begin
+					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
 			rescue ArgumentError
 				return Time.now, ''
 			end

data/lib/takuhai_status/version.rb

@@ -1,3 +1,3 @@
 module TakuhaiStatus
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: takuhai_status
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - TADA Tadashi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-18 00:00:00.000000000 Z
+date: 2015-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday