mattsears · jotolo · Nov 22, 2016 · Jan 10, 2017 · Jan 10, 2017
diff --git a/.gitignore b/.gitignore
diff --git a/Gemfile b/Gemfile
diff --git a/LICENSE.md b/LICENSE.md
diff --git a/README.md b/README.md
diff --git a/Rakefile b/Rakefile
diff --git a/lib/stamps.rb b/lib/stamps.rb
diff --git a/lib/stamps/api.rb b/lib/stamps/api.rb
diff --git a/lib/stamps/client.rb b/lib/stamps/client.rb
diff --git a/lib/stamps/client/account.rb b/lib/stamps/client/account.rb
@@ -10,23 +10,23 @@ module Account
       def account(params = {})
         params[:authenticator] = authenticator_token
         response = request('GetAccountInfo', Stamps::Mapping::Account.new(params) )
-        response[:errors].empty? ? response[:get_account_info_response][:account_info] : response
+        response[:errors].empty? ? response[:envelope][:body][:get_account_info_response][:account_info] : response[:envelope][:body]
       end
 
       # Add funds to postage account
       #
       def purchase_postage(params = {})
         params[:authenticator] = authenticator_token
         response = request('PurchasePostage', Stamps::Mapping::PurchasePostage.new(params))
-        response[:errors].empty? ? response[:purchase_postage_response] : response
+        response[:errors].empty? ? response[:envelope][:body][:purchase_postage_response] : response[:envelope][:body]
       end
 
       # Check the payment of purchase_postage 
       #
       def get_purchase_status(params = {})
         params[:authenticator] = authenticator_token
         response = request('GetPurchaseStatus', Stamps::Mapping::GetPurchaseStatus.new(params))
-        response[:errors].empty? ? response[:get_purchase_status_response] : response
+        response[:errors].empty? ? response[:envelope][:body][:get_purchase_status_response] : response[:envelope][:body]
       end
 
       # Request carrier pickup
@@ -35,7 +35,7 @@ def get_purchase_status(params = {})
       def carrier_pickup(params = {})
         params[:authenticator] = authenticator_token
         response = request('CarrierPickup', Stamps::Mapping::CarrierPickup.new(params))
-        response[:errors].empty? ?  response[:carrier_pickup_response] : response
+        response[:errors].empty? ?  response[:envelope][:body][:carrier_pickup_response] : response[:envelope][:body]
       end
 
     end

diff --git a/lib/stamps/client/address.rb b/lib/stamps/client/address.rb
@@ -7,7 +7,8 @@ module Address
       def clean_address(params = {})
         params[:authenticator] = authenticator_token
         response = request('CleanseAddress', Stamps::Mapping::CleanseAddress.new(params))
-        response[:errors].empty? ? response[:cleanse_address_response] : response
+        #response[:errors].empty? ? response[:cleanse_address_response] : response
+        response[:errors].empty? ? response[:envelope][:body][:cleanse_address_response] : response[:envelope][:body]
       end
 
     end

diff --git a/lib/stamps/client/rate.rb b/lib/stamps/client/rate.rb
@@ -25,10 +25,10 @@ def get_rates(params = {})
           :rate          => Stamps::Mapping::Rate.new(params)
         })
         response = request('GetRates', rates)
-        if response[:get_rates_response].nil?
-          response
+        if response[:envelope][:body][:get_rates_response].nil?
+          response[:envelope][:body]
         else
-          response[:get_rates_response][:rates].nil? ? [] : [response[:get_rates_response][:rates][:rate]].flatten
+          response[:envelope][:body][:get_rates_response][:rates].nil? ? [] : [response[:envelope][:body][:get_rates_response][:rates][:rate]].flatten
         end
       end
 

diff --git a/lib/stamps/client/stamp.rb b/lib/stamps/client/stamp.rb
@@ -13,7 +13,7 @@ module Stamp
       # In order to successfully create postage labels, the following steps
       # must happen:
       #
-      # 1. Authentiation -  identify the user and ensure that the user is
+      # 1. Authentication -  identify the user and ensure that the user is
       #    authorized to perform the operation.
       #
       # 2. CleanseAddress - Ship-to addresses must be standardized based on
@@ -28,9 +28,13 @@ module Stamp
       #
       def create!(params = {})
         params[:authenticator] = authenticator_token unless params[:authenticator]
