dhl-intraship 0.3.0 → 0.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 807f3bd9fa9722dc4516a4fe4b8aeaecdc9be281
+  data.tar.gz: 35c15d6d91b19b5ba137b0a8802201271a2e2381
+SHA512:
+  metadata.gz: d5692e9baf56a22c1841ce7517e7e197362f78454ecb3c66b03878f5df7c005c9dd0e00209acea55d5bc10a23de629316c58b43a3ba1d7e7b197e47d35e1ad4d
+  data.tar.gz: 2b1ac932bae07c995c25ea8b46a86b48154fcee3dbfc6e9ad278f7e23d4a1314640419b7c56368936cc1062d5a37ad2de8e628108683f63472baa470f097b5b9

data/README.md

@@ -28,19 +28,22 @@ api = Dhl::Intraship::API.new(config, options)
 Config is the following hash:
 
 ```ruby
-config = {user: 'your Intraship API user name', #mandatory
-          signature: 'Your Intraship API user password', #mandatory
-          ekp: 'Your DHL EKP (first part of your DHL Account number)', #mandatory
-          procedure_id: 'The prodedureId (second part of your DHL Account number)', #optional, defaults to '01'
-          partner_id: 'The partnerId (=attendance, third part of your DHL Account number)' #optional, defaults to '01'
-          }
+config = {
+  user: 'your Intraship API user name', #mandatory
+  signature: 'Your Intraship API user password', #mandatory
+  ekp: 'Your DHL EKP (first part of your DHL Account number)', #mandatory
+  procedure_id: 'The prodedureId (second part of your DHL Account number)', #optional, defaults to '01'
+  partner_id: 'The partnerId (=attendance, third part of your DHL Account number)' #optional, defaults to '01'
+}
 ```
 
 Options is an optional parameter and can contain the following parameters:
 
 ```ruby
-options = {test: true, # If test is set, all API calls go against the Intraship test system
-           label_response_type: :xml} # If it's set to XML the createShipment-Calls return the label data as XML instead of the PDF-Link
+options = {
+ test: true, # If test is set, all API calls go against the Intraship test system
+ label_response_type: :xml # If it's set to XML the createShipment-Calls return the label data as XML instead of the PDF-Link
+}
 ```
 
 ### Create a shipment
@@ -49,43 +52,71 @@ To create a shipment to DHL you need to create it first
 
 
 ```ruby
-sender_address = Dhl::Intraship::CompanyAddress.new(company: 'Team Europe Ventures',
-                                                    contact_person: 'John Smith',
-                                                    street: 'Mohrenstraße',
-                                                    house_number: '60',
-                                                    zip: '10117',
-                                                    city: 'Berlin',
-                                                    country_code: 'DE',
-                                                    email: 'info@teameurope.net')
-receiver_address = Dhl::Intraship::PersonAddress.new(firstname: 'John',
-                                                     lastname: 'Doe',
-                                                     street: 'Mainstreet',
-                                                     house_number: '10',
-                                                     street_additional: 'Appartment 2a',
-                                                     zip: '90210',
-                                                     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
-shipment = Dhl::Intraship::Shipment.new(sender_address: sender_address,
-                                        receiver_address: receiver_address,
-                                        shipment_date: Date.today,
-                                        weight: 2,
-                                        length: 30,
-                                        height:15,
-                                        width: 25)
+sender_address =
+ Dhl::Intraship::CompanyAddress.new(company: 'Team Europe Ventures',
+                                    contact_person: 'John Smith',
+                                    street: 'Mohrenstraße',
+                                    house_number: '60',
+                                    zip: '10117',
+                                    city: 'Berlin',
+                                    country_code: 'DE',
+                                    email: 'info@teameurope.net')
+
+receiver_address =
+  Dhl::Intraship::PersonAddress.new(firstname: 'John',
+                                    lastname: 'Doe',
+                                    street: 'Mainstreet',
+                                    house_number: '10',
+                                    street_additional: 'Appartment 2a',
+                                    zip: '90210',
+                                    city: 'Springfield',
+                                    country_code: 'DE',
+                                    email: 'john.doe@example.com')
+
+# Use can use multiple parcels per shipment. Note that the weight
+# parameter is in kg and the length/height/width in cm
+shipment_item =
+  Dhl::Intraship::ShipmentItem.new(weight: 3,
+                                   length: 120,
+                                   width:  60,
+                                   height: 60)
+
+shipment =
+  Dhl::Intraship::Shipment.new(sender_address: sender_address,
+                               receiver_address: receiver_address,
+                               shipment_items: shipment_item # give array for multiple parcel shipment
+                               shipment_date: Date.today)
 ```
 
