shopify_api 3.1.8 → 3.2.0

data/lib/shopify_api/version.rb

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

data/test/active_resource/json_errors_test.rb

@@ -0,0 +1,22 @@
+require 'test_helper'
+
+module ActiveResource
+  class JsonErrorsTest < Test::Unit::TestCase
+
+    def test_parsing_of_error_json_hash
+      errors = some_error.from_json({errors: {name: ['missing']}}.to_json)
+      assert_equal({"name"=>["missing"]}, errors)
+    end
+
+    def test_parsing_of_error_json_plain_string
+      errors = some_error.from_json({errors: 'some generic error'}.to_json)
+      assert_equal(["some generic error"], errors)
+    end
+
+    private
+
+    def some_error
+      ActiveResource::Errors.new(ShopifyAPI::Order.new)
+    end
+  end
+end

data/test/article_test.rb

@@ -2,28 +2,39 @@ require 'test_helper'
 
 class ArticleTest < Test::Unit::TestCase
 
+  def test_create_article
+    fake "blogs/1008414260/articles", :method => :post, :body => load_fixture('article')
+    article = ShopifyAPI::Article.new(:blog_id => 1008414260)
+    article.save
+    assert_equal "First Post", article.title
+  end
+
   def test_get_article
     fake "articles/6242736", :method => :get, :body => load_fixture('article')
     article = ShopifyAPI::Article.find(6242736)
     assert_equal "First Post", article.title
+    assert_equal 1008414260, article.blog_id
   end
 
   def test_get_articles
     fake "articles", :method => :get, :body => load_fixture('articles')
     articles = ShopifyAPI::Article.all
     assert_equal 3, articles.length
+    assert_equal 1008414260, articles.first.blog_id
   end
 
   def test_get_articles_namespaced
     fake "blogs/1008414260/articles", :method => :get, :body => load_fixture('articles')
     articles = ShopifyAPI::Article.find(:all, :params => {:blog_id => 1008414260})
     assert_equal 3, articles.length
+    assert_equal 1008414260, articles.first.blog_id
   end
 
   def test_get_article_namespaced
     fake "blogs/1008414260/articles/6242736", :method => :get, :body => load_fixture('article')
     article = ShopifyAPI::Article.find(6242736, :params => {:blog_id => 1008414260})
     assert_equal "First Post", article.title
+    assert_equal 1008414260, article.blog_id
   end
 
   def test_get_authors

data/test/asset_test.rb

@@ -1,5 +1,4 @@
 require 'test_helper'
-require 'uri'
 
 class AssetTest < Test::Unit::TestCase
   def test_get_assetss

data/test/base_test.rb

@@ -54,11 +54,4 @@ class BaseTest < Test::Unit::TestCase
     ShopifyAPI::Base.delete "1"
   end
 
-  test "#build 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.delete "1"
-  end
-
 end

data/test/customer_test.rb

@@ -0,0 +1,10 @@
+require 'test_helper'
+
+class CustomerTest < Test::Unit::TestCase
+  def test_search
+    fake "customers/search.json?query=Bob+country%3AUnited+States", extension: false, body: load_fixture('customers_search')
+
+    results = ShopifyAPI::Customer.search(query: 'Bob country:United States')
+    assert_equal 'Bob', results.first.first_name
+  end
+end

data/test/fixtures/customers_search.json

@@ -0,0 +1,60 @@
+{
+  "customers": [
+    {
+      "accepts_marketing": false,
+      "created_at": "2014-01-20T17:25:18-05:00",
+      "email": "bob.norman@hostmail.com",
+      "first_name": "Bob",
+      "id": 207119551,
+      "last_name": "Norman",
+      "last_order_id": null,
+      "multipass_identifier": null,
+      "note": null,
+      "orders_count": 0,
+      "state": "disabled",
+      "total_spent": "0.00",
+      "updated_at": "2014-01-20T17:25:18-05:00",
+      "verified_email": true,
+      "tags": "",
+      "last_order_name": null,
+      "default_address": {
+        "address1": "Chestnut Street 92",
+        "address2": "",
+        "city": "Louisville",
+        "company": null,
+        "country": "United States",
+        "first_name": null,
+        "id": 207119551,
+        "last_name": null,
+        "phone": "555-625-1199",
+        "province": "Kentucky",
+        "zip": "40202",
+        "name": null,
+        "province_code": "KY",
+        "country_code": "US",
+        "country_name": "United States",
+        "default": true
+      },
+      "addresses": [
+        {
+          "address1": "Chestnut Street 92",
+          "address2": "",
+          "city": "Louisville",
+          "company": null,
+          "country": "United States",
+          "first_name": null,
+          "id": 207119551,
+          "last_name": null,
+          "phone": "555-625-1199",
+          "province": "Kentucky",
+          "zip": "40202",
+          "name": null,
+          "province_code": "KY",
+          "country_code": "US",
+          "country_name": "United States",
+          "default": true
+        }
+      ]
+    }
+  ]
+}

