shopify_api 4.2.2 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fdce8306a9014e8357e21815c44369596dd94f1
-  data.tar.gz: a5554efc1f1c6b34a7129fc4db40c923c400bee9
+  metadata.gz: df0d9072de811f85dcd0a3c8dd778d36d32571c3
+  data.tar.gz: 35fcf37d798c2cc92cc960e0bafeeb2514482d15
 SHA512:
-  metadata.gz: 47c47ae9baa73dfea72a4dc9fc1bb185dedbd53c346070a6a5b9ec65e4fba0938f5ebd668a2d9bcea0dd92bd976ed6a627d34076267dfac2795ec62ad41e644e
-  data.tar.gz: 356e392df148854efde592234cd09e9505ea4b954c54cf1a978c4797b01768abd1be4c26bb14b72c62765b8514f393ed1b574b97cf874e14c7881bf650e06912
+  metadata.gz: be971202041dd157e278b3d40920d6c4e37a6dad77b0e1f5dce89c4a1ec14238a609c129ce1c19e0780543b0363527361d7b4908b079d38abec29784845791fb
+  data.tar.gz: 735562487217f0bd86fe5c430dfc08bf258c1c0cba3f0d1da18ea4c0bcb783c96f8dda78baa4cd7b16caf59c980f3e7b0141d7cbe39baef537fbb944ac6da411

data/.travis.yml

@@ -1,31 +1,32 @@
 language: ruby
+sudo: false
 
 rvm:
-  - 2.0.0
-  - 1.9.3
+  - 2.3.1
+  - 2.4.0-preview1
 
 gemfile:
   - Gemfile
   - Gemfile_ar30
   - Gemfile_ar31
   - Gemfile_ar32
-  - Gemfile_ar40threadsafe
-  - Gemfile_ar42threadsafe
-
-sudo: false
-
-before_script: echo $OLD_RAKE
+  - Gemfile_ar40
+  - Gemfile_ar_master
 
 matrix:
-  include:
-    - rvm: 2.2.1
-      gemfile: Gemfile_ar50
-    - rvm: 1.9.2
+  fast_finish: true
+  allow_failures:
+    - rvm: 2.4.0-preview1
+      gemfile: Gemfile
+    - rvm: 2.4.0-preview1
       gemfile: Gemfile_ar30
-      env: OLD_RAKE=1
-    - rvm: 1.9.2
+    - rvm: 2.4.0-preview1
       gemfile: Gemfile_ar31
-      env: OLD_RAKE=1
-    - rvm: 1.9.2
+    - rvm: 2.4.0-preview1
       gemfile: Gemfile_ar32
-      env: OLD_RAKE=1
+    - rvm: 2.4.0-preview1
+      gemfile: Gemfile_ar40
+    - rvm: 2.4.0-preview1
+      gemfile: Gemfile_ar_master
+    - rvm: 2.3.1
+      gemfile: Gemfile_ar_master

data/CHANGELOG

@@ -1,3 +1,8 @@
+== Version 4.3.0
+
+* Require Ruby >= `2.3.0`
+* Use inheritance instead of the deprecated Rails `Module#alias_method_chain`
+
 == Version 4.2.2
 
 * Support for AccessToken#delegate endpoint

data/Gemfile

@@ -2,6 +2,4 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "activeresource", '~> 4.0.0'
-
-gem 'minitest', "~> 4.2"
+gem "activeresource", "~> 4.1"

data/Gemfile_ar30

@@ -3,7 +3,3 @@ source "https://rubygems.org"
 gemspec
 
 gem "activeresource", "~> 3.0.0"
-
-if ENV['OLD_RAKE'] == '1'
-  gem "rake", "~> 0.9.2"
-end

data/Gemfile_ar31

@@ -3,8 +3,3 @@ source "https://rubygems.org"
 gemspec
 
 gem "activeresource", "~> 3.1.0"
-
-if ENV['OLD_RAKE'] == '1'
-  gem "rake", "~> 0.9.2"
-  gem "i18n", "~> 0.6.11"
-end

data/Gemfile_ar32

@@ -3,8 +3,3 @@ source "https://rubygems.org"
 gemspec
 
 gem "activeresource", "~> 3.2.0"
-
-if ENV['OLD_RAKE'] == '1'
-  gem "rake", "~> 0.9.2"
-  gem "i18n", "~> 0.6.11"
-end

data/Gemfile_ar40

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gemspec
+
+gem "activeresource", "4.0.0"

data/Gemfile_ar_master

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gemspec
+
+gem 'activeresource', git: 'git://github.com/rails/activeresource'

data/README.md

@@ -16,6 +16,10 @@ All API usage happens through Shopify applications, created by either shop owner
 
 For more information and detailed documentation about the API visit http://api.shopify.com
 
