shopify_api 2.1.0 → 2.2.0

data/CHANGELOG

@@ -1,3 +1,10 @@
+== Version 2.2.0
+
+* Fix issues with resources that have both direct and namespaced routes
+* Added detailed logger to help with debugging ActiveResource
+requests/responses
+* Add fulfillment#cancel
+
 == Version 2.1.0
 
 * Fix JSON errors handling

data/lib/active_resource/connection_ext.rb

@@ -2,15 +2,30 @@ 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)
     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
+
+    def detailed_log_subscriber(response, arguments)
+      ActiveSupport::Notifications.instrument("request.active_resource_detailed") do |payload|
+        payload[:response] = response
+        payload[:data]     = arguments
+      end
+    end
+
     alias_method_chain :handle_response, :response_capture
-    # alias_method :handle_response_without_instance, :handle_response
-    # alias_method :handle_response, :handle_response_with_instance
+    alias_method_chain :request, :detailed_log_subscriber
   end
-end
+end

data/lib/active_resource/detailed_log_subscriber.rb

@@ -0,0 +1,19 @@
+module ActiveResource
+  class DetailedLogSubscriber < ActiveSupport::LogSubscriber
+    def request(event)
+      data = event.payload[:data]
+      headers = data.extract_options!
+      request_body = data.first
+
+      info "Request:\n#{request_body}" if request_body
+      info "Headers: #{headers.inspect}"
+      info "Response:\n#{event.payload[:response].body}"
+    end
+
+    def logger
+      ActiveResource::Base.logger
+    end
+  end
+end
+
+ActiveResource::DetailedLogSubscriber.attach_to :active_resource_detailed

data/lib/active_resource/disable_prefix_check.rb

@@ -0,0 +1,8 @@
+module DisablePrefixCheck
+  extend ActiveSupport::Concern
+
+  module ClassMethods
+    def check_prefix_options(options)
+    end
+  end
+end

data/lib/shopify_api.rb

@@ -5,9 +5,11 @@ require 'active_support/core_ext/class/attribute_accessors'
 require 'digest/md5'
 require 'base64'
 require 'active_resource/connection_ext'
+require 'active_resource/detailed_log_subscriber'
 require 'shopify_api/limits'
 require 'shopify_api/json_format'
 require 'active_resource/json_errors'
+require 'active_resource/disable_prefix_check'
 
 module ShopifyAPI
   include Limits

data/lib/shopify_api/resources/asset.rb

@@ -32,6 +32,8 @@ module ShopifyAPI
   #     the value will be copied:
   #       asset.source_key = "assets/another_image.png"
   class Asset < Base
+    include DisablePrefixCheck
+
     self.primary_key = 'key'
     self.prefix = "/admin/themes/:theme_id/"
     

data/lib/shopify_api/resources/base.rb

@@ -2,5 +2,10 @@ module ShopifyAPI
   class Base < ActiveResource::Base
     extend Countable
     self.include_root_in_json = false
+
+    private
+    def only_id
+      encode(:only => :id, :include => [], :methods => [])
+    end
   end
 end

data/lib/shopify_api/resources/comment.rb

@@ -5,9 +5,5 @@ module ShopifyAPI
     def approve;  load_attributes_from_response(post(:approve, {}, only_id)); end
     def restore;  load_attributes_from_response(post(:restore, {}, only_id)); end
     def not_spam; load_attributes_from_response(post(:not_spam, {}, only_id)); end
-
-    def only_id
-      encode(:only => :id)
-    end
   end
 end

data/lib/shopify_api/resources/event.rb

@@ -1,5 +1,7 @@
 module ShopifyAPI
   class Event < Base
+    include DisablePrefixCheck
+
     self.prefix = "/admin/:resource/:resource_id/"
     
     # Hack to allow both Shop and other Events in through the same AR class

data/lib/shopify_api/resources/fulfillment.rb

@@ -1,5 +1,7 @@
 module ShopifyAPI
   class Fulfillment < Base
     self.prefix = "/admin/orders/:order_id/"
+
+    def cancel; load_attributes_from_response(post(:cancel, {}, only_id)); end
   end
 end

data/lib/shopify_api/resources/metafield.rb

@@ -1,5 +1,7 @@
 module ShopifyAPI
   class Metafield < Base
+    include DisablePrefixCheck
+
     self.prefix = "/admin/:resource/:resource_id/"
     
     # Hack to allow both Shop and other Metafields in through the same AR class

