Merge pull request #228 from Shopify/default-timeout

Add default timeout to ShopifyAPI::Base

CHANGELOG

@@ -1,3 +1,7 @@
+== Version 4.1.1
+
+* Added explicit 90 second timeout to `ShopifyAPI::Base`
+
 == Version 4.0.7
 
 * Added `ShippingAPI::ShippingZone`

lib/shopify_api/resources/base.rb

@@ -4,6 +4,7 @@ module ShopifyAPI
   class Base < ActiveResource::Base
     class InvalidSessionError < StandardError; end
     extend Countable
+    self.timeout = 90
     self.include_root_in_json = false
     self.headers['User-Agent'] = ["ShopifyAPI/#{ShopifyAPI::VERSION}",
                                   "ActiveResource/#{ActiveResource::VERSION::STRING}",

lib/shopify_api/version.rb

@@ -1,3 +1,3 @@
 module ShopifyAPI
-  VERSION = "4.1.0"
+  VERSION = "4.1.1"
 end