-        params[:from] ||= Hash.new
-        response = request('CreateIndicium', Stamps::Mapping::Stamp.new(params))
-        response[:errors].empty? ? response[:create_indicium_response] : response
+        params[:from] ||= {}
+        #params[:rate].delete(:add_ons)
+        #params[:rate][:cubic_pricing] = true
+        params[:rate].delete(:delivery_date)
+        stamp = Stamps::Mapping::Stamp.new(params)
+        response = request('CreateIndicium', stamp)
+        response[:errors].empty? ? response[:envelope][:body][:create_indicium_response] : response[:envelope][:body]
       end
 
       # Refunds postage and voids the shipping label
@@ -40,7 +44,7 @@ def create!(params = {})
       def cancel!(params = {})
         params[:authenticator] = authenticator_token unless params[:authenticator]
         response = request('CancelIndicium', Stamps::Mapping::CancelStamp.new(params))
-        response[:errors].empty? ? response[:cancel_indicium_response] : response
+        response[:errors].empty? ? response[:envelope][:body][:cancel_indicium_response] : response[:envelope][:body]
       end
 
       # Returns an array of tracking events
@@ -53,7 +57,7 @@ def track(stamps_transaction_id)
           :stamps_transaction_id => stamps_transaction_id
         }
         response = request('TrackShipment', Stamps::Mapping::TrackShipment.new(params))
-        response[:errors].empty? ? response[:track_shipment_response] : response
+        response[:errors].empty? ? response[:envelope][:body][:track_shipment_response] : response[:envelope][:body]
       end
 
     end

diff --git a/lib/stamps/configuration.rb b/lib/stamps/configuration.rb
@@ -18,10 +18,10 @@ module Configuration
       :endpoint].freeze
 
     # The endpoint that will be used to connect if none is set
-    DEFAULT_ENDPOINT = 'https://swsim.stamps.com/swsim/swsimv29.asmx'.freeze
+    DEFAULT_ENDPOINT = 'https://swsim.stamps.com/swsim/swsimv55.asmx'.freeze
 
     # The default namespace used on Stamps.com wsdl
-    DEFAULT_NAMESPACE = 'http://stamps.com/xml/namespace/2010/11/swsim/swsimv29'
+    DEFAULT_NAMESPACE = 'http://stamps.com/xml/namespace/2016/09/swsim/swsimv55'
 
     # @note JSON is preferred over XML because it is more concise and faster to parse.
     DEFAULT_FORMAT = :hash

diff --git a/lib/stamps/errors.rb b/lib/stamps/errors.rb
diff --git a/lib/stamps/mapping.rb b/lib/stamps/mapping.rb
@@ -80,6 +80,7 @@ class Rate < Hashie::Trash
       property :RateCategory,            :from => :rate_category
       property :ToState,                 :from => :to_state
       property :CubicPricing,            :from => :cubic_pricing
+      property :DeliveryDate,            :from => :delivery_date
 
       # Maps :rate to AddOns map
       def add_ons=(addons)

diff --git a/lib/stamps/request.rb b/lib/stamps/request.rb
@@ -12,13 +12,14 @@ def request(web_method, params, raw=false)
       client = Savon.client do |globals|
         globals.endpoint self.endpoint
         globals.namespace self.namespace
-        globals.namespaces("xmlns:tns" => self.namespace)
-        globals.log false
+        #globals.namespaces("xmlns:tns" => self.namespace)
+        globals.log self.log_messages
         globals.logger Logger.new(STDOUT)
-        globals.raise_errors false
+        globals.raise_errors self.raise_errors
         globals.headers({ "SoapAction" => formatted_soap_action(web_method) })
         globals.element_form_default :qualified
-        globals.namespace_identifier :tns
+        globals.namespace_identifier nil
+        globals.env_namespace :soap
         globals.open_timeout self.open_timeout
         globals.read_timeout self.read_timeout
       end
@@ -47,8 +48,9 @@ def get_authenticator_token
             :password       => self.password
         })
       )
-      if response_hash[:authenticate_user_response] != nil
-        response_hash[:authenticate_user_response][:authenticator]
+
+      if response_hash[:envelope][:body][:authenticate_user_response] != nil # response_hash[:authenticate_user_response]
+        response_hash[:envelope][:body][:authenticate_user_response][:authenticator]
       else
         raise Stamps::InvalidIntegrationID.new(response_hash[:errors][0])
       end

diff --git a/lib/stamps/response.rb b/lib/stamps/response.rb
@@ -12,7 +12,7 @@ def initialize(response)
       self.valid = true
       self.savon  = response
       self.http   = response.http
-      self.hash   = self.savon.to_hash
+      self.hash   = response.hash
       raise_errors
     end
 
@@ -63,7 +63,7 @@ def raise_errors
     # Include any errors in the response
     #
     def format_soap_faults