data/lib/shopify_api/resources/order.rb

@@ -17,9 +17,5 @@ module ShopifyAPI
     def capture(amount = "")
       Transaction.create(:amount => amount, :kind => "capture", :order_id => id)
     end
-
-    def only_id
-      encode(:only => :id, :include => [], :methods => [], :fields => [])
-    end
   end
 end

data/lib/shopify_api/resources/variant.rb

@@ -1,6 +1,7 @@
 module ShopifyAPI
   class Variant < Base
     include Metafields
+    include DisablePrefixCheck
 
     self.prefix = "/admin/products/:product_id/"
     

data/shopify_api.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{shopify_api}
-  s.version = "2.1.0"
+  s.version = "2.2.0"
   s.author = "Shopify"
 
   s.summary = %q{The Shopify API gem is a lightweight gem for accessing the Shopify admin REST web services}
@@ -27,7 +27,9 @@ Gem::Specification.new do |s|
   
   if s.respond_to?(:add_development_dependency)
     s.add_development_dependency("mocha", ">= 0.9.8")
+    s.add_development_dependency("fakeweb")
   else
     s.add_dependency("mocha", ">= 0.9.8")
+    s.add_dependency("fakeweb")
   end
 end

data/test/asset_test.rb

@@ -0,0 +1,19 @@
+require 'test_helper'
+require 'uri'
+
+class AssetTest < Test::Unit::TestCase
+  def test_get_assetss
+    fake "themes/1/assets", :method => :get, :body => load_fixture('assets')
+    v = ShopifyAPI::Asset.find(:all, :params => {:theme_id => 1})
+  end
+
+  def test_get_asset_namespaced
+    fake "themes/1/assets.json?asset%5Bkey%5D=templates%2Findex.liquid&theme_id=1", :extension=> false, :method => :get, :body => load_fixture('asset')
+    v = ShopifyAPI::Asset.find('templates/index.liquid', :params => {:theme_id => 1})
+  end
+
+  def test_get_asset
+    fake "assets.json?asset%5Bkey%5D=templates%2Findex.liquid", :extension=> false, :method => :get, :body => load_fixture('asset')
+    v = ShopifyAPI::Asset.find('templates/index.liquid')
+  end
+end

data/test/detailed_log_subscriber_test.rb

@@ -0,0 +1,46 @@
+require 'test_helper'
+require "active_support/log_subscriber/test_helper"
+
+class LogSubscriberTest < Test::Unit::TestCase
+  include ActiveSupport::LogSubscriber::TestHelper
+
+  def setup
+    super
+    @page = { :page => { :id => 1, :title => 'Shopify API' } }.to_json
+
+    ShopifyAPI::Base.site = "http://localhost/admin"
+
+    ActiveResource::LogSubscriber.attach_to :active_resource
+    ActiveResource::DetailedLogSubscriber.attach_to :active_resource_detailed
+  end
+
+  def set_logger(logger)
+    ActiveResource::Base.logger = logger
+  end
+
+  test "logging on #find" do
+    fake "pages/1", :method => :get, :body => @page
+
+    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\"}",                 @logger.logged(:info)[2]
+    assert_equal "Response:\n{\"page\":{\"title\":\"Shopify API\",\"id\":1}}",  @logger.logged(:info)[3]
+  end
+
+  test "logging on #find with an error" do
+    fake "pages/2", :method => :get, :body => nil, :status => 404
+
+    assert_raise ActiveResource::ResourceNotFound do
+      ShopifyAPI::Page.find(2)
+    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 "Headers: {\"Accept\"=>\"application/json\"}", @logger.logged(:info)[2]
+    assert_equal "Response:",                                   @logger.logged(:info)[3]
+  end
+end

data/test/fixtures/asset.json

