takuhai_status 1.7.4 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b2d9df719ff93529a07fd9a359399e5dda950f12a82d71c55fc392de213b287
-  data.tar.gz: c905145465061cc9e12449cfd68f766f490812c0919ebc48fb4baa294c18b518
+  metadata.gz: ed2db8aae5fed40752347a6f60e990a97b5c81077525919d2dc6426055f832b9
+  data.tar.gz: 6b72759578390a483719d6b7b643b57ff99dbc6c71df38634fe3d14d68644825
 SHA512:
-  metadata.gz: dfe5a1243581f3d7493e0a92dad32c9f5cec11799ac4179ee50270e4d93c553f2bc1985c9f3635291b018810cb8a0abf50904d3e81806bf64e5dc11be9febe94
-  data.tar.gz: 554e86b9e8b3262de54de788f615ba3ee011ce79a95ccb908ff7a30358495d0645a1fd4d22f507ec816bfa8436bef5a5bee7361e8e7b615dae2cce9cee9d6122
+  metadata.gz: ebd4cf407b922c128980e234fd0a6fc52cb22aba452784ba0d4d7216a5d2aefd952910fb4bab1defc662ff351d3c4ab2e82280aa5406077e3b685da4c7359190
+  data.tar.gz: 1e97d4d8e8f4c52d1395202cad34158b751c25b81a14aa1a721d34fbae1fe88f7b595ab112c3193463173264478be18eab02d6ee57217ba4e095c77384f1328e

data/.travis.yml

@@ -1,4 +1,13 @@
 language: ruby
+sudo: false
+cache: bundler
+before_install:
+- gem install bundler -v '> 1.5.0'
 rvm:
-  - 2.2.2
-before_install: gem install bundler -v 1.10.5
+- 2.5.2
+deploy:
+  provider: rubygems
+  api_key:
+    secure: anktbhiTQ2FuZn7EqJBVVCyJjMMXKz2f25ETuqMlriKOCYcKEUKtCGo91F69oxf6SAkAkZCARqTF0IxUrpadiU+x+7n0FD3x2s4BMQqvvPpLPM5sUgAZXIZGsNyfi5Pi5E9HIQ/yuKAAzuNPIlcfVo3f3Os9b/gOICr5j7NcyD6h5zU6qDEW7fskc3HA9w0DDhcxARzGl/O9wiU7NJBNVZQO25/9e1N412VlI3F8+EtLMDeHf3GgHaqwBGIdMLEvN+tb9poA4oLz1Koz3YqgHVMpHrCWWHyLIZ1FmrdhF0gLq4G0Kuas9Nrr3deAh8jAqkX/UMt4WOoOjzi9H/xb6F2CfgAq74FOdOf1SpZkpmFAiC+vtDrGJxgpNQMpoqZ8NdRSfGbEy27HlCznSYZaCm6B9KX7PdstBaqIYJGfByAktgGQnLOIIW24TJpPasMOMmG6r5o2J31fdCv4e8gWoUSRvsJmE7vS8RsL5bG6BtiEqh4akpriBQS8dQ+b2orPQ60yEcRMQVP7E7V0mhzO88j0/Cm+mhjmVo9DPd6PTEMTMOKaYCGR15PUQFmYl11f9WFMKLLzhcUBjDR6ltnDtH5Vow4AUk9oPbPbVLHk1EzM3CsPrmOMie1jlPAZyNhkpTKg385Wq5CSAVcgeLQs2wxABbrB1hJqJlf8K8zy2vU=
+  on:
+    tags: true

data/README.md

@@ -8,7 +8,7 @@
 * TMG (Amazonの荷物のみ)
 * UPS
 * FedEx (国外の移動のみ)
-
+* USPS (国外の移動のみ)
 
 ## Installation
 

data/lib/takuhai_status.rb

@@ -1,11 +1,3 @@
-require "takuhai_status/version"
-require "takuhai_status/japanpost"
-require "takuhai_status/kuronekoyamato"
-require "takuhai_status/sagawa"
-require "takuhai_status/tmg_cargo"
-require "takuhai_status/ups"
-require "takuhai_status/fedex"
-
 require "logger"
 require "timeout"
 
@@ -20,10 +12,19 @@ module TakuhaiStatus
 		end
 	end
 
