active_fulfillment 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0563ad797820f2ba1d68af1225b1c082dc61f711
-  data.tar.gz: 63d1dbca24a4e63e1b6846a6a4126ffb1edd094c
+  metadata.gz: fa12f08bf387a5a267295529073930b450614139
+  data.tar.gz: 8ee4d2ae85bc1f90971f7ea3e856e281cfb22b21
 SHA512:
-  metadata.gz: 4c8b46503c65b32f078264a26143995007d11c2c2fcdc11b6235cec69f7fa85081a33367e16ef7abb92ed24f98a39f444f18b358e8a68e8bd1e0888b054da1b6
-  data.tar.gz: 88f5644237742272a5d843b938bb46324c47376fcf21bd8e12a74b57a20fd1ad8306c88e7ef45dfdb30db300564fa40d0acb39e57e80d16fa516f29260263616
+  metadata.gz: 9bc7da03cf0ff15982a532c6b2beea0a802dd2774e070178927abe5a8c94c74c56de505e7626e175f3bd342b273c338cd93a346cc20dba582c826acfbe6982a9
+  data.tar.gz: fc39d07e52dd61ada87c10ec7644b0d80fde199e1d39fa49e8859e612573785364a28e24a377faad213ce8fc8fc79949b261fdd9675de6f5c44eda2df2636d46

data/lib/active_fulfillment/fulfillment/services/amazon_mws.rb

@@ -410,7 +410,8 @@ module ActiveMerchant
       end
 
       def build_address(address)
-        requires!(address, :name, :address1, :city, :state, :country, :zip)
+        requires!(address, :name, :address1, :city, :country, :zip)
+        address[:state] ||= "N/A"
         address[:zip].upcase!
         ary = address.map{ |key, value| [LOOKUPS[:destination_address][key], value] if LOOKUPS[:destination_address].include?(key) && value.present? }
         Hash[ary.compact]

data/lib/active_fulfillment/fulfillment/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module ActiveMerchant
   module Fulfillment
-    VERSION = "2.1.1"
+    VERSION = "2.1.2"
   end
 end

data/test/test_helper.rb

@@ -5,7 +5,7 @@ require 'rubygems'
 require 'bundler'
 Bundler.setup
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'digest/md5'
 require 'active_fulfillment'
 require 'active_utils'
@@ -14,7 +14,7 @@ require 'mocha/setup'
 
 module Test
   module Unit
-    class TestCase
+    class TestCase < MiniTest::Unit::TestCase
       include ActiveMerchant::Fulfillment
       
       LOCAL_CREDENTIALS = ENV['HOME'] + '/.active_merchant/fixtures.yml' unless defined?(LOCAL_CREDENTIALS)
@@ -48,6 +48,18 @@ module Test
         hash.symbolize_keys!
         hash.each{|k,v| symbolize_keys(v)}
       end
+
+      def assert_raise(error)
+        begin
+          yield
+        rescue => e
+          flunk "Expected #{error} but nothing raised" if e.class != error
+        end
+      end
+
+      def assert_nothing_raised
+        yield
+      end
     end
   end
 end

data/test/unit/services/amazon_mws_test.rb

@@ -141,6 +141,22 @@ class AmazonMarketplaceWebServiceTest < Test::Unit::TestCase
     assert_equal expected_items, @service.build_address(@address)
   end
 
+  def test_build_address_without_state_succeeds
+    expected_items = {
+      "DestinationAddress.Name" => @address[:name],
+      "DestinationAddress.Line1" => @address[:address1],
+      "DestinationAddress.Line2" => @address[:address2],
+      "DestinationAddress.City" => @address[:city],
+      "DestinationAddress.StateOrProvinceCode" => "N/A",
+      "DestinationAddress.CountryCode" => @address[:country],
+      "DestinationAddress.PostalCode" => @address[:zip],
+      "DestinationAddress.PhoneNumber" => @address[:phone]
+    }
+    @address.delete(:state)
+
+    assert_equal expected_items, @service.build_address(@address)
+  end
+
   def test_integrated_registration_url_creation
     service = AmazonMarketplaceWebService.new(:login => "AKIAFJPPO5KLY6G4XO7Q", :password => "aaa", :app_id => "1014f5ad-c359-4e86-8e50-bb8f8e431a9")
     options = {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_fulfillment
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Cody Fauser
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2010-12-13 00:00:00.000000000 Z
+date: 2014-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -81,6 +81,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -101,17 +115,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG
+- lib/active_fulfillment.rb
 - lib/active_fulfillment/fulfillment/base.rb
 - lib/active_fulfillment/fulfillment/response.rb
 - lib/active_fulfillment/fulfillment/service.rb
+- lib/active_fulfillment/fulfillment/services.rb
 - lib/active_fulfillment/fulfillment/services/amazon.rb
 - lib/active_fulfillment/fulfillment/services/amazon_mws.rb
 - lib/active_fulfillment/fulfillment/services/shipwire.rb
 - lib/active_fulfillment/fulfillment/services/webgistix.rb
-- lib/active_fulfillment/fulfillment/services.rb
 - lib/active_fulfillment/fulfillment/version.rb
-- lib/active_fulfillment.rb
-- CHANGELOG
+- test/fixtures.yml
 - test/fixtures/xml/amazon/inventory_get_response.xml
 - test/fixtures/xml/amazon/inventory_list_response.xml
 - test/fixtures/xml/amazon/inventory_list_response_with_next_1.xml
@@ -138,7 +153,6 @@ files:
 - test/fixtures/xml/shipwire/successful_tracking_response_with_tracking_urls.xml
 - test/fixtures/xml/webgistix/multiple_tracking_response.xml
 - test/fixtures/xml/webgistix/tracking_response.xml
-- test/fixtures.yml
 - test/remote/amazon_mws_test.rb
 - test/remote/amazon_test.rb
 - test/remote/shipwire_test.rb
@@ -168,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Framework and tools for dealing with shipping, tracking and order fulfillment