@@ -0,0 +1,9 @@
+{
+  "asset": {
+    "created_at": "2010-07-12T15:31:50-04:00",
+    "updated_at": "2010-07-12T15:31:50-04:00",
+    "public_url": null,
+    "value": "<!-- LIST 3 PER ROW -->\n<h2>Featured Products</h2>\n<table id=\"products\" cellspacing=\"0\" cellpadding=\"0\">\n{% tablerow product in collections.frontpage.products cols:3  %}\n   <a href=\"{{product.url}}\">{{ product.featured_image | product_img_url: 'small' | img_tag }}</a>\n   <h3><a href=\"{{product.url}}\">{{product.title}}</a></h3>\n   <ul class=\"attributes\">\n     <li><span class=\"money\">{{product.price_min | money}}</span></li>\n   </ul>\n{% endtablerow %}\n</table>\n<!-- /LIST 3 PER ROW  -->\n\n  <div id=\"articles\">\n  \t{% assign article = pages.frontpage %}\n\n    <div class=\"article\">\n    {% if article.content != \"\" %}\n\t\t  <h3>{{ article.title }}</h3>\n      <div class=\"article-body textile\">\n  \t\t  {{ article.content }}\n  \t\t</div>\n  \t{% else %}\n      <div class=\"article-body textile\">\n  \t  In <em>Admin &gt; Blogs &amp; Pages</em>, create a page with the handle <strong><code>frontpage</code></strong> and it will show up here.<br />\n  \t  {{ \"Learn more about handles\" | link_to \"http://wiki.shopify.com/Handle\" }}\n      </div>\n  \t{% endif %}\n    </div>\n\n  </div>\n\n",
+    "key": "templates/index.liquid"
+  }
+}

data/test/fixtures/assets.json

@@ -0,0 +1,136 @@
+{
+  "assets": [
+    {
+      "created_at": "2010-07-12T15:31:50-04:00",
+      "updated_at": "2010-07-12T15:31:50-04:00",
+      "public_url": "http://static.shopify.com/s/files/1/6909/3384/t/1/assets/bg-body-green.gif?1",
+      "key": "assets/bg-body-green.gif"
+    },
+    {
+      "created_at": "2010-07-12T15:31:50-04:00",
+      "updated_at": "2010-07-12T15:31:50-04:00",
+      "public_url": "http://static.shopify.com/s/files/1/6909/3384/t/1/assets/bg-body-orange.gif?1",
+      "key": "assets/bg-body-orange.gif"
+    },
+    {
+      "created_at": "2010-07-12T15:31:50-04:00",
+      "updated_at": "2010-07-12T15:31:50-04:00",
+      "public_url": "http://static.shopify.com/s/files/1/6909/3384/t/1/assets/bg-body-pink.gif?1",
+      "key": "assets/bg-body-pink.gif"
+    },
+    {
+      "created_at": "2010-07-12T15:31:50-04:00",
+      "updated_at": "2010-07-12T15:31:50-04:00",
+      "public_url": "http://static.shopify.com/s/files/1/6909/3384/t/1/assets/bg-body.gif?1",
+      "key": "assets/bg-body.gif"
+    },
+    {
+      "created_at": "2010-07-12T15:31:50-04:00",
+      "updated_at": "2010-07-12T15:31:50-04:00",
+      "public_url": "http://static.shopify.com/s/files/1/6909/3384/t/1/assets/bg-content.gif?1",
+      "key": "assets/bg-content.gif"
+    },
+    {
+      "created_at": "2010-07-12T15:31:50-04:00",
+      "updated_at": "2010-07-12T15:31:50-04:00",
+      "public_url": "http://static.shopify.com/s/files/1/6909/3384/t/1/assets/bg-footer.gif?1",
+      "key": "assets/bg-footer.gif"
+    },
+    {
+      "created_at": "2010-07-12T15:31:50-04:00",
+      "updated_at": "2010-07-12T15:31:50-04:00",
+      "public_url": "http://static.shopify.com/s/files/1/6909/3384/t/1/assets/bg-main.gif?1",
+      "key": "assets/bg-main.gif"
+    },
+    {
+      "created_at": "2010-07-12T15:31:50-04:00",
+      "updated_at": "2010-07-12T15:31:50-04:00",
+      "public_url": "http://static.shopify.com/s/files/1/6909/3384/t/1/assets/bg-sidebar.gif?1",
+      "key": "assets/bg-sidebar.gif"
+    },
+    {
+      "created_at": "2010-07-12T15:31:50-04:00",
+      "updated_at": "2010-07-12T15:31:50-04:00",
+      "public_url": "http://static.shopify.com/s/files/1/6909/3384/t/1/assets/shop.css?1",
+      "key": "assets/shop.css"
+    },
+    {
+      "created_at": "2010-07-12T15:31:50-04:00",
+      "updated_at": "2010-07-12T15:31:50-04:00",
+      "public_url": "http://static.shopify.com/s/files/1/6909/3384/t/1/assets/shop.css.liquid?1",
+      "key": "assets/shop.css.liquid"
+    },
+    {
+      "created_at": "2010-07-12T15:31:50-04:00",
+      "updated_at": "2010-07-12T15:31:50-04:00",
+      "public_url": "http://static.shopify.com/s/files/1/6909/3384/t/1/assets/shop.js?1",
+      "key": "assets/shop.js"
+    },
+    {
+      "created_at": "2010-07-12T15:31:50-04:00",
+      "updated_at": "2010-07-12T15:31:50-04:00",
+      "public_url": "http://static.shopify.com/s/files/1/6909/3384/t/1/assets/sidebar-devider.gif?1",
+      "key": "assets/sidebar-devider.gif"
+    },
+    {
+      "created_at": "2010-07-12T15:31:50-04:00",
+      "updated_at": "2010-07-12T15:31:50-04:00",
+      "public_url": "http://static.shopify.com/s/files/1/6909/3384/t/1/assets/sidebar-menu.jpg?1",
+      "key": "assets/sidebar-menu.jpg"
+    },
+    {
+      "created_at": "2010-07-12T15:31:50-04:00",
+      "updated_at": "2010-07-12T15:31:50-04:00",
+      "public_url": null,
+      "key": "config/settings.html"
+    },
+    {
+      "created_at": "2010-07-12T15:31:50-04:00",
+      "updated_at": "2010-07-12T15:31:50-04:00",
+      "public_url": null,
+      "key": "layout/theme.liquid"
+    },
+    {
+      "created_at": "2010-07-12T15:31:50-04:00",
+      "updated_at": "2010-07-12T15:31:50-04:00",
+      "public_url": null,
+      "key": "templates/article.liquid"
+    },
+    {
+      "created_at": "2010-07-12T15:31:50-04:00",
+      "updated_at": "2010-07-12T15:31:50-04:00",
+      "public_url": null,
+      "key": "templates/blog.liquid"
+    },
+    {
+      "created_at": "2010-07-12T15:31:50-04:00",
+      "updated_at": "2010-07-12T15:31:50-04:00",
+      "public_url": null,
+      "key": "templates/cart.liquid"
+    },
+    {
+      "created_at": "2010-07-12T15:31:50-04:00",
+      "updated_at": "2010-07-12T15:31:50-04:00",
+      "public_url": null,
+      "key": "templates/collection.liquid"
+    },
+    {
+      "created_at": "2010-07-12T15:31:50-04:00",
+      "updated_at": "2010-07-12T15:31:50-04:00",
+      "public_url": null,
+      "key": "templates/index.liquid"
+    },
+    {
+      "created_at": "2010-07-12T15:31:50-04:00",
+      "updated_at": "2010-07-12T15:31:50-04:00",
+      "public_url": null,
+      "key": "templates/page.liquid"
+    },
+    {
+      "created_at": "2010-07-12T15:31:50-04:00",
+      "updated_at": "2010-07-12T15:31:50-04:00",
+      "public_url": null,
+      "key": "templates/product.liquid"
+    }
+  ]
+}

