seko 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66df6bd7acbf00475ad822f762ee3ca2e11a2b24
-  data.tar.gz: c99bad552ceb9dec16c2a2875da6603a242557a0
+  metadata.gz: f7fd57d481612265475049cab9f94d350b8f1412
+  data.tar.gz: e1a7335dbe3c8db1dcebd4211a6ea238916342b3
 SHA512:
-  metadata.gz: 06c8ce10dfa2fd9c5c81893dc317612fb2f70b1ff7589e491abd44a20cb38709bb5265fca45f0b1d8568aea2e2eba1ebc280acdeae0b487b631f0476598d7eb2
-  data.tar.gz: 5a057f134de0dc1345985c7b284f4ad4031821a7ff0692c7693a10810b0ef740eb890a7a00c66d6ece9ff09e970cfda2412b371a10264085f563655ed0e2722c
+  metadata.gz: 58cde9d3ff5aec05589f8f3867a96161b0afbcbb82b4e60103d10017c17f6c707b8e31299fb15aaf23e9de28524b14b6af0dea4f69914a49fc5a9db2ec9a56e6
+  data.tar.gz: 93465d318dec0023a93a753244e1f5bd672a37f47b9a1a5823ec39ab41dc56c51e53a0966f16f058af71c1179a3af337b24018b56c4e525467774083302cd4ee

data/lib/seko/tracking.rb

@@ -4,10 +4,26 @@ module Seko
     attr_accessor :carrier
 
     DPD = "http://www.dpd.co.uk/apps/tracking/?reference=:tracking_number&postcode=#results"
+    UPS = "http://wwwapps.ups.com/WebTracking/track?trackNums=:tracking_number&track.x=Track"
+
+    TRACKING_NUMBERS = {
+      'UPS' => /\b(1Z ?[0-9A-Z]{3} ?[0-9A-Z]{3} ?[0-9A-Z]{2} ?[0-9A-Z]{4} ?[0-9A-Z]{3} ?[0-9A-Z]|[\dT]\d\d\d ?\d\d\d\d ?\d\d\d)\b/i,
+      'DPD' => /\b([0-9]{14} ?[A-Z]{1})/i
+    }
+
+    def get_carrier
+      TRACKING_NUMBERS.each do |carrier, pattern|
+        return carrier.dup if @tracking_number =~ pattern 
+      end
+      return 'DPD' # return DPD by default
+    end
 
     def initialize(carrier, tracking_number)
-      @carrier         = carrier
+      # FIXME: dependent apps currently rely on two arguments 
+      # (carrier and tracking_number) therefore we should keep 
+      # carrier, but should removed in next minor level release
       @tracking_number = tracking_number
+      @carrier         = get_carrier
     end
 
     def carrier_destination

data/lib/seko/version.rb

@@ -1,3 +1,3 @@
 module Seko
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/lib/tracking_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+describe Seko::Tracking do
+
+  let(:dpd_url)      { 'http://www.dpd.co.uk/apps/tracking/?reference=:tracking_number&postcode=#results' }
+  let(:ups_url)      { 'http://wwwapps.ups.com/WebTracking/track?trackNums=:tracking_number&track.x=Track' }
+  let(:ups_number)   { '1Z87932WD945835927' }
+  let(:dpd_number)   { '15503259038100Z' }
+  let(:ups_tracking) { Seko::Tracking.new('', ups_number) }
+  let(:dpd_tracking) { Seko::Tracking.new('', dpd_number) }
+
+  describe '#get_carrier' do
+    it 'returns the carrier based on a regular expression match' do
+      expect(ups_tracking.get_carrier).to eq('UPS')
+      expect(dpd_tracking.get_carrier).to eq('DPD')
+    end
+  end
+
+  describe '#carrier_destination' do
+    it 'returns the tracking url for the provided carrier' do
+      expect(ups_tracking.carrier_destination).to eq(ups_url)
+      expect(dpd_tracking.carrier_destination).to eq(dpd_url)
+    end
+  end
+
+  describe '#url' do
+    it 'returns the final tracking url' do
+      ups_tracking_number = ups_url.gsub(':tracking_number', ups_number)
+      dpd_tracking_number = dpd_url.gsub(':tracking_number', dpd_number)
+      expect(ups_tracking.url).to eq(ups_tracking_number)
+      expect(dpd_tracking.url).to eq(dpd_tracking_number)
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seko
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Justin Grubbs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-12 00:00:00.000000000 Z
+date: 2014-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -144,6 +144,7 @@ files:
 - spec/lib/receipt_spec.rb
 - spec/lib/response_spec.rb
 - spec/lib/stock_spec.rb
+- spec/lib/tracking_spec.rb
 - spec/logs/spec.log
 - spec/spec_helper.rb
 homepage: https://github.com/jGRUBBS/seko-ruby-api
@@ -192,5 +193,6 @@ test_files:
 - spec/lib/receipt_spec.rb
 - spec/lib/response_spec.rb
 - spec/lib/stock_spec.rb
+- spec/lib/tracking_spec.rb
 - spec/logs/spec.log
 - spec/spec_helper.rb