active_fulfillment 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edee633e1484a24673765631ab0a8a85cb114f4d
-  data.tar.gz: 1b3c6f2099542ca7f988a0a7ac9ee9f3309cc809
+  metadata.gz: c0398fdadc0a5d2c85eda230851fe5727c07b63e
+  data.tar.gz: c3084c84d669ea956856716bc0f32388d27039d7
 SHA512:
-  metadata.gz: 21c48116701f5281c5a4deacc5a445126e12b6e407551fc097709d579231a31d74944e88eb404b476bc2667d073686717dbce7c79388608600f73445b10a2538
-  data.tar.gz: 90872e2cce274d7bc42593f93da678bf8a234fed5c4b12d3bf4e83d8ae665ab046cf22c7ded2e26fb8f1425aa0a108d256c61ca7060f3434268e1c713bc81b31
+  metadata.gz: 86f6821811d3c3b32b83bb29ec9b1e49f2a45ede0d2296f72940a732dec6f773aa3835b2e691421aef1f44b0654fdff32be8feb5da4afbe6e49202453d005435
+  data.tar.gz: f35bcd2587f11e1ebc2e0e5189cfe9dbb373ed26db88b6773de13a906d3b2cf7c9d9b2911ae94fbabb18a8e2dc77b3dff5dd264c280a67a8211ff7904ba6e606

data/lib/active_fulfillment/services/amazon_mws.rb

@@ -168,7 +168,7 @@ module ActiveFulfillment
       query = build_full_query(verb, uri, params)
       headers = build_headers(query)
       log_query = query.dup