data/test/fixtures/events.json

@@ -0,0 +1,31 @@
+{
+  "events": [
+    {
+      "verb": "placed",
+      "created_at": "2008-01-10T11:00:00-05:00",
+      "body": null,
+      "subject_id": 450789469,
+      "id": 852065041,
+      "subject_type": "Order",
+      "message": "Order was placed"
+    },
+    {
+      "verb": "confirmed",
+      "created_at": "2008-01-10T11:00:00-05:00",
+      "body": null,
+      "subject_id": 450789469,
+      "id": 164748010,
+      "subject_type": "Order",
+      "message": "Received new order <a href=\"/admin/orders/show/450789469\">#1001</a> by Bob Norman"
+    },
+    {
+      "verb": "authorization_success",
+      "created_at": "2008-01-10T11:00:00-05:00",
+      "body": null,
+      "subject_id": 450789469,
+      "id": 103105390,
+      "subject_type": "Order",
+      "message": "<a href=\"/admin/orders/450789469/transactions/389404469\">The customer successfully authorized us to capture 210.94 USD</a>"
+    }
+  ]
+}

data/test/fixtures/metafield.json

@@ -0,0 +1,12 @@
+{
+  "metafields": {
+    "created_at": "2011-10-20T14:05:13-04:00",
+    "updated_at": "2011-10-20T14:05:13-04:00",
+    "namespace": "contact",
+    "id": 721389482,
+    "value": "123@example.com",
+    "description": null,
+    "key": "email",
+    "value_type": "string"
+  }
+}