-Beware, that due to DHL Intraship restrictions, the sender address must be a
-CompanyAddress and requires a contact_person.
-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)
+Beware, that due to DHL Intraship restrictions, the sender address
+must be a CompanyAddress and requires a contact_person.  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)
 shipment_number = result[:shipment_number]
 label_url = result[:label_url] # Or result[:xml_label] in case XML label was set in the options
 ```
+#### Deliver DHL Domestic Express Shipments
+
+If your DHL Intraship Account can deliver DHL Express shipments, you have to do the following
+
+```ruby
+shipment.product_code = Dhl::Intraship::ProductCode::DHL_DOMESTIC_EXPRESS # will set the product code to EXP
+express_service = Dhl::Intraship::DhlExpressService.new(Dhl::Intraship::DhlExpressService::EXPRESS1200)
+# You can choose between following possible service options:
+# DeliveryOnTime DeliveryEarly Express0900 Express1000 Express1200 DeliveryAfternoon DeliveryEvening ExpressSaturday ExpressSunday
+# If you are using the DeliveryOnTime service, you have to set the delivery time (format 'hh:mm'):
+express_service = Dhl::Intraship::DhlExpressService.new(Dhl::Intraship::DhlExpressService::DELIVERY_ON_TIME, '14:00')
+shipment.add_service(express_service)
+```
+
+If the DHL Intraship Webservice returns: `1102 - Service 'SERVICE_ERT'
+is not allowed for productcode 'EXP'`
+your intraship account have not enough permissions to deliver 
+express shipments (maybe also multi parcel shipment is not permitted).
 
 #### Add cash on delivery
 

data/lib/dhl-intraship.rb

@@ -5,7 +5,12 @@ require "dhl-intraship/person_address"
 require "dhl-intraship/company_address"
 require "dhl-intraship/packstation_address"
 require "dhl-intraship/shipment"
+require "dhl-intraship/shipment_item"
 require "dhl-intraship/product_code"
+require "dhl-intraship/booking_information"
 require "dhl-intraship/bankdata"
 require "dhl-intraship/service"
-require "dhl-intraship/service/cod_service"
+require "dhl-intraship/service/cod_service"
+require "dhl-intraship/service/dhl_paket_multipack_service"
+require "dhl-intraship/service/dhl_express_service"
+require "dhl-intraship/service/higher_insurance_service"

data/lib/dhl-intraship/product_code.rb

@@ -6,13 +6,15 @@ module Dhl
       WORLD_PACKAGE = 'BPI'
       DHL_EURO_PACKAGE = 'EPI'
       DHL_EURO_PLUS = 'EUP'
+      DHL_DOMESTIC_EXPRESS = 'EXP'
 
       # Time definite product codes
       DOMESTIC_EXPRESS = 'DXM'
       STARTDAY_EXPRESS = 'TDK'
       DHL_EXPRESS_WORLDWIDE = 'WPX'
 
-      VALID_PRODUCT_CODES = [DHL_PACKAGE, WORLD_PACKAGE, DHL_EURO_PACKAGE, DHL_EURO_PLUS, DOMESTIC_EXPRESS, STARTDAY_EXPRESS, DHL_EXPRESS_WORLDWIDE]
+      VALID_PRODUCT_CODES = [DHL_PACKAGE, WORLD_PACKAGE, DHL_EURO_PACKAGE, DHL_EURO_PLUS, DHL_DOMESTIC_EXPRESS,
+                             DOMESTIC_EXPRESS, STARTDAY_EXPRESS, DHL_EXPRESS_WORLDWIDE]
     end
   end
 end

data/lib/dhl-intraship/service/dhl_express_service.rb

@@ -0,0 +1,45 @@
+module Dhl
+  module Intraship
+    class DhlExpressService < Service
+
+      # Bundles following services for domestic time-definite products
+      # offered by DHL Express. One of the services must be chosen, if
+      # this service bundle is invoked
+
+      DELIVERY_ON_TIME   = 'DeliveryOnTime'
+      DELIVERY_EARLY     = 'DeliveryEarly'
+      EXPRESS0900        = 'Express0900'
+      EXPRESS1000        = 'Express1000'
+      EXPRESS1200        = 'Express1200'
+      DELIVERY_AFTERNOON = 'DeliveryAfternoon'
+      DELIVERY_EVENING   = 'DeliveryEvening'
+      EXPRESS_SATURDAY   = 'ExpressSaturday'
+      EXPRESS_SUNDAY     = 'Expresssunday'
+
+      VALID_EXPRESS_SERVICES = [DELIVERY_ON_TIME, DELIVERY_EARLY, EXPRESS0900, EXPRESS1000, EXPRESS1200,
+                                DELIVERY_AFTERNOON, DELIVERY_EVENING, EXPRESS_SATURDAY, EXPRESS_SUNDAY]
+
+
+      def initialize(service, time = nil)
+        @service, @time = service, time
+        unless VALID_EXPRESS_SERVICES.include?(@service)
+          raise "No valid express service #{@service}"
+        end
+
+        if @service == DELIVERY_ON_TIME
+          raise "Time is missing while DeliveryOnTime is specified." if time.blank?
+          raise "Invalid time format (use hh::mm)." if time !~ /^\d\d:\d\d$/
+        end
+      end
+
+      def append_to_xml(xml)
+        xml.Service do |xml|
+          xml.ServiceGroupDateTimeOption do |xml|
+            xml.tag! @service, @time || 'True'
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/dhl-intraship/service/dhl_paket_multipack_service.rb

@@ -0,0 +1,15 @@
+module Dhl
+  module Intraship
+    class DhlPaketMultipackService < Service
+
+      def append_to_xml(xml)
+        xml.Service do |xml|
+          xml.ServiceGroupDHLPaket do |xml|
+            xml.Multipack 'True'
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/dhl-intraship/service/higher_insurance_service.rb

@@ -0,0 +1,26 @@
+module Dhl
+  module Intraship
+    class HigherInsuranceService < Service
+
+      def initialize(amount = 2500, currency = 'EUR')
+        @amount, @currency = amount, currency
+
+        unless [2500, 25000].include?(@amount)
+          raise 'The insurance amount have to be 2500 or 25000!'
+        end
+      end
+
+      def append_to_xml(xml)
+        xml.Service do |xml|
+          xml.ServiceGroupOther do |xml|
+            xml.HigherInsurance do |xml|
+              xml.InsuranceAmount(@amount)
+              xml.InsuranceCurrency(@currency)
+            end
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/dhl-intraship/shipment.rb

@@ -1,16 +1,26 @@
-require "dhl-intraship/product_code"
-
 module Dhl
   module Intraship
     class Shipment
-      PACKAGE_TYPE = 'PK'
 
-      attr_accessor :sender_address, :receiver_address, :shipment_date, :weight, :length, :height, :width, :product_code,
-                    :customer_reference, :services
+      attr_accessor :sender_address, :receiver_address, :shipment_date, :product_code,
+                    :customer_reference, :services, :shipment_items, :dhl_express_service
 
       def initialize(attributes = {})
         self.product_code = ProductCode::DHL_PACKAGE
         self.services = []
+        self.shipment_items = []
+
+        # If an initial shipment is given we have to create a new
+        # ShipmentItem (for backward compatibility). Maybe we can drop
+        # this in a new major release ...
+        if attributes.has_key?(:weight) or attributes.has_key?(:length) or
+            attributes.has_key?(:width) or attributes.has_key?(:height)
+          warn "[DEPRECATION] The single shipment constructor is deprecated, please pass in a ShipmentItem"
+          @shipment_items << ShipmentItem.new(attributes)
+        else
+          @shipment_items.push(*attributes.delete(:shipment_items))
+        end
+
         attributes.each do |key, value|
           setter = :"#{key.to_s}="
           if self.respond_to?(setter)
@@ -20,18 +30,30 @@ module Dhl
       end
 
       def add_service(newservice)
+        case newservice
+        when DhlExpressService
+          unless dhl_domestic_express?
+          end
+        end
         @services << newservice
       end
 
+      def add_shipment_item(shipment_item)
+        @shipment_items << shipment_item
+      end
+
       def product_code=(product_code)
         raise "No valid product code #{product_code}" unless ProductCode::VALID_PRODUCT_CODES.include?(product_code)
         @product_code = product_code
       end
 
       def append_to_xml(ekp, partner_id, xml)
-        raise "Shipment date must be set!" if shipment_date.nil?
-        raise "Sender address must be set!" if sender_address.nil?
-        raise "Receiver address must be set!" if sender_address.nil?
+        raise "Shipment date must be set!" if shipment_date.blank?
+        raise "Sender address must be set!" if sender_address.blank?
+        raise "Receiver address must be set!" if receiver_address.blank?
+
+        add_and_validate_service_dependencies
+
         xml.Shipment do |xml|
           xml.ShipmentDetails do |xml|
             xml.ProductCode(product_code)
@@ -41,12 +63,10 @@ module Dhl
               xml.cis(:partnerID, partner_id)
             end
             xml.CustomerReference(customer_reference) unless customer_reference.blank?
-            xml.ShipmentItem do |xml|
-              xml.WeightInKG(weight)
-              xml.LengthInCM(length) unless length.nil?
-              xml.WidthInCM(width) unless width.nil?
-              xml.HeightInCM(height) unless height.nil?
-              xml.PackageType(PACKAGE_TYPE)
+
+            # multiple parcels
+            shipment_items.each do |shipment_item|
+              shipment_item.append_to_xml(xml)
             end
             services.each do |service|
               service.append_to_xml(xml)
@@ -62,6 +82,40 @@ module Dhl
           end
         end
       end
+
+      private
+
+      def add_and_validate_service_dependencies
+        # for using multiple parcels for product code EPN or EXP there
+        # is an extra service ServiceGroupDHLPaket.Multipack that
+        # needs to be add
+        if add_dhl_paket_multipack_service?
+          add_service(DhlPaketMultipackService.new)
+        end
+
+        if dhl_domestic_express? and not has_service?(HigherInsuranceService)
+          # we also need a higher insurance service if not set already
+          add_service(HigherInsuranceService.new)
+        end
+
+        # check service constraints
+        if has_service?(DhlExpressService) and not dhl_domestic_express?
+          raise 'The DhlExpressService can only be add to DHL Domestic Express (EXP) shipments.'
+        end
+      end
+
+      def has_service?(service_class)
+        services.map(&:class).include?(service_class)
+      end
+
+      def dhl_domestic_express?
+        product_code == ProductCode::DHL_DOMESTIC_EXPRESS
+      end
+
+      def add_dhl_paket_multipack_service?
+        shipment_items.size > 1 and
+          ([ProductCode::DHL_DOMESTIC_EXPRESS, ProductCode::DHL_PACKAGE].include?(product_code))
+      end
     end
   end
 end

data/lib/dhl-intraship/shipment_item.rb

@@ -0,0 +1,32 @@
+module Dhl
+  module Intraship
+    class ShipmentItem
+
+      attr_accessor :weight, :length, :height, :width
+      attr_writer :package_type
+      def package_type
+        @package_type || 'PK'
+      end
+
+      def initialize(attributes = {})
+        attributes.each do |key, value|
+          setter = :"#{key.to_s}="
+          if self.respond_to?(setter)
+            self.send(setter, value)
+          end
+        end
+      end
+
+      def append_to_xml(xml)
+        xml.ShipmentItem do |xml|
+          xml.WeightInKG(weight)
+          xml.LengthInCM(length) unless length.nil?
+          xml.WidthInCM(width) unless width.nil?
+          xml.HeightInCM(height) unless height.nil?
+          xml.PackageType(package_type)
+        end
+      end
+
+    end
+  end
+end

data/lib/dhl-intraship/version.rb

@@ -1,5 +1,5 @@
 module Dhl
   module Intraship
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

data/spec/dhl-intraship/book_pickup_spec.rb

@@ -53,10 +53,10 @@ EOS
       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
+        expect { @api.bookPickup(@booking_information, CompanyAddress.new) }.to raise_error
       end
 
     end
 
   end
-end
+end

data/spec/dhl-intraship/create_shipment_dd_spec.rb

@@ -35,25 +35,63 @@ module Dhl
 </soapenv:Envelope>
 EOS
 
+
     describe API do
       before(:each) do
-        config = {user: 'user', signature: 'signature', ekp: 'ekp12345'}
-        options = {test: true}
+        savon.expects("de:CreateShipmentDDRequest").returns(code: 200, headers: {}, body: CREATE_RESPONSE)
+
+        config  = { user: 'user', signature: 'signature', ekp: 'ekp12345' }
+        options = { test: true }
         @api = API.new(config, options)
+        @shipment = Shipment.new(shipment_date:    Date.today + 1,
+                                 sender_address:   CompanyAddress.new,
+                                 receiver_address: PersonAddress.new,
+                                 shipment_items:   ShipmentItem.new(weight: 2.5, length: 11, width: 13, height: 3))
       end
 
       it "should create an API call" do
-        savon.expects("de:CreateShipmentDDRequest" ).returns( code: 200, headers: {},body: CREATE_RESPONSE )
+        @api.createShipmentDD(@shipment).should_not be_nil
+      end
 
-        shipment = Shipment.new(shipment_date: Date.today + 1)
+      it "should not add multipack service with only one shipment item" do
+        savon.expects('de:CreateShipmentDDRequest').with do |request|
+          request.soap.to_xml.should_not include('Multipack')
+        end.returns(code: 200, headers: {}, body: CREATE_RESPONSE)
 
-        sender = CompanyAddress.new
-        receiver = PersonAddress.new
-        shipment.receiver_address=receiver
-        shipment.sender_address=sender
+        @api.createShipmentDD(@shipment).should_not be_nil
+      end
 
-        @api.createShipmentDD(shipment).should_not be_nil
+      it "should add multipack service" do
+        @shipment.add_shipment_item(ShipmentItem.new(weight: 2.5, length: 11, width: 13, height: 3))
+        savon.expects('de:CreateShipmentDDRequest').with do |request|
+          request_xml = request.soap.to_xml
+          request_xml.should include('<ServiceGroupDHLPaket>')
+          request_xml.should include('<Multipack>True</Multipack>')
+        end.returns(code: 200, headers: {}, body: CREATE_RESPONSE)
+        @api.createShipmentDD(@shipment).should_not be_nil
       end
+
+      it "should add dhl express service with higher insurance server" do
+        dhl_express_service = DhlExpressService.new(DhlExpressService::DELIVERY_ON_TIME, '13:51')
+        @shipment.product_code = ProductCode::DHL_DOMESTIC_EXPRESS
+        @shipment.add_service(dhl_express_service)
+        savon.expects('de:CreateShipmentDDRequest').with do |request|
+          request_xml = request.soap.to_xml
+          request_xml.should include('<ServiceGroupDateTimeOption>')
+          request_xml.should include('<DeliveryOnTime>')
+          request_xml.should include('13:51')
+          request_xml.should include('<HigherInsurance>')
+          request_xml.should include('<InsuranceAmount>2500</InsuranceAmount>')
+        end.returns(code: 200, headers: {}, body: CREATE_RESPONSE)
+        @api.createShipmentDD(@shipment).should_not be_nil
+      end
+
+      it "should validate service dependencies" do
+        dhl_express_service = DhlExpressService.new(DhlExpressService::DELIVERY_ON_TIME, '13:51')
+        @shipment.add_service(dhl_express_service)
+        expect { @api.createShipmentDD(@shipment) }.to raise_error(RuntimeError, 'The DhlExpressService can only be add to DHL Domestic Express (EXP) shipments.')
+      end
+
     end
 
   end

data/spec/dhl-intraship/delete_shipment_dd_spec.rb

@@ -56,22 +56,21 @@ DELETE_RESPONSE = <<EOS
 EOS
 
     describe API do
-      before(:each) do
-        config = {user: 'user', signature: 'signature', ekp: 'ekp12345'}
-        options = {test: true}
-        @api = API.new(config, options)
+      before do
+        @config  = { user: 'user', signature: 'signature', ekp: 'ekp12345' }
+        @options = { test: true }
       end
 
       it "should raise an exception on a failed call" do
-        savon.expects("de:DeleteShipmentDDRequest").returns( code: 200, headers: {},body: ERROR_DELETE_RESPONSE )
-
-        expect { @api.deleteShipmentDD("123") }.should raise_error
+        savon.expects("de:DeleteShipmentDDRequest").returns(code: 200, headers: {}, body: ERROR_DELETE_RESPONSE)
+        api = API.new(@config, @options)
+        expect { api.deleteShipmentDD("123") }.to raise_error
       end
 
       it "should return true on successful call" do
-        savon.expects("de:DeleteShipmentDDRequest").returns( code: 200, headers: {},body: DELETE_RESPONSE )
-
-	@api.deleteShipmentDD("123").should be_true
+        savon.expects("de:DeleteShipmentDDRequest").returns(code: 200, headers: {}, body: DELETE_RESPONSE)
+        api = API.new(@config, @options)
+        api.deleteShipmentDD("123").should be_true
       end
     end
 

data/spec/dhl-intraship/dhl_express_service_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+module Dhl
+  module Intraship
+
+    describe DhlExpressService do
+      it "should build object" do
+        DhlExpressService.new(DhlExpressService::EXPRESS1200).should_not be_nil
+      end
+
+      it "should raise exception if invalid time given" do
+        expect { DhlExpressService.new('invalid_option') }.to raise_error(RuntimeError, /No valid express service/)
+      end
+
+      it "should raise exception if invalid time given" do
+        expect { DhlExpressService.new(DhlExpressService::DELIVERY_ON_TIME, '13:AD') }.to raise_error(RuntimeError, 'Invalid time format (use hh::mm).')
+      end
+    end
+
+  end
+end

data/spec/dhl-intraship/do_manifest_dd_spec.rb

@@ -68,7 +68,7 @@ EOS
       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
+        expect { @api.doManifestDD("123") }.to raise_error
       end
 
       it "should return true on successful call" do
@@ -78,4 +78,4 @@ EOS
     end
 
   end
-end
+end

data/spec/spec_helper.rb

@@ -1,10 +1,10 @@
 require 'savon/spec'
 
-Dir[File.join(File.dirname(__FILE__), '../lib/dhl-intraship/*.rb')].each { |f| require f }
+require "dhl-intraship"
 
 # 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
-end
+end

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: dhl-intraship
 version: !ruby/object:Gem::Version
-  version: 0.3.0
-  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors:
 - Alexander Kops
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-08 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: savon_spec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.0
 description: A simple gem to access the DHL Intraship API
@@ -66,7 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -83,40 +76,45 @@ files:
 - lib/dhl-intraship/product_code.rb
 - lib/dhl-intraship/service.rb
 - lib/dhl-intraship/service/cod_service.rb
+- lib/dhl-intraship/service/dhl_express_service.rb
+- lib/dhl-intraship/service/dhl_paket_multipack_service.rb
+- lib/dhl-intraship/service/higher_insurance_service.rb
 - lib/dhl-intraship/shipment.rb
+- lib/dhl-intraship/shipment_item.rb
 - lib/dhl-intraship/version.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/dhl_express_service_spec.rb
 - spec/dhl-intraship/do_manifest_dd_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/teameurope/dhl-intraship
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: This wraps the DHL Intraship SOAP Interface for creating shipments
 test_files:
 - 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/dhl_express_service_spec.rb
 - spec/dhl-intraship/do_manifest_dd_spec.rb
 - spec/spec_helper.rb