-      [@options[:login], @options[:app_id], @mws_auth_token].each { |key| log_query.gsub!(/#{key}/, '[filtered]') if key.present? }
+      [@options[:login], @options[:app_id], @mws_auth_token].each { |key| log_query.gsub!(key.to_s, '[filtered]') if key.present? }
 
       logger.info "[#{self.class}][#{action}] query=#{log_query}"
       data = ssl_post(uri.to_s, query, headers)

data/lib/active_fulfillment/services/shipwire.rb

@@ -171,7 +171,11 @@ module ActiveFulfillment
     end
 
     def commit(action, request)
+      log_query = request.dup
+      [@options[:password], affiliate_id].each { |key| log_query.gsub!(key.to_s, '[filtered]') if key.present? }
+      logger.info "[#{self.class}][#{SERVICE_URLS[action]}][#{POST_VARS[action]}] query=#{log_query}"
       data = ssl_post(SERVICE_URLS[action], "#{POST_VARS[action]}=#{CGI.escape(request)}")
+      logger.info "[#{self.class}][result] #{data}"
 
       response = parse_response(action, data)
       Response.new(response[:success], response[:message], response, :test => test?)
@@ -220,8 +224,8 @@ module ActiveFulfillment
       response = { stock_levels: {} }
       Parsing.with_xml_document(xml, response) do |document|
         status = document.at_xpath('//Status'.freeze).child.content
-        total_products = document.at_xpath('//TotalProducts'.freeze).child.content
         success = test? ? status == 'Test'.freeze : status == '0'.freeze
+        total_products = success ? document.at_xpath('//TotalProducts'.freeze).child.content : 0
         message = success ? 'Successfully received the stock levels'.freeze : document.at_xpath('//ErrorMessage'.freeze).child.content
 
         {

data/lib/active_fulfillment/services/shopify_api.rb

@@ -51,7 +51,7 @@ module ActiveFulfillment
     end
 
     def fetch_tracking_data(order_numbers, options = {})
-      options.merge!({:order_ids => order_numbers, :order_names => order_numbers})
+      options.merge!({:order_names => order_numbers})
       response = send_app_request('fetch_tracking_numbers'.freeze, options.delete(:headers), options)
       if response
         tracking_numbers = parse_response(response, 'TrackingNumbers'.freeze, 'Order'.freeze, 'ID'.freeze, 'Tracking'.freeze) { |o| o }

data/lib/active_fulfillment/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module ActiveFulfillment
-  VERSION = "3.0.1"
+  VERSION = "3.0.2"
 end

data/test/test_helper.rb

@@ -5,7 +5,6 @@ require 'active_fulfillment'
 require 'minitest/autorun'
 require 'mocha/setup'
 require 'timecop'
-require 'rexml/document'
 
 require 'logger'
 ActiveFulfillment::Service.logger = Logger.new(nil)

data/test/unit/services/shipwire_test.rb

@@ -3,12 +3,14 @@ require 'test_helper'
 class ShipwireTest < Minitest::Test
   include ActiveFulfillment::Test::Fixtures
 
+  PASSWORD = 'test_password'
+
   def setup
     ActiveFulfillment::Base.mode = :test
 
     @shipwire = ActiveFulfillment::ShipwireService.new(
                   :login => 'cody@example.com',
-                  :password => 'test'
+                  :password => PASSWORD
                 )
 
     @options = {
@@ -32,7 +34,7 @@ class ShipwireTest < Minitest::Test
 
   def test_missing_login
     assert_raises(ArgumentError) do
-      ActiveFulfillment::ShipwireService.new(:password => 'test')
+      ActiveFulfillment::ShipwireService.new(:password => PASSWORD)
     end
   end
 
@@ -44,20 +46,20 @@ class ShipwireTest < Minitest::Test
 
   def test_missing_credentials
     assert_raises(ArgumentError) do
-      ActiveFulfillment::ShipwireService.new(:password => 'test')
+      ActiveFulfillment::ShipwireService.new(:password => PASSWORD)
     end
   end
 
   def test_credentials_present
     assert ActiveFulfillment::ShipwireService.new(
       :login    => 'cody',
-      :password => 'test'
+      :password => PASSWORD
     )
   end
 
   def test_country_format
-    xml = REXML::Document.new(@shipwire.send(:build_fulfillment_request, '123456', @address, @line_items, @options))
-    country_node = REXML::XPath.first(xml, "//Country")
+    xml = Nokogiri::XML(@shipwire.send(:build_fulfillment_request, '123456', @address, @line_items, @options))
+    country_node = xml.at_xpath(xml, "//Country")
     assert_equal 'US', country_node.text
   end
 
@@ -71,6 +73,36 @@ class ShipwireTest < Minitest::Test
     assert_equal 677, response.stock_levels['KingMonkey']
   end
 
+  def test_stock_levels_parses_invalid_credentials
+    @shipwire.expects(:ssl_post).returns(xml_fixture('shipwire/invalid_login_inventory_update_response'))
+
+    response = @shipwire.fetch_stock_levels
+    refute response.success?
+    assert_equal 'Error with Valid Username/EmailAddress and Password Required. There is an error in XML document.', response.message
+  end
+
+  def test_stock_levels_logs_request_and_response
+    @shipwire.class.logger.expects(:info).with do |message|
+      assert_match /InventoryUpdate/, message unless message.include?('InventoryUpdateResponse')
+      refute message.include?(PASSWORD)
+      true
+    end.twice
+
+    @shipwire.expects(:ssl_post).returns(xml_fixture('shipwire/inventory_get_response'))
+    response = @shipwire.fetch_stock_levels
+  end
+
+  def test_logging_with_specific_passwords
+    @shipwire = ActiveFulfillment::ShipwireService.new(login: 'cody@example.com', password: 345)
+    @shipwire.class.logger.expects(:info).with do |message|
+      refute message.include?('345')
+      true
+    end.twice
+
+    @shipwire.stubs(:ssl_post).returns(xml_fixture('shipwire/inventory_get_response'))
+    response = @shipwire.fetch_stock_levels
+  end
+
   def test_stock_levels_include_pending_when_set
     @shipwire = ActiveFulfillment::ShipwireService.new(
                   :login => 'cody@example.com',
@@ -93,8 +125,8 @@ class ShipwireTest < Minitest::Test
                   :password => 'test',
                   :include_empty_stock => true
                 )
-    xml = REXML::Document.new(@shipwire.send(:build_inventory_request, {}))
-    assert REXML::XPath.first(xml, '//IncludeEmpty')
+    xml = Nokogiri::XML(@shipwire.send(:build_inventory_request, {}))
+    assert xml.at_xpath(xml, '//IncludeEmpty')
   end
 
   def test_no_tracking_numbers_available
@@ -164,29 +196,30 @@ class ShipwireTest < Minitest::Test
 
   def test_affiliate_id
     ActiveFulfillment::ShipwireService.affiliate_id = 'affiliate_id'
-
-    xml = REXML::Document.new(@shipwire.send(:build_fulfillment_request, '123456', @address, @line_items, @options))
-    affiliate_id = REXML::XPath.first(xml, "//AffiliateId")
+    xml = Nokogiri::XML(@shipwire.send(:build_fulfillment_request, '123456', @address, @line_items, @options))
+    affiliate_id = xml.at_xpath(xml, "//AffiliateId")
     assert_equal 'affiliate_id', affiliate_id.text
   end
 
   def test_company_name_in_request
-    xml = REXML::Document.new(@shipwire.send(:build_fulfillment_request, '123456', @address, @line_items, @options))
-    company_node = REXML::XPath.first(xml, "//Company")
+    xml = Nokogiri::XML(@shipwire.send(:build_fulfillment_request, '123456', @address, @line_items, @options))
+    company_node = xml.at_xpath(xml, "//Company")
     assert_equal 'MyCorp', company_node.text
   end
 
   def test_order_excludes_note_by_default
-    xml = REXML::Document.new(@shipwire.send(:build_fulfillment_request, '123456', @address, @line_items, @options))
-    note_node = REXML::XPath.first(xml, "//Note").cdatas.first
-    assert_nil note_node
+    xml = Nokogiri::XML(@shipwire.send(:build_fulfillment_request, '123456', @address, @line_items, @options))
+    note_node = xml.at_xpath(xml, "//Note")
+    assert_equal 0, note_node.children.select { |child| child.cdata? }.size
+    assert_equal false, note_node.cdata?
   end
 
   def test_order_includes_note_when_present
     @options[:note] = "A test note"
-    xml = REXML::Document.new(@shipwire.send(:build_fulfillment_request, '123456', @address, @line_items, @options))
-    note_node = REXML::XPath.first(xml, "//Note").cdatas.first
-    assert_equal "A test note", note_node.to_s
+    xml = Nokogiri::XML(@shipwire.send(:build_fulfillment_request, '123456', @address, @line_items, @options))
+    note_node = xml.at_xpath(xml, "//Note")
+    assert_equal "A test note", note_node.text.strip
+    assert_equal note_node.children.select { |child| child.cdata? }.size, 1
   end
 
   def test_error_response_cdata_parsing

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_fulfillment
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Cody Fauser
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-07 00:00:00.000000000 Z
+date: 2016-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -18,6 +18,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.9
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -25,6 +28,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.9
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
@@ -154,7 +160,8 @@ files:
 - test/unit/services/shopify_api_test.rb
 - test/unit/services/webgistix_test.rb
 homepage: http://github.com/shopify/active_fulfillment
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []