dhl-intraship 0.1.1 → 0.2.0

data/.gitignore

@@ -17,3 +17,4 @@ test/version_tmp
 tmp
 atlassian-ide-plugin.xml
 .idea
+test.rb

data/README.md

@@ -1,7 +1,7 @@
 # Dhl::Intraship
 
-This is a simple gem to wrap the DHL Intraship SOAP Api. Note that currently only the simplest usecase is implemented:
-Sending a national day definite package without any extra services.
+This is a simple gem to wrap the DHL Intraship SOAP Api. Note that currently only "national day definite shipment" usecases are implemented  (Sending, deleting and manifesting national day definite packages without any extra services.)
+Booking a pickup is implemented as prototype, but not yet supported by DHL itself.
 
 ## Installation
 
@@ -43,7 +43,10 @@ options = {test: true, # If test is set, all API calls go against the Intraship
            label_response_type: :xml} # If it's set to XML the createShipment-Calls return the label data as XML instead of the PDF-Link
 ```
 
-To send a shipment to DHL you need to create it first:
+### Create a shipment
+
+To create a shipment to DHL you need to create it first
+
 
 ```ruby
 sender_address = Dhl::Intraship::CompanyAddress.new(company: 'Team Europe Ventures',
@@ -54,7 +57,6 @@ sender_address = Dhl::Intraship::CompanyAddress.new(company: 'Team Europe Ventur
                                                     city: 'Berlin',
                                                     country_code: 'DE',
                                                     email: 'info@teameurope.net')
-
 receiver_address = Dhl::Intraship::PersonAddress.new(firstname: 'John',
                                                      lastname: 'Doe',
                                                      street: 'Mainstreet',
@@ -64,8 +66,7 @@ receiver_address = Dhl::Intraship::PersonAddress.new(firstname: 'John',
                                                      city: 'Springfield',
                                                      country_code: 'DE',
                                                      email: 'john.doe@example.com')
-
-# Note that the weight parameter is in kg and the length/height/width in cm
+#Note that the weight parameter is in kg and the length/height/width in cm
 shipment = Dhl::Intraship::Shipment.new(sender_address: sender_address,
                                         receiver_address: receiver_address,
                                         shipment_date: Date.today,
@@ -74,15 +75,44 @@ shipment = Dhl::Intraship::Shipment.new(sender_address: sender_address,
                                         height:15,
                                         width: 25)
 ```
-Beware, that due to DHL Intraship restrictions, the sender address must be a 
+
+Beware, that due to DHL Intraship restrictions, the sender address must be a
 CompanyAddress and requires a contact_person.
-Also, note that the actual api-call takes an array of shipments:
+The actual api-call takes an array of shipments, or a single shipment.
+The result contains the "shipment_number", as well as the "label_url" (or the "xml_label" when it was specified as repsonse type)
 
 ```ruby
-result = api.createShipmentDD([shipment])
+result = api.createShipmentDD(shipment)
+shipment_number = result[:shipment_number]
+label_url = result[:label_url] # Or result[:xml_label] in case XML label was set in the options
 ```
 
-The result contains the "shipment_number", as well as the "label_url" (or the "xml_label" when it was specified as repsonse type)
+### Delete a shipment
+
+You can create and delete shipments as much as you like, they will not get into the "real" DHL system until you manifest them.
+To delete a shipment call deleteShipmentDD with the shipment number for a non-manifested shipment:
+
+```ruby
+api.deleteShipmentDD(shipment_number)
+```
+
+### Manifesting a shipment
+
+A shipment created in Intraship is only transferred to the "real" DHL systems after the shipment is manifested.
+If "manifestShipment" is not called manually, it should be automatically manifested after the time that is configured in the Intraship backend.
+To manifest the shipment manually call:
+
+```ruby
+api.doManifestDD(shipment_number)
+```
+
+*Note that the label has to be downloaded at least once, or Intraship will reply with status code 2030: shipment not printed*
+
+### Booking a pickup
+
+*The "book pickup"-call is defined in the Intraship API and also supported in this gem, but not implemented and supported in Intraship itself*
+
+The API will complain if no "contact orderer" is specified, although it's supposed to be optional. Furthermore issuing a "book pickup" call will yield a  "Please select a product in the shipment details." (1102) error, although the call is completely valid.
 
 ## Contributing
 

data/dhl-intraship.gemspec

@@ -8,9 +8,9 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{This wraps the DHL Intraship SOAP Interface for creating shipments}
   gem.homepage      = "https://github.com/teameurope/dhl-intraship"
 
-  gem.add_dependency "savon", "~> 0.9.9"
-  gem.add_development_dependency "rspec", "~> 2.9"
-  gem.add_development_dependency "savon_spec", "~> 0.1.6"
+  gem.add_dependency "savon", "~> 1.1.0"
+  gem.add_development_dependency "rspec", "~> 2.11.0"
+  gem.add_development_dependency "savon_spec", "~> 1.3.0"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/dhl-intraship/address.rb

@@ -2,7 +2,7 @@ module Dhl
   module Intraship
     class Address
       attr_accessor :street, :house_number, :street_additional, :street_additional_above_street,
-      :zip, :city, :country_code, :email
+      :zip, :city, :country_code, :email, :phone
 
       def initialize(attributes = {})
         self.street_additional_above_street = true
@@ -27,17 +27,6 @@ module Dhl
         @country_code = country_code
       end
 
-      # Note: DHL rejects valid email addresses containing the + sign
-      def email=(email)
-        split = email.split('@')
-        local_part = split[0]
-        if local_part.include?('+')
-          local_part = local_part.split('+')[0]
-        end
-
-        @email = "#{local_part}@#{split[1]}"
-      end
-      
       def append_to_xml(xml)
         xml.Company do |xml|
           company_xml(xml)
@@ -61,6 +50,7 @@ module Dhl
           end
         end
         xml.Communication do |xml|
+          xml.cis(:phone, self.phone) unless self.phone.blank?
           xml.cis(:email, self.email) unless self.email.blank?
           communication_xml(xml)
         end

data/lib/dhl-intraship/api.rb

@@ -15,38 +15,38 @@ module Dhl
       INTRASHIP_TEST_WSDL = "http://test-intraship.dhl.com/ws/1_0/ISService/DE.wsdl"
       INTRASHIP_TEST_ENDPOINT = "http://test-intraship.dhl.com/ws/1_0/de/ISService"
 
-       def initialize(config, options = {})
-         raise "User must be specified" if config[:user].nil?
-         raise "Signature (password) must be specified" if config[:signature].nil?
-         raise "EKP (first part of the DHL account number) must be specified" if config[:ekp].nil?
-
-         if options[:test]
-            wsdl_url = INTRASHIP_TEST_WSDL
-            endpoint = INTRASHIP_TEST_ENDPOINT
-         else
-            wsdl_url = INTRASHIP_WSDL
-            endpoint = INTRASHIP_ENDPOINT
-         end
-
-         @user = config[:user]
-         @signature = config[:signature]
-         @ekp = config[:ekp]
-         @procedure_id = config[:procedure_id] || '01'
-         @partner_id = config[:partner_id] || '01'
-
-         @options = options
-         @client = ::Savon::Client.new do
-           wsdl.document = wsdl_url
-           wsdl.endpoint = endpoint
-         end
-       end
+      def initialize(config, options = {})
+        raise "User must be specified" if config[:user].nil?
+        raise "Signature (password) must be specified" if config[:signature].nil?
+        raise "EKP (first part of the DHL account number) must be specified" if config[:ekp].nil?
+
+        if options[:test]
+          wsdl_url = INTRASHIP_TEST_WSDL
+          endpoint = INTRASHIP_TEST_ENDPOINT
+        else
+          wsdl_url = INTRASHIP_WSDL
+          endpoint = INTRASHIP_ENDPOINT
+        end
+
+        @user = config[:user]
+        @signature = config[:signature]
+        @ekp = config[:ekp]
+        @procedure_id = config[:procedure_id] || '01'
+        @partner_id = config[:partner_id] || '01'
+
+        @options = options
+        @client = ::Savon::Client.new do
+          wsdl.document = wsdl_url
+          wsdl.endpoint = endpoint
+        end
+      end
 
       def createShipmentDD(shipments)
         begin
           shipments = [shipments] unless shipments.respond_to?('each')
 
           # For some reason the class instance variables are not accessible inside of the request block
-	  ekp = @ekp
+          ekp = @ekp
           partner_id = @partner_id
 
           returnXML = @config && @config[:label_response_type] && @config[:label_response_type] == :xml;
@@ -58,10 +58,7 @@ module Dhl
                 end
                 xml.soapenv(:Body) do |xml|
                   xml.de(:"CreateShipmentDDRequest") do |xml|
-                    xml.cis(:Version) do |xml|
-                      xml.cis(:majorRelease, '1')
-                      xml.cis(:minorRelease, '0')
-                    end
+                    add_version_information(xml)
                     xml.ShipmentOrder do |xml|
                       xml.SequenceNumber('1')
                       shipments.each do |shipment|
@@ -96,39 +93,80 @@ module Dhl
 
       def deleteShipmentDD(shipment_number)
         begin
-          result = @client.request "de:DeleteShipmentDDRequest" do
+          result = do_simple_shipment_number_only_request('DeleteShipmentDDRequest', shipment_number)
+          r = result.to_hash[:delete_shipment_response]
+
+          # Return true if successful
+          raise "Intraship call failed with code #{r[:status][:status_code]}: #{r[:status][:status_message]} (Status messages: #{r[:deletion_state][:status].to_s})" unless r[:status][:status_code] == '0'
+
+          true
+        rescue Savon::Error => error
+          raise error
+        end
+      end
+
+      def doManifestDD(shipment_number)
+        begin
+          result = do_simple_shipment_number_only_request('DoManifestDDRequest', shipment_number)
+          r = result.to_hash[:do_manifest_response]
+
+          raise "Intraship call failed with code #{r[:status][:status_code]}: #{r[:status][:status_message]} (Status messages: #{r[:manifest_state][:status].to_s})" unless r[:status][:status_code] == '0'
+
+          true
+        rescue Savon::Error => error
+          raise error
+        end
+      end
+
+      def bookPickup(booking_information, pickup_address, contact_orderer = nil)
+        warn "DHL does not yet support the book pickup call"
+
+        raise "Booking information must be of type BookingInformation! Is #{booking_information}" unless booking_information.kind_of? BookingInformation
+        raise "Pickup_address must be of type Address! Is #{pickup_address.class}" unless pickup_address.kind_of? Address
+        raise "Contact orderer must be of type Address! Is #{contact_orderer.class}" unless contact_orderer.nil? or contact_orderer.kind_of? Address
+
+        if booking_information.account.nil? and [:DDI, :DDN].includes?(booking_information.product_id)
+          booking_information.account = @ekp
+        end
+        if booking_information.attendance.nil?
+          booking_information.attendance = @partner_id
+        end
+
+        begin
+          result = @client.request "de:BookPickupRequest" do
             soap.xml do |xml|
               xml.soapenv(:Envelope, DEFAULT_NAMESPACES) do |xml|
                 xml.soapenv(:Header) do |xml|
                   append_default_header_to_xml(xml)
                 end
                 xml.soapenv(:Body) do |xml|
-                  xml.de(:"DeleteShipmentDDRequest") do |xml|
-                    xml.cis(:Version) do |xml|
-                      xml.cis(:majorRelease, '1')
-                      xml.cis(:minorRelease, '0')
-                    end
-                    xml.ShipmentNumber do |xml|
-                      xml.cis(:shipmentNumber, shipment_number)
+                  xml.de(:"BookPickupRequest") do |xml|
+                    add_version_information(xml)
+                    booking_information.append_to_xml(xml)
+                    xml.PickupAddress do |xml|
+                      pickup_address.append_to_xml(xml)
                     end
+                    xml.ContactOrderer do |xml|
+                      contact_orderer.append_to_xml(xml)
+                    end unless contact_orderer.nil?
                   end
                 end
               end
-	    end
+            end
           end
-          r = result.to_hash[:delete_shipment_response]
+          r = result.to_hash[:book_pickup_response]
 
-	  # Return true if successful
-          raise "Intraship call failed with code #{r[:status][:status_code]}: #{r[:status][:status_message]} (Status messages: #{r[:deletion_state][:status].to_s})" unless r[:status][:status_code] == '0'
+          raise "Intraship call failed with code #{r[:status][:status_code]}: #{r[:status][:status_message]}" unless r[:status][:status_code] == '0'
 
-	  true
-	rescue Savon::Error => error
+          r[:confirmation_number]
+        rescue Savon::Error => error
           raise error
         end
       end
 
-protected
-      def append_default_header_to_xml(xml)
+      protected
+
+        def append_default_header_to_xml(xml)
           # For some reason the class instance variables are not accessible inside of the request block
           user = @user
           signature = @signature
@@ -142,7 +180,34 @@ protected
             xml.cis(:accountNumber, "#{ekp}|#{procedure_id}|#{partner_id}")
             xml.cis(:type, '0')
           end
-      end
+        end
+
+        def add_version_information(xml)
+          xml.cis(:Version) do |xml|
+            xml.cis(:majorRelease, '1')
+            xml.cis(:minorRelease, '0')
+          end
+        end
+
+        def do_simple_shipment_number_only_request(request_name, shipment_number)
+          @client.request "de:#{request_name}" do
+            soap.xml do |xml|
+              xml.soapenv(:Envelope, DEFAULT_NAMESPACES) do |xml|
+                xml.soapenv(:Header) do |xml|
+                  append_default_header_to_xml(xml)
+                end
+                xml.soapenv(:Body) do |xml|
+                  xml.de(request_name.to_sym) do |xml|
+                    add_version_information(xml)
+                    xml.ShipmentNumber do |xml|
+                      xml.cis(:shipmentNumber, shipment_number)
+                    end
+                  end
+                end
+              end
+            end
+          end
+        end
     end
   end
 end

data/lib/dhl-intraship/booking_information.rb

@@ -0,0 +1,46 @@
+module Dhl
+  module Intraship
+    class BookingInformation
+      attr_accessor :product_id, :pickup_date, :ready_by_time, :closing_time, :remark, :attendance, :pickup_location, :amount_of_pieces, :amount_of_pallets,
+        :weight_in_kg, :count_of_shipments, :total_volume_weight, :max_length_in_cm, :max_width_in_cm, :max_height_in_cm, :account
+
+      VALID_PRODUCT_IDS = [:TDI, :TDN, :DDI, :DDN]
+
+      def initialize(attributes = {})
+        self.product_id = :DDN
+        attributes.each do |key, value|
+          setter = :"#{key.to_s}="
+          if self.respond_to?(setter)
+            self.send(setter, value)
+          end
+        end
+      end
+
+      def product_id=(new_product_id)
+        raise "Invalid product id '#{new_product_id}'. Please use one of #{VALID_PRODUCT_IDS}" unless VALID_PRODUCT_IDS.include?(new_product_id)
+        @product_id = new_product_id
+      end
+
+      def append_to_xml(xml)
+        product_id = @product_id
+        xml.BookingInformation do |xml|
+          xml.ProductID(product_id)
+          xml.Account(account)
+          xml.Attendance(attendance) if attendance
+          xml.PickupDate(pickup_date)
+          xml.ReadyByTime(ready_by_time)
+          xml.ClosingTime(closing_time)
+          xml.PickupLocation(pickup_location) if pickup_location
+          xml.AmountOfPieces(amount_of_pieces) if amount_of_pieces
+          xml.AmountOfPallets(amount_of_pallets) if amount_of_pallets
+          xml.WeightInKG(weight_in_kg) if weight_in_kg
+          xml.CountOfShipments(count_of_shipments) if count_of_shipments
+          xml.TotalVolumeWeight(total_volume_weight) if total_volume_weight
+          xml.MaxLengthInCM(max_height_in_cm) if max_length_in_cm
+          xml.MaxWidthInCM(max_width_in_cm) if max_width_in_cm
+          xml.MaxHeightInCM(max_height_in_cm) if max_length_in_cm
+        end
+      end
+    end
+  end
+end

data/lib/dhl-intraship/version.rb

@@ -1,5 +1,5 @@
 module Dhl
   module Intraship
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

data/spec/dhl-intraship/book_pickup_spec.rb

@@ -0,0 +1,62 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+module Dhl
+  module Intraship
+
+ERROR_PICKUP_RESPONSE = <<EOS
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">
+   <soapenv:Body>
+      <ns4:BookPickupResponse xmlns:ns4="http://de.ws.intraship">
+         <Version xmlns="http://dhl.de/webservice/cisbase">
+            <majorRelease>1</majorRelease>
+            <minorRelease>0</minorRelease>
+            <build>14</build>
+         </Version>
+         <Status>
+            <StatusCode>2120</StatusCode>
+            <StatusMessage>Please select a product in the shipment details. | Ordereraddress company name required | Ordereraddress ZIP required | The current ZIP format doesn´t correspond to the required format of the country of receiver. Further informations will be available in the online-help. | House number is missing at the Ordereraddress. | Ordereraddress phone required | Ordereraddress contact required | Street is missing at the Ordereraddress. | House number is missing at the Ordereraddress. | Ordereraddress city required</StatusMessage>
+         </Status>
+      </ns4:BookPickupResponse>
+   </soapenv:Body>
+</soapenv:Envelope>
+EOS
+
+PICKUP_RESPONSE = <<EOS
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">
+   <soapenv:Body>
+      <ns2:BookPickupResponse xmlns:ns2="http://de.ws.intraship">
+         <Version xmlns="http://dhl.de/webservice/cisbase">
+            <majorRelease>1</majorRelease>
+            <minorRelease>0</minorRelease>
+            <build>11</build>
+         </Version>
+         <Status>
+            <StatusCode>0</StatusCode>
+            <StatusMessage>We have received your Individual Collection DHL Parcel under order number '123'.</StatusMessage>
+         </Status>
+         <ConfirmationNumber>123</ConfirmationNumber>
+      </ns2:BookPickupResponse>
+   </soapenv:Body>
+</soapenv:Envelope>
+EOS
+
+    describe API do
+      before(:each) do
+        config = {user: 'user', signature: 'signature', ekp: 'ekp12345'}
+        options = {test: true}
+        @api = API.new(config, options)
+        @booking_information = BookingInformation.new(pickup_date: Date.today, ready_by_time: '10:00', closing_time: '14:00')
+      end
+
+      it "should raise an exception on a failed call" do
+        savon.expects("de:BookPickupRequest").returns( code: 200, headers: {},body: ERROR_PICKUP_RESPONSE )
+
+        expect { @api.bookPickup(@booking_information, CompanyAddress.new) }.should raise_error
+      end
+
+    end
+
+  end
+end

data/spec/dhl-intraship/create_shipment_dd_spec.rb

@@ -47,7 +47,7 @@ EOS
 
         shipment = Shipment.new(shipment_date: Date.today + 1)
 
-        sender = CopmanyAddress.new
+        sender = CompanyAddress.new
         receiver = PersonAddress.new
         shipment.receiver_address=receiver
         shipment.sender_address=sender

data/spec/dhl-intraship/do_manifest_dd_spec.rb

@@ -0,0 +1,81 @@
+require 'spec_helper'
+
+module Dhl
+  module Intraship
+
+ERROR_MANIFEST_RESPONSE = <<EOS
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">
+   <soapenv:Body>
+      <ns4:DoManifestResponse xmlns:ns4="http://de.ws.intraship">
+         <Version xmlns="http://dhl.de/webservice/cisbase">
+            <majorRelease>1</majorRelease>
+            <minorRelease>0</minorRelease>
+            <build>14</build>
+         </Version>
+         <Status>
+            <StatusCode>1050</StatusCode>
+            <StatusMessage>at least on shipment could not be manifested</StatusMessage>
+         </Status>
+         <ManifestState>
+            <ShipmentNumber>
+               <ns1:shipmentNumber xmlns:ns1="http://dhl.de/webservice/cisbase">123</ns1:shipmentNumber>
+            </ShipmentNumber>
+            <Status>
+               <StatusCode>2030</StatusCode>
+               <StatusMessage>shipment not printed</StatusMessage>
+            </Status>
+         </ManifestState>
+      </ns4:DoManifestResponse>
+   </soapenv:Body>
+</soapenv:Envelope>
+EOS
+
+MANIFEST_RESPONSE = <<EOS
+    <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">
+    <soapenv:Body>
+    <ns4:DoManifestResponse xmlns:ns4="http://de.ws.intraship">
+    <Version xmlns="http://dhl.de/webservice/cisbase">
+    <majorRelease>1</majorRelease>
+            <minorRelease>0</minorRelease>
+    <build>14</build>
+         </Version>
+    <Status>
+    <StatusCode>0</StatusCode>
+            <StatusMessage>ok</StatusMessage>
+    </Status>
+         <ManifestState>
+            <ShipmentNumber>
+               <ns1:shipmentNumber xmlns:ns1="http://dhl.de/webservice/cisbase">123</ns1:shipmentNumber>
+            </ShipmentNumber>
+            <Status>
+               <StatusCode>0</StatusCode>
+               <StatusMessage>ok</StatusMessage>
+            </Status>
+         </ManifestState>
+      </ns4:DoManifestResponse>
+   </soapenv:Body>
+</soapenv:Envelope>
+EOS
+
+    describe API do
+      before(:each) do
+        config = {user: 'user', signature: 'signature', ekp: 'ekp12345'}
+        options = {test: true}
+        @api = API.new(config, options)
+      end
+
+
+      it "should raise an exception on a failed call" do
+        savon.expects("de:DoManifestDDRequest").returns( code: 200, headers: {},body: ERROR_MANIFEST_RESPONSE )
+
+        expect { @api.doManifestDD("123") }.should raise_error
+      end
+
+      it "should return true on successful call" do
+        savon.expects("de:DoManifestDDRequest").returns( code: 200, headers: {},body: MANIFEST_RESPONSE )
+        @api.doManifestDD("123").should be_true
+      end
+    end
+
+  end
+end

data/spec/spec_helper.rb

@@ -1,9 +1,9 @@
 require 'savon/spec'
-require 'dhl-intraship/api'
-require 'dhl-intraship/shipment'
-require 'dhl-intraship/address'
-require 'dhl-intraship/person_address'
-require 'dhl-intraship/company_address'
+
+Dir[File.join(File.dirname(__FILE__), '../lib/dhl-intraship/*.rb')].each { |f| require f }
+
+# Prevent warnings: http://stackoverflow.com/questions/5009838/httpi-tried-to-user-the-httpi-adapter-error-using-savon-soap-library
+HTTPI.log = false
 
 RSpec.configure do |config|
   config.include Savon::Spec::Macros

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dhl-intraship
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-26 00:00:00.000000000Z
+date: 2012-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.9
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.9
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: 2.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: savon_spec
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 1.3.0
 description: A simple gem to access the DHL Intraship API
 email:
 - a.kops@teameurope.net
@@ -75,14 +75,16 @@ files:
 - lib/dhl-intraship.rb
 - lib/dhl-intraship/address.rb
 - lib/dhl-intraship/api.rb
+- lib/dhl-intraship/booking_information.rb
 - lib/dhl-intraship/company_address.rb
 - lib/dhl-intraship/person_address.rb
 - lib/dhl-intraship/product_code.rb
 - lib/dhl-intraship/shipment.rb
 - lib/dhl-intraship/version.rb
-- spec/dhl-intraship/address_spec.rb
+- spec/dhl-intraship/book_pickup_spec.rb
 - spec/dhl-intraship/create_shipment_dd_spec.rb
 - spec/dhl-intraship/delete_shipment_dd_spec.rb
+- spec/dhl-intraship/do_manifest_dd_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/teameurope/dhl-intraship
 licenses: []
@@ -104,12 +106,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.18
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: This wraps the DHL Intraship SOAP Interface for creating shipments
 test_files:
-- spec/dhl-intraship/address_spec.rb
+- spec/dhl-intraship/book_pickup_spec.rb
 - spec/dhl-intraship/create_shipment_dd_spec.rb
 - spec/dhl-intraship/delete_shipment_dd_spec.rb
+- spec/dhl-intraship/do_manifest_dd_spec.rb
 - spec/spec_helper.rb

data/spec/dhl-intraship/address_spec.rb

@@ -1,16 +0,0 @@
-require 'spec_helper'
-
-module Dhl
-  module Intraship
-
-    describe Address do
-      before{@address = Address.new}
-
-      it "should remove the part after a + from the email address" do
-        @address.email = "test+part@teameurope.net"
-        @address.email.should == "test@teameurope.net"
-      end
-
-    end
-  end
-end