+	# loading plugins
+	@@services = []
+	def self.add_service(service_name)
+		@@services << service_name
+	end
+	Dir.glob("#{File.dirname(__FILE__)}/takuhai_status/*.rb") do |plugin|
+		require plugin
+	end
+
 	def self.scan(key, timeout: 10, logger: Logger.new(nil))
 		services = []
 		[].tap{|threads|
-			[Sagawa, JapanPost, KuronekoYamato, TMGCargo, UPS, FedEx].each do |service|
+			@@services.each do |service|
 				threads.push(Thread.new{
 					if Thread.method_defined?(:report_on_exception)
 						Thread.current.report_on_exception = false

data/lib/takuhai_status/fedex.rb

@@ -4,6 +4,7 @@ require 'json'
 module TakuhaiStatus
 	class FedEx
 		attr_reader :key, :time, :state
+		TakuhaiStatus.add_service(self)
 
 		def initialize(key)
 			@key = key

data/lib/takuhai_status/japanpost.rb

@@ -4,9 +4,11 @@ require 'nokogiri'
 module TakuhaiStatus
 	class JapanPost
 		attr_reader :key, :time, :state
+		TakuhaiStatus.add_service(self)
 
 		def initialize(key)
-			@key = key.gsub(/[^a-zA-Z0-9]/, '')
+			@key = key.strip
+			raise NotMyKey.new('invalid key format') unless @key =~ /\A[a-zA-Z0-9]+\Z/
 			@time, @state = check
 		end
 

data/lib/takuhai_status/kuronekoyamato.rb

@@ -4,9 +4,11 @@ require 'nokogiri'
 module TakuhaiStatus
 	class KuronekoYamato
 		attr_reader :key, :time, :state
+		TakuhaiStatus.add_service(self)
 
 		def initialize(key)
-			@key = key.gsub(/[^0-9]/, '')
+			@key = key.strip
+			raise NotMyKey.new('invalid key format') unless @key =~ /\A[0-9]+\Z/
 			@time, @state = check
 		end
 

data/lib/takuhai_status/sagawa.rb

@@ -4,9 +4,11 @@ require 'nokogiri'
 module TakuhaiStatus
 	class Sagawa
 		attr_reader :key, :time, :state
+		TakuhaiStatus.add_service(self)
 
 		def initialize(key)
-			@key = key.gsub(/[^0-9]/, '')
+			@key = key.strip
+			raise NotMyKey.new('invalid key format') unless @key =~ /\A[0-9]+\Z/
 			@time, @state = check
 		end
 

data/lib/takuhai_status/tmg_cargo.rb

@@ -5,10 +5,12 @@ require 'nokogiri'
 module TakuhaiStatus
 	class TMGCargo
 		attr_reader :key, :time, :state
+		TakuhaiStatus.add_service(self)
 		@@conn = nil
 
 		def initialize(key)
-			@key = key.gsub(/[^0-9]/, '')
+			@key = key.strip
+			raise NotMyKey.new('invalid key format') unless @key =~ /\A[0-9]+\Z/
 			@time, @state = check
 		end
 
@@ -18,7 +20,7 @@ module TakuhaiStatus
 
 	private
 		def check
-			@@conn = Faraday.new(url: 'http://track-a.tmg-group.jp'){|builder|
+			@@conn = Faraday.new(url: 'https://track-a.tmg-group.jp'){|builder|
 				builder.use :cookie_jar
 				builder.request :url_encoded
 				builder.adapter :net_http

data/lib/takuhai_status/ups.rb

@@ -5,10 +5,12 @@ require 'nokogiri'
 module TakuhaiStatus
 	class UPS
 		attr_reader :key, :time, :state
+		TakuhaiStatus.add_service(self)
 		@@conn = nil
 
 		def initialize(key)
-			@key = key.gsub(/[^a-zA-Z0-9]/, '')
+			@key = key.strip
+			raise NotMyKey.new('invalid key format') unless @key =~ /\A[a-zA-Z0-9]+\Z/
 			@time, @state = check
 		end
 

data/lib/takuhai_status/usps.rb

@@ -0,0 +1,35 @@
+require 'faraday'
+require 'nokogiri'
+
+module TakuhaiStatus
+	class USPS
+		attr_reader :key, :time, :state
+		TakuhaiStatus.add_service(self)
+
+		def initialize(key)
+			@key = key.strip
+			raise NotMyKey.new('invalid key format') unless @key =~ /\A[a-zA-Z0-9]+\Z/
+			@time, @state = check
+		end
+
+		def finish?
+			return !!(@state =~ /^Delivered/)
+		end
+
+	private
+		def check
+			url = "https://tools.usps.com/go/TrackConfirmAction?tLabels=#{@key}"
+			html = Faraday.new(url: url).get.body
+			date, status, detail = Nokogiri(html).css('div.status_feed p');
+			date_str = date.text.strip
+			status_str = status.text.gsub(/\u00A0/, ' ').strip
+			detail_str = detail.text.gsub(/\u00A0/, ' ').strip
+
+			unless date_str.empty?
+				return Time.parse(date_str), "#{status_str} (#{detail_str})"
+			else
+				raise NotMyKey
+			end
+		end
+	end
+end

data/lib/takuhai_status/version.rb

@@ -1,3 +1,3 @@
 module TakuhaiStatus
-  VERSION = "1.7.4"
+  VERSION = "1.8.1"
 end

data/takuhai_status.gemspec

@@ -27,4 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "travis"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: takuhai_status
 version: !ruby/object:Gem::Version
-  version: 1.7.4
+  version: 1.8.1
 platform: ruby
 authors:
 - TADA Tadashi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-06 00:00:00.000000000 Z
+date: 2018-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: travis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: get delivery status of Takuhai-bin in Japan
 email:
 - t@tdtds.jp
@@ -132,6 +146,7 @@ files:
 - lib/takuhai_status/sagawa.rb
 - lib/takuhai_status/tmg_cargo.rb
 - lib/takuhai_status/ups.rb
+- lib/takuhai_status/usps.rb
 - lib/takuhai_status/version.rb
 - takuhai_status.gemspec
 homepage: https://github.com/tdtds/takuhai_status
@@ -154,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: get delivery status of Takuhai-bin in Japan