dhl-get_quote 0.4.27 → 0.5.0

data/README.md

@@ -127,18 +127,19 @@ You can also get the value directly:
 
 #### Setting Duty
 
-You can toggle whether or not a shipment is dutiable with the #dutiable!() and #not_dutiable!() methods.
+! Note, this a breaking change from 0.4.x
+
+To set the duty on a shipment, use the dutiable!() method. It accepts the numeric value and an optional currency code. If not specified, the currency code default to US Dollars (USD).
 
 ```ruby
-  request.dutiable!
-  request.not_dutiable!
+  # set the dutiable value at $100 in US Dollars
+  request.dutiable!(100.00, 'USD')
 ```
 
-You can absolutely set the dutiable stage with the #dutiable() method:
+To remove a previously set duty, use the not_dutiable!() method.
 
 ```ruby
-  request.dutiable(true)
-  request.dutiable(false)
+  request.not_dutiable!
 ```
 
 You can query the current state with #dutiable?:

data/dhl-get_quote.gemspec

@@ -24,6 +24,11 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rake', '10.0.4'
   gem.add_development_dependency 'rspec', '2.13.0'
   gem.add_development_dependency 'rspec-must', '0.0.1'
-  gem.add_development_dependency 'debugger'
+  gem.add_development_dependency 'timecop', '~> 0.6.1'
+  # gem.add_development_dependency 'debugger'
+
+  if Dhl::GetQuote::PostInstallMessage
+    gem.post_install_message = Dhl::GetQuote::PostInstallMessage
+  end
 
 end

data/lib/dhl-get_quote.rb

@@ -1,3 +1,5 @@
+require 'date'
+
 require "dhl/get_quote/version"
 require "dhl/get_quote/helper"
 require "dhl/get_quote/errors"
@@ -44,13 +46,25 @@ class Dhl
       end
     end
 
-    def self.kilograms!
+    def self.metric_measurements!
       @@weight_unit = WEIGHT_UNIT_CODES[:kilograms]
+      @@dimensions_unit = DIMENSIONS_UNIT_CODES[:centimeters]
+    end
+
+    def self.us_measurements!
+      @@weight_unit = WEIGHT_UNIT_CODES[:pounds]
+      @@dimensions_unit = DIMENSIONS_UNIT_CODES[:inches]
+    end
+
+    def self.kilograms!
+      deprication_notice(:kilograms!, :metric)
+      metric_measurements!
     end
     def self.kilogrammes!; self.kilograms!; end
 
     def self.pounds!
-      @@weight_unit = WEIGHT_UNIT_CODES[:pounds]
+      deprication_notice(:pounds!, :us)
+      us_measurements!
     end
 
     def self.weight_unit
@@ -58,30 +72,20 @@ class Dhl
     end
 
     def self.centimeters!
-      @@dimensions_unit = DIMENSIONS_UNIT_CODES[:centimeters]
+      deprication_notice(:centimeters!, :metric)
+      metric_measurements!
     end
     def self.centimetres!; self.centimeters!; end
 
     def self.inches!
-      @@dimensions_unit = DIMENSIONS_UNIT_CODES[:inches]
+      deprication_notice(:inches!, :us)
+      us_measurements!
     end
 
     def self.dimensions_unit
       @@dimensions_unit
     end
 
-    def self.dutiable!
-      @@dutiable = true
-    end
-
-    def self.not_dutiable!
-      @@dutiable = false
-    end
-
-    def self.dutiable?
-      !!@@dutiable
-    end
-
     def self.set_defaults
       @@site_id = nil
       @@password = nil
@@ -90,6 +94,16 @@ class Dhl
       @@dutiable = false
       @@test_mode = false
     end
+
+    private
+
+    def self.deprication_notice(meth, m)
+      messages = {
+        :metric => "Method replaced by Dhl::GetQuote#metic_measurements!(). I am now setting your measurements to metric",
+        :us     => "Method replaced by Dhl::GetQuote#us_measurements!(). I am now setting your measurements to US customary",
+      }
+      puts "!!!! Method \"##{meth}()\" is depricated. #{messages[m.to_sym]}."
+    end
   end
 end
 

