shopify_api 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16a1cc4645fabc273ed6949ec27ccb17a3381488
-  data.tar.gz: ff56c49090a74e23cafb17bdbf941b04124604bb
+  metadata.gz: f83cb9b80cf63282dd34ebaebc6c7623f9c54778
+  data.tar.gz: 281e61d77b3e56c4823bdab49fe8d7d400b240c7
 SHA512:
-  metadata.gz: 6d0f540c231f47f5b239b7937578588f3e31d3df00156a2aeb199817969f02eb74bc89c5cca65b16f84a5ecac5e0eb8012a47e46f0d01722b1914eb5a08a80b0
-  data.tar.gz: 4fb110853ebf1eec0247ecd5b9f132ac6a9a69f677ac1aebac076a8b27f7eece474a0279e300328997284d41d5edfaf16346175232157d206bdec1ab78c9f404
+  metadata.gz: b87bc82865feaf0f54e6132d8794bc926bf31ab3e980b857577ec4c9855a10e2d09207e379db9ac912d5707f85c1e23ece857cf987025d9aa780b6ea3a85a02e
+  data.tar.gz: b9e4cd9e1001a1ddd539ce796448359f78ef5eb9643360be17c4f03b939a2572fc331afd91c073b37b8f434e977bcd1b927aa2ee4660efb9123265ce9fa5caac

data/CHANGELOG

@@ -1,4 +1,8 @@
-== 3.2.6 (Unreleased)
+== Version 4.0.1
+
+* Added `ShopifyAPI::OAuth.revoke` for easy token revocation.
+
+== Version 3.2.6
 
 * Fixed CustomerSavedSearch#customers method to now correctly return only relevant customers
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shopify_api (4.0.0)
+    shopify_api (4.0.1)
       activeresource
 
 GEM

data/lib/shopify_api/resources/gift_card.rb

@@ -0,0 +1,7 @@
+module ShopifyAPI
+  class GiftCard < Base
+    def disable
+      load_attributes_from_response(post(:disable))
+    end
+  end
+end

data/lib/shopify_api/resources/o_auth.rb

@@ -0,0 +1,9 @@
+module ShopifyAPI
+  class OAuth < Base
+    self.collection_name = 'oauth'
+
+    def self.revoke
+      delete(:revoke)
+    end
+  end
+end

data/lib/shopify_api/resources/shop.rb

@@ -2,8 +2,8 @@ module ShopifyAPI
   # Shop object. Use Shop.current to receive 
   # the shop.
   class Shop < Base
-    def self.current
-      find(:one, from: "/admin/shop.#{format.extension}")
+    def self.current(options={})
+      find(:one, options.merge({from: "/admin/shop.#{format.extension}"}))
     end
 
     def metafields

data/lib/shopify_api/session.rb

@@ -1,3 +1,4 @@
+require 'openssl'
 
 module ShopifyAPI
 
@@ -43,10 +44,10 @@ module ShopifyAPI
 
       def validate_signature(params)
         params = params.with_indifferent_access
-        return false unless signature = params[:signature]
+        return false unless signature = params[:hmac]
 
-        sorted_params = params.except(:signature, :action, :controller).collect{|k,v|"#{k}=#{v}"}.sort.join
-        Digest::MD5.hexdigest(secret + sorted_params) == signature
+        sorted_params = params.except(:signature, :hmac, :action, :controller).collect{|k,v|"#{k}=#{v}"}.sort.join('&')
+        OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA256.new(), secret, sorted_params) == signature
       end
 
       def host_with_port(site)

data/lib/shopify_api/version.rb

@@ -1,3 +1,3 @@
 module ShopifyAPI
-  VERSION = "4.0.0"
+  VERSION = "4.0.1"
 end

data/test/fixtures/gift_card.json

@@ -0,0 +1,20 @@
+{
+  "gift_card": {
+    "api_client_id": null,
+    "balance": "10.00",
+    "created_at": "2014-08-06T15:58:38-03:00",
+    "currency": "CAD",
+    "customer_id": null,
+    "disabled_at": null,
+    "expires_on": null,
+    "id": 1023670,
+    "initial_value": "10.00",
+    "line_item_id": null,
+    "note": "",
+    "template_suffix": "",
+    "updated_at": "2014-08-06T15:58:38-03:00",
+    "user_id": 2699672,
+    "last_characters": "dddd",
+    "order_id": null
+  }
+}

data/test/fixtures/gift_card_disabled.json

@@ -0,0 +1,20 @@
+{
+  "gift_card": {
+    "api_client_id": null,
+    "balance": "10.00",
+    "created_at": "2014-08-06T15:58:38-03:00",
+    "currency": "CAD",
+    "customer_id": null,
+    "disabled_at": "2014-09-13T20:15:21-03:00",
+    "expires_on": null,
+    "id": 1023670,
+    "initial_value": "10.00",
+    "line_item_id": null,
+    "note": "",
+    "template_suffix": "",
+    "updated_at": "2014-09-13T20:15:21-03:00",
+    "user_id": 2699672,
+    "last_characters": "dddd",
+    "order_id": null
+  }
+}

data/test/fixtures/o_auth_revoke.json

@@ -0,0 +1,5 @@
+{
+  "permission": {
+    "access_token": "8ccb0232e04c672bf044f71ff0156098"
+  }
+}

data/test/gift_card_test.rb

@@ -0,0 +1,22 @@
+require 'test_helper'
+
+class GiftCardTest < Test::Unit::TestCase
+  def setup
+    super
+    load_gift_card
+  end
+
+  def test_disable
+    fake 'gift_cards/1023670/disable.json', :body => load_fixture('gift_card_disabled'), :method => :post, :extension => false
+
+    refute @gift_card.disabled_at
+    @gift_card.disable
+    assert @gift_card.disabled_at
+  end
+
+  private
+  def load_gift_card
+    fake 'gift_cards/1023670', :body => load_fixture('gift_card')
+    @gift_card = ShopifyAPI::GiftCard.find(1023670)
+  end
+end

data/test/o_auth_test.rb

@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class OAuthTest < Test::Unit::TestCase
+  def test_revoke_kills_the_token
+    fake 'oauth/revoke', method: :delete, body: load_fixture('o_auth_revoke')
+    assert ShopifyAPI::OAuth.revoke
+  end
+end

data/test/session_test.rb

@@ -117,10 +117,10 @@ class SessionTest < Test::Unit::TestCase
       ShopifyAPI::Session.secret = 'secret'
       params = {:code => 'any-code', :timestamp => Time.now}
       sorted_params = make_sorted_params(params)
-      signature = Digest::MD5.hexdigest(ShopifyAPI::Session.secret + sorted_params)
+      signature = OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA256.new(), ShopifyAPI::Session.secret, sorted_params)
       fake nil, :url => 'https://testshop.myshopify.com/admin/oauth/access_token',:method => :post, :body => '{"access_token" : "any-token"}'
       session = ShopifyAPI::Session.new("testshop.myshopify.com")
-      token = session.request_token(params.merge(:signature => signature))
+      token = session.request_token(params.merge(:hmac => signature))
       assert_equal "any-token", token
     end
 
@@ -128,11 +128,11 @@ class SessionTest < Test::Unit::TestCase
       ShopifyAPI::Session.secret = 'secret'
       params = {:code => "any-code", :timestamp => Time.now}
       sorted_params = make_sorted_params(params)
-      signature = Digest::MD5.hexdigest(ShopifyAPI::Session.secret + sorted_params)
+      signature = OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA256.new(), ShopifyAPI::Session.secret, sorted_params)
       params[:foo] = 'world'
       assert_raises(ShopifyAPI::ValidationException) do
         session = ShopifyAPI::Session.new("testshop.myshopify.com")
-        session.request_token(params.merge(:signature => signature))
+        session.request_token(params.merge(:hmac => signature))
       end
     end
 
@@ -140,11 +140,11 @@ class SessionTest < Test::Unit::TestCase
       ShopifyAPI::Session.secret = 'secret'
       params = {:code => "any-code", :timestamp => Time.now - 2.days}
       sorted_params = make_sorted_params(params)
-      signature = Digest::MD5.hexdigest(ShopifyAPI::Session.secret + sorted_params)
+      signature = OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA256.new(), ShopifyAPI::Session.secret, sorted_params)
       params[:foo] = 'world'
       assert_raises(ShopifyAPI::ValidationException) do
         session = ShopifyAPI::Session.new("testshop.myshopify.com")
-        session.request_token(params.merge(:signature => signature))
+        session.request_token(params.merge(:hmac => signature))
       end
     end
 
@@ -152,8 +152,8 @@ class SessionTest < Test::Unit::TestCase
       now = Time.now
       params = {"code" => "any-code", "timestamp" => now}
       sorted_params = make_sorted_params(params)
-      signature = Digest::MD5.hexdigest(ShopifyAPI::Session.secret + sorted_params)
-      params = {"code" => "any-code", "timestamp" => now, "signature" => signature}
+      signature = OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA256.new(), ShopifyAPI::Session.secret, sorted_params)
+      params = {"code" => "any-code", "timestamp" => now, "hmac" => signature}
 
       assert_equal true, ShopifyAPI::Session.validate_signature(params)
     end
@@ -161,7 +161,7 @@ class SessionTest < Test::Unit::TestCase
     private
 
     def make_sorted_params(params)
-      sorted_params = params.with_indifferent_access.except(:signature, :action, :controller).collect{|k,v|"#{k}=#{v}"}.sort.join
+      sorted_params = params.with_indifferent_access.except(:signature, :hmac, :action, :controller).collect{|k,v|"#{k}=#{v}"}.sort.join('&')
     end
 
   end

data/test/shop_test.rb

@@ -16,6 +16,15 @@ class ShopTest < Test::Unit::TestCase
     assert_nil @shop.tax_shipping
   end
 
+  def test_current_with_options_should_return_current_shop
+    fake "shop.json?fields%5B%5D=name&fields%5B%5D=myshopify_domain", :extension => false, :method => :get, :status => 201, :body => load_fixture('shop')
+
+    @shop = ShopifyAPI::Shop.current(params: { fields: [:name, :myshopify_domain]})
+    assert @shop.is_a?(ShopifyAPI::Shop)
+    assert_equal "Apple Computers", @shop.name
+    assert_equal "apple.myshopify.com", @shop.myshopify_domain
+  end
+
   def test_get_metafields_for_shop
     fake "metafields"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shopify_api
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Shopify
@@ -30,7 +30,7 @@ cert_chain:
   fl3hbtVFTqbOlwL9vy1fudXcolIE/ZTcxQ+er07ZFZdKCXayR9PPs64heamfn0fp
   TConQSX2BnZdhIEYW+cKzEC/bLc=
   -----END CERTIFICATE-----
-date: 2015-04-22 00:00:00.000000000 Z
+date: 2015-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -165,11 +165,13 @@ files:
 - lib/shopify_api/resources/event.rb
 - lib/shopify_api/resources/fulfillment.rb
 - lib/shopify_api/resources/fulfillment_service.rb
+- lib/shopify_api/resources/gift_card.rb
 - lib/shopify_api/resources/image.rb
 - lib/shopify_api/resources/line_item.rb
 - lib/shopify_api/resources/location.rb
 - lib/shopify_api/resources/metafield.rb
 - lib/shopify_api/resources/note_attribute.rb
+- lib/shopify_api/resources/o_auth.rb
 - lib/shopify_api/resources/option.rb
 - lib/shopify_api/resources/order.rb
 - lib/shopify_api/resources/order_risk.rb
@@ -223,10 +225,13 @@ files:
 - test/fixtures/events.json
 - test/fixtures/fulfillment.json
 - test/fixtures/fulfillment_service.json
+- test/fixtures/gift_card.json
+- test/fixtures/gift_card_disabled.json
 - test/fixtures/image.json
 - test/fixtures/images.json
 - test/fixtures/metafield.json
 - test/fixtures/metafields.json
+- test/fixtures/o_auth_revoke.json
 - test/fixtures/order.json
 - test/fixtures/order_risk.json
 - test/fixtures/order_risks.json
@@ -246,9 +251,11 @@ files:
 - test/fixtures/webhooks.json
 - test/fulfillment_service_test.rb
 - test/fulfillment_test.rb
+- test/gift_card_test.rb
 - test/image_test.rb
 - test/limits_test.rb
 - test/metafield_test.rb
+- test/o_auth_test.rb
 - test/order_risk_test.rb
 - test/order_test.rb
 - test/policy_test.rb