shopify_api 3.2.0 → 3.2.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: fc9fc203a46569db4cddb7ed4c82f9392dfdbb33
+  data.tar.gz: ee232e9226eee62db4edd51db94ad38a66bb532b
+SHA512:
+  metadata.gz: 5aaec38706d2c2226260f34ef597108fc68bb1a578f030553771e895e8b03b8dbb0d650ea88a6b3b6097b596e8f967f0315ca922dbfe13566a167e478b32f0ab
+  data.tar.gz: d5bf632be11ffdf315c25616e26bfdd8c4e4fe89034ed98b182af5cd4b14dda035fd1dfe556ffc9a8119efbe5a188dd2e7b74399a1f6270027a24ef770e14990

data/.travis.yml

@@ -9,6 +9,7 @@ gemfile:
   - Gemfile_ar30
   - Gemfile_ar31
   - Gemfile_ar32
+  - Gemfile_ar40threadsafe
 
 install: bundle install
 
@@ -28,5 +29,5 @@ matrix:
 
 
 notifications:
-  flowdock: 
+  flowdock:
     secure: "RCgSxzMScnqK6bOwkv9sWSdieLBeJla8NcDtM/QmuFW8soTgV6qCTAPAGd4lpjg4vGTaM3DsdHU5GMDbgdWN5dE2Rf09ayFqiZg8OloPMQ63KIwLJyVcw3cVJO5i7smjIpsSjPjBkvAXHIOFcKdsnuYGS4YD8hjl+QrZ3ghi440="

data/CHANGELOG

@@ -1,3 +1,9 @@
+== Version 3.2.1
+
+* Added CarrierService resource
+* Added optionally using threadsafe ActiveResource (see readme)
+* Fixed bug in validate_signature
+
 == Version 3.2.0
 
 * in Session::request_token params is no longer optional, you must pass all the params and the method will now extract the code

data/Gemfile

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

data/Gemfile.lock

@@ -1,21 +1,21 @@
 PATH
   remote: .
   specs:
-    shopify_api (3.2.0)
+    shopify_api (3.2.1)
       activeresource (>= 3.0.0)
       thor (>= 0.14.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.0.0)
-      activesupport (= 4.0.0)
+    activemodel (4.0.3)
+      activesupport (= 4.0.3)
       builder (~> 3.1.0)
     activeresource (4.0.0)
       activemodel (~> 4.0)
       activesupport (~> 4.0)
       rails-observers (~> 0.1.1)
-    activesupport (4.0.0)
+    activesupport (4.0.3)
       i18n (~> 0.6, >= 0.6.4)
       minitest (~> 4.2)
       multi_json (~> 1.3)
@@ -29,7 +29,7 @@ GEM
     minitest (4.7.5)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.8.2)
+    multi_json (1.8.4)
     rails-observers (0.1.2)
       activemodel (~> 4.0)
     rake (10.1.0)
@@ -42,6 +42,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activeresource (~> 4.0.0)
   fakeweb
   mocha (>= 0.9.8)
   rake

data/Gemfile_ar40threadsafe

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gemspec
+
+gem 'activeresource', :git => 'git://github.com/Shopify/activeresource', :ref => 'e9dc76b4aa'

data/README.rdoc

@@ -139,6 +139,20 @@ This package also includes the +shopify+ executable to make it easy to open up a
     shopify help
 
 
+== 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.
+
+To enable threadsafety with ShopifyAPI, add the following to your Gemfile:
+
+    gem 'activeresource', git: 'git://github.com/Shopify/activeresource', branch: 'threadsafe'
+    gem 'shopify_api', '>= 3.2.1'
+
 == Using Development Version
 
 Download the source code and run:

data/lib/shopify_api/resources/base.rb

@@ -14,7 +14,7 @@ module ShopifyAPI
 
       same.send("to_#{self.class.format.extension}", options)
     end
-    
+
     def as_json(options = nil)
       root = options[:root] if options.try(:key?, :root)
       if include_root_in_json
@@ -26,13 +26,25 @@ module ShopifyAPI
     end
 
     class << self
