shopify_api 4.3.5 → 4.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a735be75b2ea0f7c4762ee44ca3a8c2a2a2a4d22
-  data.tar.gz: 6a8927da2492a41f0c3454925cae1c4ab1d2caeb
+  metadata.gz: 2255bd486a91f8b1900f6f793ed7ebaf9277c0a5
+  data.tar.gz: 62a56df1d53f48e963e1df0ed19170af6e0c7f24
 SHA512:
-  metadata.gz: 1d894337c5a7297f935866ad69749e118e68959402dfd8ec276241a2af31adab03c8937c074bb5b10360e3ddf05221cddb52d445989bcfab323667c5ab42c176
-  data.tar.gz: df8fec33376e1dc2b85660af9bd6d097fa251a15225011f0f840023ebc3be1125032dca99dc932250970a1f9754168e0b33ca3350e5c62f017b44d7a105b2b8a
+  metadata.gz: d60db8448a674113e459ea0409a531e0934f78f0ebd317dc24b33d36b07d82bae08f9de96b74a38b29d6b68ed51d7db25355cac0e0bbac3f4a0380414c57a42d
+  data.tar.gz: 2c902b762830958c3c3554115ab6295c1c35da45f61dd47d40960d0f0668fef0930c57b211d4495e068a0eafab0b0192927d212d86af260f70f95a5dc7525cfd

data/CHANGELOG

@@ -1,3 +1,7 @@
+== Version 4.3.6
+
+* Fixed the `customer_saved_search_id` param in `ShopifyAPI::CustomerSavedSearch#customers`.
+
 == Version 4.3.5
 
 * Added support for online mode access tokens, token expiry, and associated_user information.

data/lib/shopify_api/resources/customer_saved_search.rb

@@ -3,7 +3,7 @@ require 'shopify_api/resources/customer'
 module ShopifyAPI
   class CustomerSavedSearch < Base
     def customers(params = {})
-      Customer.search(params.merge({:saved_search_id => self.id}))
+      Customer.search(params.merge({:customer_saved_search_id => self.id}))
     end
   end
 end

data/lib/shopify_api/resources/fulfillment_request.rb

@@ -7,9 +7,9 @@ module ShopifyAPI
     end
 
     def mark_as_failed
-      load_attributes_from_response(
-        put(:mark_as_failed, message: failure_message)
-      )
+      options = {}
+      options[:message] = failure_message if failure_message
+      load_attributes_from_response(put(:mark_as_failed, options))
     end
   end
 end

data/lib/shopify_api/version.rb

@@ -1,3 +1,3 @@
 module ShopifyAPI
-  VERSION = "4.3.5"
+  VERSION = "4.3.6"
 end

data/test/countable_test.rb

@@ -2,6 +2,7 @@ require 'test_helper'
 
 class CountableTest < Test::Unit::TestCase
   def setup
+    super
     fake "products/count", :body => '{"count": 16}'
   end
 

data/test/customer_saved_search_test.rb

@@ -7,13 +7,13 @@ class CustomerSavedSearchTest < Test::Unit::TestCase
   end
 
   def test_get_customers_from_customer_saved_search
-    fake 'customers/search.json?saved_search_id=8899730', :body => load_fixture('customer_saved_search_customers'), :extension => false
+    fake 'customers/search.json?customer_saved_search_id=8899730', :body => load_fixture('customer_saved_search_customers'), :extension => false
     assert_equal 1, @customer_saved_search.customers.length
     assert_equal 112223902, @customer_saved_search.customers.first.id
   end
 
   def test_get_customers_from_customer_saved_search_with_params
-    fake 'customers/search.json?saved_search_id=8899730&limit=1', :body => load_fixture('customer_saved_search_customers'), :extension => false
+    fake 'customers/search.json?customer_saved_search_id=8899730&limit=1', :body => load_fixture('customer_saved_search_customers'), :extension => false
     customers = @customer_saved_search.customers(:limit => 1)
     assert_equal 1, customers.length
     assert_equal 112223902, customers.first.id

data/test/fulfillment_request_test.rb