data/lib/dhl/get_quote/errors.rb

@@ -9,5 +9,16 @@ class Dhl::GetQuote
   class Upstream < StandardError
     class UnknownError < Upstream; end
     class ValidationFailureError < Upstream; end
+    class ConditionError < Upstream
+      attr_reader :code, :message
+      def initialize(code, message)
+        @code = code
+        @message = message
+      end
+
+      def to_s
+        "#{code}: #{message}"
+      end
+    end
   end
 end

data/lib/dhl/get_quote/request.rb

@@ -4,7 +4,7 @@ require 'erb'
 require 'set'
 
 class Dhl::GetQuote::Request
-  attr_reader :site_id, :password, :from_country_code, :from_postal_code, :to_country_code, :to_postal_code
+  attr_reader :site_id, :password, :from_country_code, :from_postal_code, :to_country_code, :to_postal_code, :duty
   attr_accessor :pieces
 
   URLS = {
@@ -26,7 +26,7 @@ class Dhl::GetQuote::Request
 
     @special_services_list = Set.new
 
-    @is_dutiable = Dhl::GetQuote.dutiable?
+    @duty = false
 
     @pieces = []
   end
@@ -56,19 +56,27 @@ class Dhl::GetQuote::Request
   end
 
   def dutiable?
-    !!@is_dutiable
+    !!@duty
   end
 
-  def dutiable(val)
-    @is_dutiable = !!val
+  def dutiable(value, currency_code="USD")
+    @duty = {
+      :declared_value => value.to_f,
+      :declared_currency => currency_code.slice(0,3).upcase
+    }
   end
+  alias_method :dutiable!, :dutiable
 
-  def dutiable!
-    dutiable(true)
+  def not_dutiable!
+    @duty = false
   end
 
-  def not_dutiable!
-    dutiable(false)
+  def payment_account_number(pac = nil)
+    if pac.to_s.size > 0
+      @payment_account_number = pac
+    else
+      @payment_account_number
+    end
   end
 
   def dimensions_unit
@@ -79,13 +87,33 @@ class Dhl::GetQuote::Request
     @weight_unit ||= Dhl::GetQuote.weight_unit
   end
 
-  def centimeters!
+  def metric_measurements!
+    @weight_unit = Dhl::GetQuote::WEIGHT_UNIT_CODES[:kilograms]
     @dimensions_unit = Dhl::GetQuote::DIMENSIONS_UNIT_CODES[:centimeters]
   end
+
+  def us_measurements!
+    @weight_unit = Dhl::GetQuote::WEIGHT_UNIT_CODES[:pounds]
+    @dimensions_unit = Dhl::GetQuote::DIMENSIONS_UNIT_CODES[:inches]
+  end
+
+  def centimeters!
+    deprication_notice(:centimeters!, :metric)
+    metric_measurements!
+  end
   alias :centimetres! :centimeters!
 
   def inches!
-    @dimensions_unit = Dhl::GetQuote::DIMENSIONS_UNIT_CODES[:inches]
+    deprication_notice(:inches!, :us)
+    us_measurements!
+  end
+
+  def metric_measurements?
+    centimeters? && kilograms?
+  end
+
+  def us_measurements?
+    pounds? && inches?
   end
 
   def centimeters?
@@ -98,12 +126,14 @@ class Dhl::GetQuote::Request
   end
 
   def kilograms!
-    @weight_unit = Dhl::GetQuote::WEIGHT_UNIT_CODES[:kilograms]
+    deprication_notice(:kilograms!, :metric)
+    metric_measurements!
   end
   alias :kilogrammes! :kilograms!
 
   def pounds!
-    @weight_unit = Dhl::GetQuote::WEIGHT_UNIT_CODES[:pounds]
+    deprication_notice(:pounds!, :us)
+    us_measurements!
   end
 
   def pounds?
@@ -120,8 +150,23 @@ class Dhl::GetQuote::Request
     ERB.new(File.new(xml_template_path).read, nil,'%<>-').result(binding)
   end
 
+  # ready times are only 8a-5p(17h)
   def ready_time(time=Time.now)
-    time.strftime("PT%HH%MM")
+    if time.hour >= 17 || time.hour < 8
+      time.strftime("PT08H00M")
+    else
+      time.strftime("PT%HH%MM")
+    end
+  end
+
+  # ready dates are only mon-fri
+  def ready_date(t=Time.now)
+    date = Date.parse(t.to_s)
+    if date.wday >= 5 && t.hour >= 17
+      date.send(:next_day, (8-date.wday))
+    else
+      date
+    end.strftime("%Y-%m-%d")
   end
 
   def post
@@ -180,4 +225,14 @@ protected
     gem_root = spec.gem_dir
     gem_root + "/tpl/request.xml.erb"
   end
+
+private
+
+  def deprication_notice(meth, m)
+    messages = {
+      :metric => "Method replaced by Dhl::GetQuote::Request#metic_measurements!(). I am now setting your measurements to metric",
+      :us     => "Method replaced by Dhl::GetQuote::Request#us_measurements!(). I am now setting your measurements to US customary",
+    }
+    puts "!!!! Method \"##{meth}()\" is depricated. #{messages[m.to_sym]}."
+  end
 end

data/lib/dhl/get_quote/response.rb

@@ -23,6 +23,8 @@ class Dhl::GetQuote::Response
       else
         Dhl::GetQuote::Upstream::UnknownError.new(response_error_condition_data)
       end
+    elsif condition_indicates_error?
+      @error = Dhl::GetQuote::Upstream::ConditionError.new(condition_error_code, condition_error_message)
     else
       load_costs(DEFAULT_CURRENCY_ROLE_TYPE_CODE)
     end
@@ -90,6 +92,20 @@ protected
     @response_error_condition_data ||= response_error_status_condition['ConditionData']
   end
 
+  def condition_indicates_error?
+    @parsed_xml["DCTResponse"]["GetQuoteResponse"] &&
+      @parsed_xml["DCTResponse"]["GetQuoteResponse"]["Note"] &&
+        @parsed_xml["DCTResponse"]["GetQuoteResponse"]["Note"]["Condition"].is_a?(Hash)
+  end
+
+  def condition_error_code
+    @parsed_xml["DCTResponse"]["GetQuoteResponse"]["Note"]["Condition"]["ConditionCode"]
+  end
+
+  def condition_error_message
+    @parsed_xml["DCTResponse"]["GetQuoteResponse"]["Note"]["Condition"]["ConditionData"].strip
+  end
+
   def market_services
     @market_services ||= begin
       srv = @parsed_xml["DCTResponse"]["GetQuoteResponse"]["Srvs"]["Srv"]

data/lib/dhl/get_quote/version.rb

@@ -1,5 +1,18 @@
 class Dhl
   class GetQuote
-    VERSION = "0.4.27"
+    VERSION = "0.5.0"
+
+    PostInstallMessage = <<EOS
+
+*** NOTE Dhl-GetQuote ***
+
+This version introduces the following changes from 0.4.x:
+
+* #inches!, #pounds!, #kilograms! and #centimeters have been depricated.
+  Please use #us_measurements! or #metric_measurements!.
+
+* dutiable() replaces dutiable! now requires arguments (dutiable value and currency).
+
+EOS
   end
 end

data/spec/lib/dhl/dh-get_quote_spec.rb

@@ -94,83 +94,74 @@ describe Dhl::GetQuote do
       end
 
       describe "kilograms!" do
-        before(:each) { klass.configure { |c| c.kilograms! } }
+        # silence deprication notices in tests
+        before(:each) { klass.stub!(:puts) }
 
-        it "must set class weight_unit to KG" do
-          klass.weight_unit.must == "KG"
-        end
-
-        it "Dhl::GetQuote::Request must honor this" do
-          valid_request.weight_unit.must == "KG"
+        it "must call #metric_measurements!" do
+          klass.must_receive(:metric_measurements!)
+          klass.kilograms!
         end
       end
 
       describe "pounds!" do
-        before(:each) { klass.configure { |c| c.pounds! } }
+        # silence deprication notices in tests
+        before(:each) { klass.stub!(:puts) }
 
-        it "must set class weight_unit to LB" do
-          klass.weight_unit.must == "LB"
-        end
-
-        it "Dhl::GetQuote::Request must honor this" do
-          valid_request.weight_unit.must == "LB"
+        it "must call #us_measurements!" do
+          klass.must_receive(:us_measurements!)
+          klass.pounds!
         end
       end
 
       describe "centimeters!" do
-        before(:each) { klass.configure { |c| c.centimeters! } }
+        # silence deprication notices in tests
+        before(:each) { klass.stub!(:puts) }
 
-        it "must set class weight_unit to CM" do
-          klass.dimensions_unit.must == "CM"
-        end
-
-        it "Dhl::GetQuote::Request must honor this" do
-          valid_request.dimensions_unit.must == "CM"
+        it "must call #metric_measurements!" do
+          klass.must_receive(:metric_measurements!)
+          klass.centimeters!
         end
       end
 
       describe "inches!" do
-        before(:each) { klass.configure { |c| c.inches! } }
-
-        it "must set class weight_unit to IN" do
-          klass.dimensions_unit.must == "IN"
-        end
+        # silence deprication notices in tests
+        before(:each) { klass.stub!(:puts) }
 
-        it "Dhl::GetQuote::Request must honor this" do
-          valid_request.dimensions_unit.must == "IN"
+        it "must call #us_measurements!" do
+          klass.must_receive(:us_measurements!)
+          klass.inches!
         end
       end
 
-      describe ".dutiable!" do
-        before(:each) do
-          klass.configure { |c| c.dutiable! }
-        end
-
-        it "must set the class dutiable to true" do
-          klass.dutiable?.must be_true
+      describe "us_measurements!" do
+        before(:each) { klass.metric_measurements! }
+        it "must set the weight and dimensions to LB and IN" do
+          klass.us_measurements!
+          klass.dimensions_unit.must == "IN"
+          klass.weight_unit.must == "LB"
         end
 
-        it "Dhl::GetQuote::Request must honor this test mode" do
-          request = Dhl::GetQuote::Request.new(valid_request_options)
-          request.dutiable?.must be_true
+        it "Dhl::GetQuote::Request must honor this" do
+          klass.us_measurements!
+          valid_request.dimensions_unit.must == "IN"
+          valid_request.weight_unit.must == "LB"
         end
       end
 
-      describe ".not_dutiable!" do
-        before(:each) do
-          klass.configure { |c| c.not_dutiable! }
-        end
-
-        it "must set the classvar test_mode to false" do
-          klass.dutiable?.must be_false
+      describe "metric_measurements!" do
+        before(:each) { klass.us_measurements! }
+        it "must set the weight and dimensions to KG and CM" do
+          klass.metric_measurements!
+          klass.dimensions_unit.must == "CM"
+          klass.weight_unit.must == "KG"
         end
 
-        it "Dhl::GetQuote::Request must honor this test mode" do
-          request = Dhl::GetQuote::Request.new(valid_request_options)
-          request.dutiable?.must be_false
+        it "Dhl::GetQuote::Request must honor this" do
+          klass.metric_measurements!
+          valid_request.dimensions_unit.must == "CM"
+          valid_request.weight_unit.must == "KG"
         end
       end
-
     end
   end
 

data/spec/lib/dhl/get_quote/request_spec.rb

@@ -98,12 +98,12 @@ describe Dhl::GetQuote::Request do
 
   describe "#dutiable?" do
     it "must be true if dutiable set to yes" do
-      subject.instance_variable_set(:@is_dutiable, true)
+      subject.dutiable!(1.0, 'USD')
       subject.dutiable?.must be_true
     end
 
     it "must be false if dutiable set to no" do
-      subject.instance_variable_set(:@is_dutiable, false)
+      subject.not_dutiable!
       subject.dutiable?.must be_false
     end
 
@@ -112,30 +112,41 @@ describe Dhl::GetQuote::Request do
     end
   end
 
-  describe "#dutiable" do
-    it "must set dutiable to true if passed a true value" do
-      subject.dutiable(true)
+  describe "#dutiable!" do
+    it "must accept a value and currency code" do
+      subject.dutiable?.must be_false #sanity
+
+      subject.dutiable!(1.0, 'CAD')
+
       subject.dutiable?.must be_true
+
+      subject.duty.must be_an_instance_of Hash
+      subject.duty[:declared_currency].must == 'CAD'
+      subject.duty[:declared_value].must == 1.0
     end
 
-    it "must set dutiable to false if passed a false value" do
-      subject.dutiable(false)
-      subject.dutiable?.must be_false
+    it "must use USD as the default currency code" do
+      subject.dutiable!(1.0)
+
+      subject.duty[:declared_currency].must == 'USD'
     end
-  end
 
-  describe "#dutiable!" do
-    it "must set dutiable() to true" do
-      subject.dutiable?.must be_false #sanity
+    it "must upcase and truncate currency codes" do
+      subject.dutiable!(1.0, 'MxPe')
 
-      subject.dutiable!
-      subject.dutiable?.must be_true
+      subject.duty[:declared_currency].must == 'MXP'
+    end
+
+    it "must cast value to float" do
+      subject.dutiable!(1)
+
+      subject.duty[:declared_value].must == 1.0
     end
   end
 
   describe "#not_dutiable!" do
     it "must set dutiable() to false" do
-      subject.instance_variable_set(:@is_dutiable, true)
+      subject.instance_variable_set(:@duty, {})
       subject.dutiable?.must be_true #sanity
 
       subject.not_dutiable!
@@ -167,21 +178,75 @@ describe Dhl::GetQuote::Request do
     end
   end
 
+  describe "#us_measurements!" do
+    it "should set the measurement units to us" do
+      subject.instance_variable_set(:@dimensions_unit, "CM")
+      subject.instance_variable_set(:@weight_unit, "KG")
+
+      subject.us_measurements!
+
+      subject.dimensions_unit.must == "IN"
+      subject.weight_unit.must == "LB"
+    end
+  end
+
+  describe "#metric_measurements!" do
+    it "must set the measurement units to metric" do
+      subject.instance_variable_set(:@dimensions_unit, "IN")
+      subject.instance_variable_set(:@weight_unit, "LB")
+
+      subject.metric_measurements!
+
+      subject.dimensions_unit.must == "CM"
+      subject.weight_unit.must == "KG"
+    end
+  end
+
+  describe "#metric_measurements?" do
+    it "must be true if measurements are in kg and cm" do
+      subject.metric_measurements!
+
+      subject.metric_measurements?.must be_true
+    end
+
+    it "must be false if measurements are not in kg and cm" do
+      subject.us_measurements!
+
+      subject.metric_measurements?.must be_false
+    end
+  end
+
+  describe "#us_measurements?" do
+    it "must be true if measurements are in ln and in" do
+      subject.us_measurements!
+
+      subject.us_measurements?.must be_true
+    end
+
+    it "must be false if measurements are not in lb and in" do
+      subject.metric_measurements!
+
+      subject.us_measurements?.must be_false
+    end
+  end
+
   describe "#centimeters!" do
-    it "must set the dimensions_unit to centimeters" do
-      subject.instance_variable_set(:@dimensions_unit, nil)
+    # silence deprication notices in tests
+    before(:each) { subject.stub!(:puts) }
 
+    it "must call #metric_measurements!" do
+      subject.must_receive(:metric_measurements!)
       subject.centimeters!
-      subject.dimensions_unit.must == "CM"
     end
   end
 
   describe "#inches!" do
-    it "must set the dimensions_unit to inches" do
-      subject.instance_variable_set(:@dimensions_unit, nil)
+    # silence deprication notices in tests
+    before(:each) { subject.stub!(:puts) }
 
+    it "must call #us_measurements!" do
+      subject.must_receive(:us_measurements!)
       subject.inches!
-      subject.dimensions_unit.must == "IN"
     end
   end
 
@@ -210,20 +275,22 @@ describe Dhl::GetQuote::Request do
   end
 
   describe "#kilograms!" do
-    it "must set the weight unit to kilograms" do
-      subject.instance_variable_set(:@weight_unit, nil)
+    # silence deprication notices in tests
+    before(:each) { subject.stub!(:puts) }
 
+    it "must call #metric_measurements!" do
+      subject.must_receive(:metric_measurements!)
       subject.kilograms!
-      subject.weight_unit.must == "KG"
     end
   end
 
   describe "#pounds!" do
-    it "must set the weight unit to pounds" do
-      subject.instance_variable_set(:@weight_unit, nil)
+    # silence deprication notices in tests
+    before(:each) { subject.stub!(:puts) }
 
+    it "must call #us_measurements!" do
+      subject.must_receive(:us_measurements!)
       subject.pounds!
-      subject.weight_unit.must == "LB"
     end
   end
 
@@ -255,6 +322,12 @@ describe Dhl::GetQuote::Request do
     before(:each) do
       subject.from('US', 84010)
       subject.to('CA', 'T1H 0A1')
+
+      Timecop.freeze(Time.local(2013, 5, 15, 10, 5, 0))
+    end
+
+    after(:each) do
+      Timecop.return
     end
 
     let(:time) { Time.now }
@@ -479,4 +552,82 @@ eos
       subject.instance_variable_get(:@test_mode).must be_false
     end
   end
+
+  describe "#ready_time" do
+    after(:each) do
+      Timecop.return
+    end
+
+    it "should conver the current time into a DHL timestamp" do
+      Timecop.freeze(Time.local(2013, 5, 15, 10, 5, 0))
+
+      subject.ready_time.must == 'PT10H05M'
+    end
+
+    context "the time is after 5pm" do
+      it "should provide a stamp for the 8am" do
+        Timecop.freeze(Time.local(2013, 5, 15, 19, 5, 0))
+
+        subject.ready_time.must == 'PT08H00M'
+      end
+    end
+
+    context "the time is before 8am" do
+      it "should provide a stamp for the 8am" do
+        Timecop.freeze(Time.local(2013, 5, 15, 6, 5, 0))
+
+        subject.ready_time.must == 'PT08H00M'
+      end
+    end
+  end
+
+
+  describe "#ready_date" do
+    after(:each) do
+      Timecop.return
+    end
+
+    it 'should provide an ISO date of the current or next business day' do
+      Timecop.freeze(Time.local(2013, 5, 15, 10, 5, 0))
+
+      subject.ready_date.must == '2013-05-15'
+    end
+
+    context 'the date is friday' do
+      context 'the time is before 5pm' do
+        it 'should return todays date' do
+          Timecop.freeze(Time.local(2013, 5, 31, 10, 4, 0))
+
+          subject.ready_date.must == '2013-05-31'
+        end
+      end
+      context 'the time is after 5pm' do
+        it 'should return todays date' do
+          Timecop.freeze(Time.local(2013, 5, 31, 19, 4, 0))
+
+          subject.ready_date.must == '2013-06-03'
+        end
+      end
+    end
+  end
+
+  describe "#payment_account_number" do
+    context "payment account number is passed" do
+      it "must set the pac to be the passed number" do
+        subject.payment_account_number('abc123')
+
+        subject.instance_variable_get(:@payment_account_number).must == 'abc123'
+      end
+    end
+    context "payment account number is not passes" do
+      it "must be nil if no pac is recorded" do
+        subject.payment_account_number.must be_nil
+      end
+      it "must return the pac if one was set previously" do
+        subject.instance_variable_set(:@payment_account_number, '123abc')
+
+        subject.payment_account_number.must == '123abc'
+      end
+    end
+  end
 end

data/spec/lib/dhl/get_quote/response_spec.rb

@@ -96,6 +96,23 @@ describe Dhl::GetQuote::Response do
 
     end
 
+    context "Condition error" do
+      let(:r) { klass.new(conditon_error_response) }
+      it "must return a valid object" do
+        r.must be_an_instance_of(klass)
+      end
+
+      it "must indicater an error" do
+        r.error?.must be_true
+      end
+
+      it "must set the error value appropriately" do
+        r.error.must be_an_instance_of Dhl::GetQuote::Upstream::ConditionError
+        r.error.message.must == "The declared value is missing."
+        r.error.code.must == "5021"
+      end
+    end
+
   end
 
   describe "#error?" do

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
 require 'rspec'
 require 'rspec/must'
 
+require 'timecop'
+
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
@@ -505,4 +507,8 @@ def mkt_srv_response
     </Srvs>
   </GetQuoteResponse>
 </res:DCTResponse>'
+end
+
+def conditon_error_response
+  "<?xml version=\"1.0\" encoding=\"UTF-8\"?><res:DCTResponse xmlns:res='http://www.dhl.com' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation= 'http://www.dhl.com DCT-Response.xsd'><GetQuoteResponse><Response><ServiceHeader><MessageTime>2013-05-31T22:49:42.138+01:00</MessageTime><SiteID>Desere</SiteID></ServiceHeader></Response><Note><Condition><ConditionCode>5021</ConditionCode><ConditionData>The declared value is missing.                                                                       </ConditionData></Condition></Note></GetQuoteResponse></res:DCTResponse>\n"
 end

data/tpl/request.xml.erb

@@ -13,7 +13,7 @@
         </From>
         <BkgDetails>
             <PaymentCountryCode><%= @from_country_code %></PaymentCountryCode>
-            <Date><%= Time.now.strftime("%Y-%m-%d") %></Date>
+            <Date><%= ready_date %></Date>
             <ReadyTime><%= ready_time %></ReadyTime>
             <ReadyTimeGMTOffset>+00:00</ReadyTimeGMTOffset>
             <DimensionUnit><%= dimensions_unit %></DimensionUnit>
@@ -21,6 +21,9 @@
             <Pieces>
                 <% pieces.each_with_index do |piece,i| %><%= piece.piece_id = i+1; piece.to_xml %><% end %>
             </Pieces>
+            <% if @payment_account_number -%>
+                <PaymentAccountNumber><%= @payment_account_number %></PaymentAccountNumber>
+            <% end -%>
             <IsDutiable><%= dutiable? ? "Y" : "N" %></IsDutiable>
             <% if special_services.size>0 -%>
                 <QtdShp>
@@ -36,5 +39,11 @@
             <CountryCode><%= @to_country_code %></CountryCode>
             <Postalcode><%= @to_postal_code %></Postalcode>
         </To>
+        <%- if dutiable? %>
+            <Dutiable>
+                <DeclaredCurrency><%= @duty[:declared_currency] %></DeclaredCurrency>
+                <DeclaredValue><%= @duty[:declared_value] %></DeclaredValue>
+            </Dutiable>
+        <% end %>
     </GetQuote>
 </p:DCTRequest>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dhl-get_quote
 version: !ruby/object:Gem::Version
-  version: 0.4.27
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-30 00:00:00.000000000 Z
+date: 2013-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -109,21 +109,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.0.1
 - !ruby/object:Gem::Dependency
-  name: debugger
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.1
 description: Get shipping quotes from DHL
 email:
 - mnielsen@deseretbook.com
@@ -157,7 +157,10 @@ files:
 - tpl/request.xml.erb
 homepage: https://github.com/deseretbook/dhl-get_quote
 licenses: []
-post_install_message: 
+post_install_message: ! "\n*** NOTE Dhl-GetQuote ***\n\nThis version introduces the
+  following changes from 0.4.x:\n\n* #inches!, #pounds!, #kilograms! and #centimeters
+  have been depricated.\n  Please use #us_measurements! or #metric_measurements!.\n\n*
+  dutiable() replaces dutiable! now requires arguments (dutiable value and currency).\n\n"
 rdoc_options: []
 require_paths:
 - lib