data/test/fixtures/metafields.json

@@ -0,0 +1,24 @@
+{
+  "metafields": [
+    {
+      "created_at": "2011-10-20T14:05:13-04:00",
+      "updated_at": "2011-10-20T14:05:13-04:00",
+      "namespace": "affiliates",
+      "id": 721389482,
+      "value": "app_key",
+      "description": null,
+      "key": "app_key",
+      "value_type": "string"
+     },
+    {
+      "created_at": "2011-10-20T14:05:13-04:00",
+      "updated_at": "2011-10-20T14:05:13-04:00",
+      "namespace": "contact",
+      "id": 721389480,
+      "value": "1231231231",
+      "description": null,
+      "key": "phone",
+      "value_type": "string"
+    }
+  ]
+}

data/test/fixtures/product.json

@@ -0,0 +1,112 @@
+{
+  "product": {
+    "product_type": "Cult Products",
+    "handle": "ipod-nano",
+    "created_at": "2011-10-20T14:05:13-04:00",
+    "body_html": "<p>It's the small iPod with one very big idea: Video. Now the world's most popular music player, available in 4GB and 8GB models, lets you enjoy TV shows, movies, video podcasts, and more. The larger, brighter display means amazing picture quality. In six eye-catching colors, iPod nano is stunning all around. And with models starting at just $149, little speaks volumes.</p>",
+    "title": "IPod Nano - 8GB",
+    "template_suffix": null,
+    "updated_at": "2011-10-20T14:05:13-04:00",
+    "id": 632910392,
+    "tags": "Emotive, Flash Memory, MP3, Music",
+    "images": [
+      {
+        "position": 1,
+        "created_at": "2011-10-20T14:05:13-04:00",
+        "product_id": 632910392,
+        "updated_at": "2011-10-20T14:05:13-04:00",
+        "src": "http://static.shopify.com/s/files/1/6909/3384/products/ipod-nano.png?0",
+        "id": 850703190
+      }
+    ],
+    "variants": [
+      {
+        "position": 1,
+        "price": "199.00",
+        "created_at": "2011-10-20T14:05:13-04:00",
+        "requires_shipping": true,
+        "title": "Pink",
+        "inventory_quantity": 10,
+        "compare_at_price": null,
+        "inventory_policy": "continue",
+        "updated_at": "2011-10-20T14:05:13-04:00",
+        "inventory_management": "shopify",
+        "id": 808950810,
+        "taxable": true,
+        "grams": 200,
+        "sku": "IPOD2008PINK",
+        "option1": "Pink",
+        "fulfillment_service": "manual",
+        "option2": null,
+        "option3": null
+      },
+      {
+        "position": 2,
+        "price": "199.00",
+        "created_at": "2011-10-20T14:05:13-04:00",
+        "requires_shipping": true,
+        "title": "Red",
+        "inventory_quantity": 20,
+        "compare_at_price": null,
+        "inventory_policy": "continue",
+        "updated_at": "2011-10-20T14:05:13-04:00",
+        "inventory_management": "shopify",
+        "id": 49148385,
+        "taxable": true,
+        "grams": 200,
+        "sku": "IPOD2008RED",
+        "option1": "Red",
+        "fulfillment_service": "manual",
+        "option2": null,
+        "option3": null
+      },
+      {
+        "position": 3,
+        "price": "199.00",
+        "created_at": "2011-10-20T14:05:13-04:00",
+        "requires_shipping": true,
+        "title": "Green",
+        "inventory_quantity": 30,
+        "compare_at_price": null,
+        "inventory_policy": "continue",
+        "updated_at": "2011-10-20T14:05:13-04:00",
+        "inventory_management": "shopify",
+        "id": 39072856,
+        "taxable": true,
+        "grams": 200,
+        "sku": "IPOD2008GREEN",
+        "option1": "Green",
+        "fulfillment_service": "manual",
+        "option2": null,
+        "option3": null
+      },
+      {
+        "position": 4,
+        "price": "199.00",
+        "created_at": "2011-10-20T14:05:13-04:00",
+        "requires_shipping": true,
+        "title": "Black",
+        "inventory_quantity": 40,
+        "compare_at_price": null,
+        "inventory_policy": "continue",
+        "updated_at": "2011-10-20T14:05:13-04:00",
+        "inventory_management": "shopify",
+        "id": 457924702,
+        "taxable": true,
+        "grams": 200,
+        "sku": "IPOD2008BLACK",
+        "option1": "Black",
+        "fulfillment_service": "manual",
+        "option2": null,
+        "option3": null
+      }
+    ],
+    "vendor": "Apple",
+    "published_at": "2007-12-31T19:00:00-05:00",
+    "options": [
+      {
+        "name": "Title"
+      }
+    ]
+  }
+}

