shopify_api 7.0.2 → 7.1.0

data/test/product_publication_test.rb

@@ -35,6 +35,6 @@ class ProductPublicationTest < Test::Unit::TestCase
       },
     }.to_json
 
-    assert_equal expected_body, FakeWeb.last_request.body
+    assert_equal expected_body, WebMock.last_request.body
   end
 end

data/test/product_test.rb

@@ -12,7 +12,7 @@ class ProductTest < Test::Unit::TestCase
     fake "products/632910392/metafields", :method => :post, :status => 201, :body => load_fixture('metafield')
 
     field = @product.add_metafield(ShopifyAPI::Metafield.new(:namespace => "contact", :key => "email", :value => "123@example.com", :value_type => "string"))
-    assert_equal ActiveSupport::JSON.decode('{"metafield":{"namespace":"contact","key":"email","value":"123@example.com","value_type":"string"}}'), ActiveSupport::JSON.decode(FakeWeb.last_request.body)
+    assert_equal ActiveSupport::JSON.decode('{"metafield":{"namespace":"contact","key":"email","value":"123@example.com","value_type":"string"}}'), ActiveSupport::JSON.decode(WebMock.last_request.body)
     assert !field.new_record?
     assert_equal "contact", field.namespace
     assert_equal "email", field.key

data/test/recurring_application_charge_test.rb

@@ -129,15 +129,14 @@ class RecurringApplicationChargeTest < Test::Unit::TestCase
     fake "recurring_application_charges", body: {recurring_application_charges: []}.to_json
 
     assert_equal 0, ShopifyAPI::RecurringApplicationCharge.all.count
-    assert_equal nil, ShopifyAPI::RecurringApplicationCharge.current
+    assert_nil ShopifyAPI::RecurringApplicationCharge.current
     assert_equal [], ShopifyAPI::RecurringApplicationCharge.pending
   end
 
   def test_recurring_application_charge_not_found_error
     fake "recurring_application_charges", body: '{"errors":"Not Found"}', status: 404
-
-    assert_equal(nil, ShopifyAPI::RecurringApplicationCharge.all)
-    assert_equal(nil, ShopifyAPI::RecurringApplicationCharge.current)
+    assert_nil ShopifyAPI::RecurringApplicationCharge.all
+    assert_nil ShopifyAPI::RecurringApplicationCharge.current
     assert_equal([], ShopifyAPI::RecurringApplicationCharge.pending)
   end
 end

data/test/shop_test.rb

@@ -50,7 +50,7 @@ class ShopTest < Test::Unit::TestCase
     fake "metafields", :method => :post, :status => 201, :body =>load_fixture('metafield')
 
     field = @shop.add_metafield(ShopifyAPI::Metafield.new(:namespace => "contact", :key => "email", :value => "123@example.com", :value_type => "string"))
-    assert_equal ActiveSupport::JSON.decode('{"metafield":{"namespace":"contact","key":"email","value":"123@example.com","value_type":"string"}}'), ActiveSupport::JSON.decode(FakeWeb.last_request.body)
+    assert_equal ActiveSupport::JSON.decode('{"metafield":{"namespace":"contact","key":"email","value":"123@example.com","value_type":"string"}}'), ActiveSupport::JSON.decode(WebMock.last_request.body)
     assert !field.new_record?
     assert_equal "contact", field.namespace
     assert_equal "email", field.key

data/test/tax_service_test.rb

@@ -3,6 +3,7 @@ class TaxServiceTest < Test::Unit::TestCase
   test "tax service creation" do
     fake "tax_services", :method => :post, :status => 202, :body => load_fixture('tax_service')
     tax_service = ShopifyAPI::TaxService.create(:name => "My Tax Service", :url => "https://mytaxservice.com")
-    assert_equal '{"tax_service":{"name":"My Tax Service","url":"https://mytaxservice.com"}}', FakeWeb.last_request.body
+    assert_equal '{"tax_service":{"name":"My Tax Service","url":"https://mytaxservice.com"}}', WebMock.last_request.body
+
   end
 end

data/test/test_helper.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'minitest/autorun'
-require 'fakeweb'
+require 'webmock/minitest'
+require_relative 'lib/webmock_extensions/last_request'
 require 'mocha/setup'
 require 'pry'
 
@@ -8,107 +9,106 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'shopify_api'
 
-FakeWeb.allow_net_connect = false
+WebMock.disable_net_connect!
 
 # setup ShopifyAPI with fake api_key and secret
 module Test
   module Unit