-      fault = self.hash.delete("soap:Fault") || self.hash.delete(:fault)
+      fault = self.hash[:envelope][:body].delete("soap:Fault") || self.hash[:envelope][:body].delete(:fault)
       self.errors << (fault[:faultstring] || fault["faultstring"])
       self.valid = false
     end

diff --git a/lib/stamps/trash.rb b/lib/stamps/trash.rb
diff --git a/lib/stamps/types.rb b/lib/stamps/types.rb
diff --git a/lib/stamps/version.rb b/lib/stamps/version.rb
diff --git a/stamps.gemspec b/stamps.gemspec
@@ -20,22 +20,22 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_development_dependency('simplecov', '~> 0.4.0')
-  s.add_development_dependency('shoulda', '~> 2.11.3')
+  s.add_development_dependency 'shoulda', '~> 2.11', '>= 2.11.3'
   s.add_development_dependency('mocha', '~> 0.9.11')
-  s.add_development_dependency('webmock', '~> 1.6.2')
-  s.add_development_dependency('awesome_print')
-  s.add_development_dependency('yard')
-  s.add_development_dependency('bluecloth')
-  s.add_development_dependency('rake')
-  s.add_development_dependency('pry')
+  s.add_development_dependency 'webmock', '~> 1.6', '>= 1.6.2'
+  s.add_development_dependency 'awesome_print', '~> 0'
+  s.add_development_dependency 'yard', '~> 0'
+  s.add_development_dependency 'bluecloth', '>= 0', '~> 0'
+  s.add_development_dependency 'rake', '~> 0'
+  s.add_development_dependency 'pry', '~> 0'
 
   # We have to use savon 0.8.6 for now since newer versions of savon don't
   # convert booleans, dates, or decimals consistently.
   # See: https://github.com/rubiii/savon/issues/301
-  s.add_runtime_dependency('savon', '~> 2.3.0')
-  s.add_runtime_dependency('httpi', '~> 2.1.0')
+  #
+  s.add_runtime_dependency 'savon', '~> 2.3', '>= 2.3.0' 
+  s.add_runtime_dependency 'httpi', '~> 2.1', '>= 2.1.0'
   s.add_runtime_dependency('json', '~> 1.0')
   s.add_runtime_dependency('multi_json', '~> 1.0')
-  s.add_runtime_dependency('hashie', '~> 1.0.0')
-
+  s.add_runtime_dependency 'hashie', '~> 1.2', '>= 1.2.0'
 end
diff --git a/test/client/account_test.rb b/test/client/account_test.rb
diff --git a/test/client/address_test.rb b/test/client/address_test.rb
diff --git a/test/client/rate_test.rb b/test/client/rate_test.rb
diff --git a/test/client/stamp_test.rb b/test/client/stamp_test.rb
diff --git a/test/fixtures/AuthenticateUser.xml b/test/fixtures/AuthenticateUser.xml
diff --git a/test/fixtures/CancelIndicium.xml b/test/fixtures/CancelIndicium.xml
diff --git a/test/fixtures/CarrierPickup.xml b/test/fixtures/CarrierPickup.xml
diff --git a/test/fixtures/CleanseAddress.xml b/test/fixtures/CleanseAddress.xml
diff --git a/test/fixtures/CreateIndicium.xml b/test/fixtures/CreateIndicium.xml
diff --git a/test/fixtures/GetAccountInfo.xml b/test/fixtures/GetAccountInfo.xml
diff --git a/test/fixtures/GetRate.xml b/test/fixtures/GetRate.xml
diff --git a/test/fixtures/GetRates.xml b/test/fixtures/GetRates.xml
diff --git a/test/fixtures/GetRatesEmpty.xml b/test/fixtures/GetRatesEmpty.xml
diff --git a/test/fixtures/InsufficientPostage.xml b/test/fixtures/InsufficientPostage.xml
diff --git a/test/fixtures/InvalidSoap.xml b/test/fixtures/InvalidSoap.xml
diff --git a/test/fixtures/PurchasePostage.xml b/test/fixtures/PurchasePostage.xml
diff --git a/test/fixtures/TrackShipment.xml b/test/fixtures/TrackShipment.xml
diff --git a/test/fixtures/failed_auth.xml b/test/fixtures/failed_auth.xml
diff --git a/test/helper.rb b/test/helper.rb
diff --git a/test/mapping_test.rb b/test/mapping_test.rb
diff --git a/test/request_test.rb b/test/request_test.rb
diff --git a/test/response_test.rb b/test/response_test.rb
diff --git a/test/stamps_test.rb b/test/stamps_test.rb
diff --git a/test/types_test.rb b/test/types_test.rb