@@ -2,20 +2,20 @@ require 'test_helper'
 
 class FulFillmentRequestTest < Test::Unit::TestCase
   def setup
-    fake "orders/450789469/fulfillment_requests/255858046", method: :get, body: load_fixture('fulfillment_request')
+    super
+    fake "orders/450789469/fulfillment_requests/695890229", method: :get, body: load_fixture('fulfillment_request')
   end
 
   context "#mark_as_failed" do
     should "be able to mark_as_failed a fulfillment request" do
-      fulfillment_request = ShopifyAPI::FulfillmentRequest.find(255858046, params: { order_id: 450789469 })
+      fulfillment_request = ShopifyAPI::FulfillmentRequest.find(695890229, params: { order_id: 450789469 })
 
       cancelled = ActiveSupport::JSON.decode(load_fixture('fulfillment_request'))
       cancelled['failure_message'] = 'failure reason'
       cancelled['message'] = nil
-      fake "orders/450789469/fulfillment_requests/695890229/mark_as_failed.json?message=",
+      fake "orders/450789469/fulfillment_requests/695890229/mark_as_failed",
         method: :put,
-        body: ActiveSupport::JSON.encode(cancelled),
-        extension: false
+        body: ActiveSupport::JSON.encode(cancelled)
 
       assert fulfillment_request.failure_message.blank?
       assert fulfillment_request.mark_as_failed
@@ -25,7 +25,7 @@ class FulFillmentRequestTest < Test::Unit::TestCase
 
   context "#find" do
     should "be able to find fulfillment request" do
-      fulfillment_request = ShopifyAPI::FulfillmentRequest.find(255858046, params: { order_id: 450789469 })
+      fulfillment_request = ShopifyAPI::FulfillmentRequest.find(695890229, params: { order_id: 450789469 })
       assert_equal 695890229, fulfillment_request.id
       assert_equal 450789469, fulfillment_request.order_id
     end

data/test/fulfillment_test.rb

@@ -2,6 +2,7 @@ require 'test_helper'
 
 class FulFillmentTest < Test::Unit::TestCase
   def setup
+    super
     fake "orders/450789469/fulfillments/255858046", :method => :get, :body => load_fixture('fulfillment')
   end
 

data/test/limits_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class LimitsTest < Test::Unit::TestCase
   def setup
-    ShopifyAPI::Base.site = "test.myshopify.com"
+    super
     @header_hash = {'http_x_shopify_shop_api_call_limit' => '100/300'}
     ShopifyAPI::Base.connection.expects(:response).at_least(0).returns(@header_hash)
   end

data/test/session_test.rb

@@ -4,6 +4,7 @@ require 'timecop'
 class SessionTest < Test::Unit::TestCase
 
   def setup
+    super
     ShopifyAPI::Session.secret = 'secret'
   end
 

data/test/test_helper.rb

@@ -17,7 +17,7 @@ end
 
 class Test::Unit::TestCase < Minitest::Unit::TestCase
   def self.test(string, &block)
-    define_method("test:#{string}", &block)
+    define_method("test_#{string}", &block)
   end
 
   def self.should(string, &block)
@@ -46,6 +46,11 @@ class Test::Unit::TestCase < Minitest::Unit::TestCase
 
   def teardown
     FakeWeb.clean_registry
+
+    ShopifyAPI::Base.clear_session
+    ShopifyAPI::Base.site = nil
+    ShopifyAPI::Base.password = nil
+    ShopifyAPI::Base.user = nil
   end
 
   # Custom Assertions

data/test/transaction_test.rb

@@ -2,6 +2,7 @@ require 'test_helper'
 
 class TransactionTest < Test::Unit::TestCase
   def setup
+    super
     fake "orders/450789469/transactions/389404469", :method => :get, :body => load_fixture('transaction')
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify_api
 version: !ruby/object:Gem::Version
-  version: 4.3.5
+  version: 4.3.6
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-06 00:00:00.000000000 Z
+date: 2017-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -366,7 +366,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: ShopifyAPI is a lightweight gem for accessing the Shopify admin REST web