shopify_api 2.0.0 → 2.1.0

data/CHANGELOG

@@ -1,3 +1,8 @@
+== Version 2.1.0
+
+* Fix JSON errors handling
+* Remove global limit from ShopifyAPI::Limits
+
 == Version 2.0.0
 
 * Bump to 2.0.0 as this release breaks Rails 2 compatibility; we're now officially only supporting Rails 3. Rails 2 devs can follow the rails2 tag in this repo to know where we broke off

data/CONTRIBUTORS

@@ -0,0 +1,3 @@
+API limits code
+
+* Contributed by Chris Scott, https://github.com/christocracy/shopify-api-limits

data/lib/active_resource/json_errors.rb

@@ -0,0 +1,21 @@
+require 'active_resource/base'
+
+module ActiveResource
+  class Errors < ActiveModel::Errors
+    def from_hash(messages, save_cache = false)
+      clear unless save_cache
+
+      messages.each do |key,errors|
+        errors.each do |error|
+          add(key, error)
+        end
+      end
+    end
+
+    # Grabs errors from a json response.
+    def from_json(json, save_cache = false)
+      hash = ActiveSupport::JSON.decode(json)['errors'] || {} rescue {}
+      from_hash hash, save_cache
+    end
+  end
+end

data/lib/shopify_api.rb

@@ -7,6 +7,7 @@ require 'base64'
 require 'active_resource/connection_ext'
 require 'shopify_api/limits'
 require 'shopify_api/json_format'
+require 'active_resource/json_errors'
 
 module ShopifyAPI
   include Limits

data/lib/shopify_api/limits.rb

@@ -9,7 +9,6 @@ module ShopifyAPI
       # Takes form num_requests_executed/max_requests
       # Eg: 101/3000
       CREDIT_LIMIT_HEADER_PARAM = {
-        :global => 'http_x_shopify_api_call_limit',
         :shop => 'http_x_shopify_shop_api_call_limit'
       }
 
@@ -18,9 +17,7 @@ module ShopifyAPI
       # @return {Integer}
       #
       def credit_left
-        shop = credit_limit(:shop) - credit_used(:shop)
-        global = credit_limit(:global) - credit_used(:global)      
-        shop < global ? shop : global
+        credit_limit(:shop) - credit_used(:shop)
       end
       alias_method :available_calls, :credit_left
       
@@ -35,8 +32,8 @@ module ShopifyAPI
       
       ##
       # How many total API calls can I make?
-      # NOTE: subtracting 1 from credit_limit because I think ShopifyAPI cuts off at 299/2999 or shop/global limits.
-      # @param {Symbol} scope [:shop|:global]
+      # NOTE: subtracting 1 from credit_limit because I think ShopifyAPI cuts off at 299 or shop limits.
+      # @param {Symbol} scope [:shop]
       # @return {Integer}
       #
       def credit_limit(scope=:shop)
@@ -47,7 +44,7 @@ module ShopifyAPI
 
       ##
       # How many API calls have I made?
-      # @param {Symbol} scope [:shop|:global]
+      # @param {Symbol} scope [:shop]
       # @return {Integer}
       #
       def credit_used(scope=:shop)

data/shopify_api.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{shopify_api}
-  s.version = "2.0.0"
+  s.version = "2.1.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/limits_test.rb

@@ -4,20 +4,17 @@ require 'mocha'
 class LimitsTest < Test::Unit::TestCase
   def setup
     ShopifyAPI::Base.site = "test.myshopify.com"
-    @header_hash = {'http_x_shopify_api_call_limit' => '150/3000',
-                    'http_x_shopify_shop_api_call_limit' => '100/300'}
+    @header_hash = {'http_x_shopify_shop_api_call_limit' => '100/300'}
     ShopifyAPI::Base.connection.expects(:response).at_least(0).returns(@header_hash)
   end
   
   context "Limits" do
     should "fetch limit total" do
       assert_equal(299, ShopifyAPI.credit_limit(:shop))
-      assert_equal(2999, ShopifyAPI.credit_limit(:global))
     end
     
     should "fetch used calls" do
       assert_equal(100, ShopifyAPI.credit_used(:shop))
-      assert_equal(150, ShopifyAPI.credit_used(:global))
     end
     
     should "calculate remaining calls" do
@@ -26,12 +23,9 @@ class LimitsTest < Test::Unit::TestCase
     
     should "flag maxed out credits" do
       assert !ShopifyAPI.maxed?
-      @header_hash = {'http_x_shopify_api_call_limit' => '2999/3000',
-                      'http_x_shopify_shop_api_call_limit' => '299/300'}
+      @header_hash = {'http_x_shopify_shop_api_call_limit' => '299/300'}
       ShopifyAPI::Base.connection.expects(:response).at_least(1).returns(@header_hash)
       assert ShopifyAPI.maxed?
     end
   end
-  
-  
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: shopify_api
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: 
   segments: 
   - 2
+  - 1
   - 0
-  - 0
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors: 
 - Shopify
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-20 00:00:00 Z
+date: 2011-10-17 00:00:00 -04:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activeresource
@@ -78,12 +79,14 @@ files:
 - .document
 - .gitignore
 - CHANGELOG
+- CONTRIBUTORS
 - LICENSE
 - README.rdoc
 - RELEASING
 - Rakefile
 - bin/shopify
 - lib/active_resource/connection_ext.rb
+- lib/active_resource/json_errors.rb
 - lib/shopify_api.rb
 - lib/shopify_api/cli.rb
 - lib/shopify_api/countable.rb
@@ -139,6 +142,7 @@ files:
 - test/order_test.rb
 - test/shopify_api_test.rb
 - test/test_helper.rb
+has_rdoc: true
 homepage: http://www.shopify.com/partners/apps
 licenses: 
 - MIT
@@ -168,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: ShopifyAPI is a lightweight gem for accessing the Shopify admin REST web services