+#### Ruby version
+
+This gem requires Ruby 2.3.1 as of version 4.3. If you need to use an older Ruby version then update your `Gemfile` to lock onto an older release than 4.3.
+
 ### Installation
 
 To easily install or upgrade to the latest release, use [gem](http://rubygems.org/)
@@ -188,16 +192,9 @@ gem install shopify_cli
 
 ## Threadsafety
 
-ActiveResource is inherently non-threadsafe, because class variables like ActiveResource::Base.site and ActiveResource::Base.headers are shared between threads. This can cause conflicts when using threaded libraries, like Sidekiq.
-
-We have a forked version of ActiveResource that stores these class variables in threadlocal variables. Using this forked version will allow ShopifyAPI to be used in a threaded environment.
+ActiveResource is threadsafe as of version 4.1 (which works with Rails 4.x and above).
 
-To enable threadsafety with ShopifyAPI, add the following to your Gemfile. There are various threadsafe tags that you can use, [depending on which version of rails you are using](https://github.com/shopify/activeresource/tags).
-
-```
-gem 'activeresource', git: 'git://github.com/Shopify/activeresource', tag: '4.2-threadsafe'
-gem 'shopify_api', '>= 3.2.1'
-```
+If you were previously using Shopify's [activeresource fork](https://github.com/shopify/activeresource) then you should remove it and use ActiveResource 4.1.
 
 ## Using Development Version
 

data/Rakefile

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-require 'rubygems'
 require 'rake'
 require "bundler/gem_tasks"
 
@@ -23,7 +21,6 @@ rescue LoadError
   end
 end
 
-
 task :default => :test
 
 require 'rdoc/task'

data/lib/active_resource/connection_ext.rb

@@ -1,31 +1,32 @@
-require 'active_support/core_ext/module/aliasing'
-
 module ActiveResource
   class Connection
-
     attr_reader :response
 
-    def handle_response_with_response_capture(response)
-      @response = handle_response_without_response_capture(response)
+    module ResponseCapture
+      def handle_response(response)
+        @response = super
+      end
     end
 
-    def request_with_detailed_log_subscriber(method, path, *arguments)
-      result = request_without_detailed_log_subscriber(method, path, *arguments)
-      detailed_log_subscriber(result, arguments)
-      result
-    rescue => e
-      detailed_log_subscriber(e.response, arguments) if e.respond_to?(:response)
-      raise
-    end
+    module RequestNotification
+      def request(method, path, *arguments)
+        super.tap do |response|
+          notify_about_request(response, arguments)
+        end
+      rescue => e
+        notify_about_request(e.response, arguments) if e.respond_to?(:response)
+        raise
+      end
 
-    def detailed_log_subscriber(response, arguments)
-      ActiveSupport::Notifications.instrument("request.active_resource_detailed") do |payload|
-        payload[:response] = response
-        payload[:data]     = arguments
+      def notify_about_request(response, arguments)
+        ActiveSupport::Notifications.instrument("request.active_resource_detailed") do |payload|
+          payload[:response] = response
+          payload[:data]     = arguments
+        end
       end
     end
 
-    alias_method_chain :handle_response, :response_capture
-    alias_method_chain :request, :detailed_log_subscriber
+    prepend ResponseCapture
+    prepend RequestNotification
   end
 end

data/lib/shopify_api/version.rb

@@ -1,3 +1,3 @@
 module ShopifyAPI
-  VERSION = "4.2.2"
+  VERSION = "4.3.0"
 end

data/shopify_api.gemspec

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
 require "shopify_api/version"
 
@@ -22,20 +21,15 @@ Gem::Specification.new do |s|
 
   s.rdoc_options = ["--charset=UTF-8"]
   s.summary = %q{ShopifyAPI is a lightweight gem for accessing the Shopify admin REST web services}
-  s.license = 'MIT'
+  s.license = "MIT"
 
-  s.add_dependency("activeresource")
-  s.add_dependency("rack")
+  s.required_ruby_version = ">= 2.3"
 
-  dev_dependencies = [['mocha', '>= 0.9.8'],
-                      ['fakeweb'], 
-                      ['minitest', '~> 4.0'],
-                      ['rake']
-  ]
+  s.add_runtime_dependency("activeresource", ">= 3.0.0")
+  s.add_runtime_dependency("rack")
 
-  if s.respond_to?(:add_development_dependency)
-    dev_dependencies.each { |dep| s.add_development_dependency(*dep) }
-  else
-    dev_dependencies.each { |dep| s.add_dependency(*dep) }
-  end
+  s.add_development_dependency("mocha", ">= 0.9.8")
+  s.add_development_dependency("fakeweb")
+  s.add_development_dependency("minitest", ">= 4.0")
+  s.add_development_dependency("rake")
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify_api
 version: !ruby/object:Gem::Version
-  version: 4.2.2
+  version: 4.3.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-30 00:00:00.000000000 Z
+date: 2016-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -70,14 +70,14 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
@@ -116,9 +116,8 @@ files:
 - Gemfile_ar30
 - Gemfile_ar31
 - Gemfile_ar32
-- Gemfile_ar40threadsafe
-- Gemfile_ar42threadsafe
-- Gemfile_ar50
+- Gemfile_ar40
+- Gemfile_ar_master
 - LICENSE
 - README.md
 - RELEASING
@@ -316,7 +315,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/Gemfile_ar40threadsafe

@@ -1,7 +0,0 @@
-source "https://rubygems.org"
-
-gemspec
-
-gem 'activeresource', :git => 'git://github.com/Shopify/activeresource', tag: '4.0-threadsafe'
-
-gem 'minitest', "~> 4.2"

data/Gemfile_ar42threadsafe

@@ -1,7 +0,0 @@
-source "https://rubygems.org"
-
-gemspec
-
-gem 'activeresource', :git => 'git://github.com/Shopify/activeresource', tag: '4.2-threadsafe'
-
-gem 'minitest', "~> 4.2"

data/Gemfile_ar50

@@ -1,11 +0,0 @@
-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'