-      def headers
-        if defined?(@headers)
-          @headers
-        elsif superclass != Object && superclass.headers
-          superclass.headers
-        else
-          @headers ||= {}
+      if ActiveResource::VERSION::MAJOR == 4 && ActiveResource::VERSION::PRE == 'threadsafe'
+        def headers
+          if _headers_defined?
+            _headers
+          elsif superclass != Object && superclass.headers
+            superclass.headers
+          else
+            _headers ||= {}
+          end
+        end
+      else
+        def headers
+          if defined?(@headers)
+            @headers
+          elsif superclass != Object && superclass.headers
+            superclass.headers
+          else
+            @headers ||= {}
+          end
         end
       end
 

data/lib/shopify_api/resources/carrier_service.rb

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

data/lib/shopify_api/resources/recurring_application_charge.rb

@@ -1,7 +1,7 @@
 module ShopifyAPI
   class RecurringApplicationCharge < Base
     undef_method :test
-    
+
     class << self
       def current
         all.find { |c| c.status == 'active' }
@@ -11,11 +11,11 @@ module ShopifyAPI
         define_method(status) { all.select { |c| c.status == status.to_s } }
       end
     end
-    
+
     def cancel
       load_attributes_from_response(self.destroy)
     end
-    
+
     def activate
       load_attributes_from_response(post(:activate))
     end

data/lib/shopify_api/session.rb

@@ -39,6 +39,7 @@ module ShopifyAPI
       end
 
       def validate_signature(params)
+        params = params.with_indifferent_access
         return false unless signature = params[:signature]
 
         sorted_params = params.except(:signature, :action, :controller).collect{|k,v|"#{k}=#{v}"}.sort.join

data/lib/shopify_api/version.rb

@@ -1,3 +1,3 @@
 module ShopifyAPI
-  VERSION = "3.2.0"
+  VERSION = "3.2.1"
 end

data/test/base_test.rb

@@ -8,20 +8,24 @@ class BaseTest < Test::Unit::TestCase
     @session2 = ShopifyAPI::Session.new('shop2.myshopify.com', 'token2')
   end
 
+  def teardown
+    clear_header('X-Custom')
+  end
+
   test '#activate_session should set site and headers for given session' do
     ShopifyAPI::Base.activate_session @session1
 
     assert_nil ActiveResource::Base.site
     assert_equal 'https://shop1.myshopify.com/admin', ShopifyAPI::Base.site.to_s
     assert_equal 'https://shop1.myshopify.com/admin', ShopifyAPI::Shop.site.to_s
-    
+
     assert_nil ActiveResource::Base.headers['X-Shopify-Access-Token']
     assert_equal 'token1', ShopifyAPI::Base.headers['X-Shopify-Access-Token']
     assert_equal 'token1', ShopifyAPI::Shop.headers['X-Shopify-Access-Token']
   end
 
   test '#clear_session should clear site and headers from Base' do
-    ShopifyAPI::Base.activate_session @session1    
+    ShopifyAPI::Base.activate_session @session1
     ShopifyAPI::Base.clear_session
 
     assert_nil ActiveResource::Base.site
@@ -34,8 +38,8 @@ class BaseTest < Test::Unit::TestCase
   end
 
   test '#activate_session with one session, then clearing and activating with another session should send request to correct shop' do
-    ShopifyAPI::Base.activate_session @session1   
-    ShopifyAPI::Base.clear_session    
+    ShopifyAPI::Base.activate_session @session1
+    ShopifyAPI::Base.clear_session
     ShopifyAPI::Base.activate_session @session2
 
     assert_nil ActiveResource::Base.site
@@ -49,9 +53,54 @@ class BaseTest < Test::Unit::TestCase
 
   test "#delete should send custom headers with request" do
     ShopifyAPI::Base.activate_session @session1
-    ShopifyAPI::Base.expects(:headers).returns({'X-Custom' => 'abc'})
-    ShopifyAPI::Base.connection.expects(:delete).with('/admin/bases/1.json', {'X-Custom' => 'abc'})
+    ShopifyAPI::Base.headers['X-Custom'] = 'abc'
+    ShopifyAPI::Base.connection.expects(:delete).with('/admin/bases/1.json', has_entry('X-Custom', 'abc'))
     ShopifyAPI::Base.delete "1"
   end
 
+  test "#headers includes the User-Agent" do
+    assert_not_includes ActiveResource::Base.headers.keys, 'User-Agent'
+    assert_includes ShopifyAPI::Base.headers.keys, 'User-Agent'
+    thread = Thread.new do
+      assert_includes ShopifyAPI::Base.headers.keys, 'User-Agent'
+    end
+    thread.join
+  end
+
+  if ActiveResource::VERSION::MAJOR >= 4
+    test "#headers propagates changes to subclasses" do
+      ShopifyAPI::Base.headers['X-Custom'] = "the value"
+      assert_equal "the value", ShopifyAPI::Base.headers['X-Custom']
+      assert_equal "the value", ShopifyAPI::Product.headers['X-Custom']
+    end
+
+    test "#headers clears changes to subclasses" do
+      ShopifyAPI::Base.headers['X-Custom'] = "the value"
+      assert_equal "the value", ShopifyAPI::Product.headers['X-Custom']
+      ShopifyAPI::Base.headers['X-Custom'] = nil
+      assert_nil ShopifyAPI::Product.headers['X-Custom']
+    end
+  end
+
+  if 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
+        assert_equal "the value", ShopifyAPI::Base.headers['X-Custom']
+      end.join
+    end
+
+    test "#headers set in spawned threads do not affect the main thread" do
+      Thread.new do
+        ShopifyAPI::Base.headers['X-Custom'] = "the value"
+      end.join
+      assert_nil ShopifyAPI::Base.headers['X-Custom']
+    end
+  end
+
+  def clear_header(header)
+    [ActiveResource::Base, ShopifyAPI::Base, ShopifyAPI::Product].each do |klass|
+      klass.headers.delete(header)
+    end
+  end
 end

data/test/carrier_service_test.rb

@@ -0,0 +1,17 @@
+require 'test_helper'
+
+class CarrierServiceTest < Test::Unit::TestCase
+  test 'new should create carrier service' do
+    fake "carrier_services", :method => :post, :body => load_fixture('carrier_service')
+    carrier_service = ShopifyAPI::CarrierService.new(:name => "Some Postal Service")
+    carrier_service.save
+    assert_equal "Some Postal Service" , carrier_service.name
+  end
+
+  test 'find should return the carrier service' do
+    fake "carrier_services/123456", :method => :get, :body => load_fixture('carrier_service')
+    carrier_service = ShopifyAPI::CarrierService.find(123456)
+    assert_equal 123456 , carrier_service.id
+    assert_equal "Some Postal Service", carrier_service.name
+  end
+end

data/test/detailed_log_subscriber_test.rb

@@ -10,7 +10,7 @@ class LogSubscriberTest < Test::Unit::TestCase
     @ua_header = "\"User-Agent\"=>\"ShopifyAPI/#{ShopifyAPI::VERSION} ActiveResource/#{ActiveResource::VERSION::STRING} Ruby/#{RUBY_VERSION}\""
 
     ShopifyAPI::Base.clear_session
-    ShopifyAPI::Base.site = "http://localhost/admin"
+    ShopifyAPI::Base.site = "https://this-is-my-test-shop.myshopify.com/admin"
 
     ActiveResource::LogSubscriber.attach_to :active_resource
     ActiveResource::DetailedLogSubscriber.attach_to :active_resource_detailed
@@ -26,9 +26,9 @@ class LogSubscriberTest < Test::Unit::TestCase
     ShopifyAPI::Page.find(1)
 
     assert_equal 4, @logger.logged(:info).size
-    assert_equal "GET http://localhost:80/admin/pages/1.json",                  @logger.logged(:info)[0]
-    assert_match /\-\-\> 200/,                                                  @logger.logged(:info)[1]
-    assert_equal "Headers: {\"Accept\"=>\"application/json\", #{@ua_header}}",  @logger.logged(:info)[2]
+    assert_equal "GET https://this-is-my-test-shop.myshopify.com:443/admin/pages/1.json", @logger.logged(:info)[0]
+    assert_match /\-\-\> 200/, @logger.logged(:info)[1]
+    assert_equal "Headers: {\"Accept\"=>\"application/json\", #{@ua_header}}", @logger.logged(:info)[2]
     assert_match /Response:\n\{\"page\"\:\{((\"id\"\:1)|(\"title\"\:\"Shopify API\")),((\"id\"\:1)|(\"title\"\:\"Shopify API\"))\}\}/,  @logger.logged(:info)[3]
 
   end
@@ -41,9 +41,9 @@ class LogSubscriberTest < Test::Unit::TestCase
     end
 
     assert_equal 4, @logger.logged(:info).size
-    assert_equal "GET http://localhost:80/admin/pages/2.json",  @logger.logged(:info)[0]
-    assert_match /\-\-\> 404/,                                  @logger.logged(:info)[1]
+    assert_equal "GET https://this-is-my-test-shop.myshopify.com:443/admin/pages/2.json", @logger.logged(:info)[0]
+    assert_match /\-\-\> 404/, @logger.logged(:info)[1]
     assert_equal "Headers: {\"Accept\"=>\"application/json\", #{@ua_header}}", @logger.logged(:info)[2]
-    assert_equal "Response:",                                   @logger.logged(:info)[3]
+    assert_equal "Response:", @logger.logged(:info)[3]
   end
 end

data/test/fixtures/carrier_service.json

@@ -0,0 +1,9 @@
+{
+  "carrier_service": {
+    "name": "Some Postal Service",
+    "id": 123456,
+    "callback_url": "http://google.com",
+    "format": "json",
+    "service_discovery": true
+  }
+}

data/test/fixtures/recurring_application_charge.json

@@ -0,0 +1,20 @@
+{
+  "recurring_application_charge": {
+    "activated_on": null,
+    "api_client_id": 755357713,
+    "billing_on": null,
+    "cancelled_on": null,
+    "created_at": "2014-01-20T13:42:19-05:00",
+    "id": 654381177,
+    "name": "Super Duper Plan",
+    "price": "10.00",
+    "return_url": "http://super-duper.shopifyapps.com",
+    "status": "pending",
+    "test": null,
+    "trial_days": 0,
+    "trial_ends_on": null,
+    "updated_at": "2014-01-20T13:42:19-05:00",
+    "decorated_return_url": "http://super-duper.shopifyapps.com?charge_id=654381177",
+    "confirmation_url": "http://apple.myshopify.com/admin/charges/654381177/confirm_recurring_application_charge?signature=BAhpBHkQASc%3D--419fc7424f8c290ac2b21b9004ed223e35b52164"
+  }
+}

data/test/fixtures/recurring_application_charges.json

@@ -1,10 +1,106 @@
 {
   "recurring_application_charges": [
     {
-      "name": "Super Duper Plan",
-      "price": 10.0,
-      "return_url": "http://super-duper.shopifyapps.com",
-      "status": "active"
+      "activated_on": null,
+      "api_client_id": 755357713,
+      "billing_on": "2014-01-19T00:00:00+00:00",
+      "cancelled_on": null,
+      "created_at": "2014-01-20T13:41:37-05:00",
+      "id": 455696194,
+      "name": "Super Mega Plan2",
+      "price": "15.00",
+      "return_url": "http://yourapp.com",
+      "status": "active",
+      "test": null,
+      "trial_days": 0,
+      "trial_ends_on": null,
+      "updated_at": "2014-01-20T13:42:20-05:00",
+      "decorated_return_url": "http://yourapp.com?charge_id=455696195"
+    },
+    {
+      "activated_on": null,
+      "api_client_id": 755357713,
+      "billing_on": "2014-01-19T00:00:00+00:00",
+      "cancelled_on": null,
+      "created_at": "2014-01-20T13:41:37-05:00",
+      "id": 455696195,
+      "name": "Super Mega Plan2",
+      "price": "15.00",
+      "return_url": "http://yourapp.com",
+      "status": "pending",
+      "test": null,
+      "trial_days": 0,
+      "trial_ends_on": null,
+      "updated_at": "2014-01-20T13:42:20-05:00",
+      "decorated_return_url": "http://yourapp.com?charge_id=455696195"
+    },
+    {
+      "activated_on": null,
+      "api_client_id": 755357713,
+      "billing_on": "2014-01-19T00:00:00+00:00",
+      "cancelled_on": null,
+      "created_at": "2014-01-20T13:41:37-05:00",
+      "id": 455696196,
+      "name": "Super Mega Plan3",
+      "price": "15.00",
+      "return_url": "http://yourapp.com",
+      "status": "cancelled",
+      "test": null,
+      "trial_days": 0,
+      "trial_ends_on": null,
+      "updated_at": "2014-01-20T13:42:20-05:00",
+      "decorated_return_url": "http://yourapp.com?charge_id=455696195"
+    },
+    {
+      "activated_on": null,
+      "api_client_id": 755357713,
+      "billing_on": "2014-01-19T00:00:00+00:00",
+      "cancelled_on": null,
+      "created_at": "2014-01-20T13:41:37-05:00",
+      "id": 455696197,
+      "name": "Super Mega Plan4",
+      "price": "15.00",
+      "return_url": "http://yourapp.com",
+      "status": "accepted",
+      "test": null,
+      "trial_days": 0,
+      "trial_ends_on": null,
+      "updated_at": "2014-01-20T13:42:20-05:00",
+      "decorated_return_url": "http://yourapp.com?charge_id=455696195"
+    },
+    {
+      "activated_on": null,
+      "api_client_id": 755357713,
+      "billing_on": "2014-01-19T00:00:00+00:00",
+      "cancelled_on": null,
+      "created_at": "2014-01-20T13:41:37-05:00",
+      "id": 455696198,
+      "name": "Super Mega Plan5",
+      "price": "15.00",
+      "return_url": "http://yourapp.com",
+      "status": "declined",
+      "test": null,
+      "trial_days": 0,
+      "trial_ends_on": null,
+      "updated_at": "2014-01-20T13:42:20-05:00",
+      "decorated_return_url": "http://yourapp.com?charge_id=455696195"
+    },
+    {
+      "activated_on": null,
+      "api_client_id": 755357713,
+      "billing_on": "2014-01-19T00:00:00+00:00",
+      "cancelled_on": null,
+      "created_at": "2014-01-20T13:41:37-05:00",
+      "id": 455696199,
+      "name": "Super Mega Plan",
+      "price": "15.00",
+      "return_url": "http://yourapp.com",
+      "status": "accepted",
+      "test": null,
+      "trial_days": 0,
+      "trial_ends_on": null,
+      "updated_at": "2014-01-20T13:42:20-05:00",
+      "decorated_return_url": "http://yourapp.com?charge_id=455696195"
     }
   ]
 }

data/test/fulfillment_test.rb

@@ -35,4 +35,4 @@ class FulFillmentTest < Test::Unit::TestCase
     end
   end
 
-end
+end

data/test/recurring_application_charge_test.rb

@@ -1,21 +1,107 @@
 require 'test_helper'
 
 class RecurringApplicationChargeTest < Test::Unit::TestCase
-  context "#all" do
-    should "get all charges" do
-      fake "recurring_application_charges"
 
-      charges = ShopifyAPI::RecurringApplicationCharge.all
-      assert_equal "Super Duper Plan", charges.first.name
-    end
+  def test_recurring_application_charges_create
+    fake "recurring_application_charges", :method => :post, :status => 201, :body => load_fixture('recurring_application_charge')
+
+    charge = ShopifyAPI::RecurringApplicationCharge.create(
+      name: "Default Plan",
+      price: 10.0,
+      return_url: "http://test.com/confirm"
+    )
+
+    assert_equal 'http://apple.myshopify.com/admin/charges/654381177/confirm_recurring_application_charge?signature=BAhpBHkQASc%3D--419fc7424f8c290ac2b21b9004ed223e35b52164', charge.confirmation_url
+  end
+
+  def test_get_recurring_application_charges
+    fake "recurring_application_charges/654381177", :method => :get, :status => 201, :body => load_fixture('recurring_application_charge')
+
+    charge = ShopifyAPI::RecurringApplicationCharge.find(654381177)
+
+    assert_equal "Super Duper Plan", charge.name
   end
 
+  def test_list_recurring_application_charges
+    fake "recurring_application_charges", :method => :get, :status => 201, :body => load_fixture('recurring_application_charges')
+
+    charge = ShopifyAPI::RecurringApplicationCharge.find(:all)
+
+    assert_equal "Super Mega Plan", charge.last.name
+  end
+
+  def test_list_since_recurring_application_charges
+    fake "recurring_application_charges.json?since_id=64512345",:extension => false, :method => :get, :status => 201, :body => load_fixture('recurring_application_charges')
+
+    charge = ShopifyAPI::RecurringApplicationCharge.find(:all, :params => {:since_id => '64512345'})
+
+    assert_equal "Super Mega Plan", charge.last.name
+  end
+
+  def test_list_fields_recurring_application_charges
+    fake "recurring_application_charges.json?fields=name",:extension => false, :method => :get, :status => 201, :body => load_fixture('recurring_application_charges')
+
+    charge = ShopifyAPI::RecurringApplicationCharge.find(:all, :params => {:fields => 'name'})
+
+    assert_equal "Super Mega Plan", charge.last.name
+  end
+
+  def test_pending_recurring_application_charge
+    fake "recurring_application_charges", :method => :get, :status => 201, :body => load_fixture('recurring_application_charges')
+
+    charge = ShopifyAPI::RecurringApplicationCharge.pending
+
+    assert_equal "Super Mega Plan2", charge.last.name
+  end
 
-  should "not fail when there are no charges" do
+  def test_cancelled_recurring_application_charge
+    fake "recurring_application_charges", :method => :get, :status => 201, :body => load_fixture('recurring_application_charges')
+
+    charge = ShopifyAPI::RecurringApplicationCharge.cancelled
+
+    assert_equal "Super Mega Plan3", charge.last.name
+  end
+
+  def test_accepted_recurring_application_charge
+    fake "recurring_application_charges", :method => :get, :status => 201, :body => load_fixture('recurring_application_charges')
+
+    charge = ShopifyAPI::RecurringApplicationCharge.accepted
+
+    assert_equal "Super Mega Plan4", charge.first.name
+    assert_equal "Super Mega Plan", charge.last.name
+  end
+
+  def test_declined_recurring_application_charge
+    fake "recurring_application_charges", :method => :get, :status => 201, :body => load_fixture('recurring_application_charges')
+
+    charge = ShopifyAPI::RecurringApplicationCharge.declined
+
+    assert_equal "Super Mega Plan5", charge.last.name
+  end
+
+  def test_activate_recurring_application_charge
+    fake "recurring_application_charges", :method => :get, :status => 201, :body => load_fixture('recurring_application_charges')
+    fake "recurring_application_charges/455696199/activate", :method => :post, :status => 200, :body => "{}"
+
+    charge = ShopifyAPI::RecurringApplicationCharge.accepted
+
+    assert charge.last.activate
+  end
+
+  def test_cancel_recurring_application_charge
+    fake "recurring_application_charges", :method => :get, :status => 201, :body => load_fixture('recurring_application_charges')
+    fake "recurring_application_charges/455696194", :method => :delete, :status => 200, :body => "{}"
+
+    charge = ShopifyAPI::RecurringApplicationCharge.current
+    assert charge.cancel
+  end
+
+  def test_no_recurring_application_charge_found
     fake "recurring_application_charges", body: {recurring_application_charges: []}.to_json
 
     assert_equal 0, ShopifyAPI::RecurringApplicationCharge.all.count
     assert_equal nil, ShopifyAPI::RecurringApplicationCharge.current
     assert_equal [], ShopifyAPI::RecurringApplicationCharge.pending
   end
+
 end

data/test/session_test.rb

@@ -148,10 +148,20 @@ class SessionTest < Test::Unit::TestCase
       end
     end
 
+    should "return true when the signature is valid and the keys of params are strings" do
+      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}
+
+      assert_equal true, ShopifyAPI::Session.validate_signature(params)
+    end
+
     private
 
     def make_sorted_params(params)
-      sorted_params = params.except(:signature, :action, :controller).collect{|k,v|"#{k}=#{v}"}.sort.join
+      sorted_params = params.with_indifferent_access.except(:signature, :action, :controller).collect{|k,v|"#{k}=#{v}"}.sort.join
     end
 
   end

data/test/test_helper.rb

@@ -35,7 +35,7 @@ class Test::Unit::TestCase
     end
 
     ShopifyAPI::Base.clear_session
-    ShopifyAPI::Base.site = "http://localhost/admin"
+    ShopifyAPI::Base.site = "https://this-is-my-test-shop.myshopify.com/admin"
     ShopifyAPI::Base.password = nil
     ShopifyAPI::Base.user = nil
   end
@@ -62,7 +62,7 @@ class Test::Unit::TestCase
     url = if options.has_key?(:url)
       options[:url]
     else
-      "http://localhost/admin/#{endpoint}#{extension}"
+      "https://this-is-my-test-shop.myshopify.com/admin/#{endpoint}#{extension}"
     end
 
     FakeWeb.register_uri(method, url, {:body => body, :status => 200, :content_type => "text/#{format}", :content_length => 1}.merge(options))

metadata

@@ -1,94 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: shopify_api
 version: !ruby/object:Gem::Version
-  version: 3.2.0
-  prerelease: 
+  version: 3.2.1
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-24 00:00:00.000000000 Z
+date: 2014-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.4
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.8
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: The Shopify API gem allows Ruby developers to programmatically access
@@ -103,9 +92,9 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files:
-- .document
-- .gitignore
-- .travis.yml
+- ".document"
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG
 - CONTRIBUTORS
 - Gemfile
@@ -113,6 +102,7 @@ files:
 - Gemfile_ar30
 - Gemfile_ar31
 - Gemfile_ar32
+- Gemfile_ar40threadsafe
 - LICENSE
 - README.rdoc
 - RELEASING
@@ -140,6 +130,7 @@ files:
 - lib/shopify_api/resources/base.rb
 - lib/shopify_api/resources/billing_address.rb
 - lib/shopify_api/resources/blog.rb
+- lib/shopify_api/resources/carrier_service.rb
 - lib/shopify_api/resources/cart.rb
 - lib/shopify_api/resources/checkout.rb
 - lib/shopify_api/resources/collect.rb
@@ -186,6 +177,7 @@ files:
 - test/asset_test.rb
 - test/base_test.rb
 - test/blog_test.rb
+- test/carrier_service_test.rb
 - test/cart_test.rb
 - test/cli_test.rb
 - test/customer_saved_search_test.rb
@@ -198,6 +190,7 @@ files:
 - test/fixtures/authors.json
 - test/fixtures/blog.json
 - test/fixtures/blogs.json
+- test/fixtures/carrier_service.json
 - test/fixtures/carts.json
 - test/fixtures/customer_saved_search.json
 - test/fixtures/customer_saved_search_customers.json
@@ -212,6 +205,7 @@ files:
 - test/fixtures/order_risk.json
 - test/fixtures/order_risks.json
 - test/fixtures/product.json
+- test/fixtures/recurring_application_charge.json
 - test/fixtures/recurring_application_charges.json
 - test/fixtures/shop.json
 - test/fixtures/tags.json
@@ -234,28 +228,27 @@ files:
 homepage: http://www.shopify.com/partners/apps
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ShopifyAPI is a lightweight gem for accessing the Shopify admin REST web
   services
 test_files: []