data/test/fixtures/fulfillment_service.json

@@ -0,0 +1,10 @@
+{
+	"fulfillment_service": {
+		"name": "SomeService",
+		"id": 123456,
+		"inventory_management": false,
+		"tracking_support": true,
+		"requires_shipping_method": false,
+		"format": "json"
+	}
+}

data/test/fixtures/image.json

@@ -0,0 +1,10 @@
+{
+  "image": {
+    "created_at": "2014-01-10T16:15:40-05:00",
+    "id": 850703190,
+    "position": 1,
+    "product_id": 632910392,
+    "updated_at": "2014-01-10T16:15:40-05:00",
+    "src": "http://cdn.shopify.com/s/files/1/0006/9093/3842/products/ipod-nano.png?v=1389388540"
+  }
+}

data/test/fixtures/images.json

@@ -0,0 +1,20 @@
+{
+  "images": [
+    {
+      "created_at": "2014-01-17T16:11:52-05:00",
+      "id": 850703190,
+      "position": 1,
+      "product_id": 632910392,
+      "updated_at": "2014-01-17T16:11:52-05:00",
+      "src": "http://cdn.shopify.com/s/files/1/0006/9093/3842/products/ipod-nano.png?v=1389993112"
+    },
+    {
+      "created_at": "2014-01-17T16:11:52-05:00",
+      "id": 562641783,
+      "position": 2,
+      "product_id": 632910392,
+      "updated_at": "2014-01-17T16:11:52-05:00",
+      "src": "http://cdn.shopify.com/s/files/1/0006/9093/3842/products/ipod-nano-2.png?v=1389993112"
+    }
+  ]
+}

data/test/fixtures/order_risk.json

@@ -0,0 +1,14 @@
+{
+  "risk": {
+    "cause_cancel": true,
+    "checkout_id": null,
+    "display": true,
+    "id": 284138680,
+    "message": "This order was placed from a proxy IP",
+    "order_id": 450789469,
+    "recommendation": "cancel",
+    "score": "1.0",
+    "source": "External",
+    "merchant_message": "This order was placed from a proxy IP"
+  }
+}

data/test/fixtures/order_risks.json

@@ -0,0 +1,28 @@
+{
+  "risks": [
+    {
+      "cause_cancel": true,
+      "checkout_id": null,
+      "display": true,
+      "id": 284138680,
+      "message": "This order was placed from a proxy IP",
+      "order_id": 450789469,
+      "recommendation": "cancel",
+      "score": "1.0",
+      "source": "External",
+      "merchant_message": "This order was placed from a proxy IP"
+    },
+    {
+      "cause_cancel": true,
+      "checkout_id": null,
+      "display": true,
+      "id": 432527878,
+      "message": "This order came from an anonymous proxy",
+      "order_id": 450789469,
+      "recommendation": "cancel",
+      "score": "1.0",
+      "source": "External",
+      "merchant_message": "This order came from an anonymous proxy"
+    }
+  ]
+}

data/test/fixtures/recurring_application_charges.json

@@ -0,0 +1,10 @@
+{
+  "recurring_application_charges": [
+    {
+      "name": "Super Duper Plan",
+      "price": 10.0,
+      "return_url": "http://super-duper.shopifyapps.com",
+      "status": "active"
+    }
+  ]
+}

data/test/fixtures/variant.json

@@ -17,6 +17,7 @@
     "option1": "Pink",
     "option2": null,
     "fulfillment_service": "manual",
-    "option3": null
+    "option3": null,
+    "product_id": 632910392
   }
 }

data/test/fixtures/variants.json

@@ -18,7 +18,8 @@
       "option1": "Pink",
       "option2": null,
       "fulfillment_service": "manual",
-      "option3": null
+      "option3": null,
+      "product_id": 632910392
     },
     {
       "price": "199.00",
@@ -38,7 +39,8 @@
       "option1": "Red",
       "option2": null,
       "fulfillment_service": "manual",
-      "option3": null
+      "option3": null,
+      "product_id": 632910392
     },
     {
       "price": "199.00",
@@ -58,7 +60,8 @@
       "option1": "Green",
       "option2": null,
       "fulfillment_service": "manual",
-      "option3": null
+      "option3": null,
+      "product_id": 632910392
     },
     {
       "price": "199.00",
@@ -78,7 +81,8 @@
       "option1": "Black",
       "option2": null,
       "fulfillment_service": "manual",
-      "option3": null
+      "option3": null,
+      "product_id": 632910392
     }
   ]
 }