-  end
-end
-
-class Test::Unit::TestCase < Minitest::Unit::TestCase
-  def self.test(string, &block)
-    define_method("test_#{string}", &block)
-  end
-
-  def self.should(string, &block)
-    self.test("should_#{string}", &block)
-  end
-
-  def self.context(string)
-    yield
-  end
+    class TestCase < Minitest::Test
+      def self.test(string, &block)
+        define_method("test_#{string}", &block)
+      end
 
-  def setup
-    ActiveResource::Base.format = :json
-    ShopifyAPI.constants.each do |const|
-      begin
-        const = mod.const_get(const)
-        const.format = :json if const.respond_to?(:format=)
-      rescue NameError
+      def self.should(string, &block)
+        self.test("should_#{string}", &block)
       end
-    end
 
-    ShopifyAPI::ApiVersion.define_version(ShopifyAPI::ApiVersion::Release.new('2019-01'))
+      def self.context(string)
+        yield
+      end
 
-    ShopifyAPI::Base.clear_session
-    session = ShopifyAPI::Session.new(
-      domain: "https://this-is-my-test-shop.myshopify.com",
-      token: "token_test_helper",
-      api_version: '2019-01',
-    )
+      def setup
+        ActiveResource::Base.format = :json
+        ShopifyAPI.constants.each do |const|
+          begin
+            const = mod.const_get(const)
+            const.format = :json if const.respond_to?(:format=)
+          rescue NameError
+          end
+        end
+
+        ShopifyAPI::ApiVersion.define_version(ShopifyAPI::ApiVersion::Release.new('2019-01'))
+
+        ShopifyAPI::Base.clear_session
+        session = ShopifyAPI::Session.new(
+          domain: "https://this-is-my-test-shop.myshopify.com",
+          token: "token_test_helper",
+          api_version: '2019-01',
+        )
+
+        ShopifyAPI::Base.activate_session(session)
+      end
 
-    ShopifyAPI::Base.activate_session(session)
-  end
+      def teardown
+        ShopifyAPI::Base.clear_session
+        ShopifyAPI::Base.site = nil
+        ShopifyAPI::Base.password = nil
+        ShopifyAPI::Base.user = nil
 
-  def teardown
-    FakeWeb.clean_registry
+        ShopifyAPI::ApiVersion.clear_defined_versions
+        ShopifyAPI::ApiVersion.define_known_versions
+      end
 
-    ShopifyAPI::Base.clear_session
-    ShopifyAPI::Base.site = nil
-    ShopifyAPI::Base.password = nil
-    ShopifyAPI::Base.user = nil
+      # Custom Assertions
+      def assert_not(expression)
+        refute expression, "Expected <#{expression}> to be false!"
+      end
 
-    ShopifyAPI::ApiVersion.clear_defined_versions
-    ShopifyAPI::ApiVersion.define_known_versions
-  end
+      def assert_nothing_raised
+        yield
+      end
 
-  # Custom Assertions
-  def assert_not(expression)
-    refute expression, "Expected <#{expression}> to be false!"
-  end
+      def assert_not_includes(array, value)
+        refute array.include?(value)
+      end
 
-  def assert_nothing_raised
-    yield
-  end
+      def assert_includes(array, value)
+        assert array.include?(value)
+      end
 
-  def assert_not_includes(array, value)
-    refute array.include?(value)
-  end
+      def load_fixture(name, format=:json)
+        File.read(File.dirname(__FILE__) + "/fixtures/#{name}.#{format}")
+      end
 
-  def assert_includes(array, value)
-    assert array.include?(value)
-  end
+      def assert_request_body(expected)
+        assert_equal expected, WebMock.last_request.body
+      end
 
-  def load_fixture(name, format=:json)
-    File.read(File.dirname(__FILE__) + "/fixtures/#{name}.#{format}")
-  end
+      def fake(endpoint, options={})
+        body   = options.has_key?(:body) ? options.delete(:body) : load_fixture(endpoint)
+        format = options.delete(:format) || :json
+        method = options.delete(:method) || :get
+        api_version = options.delete(:api_version) || ShopifyAPI::ApiVersion.coerce_to_version('2019-01')
+        extension = ".#{options.delete(:extension)||'json'}" unless options[:extension]==false
+        status = options.delete(:status) || 200
+        url = if options.has_key?(:url)
+          options[:url]
+        else
+          "https://this-is-my-test-shop.myshopify.com#{api_version.construct_api_path("#{endpoint}#{extension}")}"
+        end
+
+        WebMock.stub_request(method, url).to_return(
+          body: body, status: status, headers: { content_type: "text/#{format}", content_length: 1 }.merge(options)
+        )
+      end
 
-  def assert_request_body(expected)
-    assert_equal expected, FakeWeb.last_request.body
-  end
+      def ar_version_before?(version_string)
+        Gem::Version.new(ActiveResource::VERSION::STRING) < Gem::Version.new(version_string)
+      end
 
-  def fake(endpoint, options={})
-    body   = options.has_key?(:body) ? options.delete(:body) : load_fixture(endpoint)
-    format = options.delete(:format) || :json
-    method = options.delete(:method) || :get
-    api_version = options.delete(:api_version) || ShopifyAPI::ApiVersion.coerce_to_version('2019-01')
-    extension = ".#{options.delete(:extension)||'json'}" unless options[:extension]==false
-
-    url = if options.has_key?(:url)
-      options[:url]
-    else
-      "https://this-is-my-test-shop.myshopify.com#{api_version.construct_api_path("#{endpoint}#{extension}")}"
+      def ar_version_after?(version_string)
+        Gem::Version.new(version_string) < Gem::Version.new(ActiveResource::VERSION::STRING)
+      end
     end
-
-    FakeWeb.register_uri(method, url, {:body => body, :status => 200, :content_type => "text/#{format}", :content_length => 1}.merge(options))
-  end
-
-  def ar_version_before?(version_string)
-    Gem::Version.new(ActiveResource::VERSION::STRING) < Gem::Version.new(version_string)
-  end
-
-  def ar_version_after?(version_string)
-    Gem::Version.new(version_string) < Gem::Version.new(ActiveResource::VERSION::STRING)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify_api
 version: !ruby/object:Gem::Version
-  version: 7.0.2
+  version: 7.1.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-02 00:00:00.000000000 Z
+date: 2019-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -73,7 +73,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.9.8
 - !ruby/object:Gem::Dependency
-  name: fakeweb
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -186,6 +186,7 @@ files:
 - ".github/CODEOWNERS"
 - ".github/probots.yml"
 - ".gitignore"
+- ".rubocop-https---shopify-github-io-ruby-style-guide-rubocop-yml"
 - ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
@@ -214,6 +215,8 @@ files:
 - lib/shopify_api/events.rb
 - lib/shopify_api/limits.rb
 - lib/shopify_api/metafields.rb
+- lib/shopify_api/paginated_collection.rb
+- lib/shopify_api/pagination_link_headers.rb
 - lib/shopify_api/resources.rb
 - lib/shopify_api/resources/abandoned_checkout.rb
 - lib/shopify_api/resources/access_scope.rb
@@ -223,6 +226,7 @@ files:
 - lib/shopify_api/resources/api_permission.rb
 - lib/shopify_api/resources/application_charge.rb
 - lib/shopify_api/resources/application_credit.rb
+- lib/shopify_api/resources/array_base.rb
 - lib/shopify_api/resources/article.rb
 - lib/shopify_api/resources/asset.rb
 - lib/shopify_api/resources/base.rb
@@ -351,6 +355,7 @@ files:
 - test/fixtures/collect.json
 - test/fixtures/collection_listing.json
 - test/fixtures/collection_listing_product_ids.json
+- test/fixtures/collection_listing_product_ids2.json
 - test/fixtures/collection_listings.json
 - test/fixtures/collection_publication.json
 - test/fixtures/collection_publications.json
@@ -401,6 +406,7 @@ files:
 - test/fixtures/product.json
 - test/fixtures/product_listing.json
 - test/fixtures/product_listing_product_ids.json
+- test/fixtures/product_listing_product_ids2.json
 - test/fixtures/product_listings.json
 - test/fixtures/product_publication.json
 - test/fixtures/product_publications.json
@@ -440,12 +446,14 @@ files:
 - test/gift_card_test.rb
 - test/image_test.rb
 - test/inventory_level_test.rb
+- test/lib/webmock_extensions/last_request.rb
 - test/limits_test.rb
 - test/location_test.rb
 - test/marketing_event_test.rb
 - test/metafield_test.rb
 - test/order_risk_test.rb
 - test/order_test.rb
+- test/pagination_test.rb
 - test/payment_test.rb
 - test/policy_test.rb
 - test/price_rule_test.rb
@@ -493,8 +501,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: ShopifyAPI is a lightweight gem for accessing the Shopify admin REST web