data/test/fixtures/shop.json

@@ -0,0 +1,26 @@
+{
+  "shop": {
+    "name": "Apple Computers",
+    "city": "Cupertino",
+    "address1": "1 Infinite Loop",
+    "zip": "95014",
+    "created_at": "2007-12-31T19:00:00-05:00",
+    "shop_owner": "Steve Jobs",
+    "plan_name": "enterprise",
+    "public": false,
+    "country": "US",
+    "money_with_currency_format": "$ {{amount}} USD",
+    "money_format": "$ {{amount}}",
+    "domain": "shop.apple.com",
+    "taxes_included": null,
+    "id": 690933842,
+    "timezone": "(GMT-05:00) Eastern Time (US & Canada)",
+    "tax_shipping": null,
+    "phone": null,
+    "currency": "USD",
+    "myshopify_domain": "apple.myshopify.com",
+    "source": null,
+    "province": "CA",
+    "email": "steve@apple.com"
+  }
+}

data/test/fixtures/variant.json

@@ -0,0 +1,22 @@
+{
+  "variant": {
+    "price": "199.00",
+    "position": 1,
+    "created_at": "2011-10-20T14:05:13-04:00",
+    "title": "Pink",
+    "requires_shipping": true,
+    "updated_at": "2011-10-20T14:05:13-04:00",
+    "inventory_policy": "continue",
+    "compare_at_price": null,
+    "inventory_quantity": 10,
+    "inventory_management": "shopify",
+    "taxable": true,
+    "id": 808950810,
+    "grams": 200,
+    "sku": "IPOD2008PINK",
+    "option1": "Pink",
+    "option2": null,
+    "fulfillment_service": "manual",
+    "option3": null
+  }
+}

data/test/fixtures/variants.json

@@ -0,0 +1,84 @@
+{
+  "variants": [
+    {
+      "price": "199.00",
+      "position": 1,
+      "created_at": "2011-10-20T14:05:13-04:00",
+      "title": "Pink",
+      "requires_shipping": true,
+      "updated_at": "2011-10-20T14:05:13-04:00",
+      "inventory_policy": "continue",
+      "compare_at_price": null,
+      "inventory_quantity": 10,
+      "inventory_management": "shopify",
+      "taxable": true,
+      "id": 808950810,
+      "grams": 200,
+      "sku": "IPOD2008PINK",
+      "option1": "Pink",
+      "option2": null,
+      "fulfillment_service": "manual",
+      "option3": null
+    },
+    {
+      "price": "199.00",
+      "position": 2,
+      "created_at": "2011-10-20T14:05:13-04:00",
+      "title": "Red",
+      "requires_shipping": true,
+      "updated_at": "2011-10-20T14:05:13-04:00",
+      "inventory_policy": "continue",
+      "compare_at_price": null,
+      "inventory_quantity": 20,
+      "inventory_management": "shopify",
+      "taxable": true,
+      "id": 49148385,
+      "grams": 200,
+      "sku": "IPOD2008RED",
+      "option1": "Red",
+      "option2": null,
+      "fulfillment_service": "manual",
+      "option3": null
+    },
+    {
+      "price": "199.00",
+      "position": 3,
+      "created_at": "2011-10-20T14:05:13-04:00",
+      "title": "Green",
+      "requires_shipping": true,
+      "updated_at": "2011-10-20T14:05:13-04:00",
+      "inventory_policy": "continue",
+      "compare_at_price": null,
+      "inventory_quantity": 30,
+      "inventory_management": "shopify",
+      "taxable": true,
+      "id": 39072856,
+      "grams": 200,
+      "sku": "IPOD2008GREEN",
+      "option1": "Green",
+      "option2": null,
+      "fulfillment_service": "manual",
+      "option3": null
+    },
+    {
+      "price": "199.00",
+      "position": 4,
+      "created_at": "2011-10-20T14:05:13-04:00",
+      "title": "Black",
+      "requires_shipping": true,
+      "updated_at": "2011-10-20T14:05:13-04:00",
+      "inventory_policy": "continue",
+      "compare_at_price": null,
+      "inventory_quantity": 40,
+      "inventory_management": "shopify",
+      "taxable": true,
+      "id": 457924702,
+      "grams": 200,
+      "sku": "IPOD2008BLACK",
+      "option1": "Black",
+      "option2": null,
+      "fulfillment_service": "manual",
+      "option3": null
+    }
+  ]
+}

