dhl 0.0.1 → 0.0.2

data/spec/lib/dhl/client_spec.rb

@@ -5,46 +5,69 @@ require_relative '../../spec_helper'
 describe Dhl::Client do
 
   let(:client) { Dhl.client(username: 'username', password: 'password', account: 123456789) }
+  subject { response }
 
   after do
     VCR.eject_cassette
   end
 
   describe '#request_shipment' do
-    before do
-      VCR.insert_cassette 'shipment', record: :new_episodes
-    end
+    before { VCR.insert_cassette 'shipment', record: :new_episodes }
 
     let(:shipment_request) { Dhl::ShipmentRequest.new }
     let(:shipper) { FactoryGirl.build(:contact) }
     let(:recipient) { FactoryGirl.build(:contact) }
     let(:packages) { shipment_request.packages }
     let(:shipment) { FactoryGirl.build(:shipment) }
+    let(:response) { client.request_shipment(shipment_request) }
 
     it "should return a PDF shipping label" do
       shipment_request.shipper = shipper
       shipment_request.recipient = recipient
       shipment.pickup_time = (Time.now + 86400)
       shipment_request.shipment = shipment
-
       packages.add(50, 10, 15, 20, 'Ref 1')
       packages.add(100, 40, 45, 35, 'Ref 2')
 
-      response = client.request_shipment(shipment_request)
-      response[:tracking_numbers].should == ["JD012038742880323158", "JD012038742880323159"]
+      response[:tracking_number].should == '9085882330'
       File.exists?('labels/9085882330.pdf').should be_true
     end
   end
 
-  # describe '#track' do
-  #   before do
-  #     VCR.insert_cassette 'tracking', record: :new_episodes
-  #   end
+  describe '#track' do
+    context 'the shipment has been fully delivered' do
+      before { VCR.insert_cassette 'tracking/5223281416', record: :new_episodes}
+      let(:response) { client.track "5223281416" }
+
+      its(:shipment_info) { should_not be_nil }
+      it { should have_at_least(1).event }
+      it { should be_delivered }
+    end
+
+    context 'the shipment is not yet delivered' do
+      before { VCR.insert_cassette 'tracking/6676848301', record: :new_episodes}
+      let(:response) { client.track "6676848301" }
+      it { should_not be_delivered }
+    end
+
+    # More VCR cassettes for testing purposes
+    context 'the shipment has been fully delivered' do
+      before { VCR.insert_cassette 'tracking/9786162326', record: :new_episodes}
+      let(:response) { client.track "9786162326" }
+      it { should be_delivered }
+    end
+
+    context 'the shipment has been fully delivered' do
+      before { VCR.insert_cassette 'tracking/5223300596', record: :new_episodes}
+      let(:response) { client.track "5223300596" }
+      it { should be_delivered }
+    end
 
-  #   it "should give back a tracking status" do
-  #     response = client.track ["JD012038742880323158"]
-  #     response[:tracking_response][:awb_info][:array].should_have 1.item
-  #   end
-  # end
+    context 'the shipment has been fully delivered' do
+      before { VCR.insert_cassette 'tracking/6676848415', record: :new_episodes}
+      let(:response) { client.track "6676848415" }
+      it { should be_delivered }
+    end
+  end
 
 end

data/spec/spec_helper.rb

@@ -15,6 +15,7 @@ RSpec.configure do |config|
   #     --seed 1234
   config.order = 'random'
 
+  # Deletes all existing shipping labels when done
   config.after(:all) do
     FileUtils.rm_rf('labels')
   end
@@ -34,7 +35,6 @@ require 'rspec/autorun'
 require 'webmock/rspec'
 require 'vcr'
 
-#VCR config
 VCR.configure do |config|
   config.cassette_library_dir = 'spec/fixtures/dhl_cassettes'
   config.hook_into :webmock

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dhl
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Alessandro Mencarini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-10 00:00:00.000000000 Z
+date: 2013-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
@@ -86,28 +86,42 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.11.0
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.12
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.12
 description: 'A wrapper for DHL SOAP interface. '
 email:
 - a.mencarini@freegoweb.it
@@ -127,16 +141,27 @@ files:
 - lib/dhl/client.rb
 - lib/dhl/configuration.rb
 - lib/dhl/contact.rb
+- lib/dhl/error.rb
+- lib/dhl/error/generic.rb
 - lib/dhl/examples.rb
 - lib/dhl/package.rb
 - lib/dhl/packages.rb
 - lib/dhl/shipment.rb
 - lib/dhl/shipment_request.rb
-- lib/dhl/tracking_request.rb
+- lib/dhl/tracking.rb
+- lib/dhl/tracking/event.rb
+- lib/dhl/tracking/request.rb
+- lib/dhl/tracking/response.rb
+- lib/dhl/tracking/shipment_info.rb
 - lib/dhl/version.rb
 - spec/factories/contact_factory.rb
 - spec/factories/shipment_factory.rb
 - spec/fixtures/dhl_cassettes/shipment.yml
+- spec/fixtures/dhl_cassettes/tracking/5223281416.yml
+- spec/fixtures/dhl_cassettes/tracking/5223300596.yml
+- spec/fixtures/dhl_cassettes/tracking/6676848301.yml
+- spec/fixtures/dhl_cassettes/tracking/6676848415.yml
+- spec/fixtures/dhl_cassettes/tracking/9786162326.yml
 - spec/lib/dhl/client_spec.rb
 - spec/lib/dhl/contact_spec.rb
 - spec/lib/dhl/packages_spec.rb
@@ -172,6 +197,11 @@ test_files:
 - spec/factories/contact_factory.rb
 - spec/factories/shipment_factory.rb
 - spec/fixtures/dhl_cassettes/shipment.yml
+- spec/fixtures/dhl_cassettes/tracking/5223281416.yml
+- spec/fixtures/dhl_cassettes/tracking/5223300596.yml
+- spec/fixtures/dhl_cassettes/tracking/6676848301.yml
+- spec/fixtures/dhl_cassettes/tracking/6676848415.yml
+- spec/fixtures/dhl_cassettes/tracking/9786162326.yml
 - spec/lib/dhl/client_spec.rb
 - spec/lib/dhl/contact_spec.rb
 - spec/lib/dhl/packages_spec.rb

data/lib/dhl/tracking_request.rb

@@ -1,32 +0,0 @@
-module Dhl
-  class TrackingRequest
-
-    attr_accessor :tracking_number
-
-    # Accepts and array of tracking numbers
-    def initialize(numbers)
-      @tracking_numbers = numbers
-    end
-
-    def to_hash
-      {
-        tracking_request: {
-          request: {
-            service_header: {
-              message_time: Time.now.strftime('%Y-%m-%dT%H:%M:%S%:z'),
-              message_reference: '1234567890123456789012345678' # Ref between 28 and 32 characters
-            }
-          },
-          a_w_b_number: {
-            array_of_a_w_b_number_item: @tracking_numbers
-          },
-          # lp_number: nil, # Inactive in API
-          level_of_details: 'LAST_CHECK_POINT_ONLY', # ALL_CHECK_POINTS for complete tracking
-          pieces_enabled: 'B' # B for Both, S for shipment details only, P for piece details only
-        }
-      }
-    end
-
-
-  end
-end