takuhai_status 1.8.7 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5905eec5ea6483df7e510af180443d1e7027a80e37f4c104127e2739a4b428f
-  data.tar.gz: 9083558ba2a088cc3b2b2ca1c3f250259acab4ba657a8193e2f081006fcedac6
+  metadata.gz: 271863577b644e618af2df2a53eef10f98b678210ec6470ebbbf7af9d4ecf95a
+  data.tar.gz: a10652ae8164b17c9b5544eff250de9ae7c4269988d50dacdbf42fd2277d2e4b
 SHA512:
-  metadata.gz: 0c7678aea07f4086b27329bcf9471facac84c555d465454044ee3e1cee02a0985466fbbb4311568ceff9717c8c6d17c4f58eca08fedfa15da91f0aaba8d4958e
-  data.tar.gz: 9c7274a28d1444ba210d9cfe0b95f30c3f2a0f872d483e9c169b659154f653034d9927241822bf7720a0d79169b4e519ea3408ad28bf6af7ca9863ea21266d64
+  metadata.gz: 32d23a601473c351ff967f0e135e0afca8b87806ee90b0593f3d29a04e169f13623aa80c9fe1639534e420acff596931cc328b027d2941003f68cc332ad0a91b
+  data.tar.gz: faf1ebfc7389c9584324b679e3ff9a38abe97fa20df0ff88c4ebe8bb139137cfd37c749c0f521f647a2b94f333be9b2a96f9fe557fe7676b2e2cd65c1e2c39e4

data/.travis.yml

@@ -4,9 +4,9 @@ cache: bundler
 before_install:
   - gem install bundler -v '> 1.5.0'
 rvm:
-  - 2.4.5
-  - 2.5.2
-  - 2.6.0
+  - 2.5.8
+  - 2.6.6
+  - 2.7.1
 deploy:
   provider: rubygems
   api_key:

data/lib/takuhai_status.rb

@@ -14,13 +14,23 @@ module TakuhaiStatus
 
 	# loading plugins
 	@@services = []
-	def self.add_service(service_name)
-		@@services << service_name
+	# service_class as class
+	def self.add_service(service_class)
+		@@services << service_class
 	end
 	Dir.glob("#{File.dirname(__FILE__)}/takuhai_status/*.rb") do |plugin|
 		require plugin
 	end
 
+	# service_name as symbol, cf. :USPS
+	def self.ignore_service(service_name)
+		begin
+			@@services.delete(TakuhaiStatus.const_get(service_name))
+		rescue NameError
+			return nil
+		end
+	end
+
 	def self.scan(key, timeout: 10, logger: Logger.new(nil))
 		services = []
 		[].tap{|threads|

data/lib/takuhai_status/japanpost.rb

@@ -19,7 +19,7 @@ module TakuhaiStatus
 	private
 		def check
 			uri = "https://trackings.post.japanpost.jp/services/srv/search/direct?reqCodeNo1=#{@key}"
-			doc = Nokogiri(open(uri, &:read))
+			doc = Nokogiri(URI.open(uri, &:read))
 
 			begin
 				begin

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/tmg_cargo.rb

@@ -21,8 +21,7 @@ module TakuhaiStatus
 
 	private
 		def check
-			@@conn = Faraday.new(url: 'https://track-a.tmg-group.jp'){|builder|
-			#@@conn = Faraday.new(url: 'https://track-a.tmg-tms.com'){|builder|
+			@@conn = Faraday.new(url: 'https://track-a.tmg-tms.com'){|builder|
 				builder.use :cookie_jar
 				builder.use FaradayMiddleware::FollowRedirects
 				builder.request :url_encoded
@@ -37,9 +36,10 @@ module TakuhaiStatus
 			begin
 				state = doc.css('#list tr td')[2].text.strip
 				raise if state =~ /お荷物情報が見つかりません/
+				raise if state == '2' # skip error state occurs sometime
 				return Time.now, state
 			rescue
-				raise NotMyKey
+				raise NotMyKey.new(state)
 			end
 		end
 	end

data/lib/takuhai_status/version.rb

@@ -1,3 +1,3 @@
 module TakuhaiStatus
-  VERSION = "1.8.7"
+  VERSION = "1.9.1"
 end

data/takuhai_status.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "faraday_middleware"
 
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "travis"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: takuhai_status
 version: !ruby/object:Gem::Version
-  version: 1.8.7
+  version: 1.9.1
 platform: ruby
 authors:
 - TADA Tadashi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-13 00:00:00.000000000 Z
+date: 2020-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -151,8 +151,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/console
-- bin/setup
 - lib/takuhai_status.rb
 - lib/takuhai_status/fedex.rb
 - lib/takuhai_status/japanpost.rb
@@ -182,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.8
 signing_key: 
 specification_version: 4
 summary: get delivery status of Takuhai-bin in Japan

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "takuhai_status"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start

data/bin/setup

@@ -1,7 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-bundle install
-
-# Do any other automated setup that you need to do here