data/test/product_test.rb

@@ -0,0 +1,30 @@
+require 'test_helper'
+
+class ProductTest < Test::Unit::TestCase
+  def setup
+    super
+
+    fake "products/632910392", :body => load_fixture('product')
+    @product = ShopifyAPI::Product.find(632910392)
+  end
+
+  def test_add_metafields_to_product
+    fake "products/632910392/metafields", :method => :post, :status => 201, :body => load_fixture('metafield')
+
+    field = @product.add_metafield(ShopifyAPI::Metafield.new(:namespace => "contact", :key => "email", :value => "123@example.com", :value_type => "string"))
+
+    assert !field.new_record?
+    assert_equal "contact", field.namespace
+    assert_equal "email", field.key
+    assert_equal "123@example.com", field.value
+  end
+
+  def test_get_metafields_for_product
+    fake "products/632910392/metafields", :body => load_fixture('metafields')
+
+    metafields = @product.metafields
+
+    assert_equal 2, metafields.length
+    assert metafields.all?{|m| m.is_a?(ShopifyAPI::Metafield)}
+  end
+end

data/test/{shopify_api_test.rb → session_test.rb}

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class ShopifyApiTest < Test::Unit::TestCase
+class SessionTest < Test::Unit::TestCase
   
   context "Session" do
     should "not be valid without a url" do
@@ -51,5 +51,15 @@ class ShopifyApiTest < Test::Unit::TestCase
       assert_equal 'https://key:e56d5793b869753d87cf03ceb6bb5dfc@testshop.myshopify.com/admin', assigned_site.to_s
       assert_equal 'http://www.original.com', ShopifyAPI::Base.site.to_s
     end
+
+    should "return permissions url" do
+      session = ShopifyAPI::Session.new("testshop.myshopify.com", "any-token")
+      assert_equal "http://testshop.myshopify.com/admin/api/auth?api_key=key", session.create_permission_url
+    end
+
+    should "return site for session" do
+      session = ShopifyAPI::Session.new("testshop.myshopify.com", "any-token")
+      assert_equal "https://key:e56d5793b869753d87cf03ceb6bb5dfc@testshop.myshopify.com/admin", session.site
+    end
   end
 end

data/test/shop_test.rb

@@ -0,0 +1,47 @@
+require 'test_helper'
+
+class ShopTest < Test::Unit::TestCase
+  def setup
+    super
+    fake "shop"
+    @shop = ShopifyAPI::Shop.current
+  end
+
+  def test_current_should_return_current_shop
+    assert @shop.is_a?(ShopifyAPI::Shop)
+    assert_equal "Apple Computers", @shop.name
+    assert_equal "apple.myshopify.com", @shop.myshopify_domain
+    assert_equal 690933842, @shop.id
+    assert_equal "2007-12-31T19:00:00-05:00", @shop.created_at
+    assert_nil @shop.tax_shipping
+  end
+
+  def test_get_metafields_for_shop
+    fake "metafields"
+
+    metafields = @shop.metafields
+
+    assert_equal 2, metafields.length
+    assert metafields.all?{|m| m.is_a?(ShopifyAPI::Metafield)}
+  end
+
+  def test_add_metafield
+    fake "metafields", :method => :post, :status => 201, :body =>load_fixture('metafield')
+
+    field = @shop.add_metafield(ShopifyAPI::Metafield.new(:namespace => "contact", :key => "email", :value => "123@example.com", :value_type => "string"))
+
+    assert !field.new_record?
+    assert_equal "contact", field.namespace
+    assert_equal "email", field.key
+    assert_equal "123@example.com", field.value
+  end
+
+  def test_events
+    fake "events"
+
+    events = @shop.events
+
+    assert_equal 3, events.length
+    assert events.all?{|m| m.is_a?(ShopifyAPI::Event)}
+  end
+end

data/test/test_helper.rb

@@ -1,13 +1,15 @@
 require 'rubygems'
 require 'test/unit'
+require 'fakeweb'
 require 'mocha'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'shopify_api'
 
+FakeWeb.allow_net_connect = false
+
 # setup ShopifyAPI with fake api_key and secret
