shopify_api 2.2.0 → 2.3.0

data/CHANGELOG

@@ -1,3 +1,9 @@
+== Version 2.3.0
+
+* Fix double root bug with ActiveSupport 3.2.0
+* Add metafields methods on Customer resource
+* Fix prefix_options on assets returned from Asset.find
+
 == Version 2.2.0
 
 * Fix issues with resources that have both direct and namespaced routes

data/lib/shopify_api/json_format.rb

@@ -3,7 +3,7 @@ module ActiveResource
     def encode(options = {})
       same = dup
       same.attributes = {self.class.element_name => same.attributes} if self.class.format.extension == 'json'
-
+      
       same.send("to_#{self.class.format.extension}", options)
     end
   end
@@ -21,3 +21,19 @@ module ActiveResource
     end
   end
 end
+
+module ActiveModel
+  module Serializers
+    module JSON
+      def as_json(options = nil)
+        root = options[:root] if options.try(:key?, :root)
+        if include_root_in_json
+          root = self.class.model_name.element if root == true
+          { root => serializable_hash(options) }
+        else
+          serializable_hash(options)
+        end
+      end
+    end
+  end
+end

data/lib/shopify_api/resources/asset.rb

@@ -55,7 +55,9 @@ module ShopifyAPI
         params = {:asset => {:key => args[0]}}
         params = params.merge(args[1][:params]) if args[1] && args[1][:params]
         path_prefix = params[:theme_id] ? "/admin/themes/#{params[:theme_id]}" : "/admin"
-        find(:one, :from => "#{path_prefix}/assets.#{format.extension}", :params => params)
+        resource = find(:one, :from => "#{path_prefix}/assets.#{format.extension}", :params => params)
+        resource.prefix_options[:theme_id] = params[:theme_id] if resource && params[:theme_id]
+        resource
       end
     end
     

data/lib/shopify_api/resources/customer.rb

@@ -1,4 +1,5 @@
 module ShopifyAPI
   class Customer < Base
+    include Metafields
   end
 end

data/shopify_api.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{shopify_api}
-  s.version = "2.2.0"
+  s.version = "2.3.0"
   s.author = "Shopify"
 
   s.summary = %q{The Shopify API gem is a lightweight gem for accessing the Shopify admin REST web services}

data/test/blog_test.rb

@@ -0,0 +1,8 @@
+require 'test_helper'
+class BlogTest < Test::Unit::TestCase
+  test "blog creation" do
+    fake "blogs", :method => :post, :status => 202
+    ShopifyAPI::Blog.create(:title => "Test Blog")
+    assert_equal '{"blog":{"title":"Test Blog"}}', FakeWeb.last_request.body
+  end
+end

data/test/detailed_log_subscriber_test.rb

@@ -27,7 +27,8 @@ class LogSubscriberTest < Test::Unit::TestCase
     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]
+    assert_match /Response:\n\{\"page\"\:\{((\"id\"\:1)|(\"title\"\:\"Shopify API\")),((\"id\"\:1)|(\"title\"\:\"Shopify API\"))\}\}/,  @logger.logged(:info)[3]
+
   end
 
   test "logging on #find with an error" do

data/test/fixtures/blogs.json

@@ -0,0 +1,13 @@
+{
+  "blog": {
+    "handle": "test-blog",
+    "created_at": "2012-01-10T17:45:19-05:00",
+    "title": "Test Blog",
+    "template_suffix": null,
+    "updated_at": "2012-01-10T17:45:19-05:00",
+    "feedburner_location": null,
+    "id": 1008414260,
+    "feedburner": null,
+    "commentable": "no"
+  }
+}

data/test/product_test.rb

@@ -12,7 +12,7 @@ class ProductTest < Test::Unit::TestCase
     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_equal ActiveSupport::JSON.decode('{"metafield":{"namespace":"contact","key":"email","value":"123@example.com","value_type":"string"}}'), ActiveSupport::JSON.decode(FakeWeb.last_request.body)
     assert !field.new_record?
     assert_equal "contact", field.namespace
     assert_equal "email", field.key

data/test/shop_test.rb

@@ -29,7 +29,7 @@ class ShopTest < Test::Unit::TestCase
     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_equal ActiveSupport::JSON.decode('{"metafield":{"namespace":"contact","key":"email","value":"123@example.com","value_type":"string"}}'), ActiveSupport::JSON.decode(FakeWeb.last_request.body)
     assert !field.new_record?
     assert_equal "contact", field.namespace
     assert_equal "email", field.key

metadata

@@ -1,95 +1,72 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: shopify_api
-version: !ruby/object:Gem::Version 
-  hash: 7
+version: !ruby/object:Gem::Version
+  version: 2.3.0
   prerelease: 
-  segments: 
-  - 2
-  - 2
-  - 0
-  version: 2.2.0
 platform: ruby
-authors: 
+authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-25 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activeresource
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2152625980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: thor
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2152625980
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: &2152625260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 0
-        - 14
-        - 4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.14.4
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2152625260
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &2152624800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 9
-        - 8
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.8
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: fakeweb
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2152624800
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: &2152624420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        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.
+  prerelease: false
+  version_requirements: *2152624420
+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: 
+executables:
 - shopify
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - .document
 - .gitignore
 - CHANGELOG
@@ -154,10 +131,12 @@ files:
 - lib/shopify_api/session.rb
 - shopify_api.gemspec
 - test/asset_test.rb
+- test/blog_test.rb
 - test/cli_test.rb
 - test/detailed_log_subscriber_test.rb
 - test/fixtures/asset.json
 - test/fixtures/assets.json
+- test/fixtures/blogs.json
 - test/fixtures/events.json
 - test/fixtures/metafield.json
 - test/fixtures/metafields.json
@@ -172,39 +151,31 @@ files:
 - test/shop_test.rb
 - test/test_helper.rb
 - test/variant_test.rb
-has_rdoc: true
 homepage: http://www.shopify.com/partners/apps
-licenses: 
+licenses:
 - MIT
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: ShopifyAPI is a lightweight gem for accessing the Shopify admin REST web services
+summary: ShopifyAPI is a lightweight gem for accessing the Shopify admin REST web
+  services
 test_files: []
-