data/test/fulfillment_service_test.rb

@@ -0,0 +1,17 @@
+require 'test_helper'
+
+class FulFillmentServiceTest < Test::Unit::TestCase
+	test 'new should create fulfillment service' do
+		fake "fulfillment_services", :method => :post, :body => load_fixture('fulfillment_service')
+		fulfillment_service = ShopifyAPI::FulfillmentService.new(:name => "SomeService")
+		fulfillment_service.save
+		assert_equal "SomeService" , fulfillment_service.name
+	end
+
+	test 'find should return the fulfillment service' do
+		fake "fulfillment_services/123456", :method => :get, :body => load_fixture('fulfillment_service')
+		fulfillment_service = ShopifyAPI::FulfillmentService.find(123456)
+		assert_equal 123456 , fulfillment_service.id
+		assert_equal "SomeService", fulfillment_service.name
+	end
+end

data/test/image_test.rb

@@ -0,0 +1,26 @@
+require 'test_helper'
+
+class ImageTest < Test::Unit::TestCase
+  def test_create_image
+    fake "products/632910392/images", :method => :post, :body => load_fixture('image')
+    image = ShopifyAPI::Image.new(:product_id => 632910392)
+    image.position = 1
+    image.attachment = "R0lGODlhbgCMAPf/APbr48VySrxTO7IgKt2qmKQdJeK8lsFjROG5p/nz7Zg3MNmnd7Q1MLNVS9GId71hSJMZIuzTu4UtKbeEeakhKMl8U8WYjfr18YQaIbAf=="
+    image.save
+
+    assert_equal 'http://cdn.shopify.com/s/files/1/0006/9093/3842/products/ipod-nano.png?v=1389388540', image.src
+    assert_equal 850703190, image.id
+  end
+
+  def test_get_images
+    fake "products/632910392/images", :method => :get, :body => load_fixture('images')
+    image = ShopifyAPI::Image.find(:all, :params => {:product_id => 632910392})
+    assert_equal 2, image.size
+  end
+
+  def test_get_image
+    fake "products/632910392/images/850703190", :method => :get, :body => load_fixture('image')
+    image = ShopifyAPI::Image.find(850703190, :params => {:product_id => 632910392})
+    assert_equal 850703190, image.id
+  end
+end

data/test/limits_test.rb

@@ -1,5 +1,4 @@
 require 'test_helper'
-require 'mocha'
 
 class LimitsTest < Test::Unit::TestCase
   def setup

data/test/order_risk_test.rb

@@ -0,0 +1,46 @@
+require 'test_helper'
+
+class OrderRiskTest < Test::Unit::TestCase
+  def test_create_order_risk
+    fake "orders/450789469/risks", :method => :post, :body => load_fixture('order_risk')
+    v = ShopifyAPI::OrderRisk.new(:order_id => 450789469)
+    v.message = "This order was placed from a proxy IP"
+    v.recommendation = "cancel"
+    v.score = "1.0"
+    v.source = "External"
+    v.merchant_message = "This order was placed from a proxy IP"
+    v.display = true
+    v.cause_cancel = true
+    v.save
+
+    assert_equal 284138680, v.id
+  end
+
+  def test_get_order_risks
+    fake "orders/450789469/risks", :method => :get, :body => load_fixture('order_risks')
+    v = ShopifyAPI::OrderRisk.find(:all, :params => {:order_id => 450789469})
+    assert_equal 2, v.size
+  end
+
+  def test_get_order_risk
+    fake "orders/450789469/risks/284138680", :method => :get, :body => load_fixture('order_risk')
+    v = ShopifyAPI::OrderRisk.find(284138680, :params => {:order_id => 450789469})
+    assert_equal 284138680, v.id
+  end
+
+  def test_delete_order_risk
+    fake "orders/450789469/risks/284138680", :method => :get, :body => load_fixture('order_risk')
+    fake "orders/450789469/risks/284138680", :method => :delete, :body => "destroyed"
+    v = ShopifyAPI::OrderRisk.find(284138680, :params => {:order_id => 450789469})
+    assert v.destroy
+  end
+
+  def test_delete_order_risk
+    fake "orders/450789469/risks/284138680", :method => :get, :body => load_fixture('order_risk')
+    fake "orders/450789469/risks/284138680", :method => :put, :body => load_fixture('order_risk')
+
+    v = ShopifyAPI::OrderRisk.find(284138680, :params => {:order_id => 450789469})
+    v.position = 3
+    v.save
+  end
+end

data/test/recurring_application_charge_test.rb

@@ -0,0 +1,21 @@
+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
+  end
+
+
+  should "not fail when there are no charges" do
+    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