-ShopifyAPI::Session.setup(:api_key => "API Test key", :secret => "API Test secret")
 
 class Test::Unit::TestCase
   def self.test(string, &block)
@@ -21,9 +23,42 @@ class Test::Unit::TestCase
   def self.context(string)
     yield
   end
+
+  def setup
+    ActiveResource::Base.format = :json
+    ShopifyAPI.constants.each do |const|
+      begin
+        const = "ShopifyAPI::#{const}".constantize
+        const.format = :json if const.respond_to?(:format=)
+      rescue NameError
+      end
+    end
+
+    ShopifyAPI::Base.site = "http://localhost/admin"
+    ShopifyAPI::Base.password = nil
+    ShopifyAPI::Base.user = nil
+  end
+
+  def teardown
+    FakeWeb.clean_registry
+  end
   
   # Custom Assertions
   def assert_not(expression)
     assert_block("Expected <#{expression}> to be false!") { not expression }
-  end  
+  end
+
+  def load_fixture(name, format=:json)
+    File.read(File.dirname(__FILE__) + "/fixtures/#{name}.#{format}")
+  end
+
+  def fake(endpoint, options={})
+    body   = options.has_key?(:body) ? options.delete(:body) : load_fixture(endpoint)
+    format = options.delete(:format) || :json
+    method = options.delete(:method) || :get
+    extension = ".#{options.delete(:extension)||'json'}" unless options[:extension]==false
+
+    url = "http://localhost/admin/#{endpoint}#{extension}"
+    FakeWeb.register_uri(method, url, {:body => body, :status => 200, :content_type => "text/#{format}", :content_length => 1}.merge(options))
+  end
 end

data/test/variant_test.rb

@@ -0,0 +1,22 @@
+require 'test_helper'
+
+class VariantTest < Test::Unit::TestCase
+
+  def test_get_variants
+    fake "products/632910392/variants", :method => :get, :body => load_fixture('variants')
+
+    v = ShopifyAPI::Variant.find(:all, :params => {:product_id => 632910392})
+  end
+
+  def test_get_variant_namespaced
+    fake "products/632910392/variants/808950810", :method => :get, :body => load_fixture('variant')
+
+    v = ShopifyAPI::Variant.find(808950810, :params => {:product_id => 632910392})
+  end
+
+  def test_get_variant
+    fake "variants/808950810", :method => :get, :body => load_fixture('variant')
+
+    v = ShopifyAPI::Variant.find(808950810)
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: shopify_api
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 7
   prerelease: 
   segments: 
   - 2
-  - 1
+  - 2
   - 0
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors: 
 - Shopify
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-17 00:00:00 -04:00
+date: 2011-11-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,6 +66,20 @@ dependencies:
         version: 0.9.8
   type: :development
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: fakeweb
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
 description: The Shopify API gem allows Ruby developers to programmatically access the admin section of Shopify stores. The API is implemented as JSON or XML over HTTP using all four verbs (GET/POST/PUT/DELETE). Each resource, like Order, Product, or Collection, has its own URL and is manipulated in isolation.
 email: developers@jadedpixel.com
 executables: 
@@ -86,6 +100,8 @@ files:
 - Rakefile
 - bin/shopify
 - lib/active_resource/connection_ext.rb
+- lib/active_resource/detailed_log_subscriber.rb
+- lib/active_resource/disable_prefix_check.rb
 - lib/active_resource/json_errors.rb
 - lib/shopify_api.rb
 - lib/shopify_api/cli.rb
@@ -137,11 +153,25 @@ files:
 - lib/shopify_api/resources/webhook.rb
 - lib/shopify_api/session.rb
 - shopify_api.gemspec
+- test/asset_test.rb
 - test/cli_test.rb
+- test/detailed_log_subscriber_test.rb
+- test/fixtures/asset.json
+- test/fixtures/assets.json
+- test/fixtures/events.json
+- test/fixtures/metafield.json
+- test/fixtures/metafields.json
+- test/fixtures/product.json
+- test/fixtures/shop.json
+- test/fixtures/variant.json
+- test/fixtures/variants.json
 - test/limits_test.rb
 - test/order_test.rb
-- test/shopify_api_test.rb
+- test/product_test.rb
+- test/session_test.rb
+- test/shop_test.rb
 - test/test_helper.rb
+- test/variant_test.rb
 has_rdoc: true
 homepage: http://www.shopify.com/partners/apps
 licenses: