shopify_api 4.1.1 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3210f33bde8303e1ad0630c26f291e253d8607c0
-  data.tar.gz: 4cf3248d808d100d9b65fffe38eb27b365b4d4a4
+  metadata.gz: a469a08bffed1215a271c451c89c0c2df287dce8
+  data.tar.gz: d3e501f6992c3eaf5318b9b15a31b30a4972b221
 SHA512:
-  metadata.gz: 3dd39837431fd7d52a5a82387efbc888a476ca056b3baec91250df0728b125ca6b626568022c173c31cce9d76779158a01c5166f1a47f30edbf8eaddaf05524b
-  data.tar.gz: e3b6daf0c4a659474a8f62489073a759778c27757ab33ed92bc0a936643f6a6d4dca292b86522c573435476a9ecbf5b55f1abe2da4f525575292751e564ac581
+  metadata.gz: be1d93b8ddf0cb35df0f89c968b3b3fbacf392fe4a50be88458f1afac5ab03531955da21ffaf3cc9b14edf9323ab05c5a635b35b7e922520a6457084f0eaa194
+  data.tar.gz: c9d4da93918d73615f59df1eb5174b992b2ac4ae5f58e29022ed11c0335b9fb98b83331bed09dd81e87483c6ac650371400d3467bf37b69bc6b3f9312ffd1708

data/.travis.yml

@@ -10,6 +10,7 @@ gemfile:
   - Gemfile_ar31
   - Gemfile_ar32
   - Gemfile_ar40threadsafe
+  - Gemfile_ar42threadsafe
 
 sudo: false
 
@@ -17,6 +18,8 @@ before_script: echo $OLD_RAKE
 
 matrix:
   include:
+    - rvm: 2.2.1
+      gemfile: Gemfile_ar50
     - rvm: 1.9.2
       gemfile: Gemfile_ar30
       env: OLD_RAKE=1

data/CHANGELOG

@@ -1,3 +1,7 @@
+== Version 4.2.0
+
+* Threadsafety is now compatible with the latest ActiveResource master
+
 == Version 4.1.1
 
 * Added explicit 90 second timeout to `ShopifyAPI::Base`

data/Gemfile_ar50

@@ -0,0 +1,11 @@
+source "https://rubygems.org"
+
+gemspec
+
+gem 'activeresource', git: 'git://github.com/rails/activeresource', ref: 'c3cd2b535b7c5cdc12cc6a3c1e11be6c74ffa179'
+
+gem 'minitest', "~> 5.1"
+gem 'activesupport', github: 'rails/rails'
+gem 'activemodel', github: 'rails/rails'
+gem 'arel', github: 'rails/arel'
+gem 'rails-observers', github: 'rails/rails-observers'

data/lib/shopify_api/resources/base.rb

@@ -28,7 +28,7 @@ module ShopifyAPI
     end
 
     class << self
-      if ActiveResource::VERSION::MAJOR == 4 && ActiveResource::VERSION::PRE == 'threadsafe'
+      if ActiveResource::Base.respond_to?(:_headers) && ActiveResource::Base.respond_to?(:_headers_defined?)
         def headers
           if _headers_defined?
             _headers

data/lib/shopify_api/resources/tax_service.rb

@@ -0,0 +1,4 @@
+module ShopifyAPI
+  class TaxService < Base
+  end
+end

data/lib/shopify_api/version.rb

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

data/test/base_test.rb

@@ -88,7 +88,7 @@ class BaseTest < Test::Unit::TestCase
     end
   end
 
-  if ActiveResource::VERSION::MAJOR >= 4 && ActiveResource::VERSION::PRE == "threadsafe"
+  if ActiveResource::VERSION::MAJOR >= 5 || (ActiveResource::VERSION::MAJOR >= 4 && ActiveResource::VERSION::PRE == "threadsafe")
     test "#headers set in the main thread affect spawned threads" do
       ShopifyAPI::Base.headers['X-Custom'] = "the value"
       Thread.new do

data/test/fixtures/tax_service.json

@@ -0,0 +1,9 @@
+{
+  "tax_service": {
+    "name": "My Tax Service",
+    "url": "https://mytaxservice.com",
+    "id": 123456,
+    "default_tax_code": "TX123",
+    "active": "true"
+  }
+}

data/test/recurring_application_charge_test.rb

@@ -137,7 +137,7 @@ class RecurringApplicationChargeTest < Test::Unit::TestCase
     fake "recurring_application_charges", body: '{"errors":"Not Found"}', status: 404
 
     all_application_charges = ShopifyAPI::RecurringApplicationCharge.all
-    if ActiveResource::VERSION::MAJOR >= 4 && ActiveResource::VERSION::MINOR >= 2
+    if ActiveResource::VERSION::MAJOR >= 5 || (ActiveResource::VERSION::MAJOR == 4 && ActiveResource::VERSION::MINOR >= 2)
       assert_equal [], all_application_charges
     else
       assert_equal nil, all_application_charges

data/test/tax_service_test.rb

@@ -0,0 +1,8 @@
+require 'test_helper'
+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
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify_api
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.2.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-29 00:00:00.000000000 Z
+date: 2016-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -118,6 +118,7 @@ files:
 - Gemfile_ar32
 - Gemfile_ar40threadsafe
 - Gemfile_ar42threadsafe
+- Gemfile_ar50
 - LICENSE
 - README.md
 - RELEASING
@@ -184,6 +185,7 @@ files:
 - lib/shopify_api/resources/shop.rb
 - lib/shopify_api/resources/smart_collection.rb
 - lib/shopify_api/resources/tax_line.rb
+- lib/shopify_api/resources/tax_service.rb
 - lib/shopify_api/resources/theme.rb
 - lib/shopify_api/resources/transaction.rb
 - lib/shopify_api/resources/usage_charge.rb
@@ -245,6 +247,7 @@ files:
 - test/fixtures/shipping_zones.json
 - test/fixtures/shop.json
 - test/fixtures/tags.json
+- test/fixtures/tax_service.json
 - test/fixtures/transaction.json
 - test/fixtures/usage_charge.json
 - test/fixtures/usage_charges.json
@@ -269,6 +272,7 @@ files:
 - test/session_test.rb
 - test/shipping_zone_test.rb
 - test/shop_test.rb
+- test/tax_service_test.rb
 - test/test_helper.rb
 - test/transaction_test.rb
 - test/usage_charge_test.rb