@@ -1,13 +1,13 @@
 require 'test_helper'
 
 class SessionTest < Test::Unit::TestCase
-  
+
   context "Session" do
     should "not be valid without a url" do
       session = ShopifyAPI::Session.new(nil, "any-token")
       assert_not session.valid?
     end
-    
+
     should "not be valid without token" do
       session = ShopifyAPI::Session.new("testshop.myshopify.com")
       assert_not session.valid?
@@ -17,7 +17,7 @@ class SessionTest < Test::Unit::TestCase
       session = ShopifyAPI::Session.new("testshop.myshopify.com", "any-token")
       assert session.valid?
     end
-    
+
     should "not raise error without params" do
       assert_nothing_raised do
         session = ShopifyAPI::Session.new("testshop.myshopify.com", "any-token")
@@ -26,7 +26,8 @@ class SessionTest < Test::Unit::TestCase
 
     should "raise error if params passed but signature omitted" do
       assert_raises(RuntimeError) do
-        session = ShopifyAPI::Session.new("testshop.myshopify.com", "any-token", {'foo' => 'bar'})
+        session = ShopifyAPI::Session.new("testshop.myshopify.com")
+        session.request_token({'code' => 'any-code'})
       end
     end
 
@@ -35,13 +36,13 @@ class SessionTest < Test::Unit::TestCase
       assert_equal "My test key", ShopifyAPI::Session.api_key
       assert_equal "My test secret", ShopifyAPI::Session.secret
     end
-    
+
     should "use 'https' protocol by default for all sessions" do
       assert_equal 'https', ShopifyAPI::Session.protocol
     end
 
     should "#temp reset ShopifyAPI::Base.site to original value" do
-      
+
       ShopifyAPI::Session.setup(:api_key => "key", :secret => "secret")
       session1 = ShopifyAPI::Session.new('fakeshop.myshopify.com', 'token1')
       ShopifyAPI::Base.activate_session(session1)
@@ -85,19 +86,12 @@ class SessionTest < Test::Unit::TestCase
       assert_equal "https://localhost.myshopify.com/admin/oauth/authorize?client_id=My_test_key&scope=", permission_url
     end
 
-    should "request token should get token" do
-      ShopifyAPI::Session.setup(:api_key => "My test key", :secret => "My test secret")
-      session = ShopifyAPI::Session.new('http://localhost.myshopify.com')
-      fake nil, :url => 'https://localhost.myshopify.com/admin/oauth/access_token',:method => :post, :body => '{"access_token" : "token"}'
-      assert_equal "token", session.request_token("code")
-    end
-
     should "raise exception if code invalid in request token" do
       ShopifyAPI::Session.setup(:api_key => "My test key", :secret => "My test secret")
       session = ShopifyAPI::Session.new('http://localhost.myshopify.com')
       fake nil, :url => 'https://localhost.myshopify.com/admin/oauth/access_token',:method => :post, :status => 404, :body => '{"error" : "invalid_request"}'
       assert_raises(RuntimeError) do
-        session.request_token("bad_code")
+        session.request_token(params={:code => "bad-code"})
       end
       assert_equal false, session.valid?
     end
@@ -119,13 +113,46 @@ class SessionTest < Test::Unit::TestCase
       assert_equal "https://testshop.myshopify.com/admin", session.site
     end
 
+    should "return_token_if_signature_is_valid" do
+      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)
+      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))
+      assert_equal "any-token", token
+    end
+
     should "raise error if signature does not match expected" do
       ShopifyAPI::Session.secret = 'secret'
-      params = {:foo => 'hello', :foo => 'world', :timestamp => Time.now}
-      sorted_params = params.except(:signature, :action, :controller).collect{|k,v|"#{k}=#{v}"}.sort.join
+      params = {:code => "any-code", :timestamp => Time.now}
+      sorted_params = make_sorted_params(params)
       signature = Digest::MD5.hexdigest(ShopifyAPI::Session.secret + sorted_params)
+      params[:foo] = 'world'
+      assert_raises(RuntimeError) do
+        session = ShopifyAPI::Session.new("testshop.myshopify.com")
+        session.request_token(params.merge(:signature => signature))
+      end
+    end
 
-      session = ShopifyAPI::Session.new("testshop.myshopify.com", "any-token", params.merge(:signature => signature))
+    should "raise error if timestamp is too old" do
+      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)
+      params[:foo] = 'world'
+      assert_raises(RuntimeError) do
+        session = ShopifyAPI::Session.new("testshop.myshopify.com")
+        session.request_token(params.merge(:signature => signature))
+      end
+    end
+
+    private
+
+    def make_sorted_params(params)
+      sorted_params = params.except(:signature, :action, :controller).collect{|k,v|"#{k}=#{v}"}.sort.join
     end
+
   end
 end