active_fulfillment 1.0.2 → 1.0.3

data/CHANGELOG

@@ -1,5 +1,10 @@
 = ActiveFulfillment CHANGELOG
 
+== Version 1.0.3 (Jan 21, 2010)
+
+* Include "pending" counts in stock levels for Shipwire [wisq]
+* Add option to include pending stock in Shipwire inventory calculations [jessehk]
+
 == Version 1.0.2 (Jan 12, 2010)
 
 * Include "pending" counts in stock levels for Shipwire [wisq]

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

data/active_fulfillment.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_fulfillment}
-  s.version = "1.0.2"
+  s.version = "1.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cody Fauser", "James MacAulay"]

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

@@ -3,6 +3,7 @@ require 'cgi'
 module ActiveMerchant
   module Fulfillment
     class ShipwireService < Service
+
       SERVICE_URLS = { :fulfillment => 'https://api.shipwire.com/exec/FulfillmentServices.php',
                        :inventory   => 'https://api.shipwire.com/exec/InventoryServices.php',
                        :tracking    => 'https://api.shipwire.com/exec/TrackingServices.php'
@@ -67,6 +68,10 @@ module ActiveMerchant
         true
       end
 
+      def include_pending_stock?
+        @options[:include_pending_stock]
+      end
+
       private
       def build_fulfillment_request(order_id, shipping_address, line_items, options)
         xml = Builder::XmlMarkup.new :indent => 2
@@ -196,7 +201,10 @@ module ActiveMerchant
         document = REXML::Document.new(xml)
         document.root.elements.each do |node|
           if node.name == 'Product'
-            amount = ['quantity', 'pending'].map { |a| node.attributes[a].to_i }.sum
+            to_check = ['quantity']
+            to_check << 'pending' if include_pending_stock?
+
+            amount = to_check.sum { |a| node.attributes[a].to_i }
             response[:stock_levels][node.attributes['code']] = amount
           else
             response[node.name.underscore.to_sym] = node.text

data/test/unit/services/shipwire_test.rb

@@ -60,12 +60,28 @@ class ShipwireTest < Test::Unit::TestCase
     assert_equal 'US', country_node.text
   end
 
-  def test_stock_levels
+  def test_stock_levels_dont_include_pending_by_default
     @shipwire.expects(:ssl_post).returns(xml_fixture('shipwire/inventory_get_response'))
 
     response = @shipwire.fetch_stock_levels
     assert response.success?
     assert_equal 926, response.stock_levels['BlackDog']
+    assert_equal -1, response.stock_levels['MoustacheCat']
+    assert_equal 677, response.stock_levels['KingMonkey']
+  end
+
+  def test_stock_levels_include_pending_when_set
+    @shipwire = ShipwireService.new(
+                  :login => 'cody@example.com',
+                  :password => 'test',
+                  :include_pending_stock => true
+                )
+    @shipwire.expects(:ssl_post).returns(xml_fixture('shipwire/inventory_get_response'))
+
+    response = @shipwire.fetch_stock_levels
+    assert response.success?
+    assert @shipwire.include_pending_stock?
+    assert_equal 926, response.stock_levels['BlackDog']
     assert_equal 805, response.stock_levels['MoustacheCat']
     assert_equal 921, response.stock_levels['KingMonkey']
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_fulfillment
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Cody Fauser