shopify_api 4.0.7 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c171c258fbdbd3d55c3d29332ae04332f4712cf
-  data.tar.gz: ae0cc40c73d57a7938195fc1d0bb90af8aeff0b1
+  metadata.gz: b0d75415d15fd29b2fc2eb1dda08bbea82c45093
+  data.tar.gz: 3a93ef51f81e79cb1c88fda8593768510a59090c
 SHA512:
-  metadata.gz: 58ec881bfa5d516de2c9a39aefd1d8278b933f7fffe949e191d451b5b03a55e2afccb4c60c9ff9f4e3965fa30c15fa7b7336d18ad0f5d0510c13030338e81fd5
-  data.tar.gz: 28d02bc796f1ff6dcd56b83a01acfd94ef6aed81bcaef446c2bb4d1d30a0156c5534250f14db4cff2c5d4d7555c8665cbefc68ea4be604acf5a8b9e03e3c0a27
+  metadata.gz: e2b080d989b2bc8ed91d267daa040c815f3a675b258691eb75f52f9bef5d958e6b31f875df8f1c28a09fb699329ab70121e5d652aa2047566c414d93e50aaad7
+  data.tar.gz: ff815d6221f9073c3250f6970b1ba727fa7b2456798337aa3971650b7e1468a77be7a1add37fe7170b22dfd6b7cf197e5403cf5d78d22af4d970cc69a431d033

data/lib/shopify_api/resources/recurring_application_charge.rb

@@ -12,6 +12,10 @@ module ShopifyAPI
       end
     end
 
+    def usage_charges
+      UsageCharge.find(:all, params: { recurring_application_charge_id: id })
+    end
+
     def cancel
       load_attributes_from_response(self.destroy)
     end
@@ -19,5 +23,9 @@ module ShopifyAPI
     def activate
       load_attributes_from_response(post(:activate))
     end
+
+    def customize(customize_recurring_app_charge_params = {})
+      load_attributes_from_response(put(:customize, recurring_application_charge: customize_recurring_app_charge_params ))
+    end
   end
 end

data/lib/shopify_api/resources/usage_charge.rb

@@ -0,0 +1,5 @@
+module ShopifyAPI
+  class UsageCharge < Base
+    init_prefix :recurring_application_charge
+  end
+end

data/lib/shopify_api/version.rb

@@ -1,3 +1,3 @@
 module ShopifyAPI
-  VERSION = "4.0.7"
+  VERSION = "4.1.0"
 end

data/test/fixtures/recurring_application_charge.json

@@ -13,6 +13,8 @@
     "test": null,
     "trial_days": 0,
     "trial_ends_on": null,
+    "terms": "$1 per 1000 emails",
+    "capped_amount": "100.00",
     "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_charge_adjustment.json

@@ -0,0 +1,5 @@
+{
+  "recurring_application_charge": {
+    "update_capped_amount_url": "http://apple.myshopify.com/admin/charges/654381177/confirm_update_capped_amount?signature=BAhpBHkQASc%3D--419fc7424f8c290ac2b21b9004ed223e35b52164"
+  }
+}

data/test/fixtures/usage_charge.json

@@ -0,0 +1,11 @@
+{
+  "usage_charge": {
+    "id": 359376002,
+    "description": "1000 emails",
+    "price": "9.00",
+    "recurring_application_charge_id": 654381177,
+    "billing_on": "2015-07-08",
+    "balance_remaining": "91.00",
+    "balance_used": "9.00"
+  }
+}

data/test/fixtures/usage_charges.json

@@ -0,0 +1,23 @@
+{
+  "usage_charges": [
+    {
+      "id": 359376005,
+      "description": "1000 emails",
+      "price": "9.00",
+      "recurring_application_charge_id": 654381177,
+      "billing_on": "2015-07-08",
+      "balance_remaining": "82.00",
+      "balance_used": "18.00"
+
+    },
+    {
+      "id": 359376006,
+      "description": "1000 emails",
+      "price": "9.00",
+      "recurring_application_charge_id": 654381177,
+      "billing_on": "2015-07-08",
+      "balance_remaining": "82.00",
+      "balance_used": "18.00"
+    }
+  ]
+}

data/test/recurring_application_charge_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class RecurringApplicationChargeTest < Test::Unit::TestCase
 
   def test_recurring_application_charges_create
-    fake "recurring_application_charges", :method => :post, :status => 201, :body => load_fixture('recurring_application_charge')
+    fake "recurring_application_charges", method: :post, status: 201, body: load_fixture('recurring_application_charge')
 
     charge = ShopifyAPI::RecurringApplicationCharge.create(
       name: "Default Plan",
@@ -15,7 +15,7 @@ class RecurringApplicationChargeTest < Test::Unit::TestCase
   end
 
   def test_get_recurring_application_charges
-    fake "recurring_application_charges/654381177", :method => :get, :status => 201, :body => load_fixture('recurring_application_charge')
+    fake "recurring_application_charges/654381177", method: :get, status: 201, body: load_fixture('recurring_application_charge')
 
     charge = ShopifyAPI::RecurringApplicationCharge.find(654381177)
 
@@ -23,7 +23,7 @@ class RecurringApplicationChargeTest < Test::Unit::TestCase
   end
 
   def test_list_recurring_application_charges
-    fake "recurring_application_charges", :method => :get, :status => 201, :body => load_fixture('recurring_application_charges')
+    fake "recurring_application_charges", method: :get, status: 201, body: load_fixture('recurring_application_charges')
 
     charge = ShopifyAPI::RecurringApplicationCharge.find(:all)
 
@@ -31,23 +31,23 @@ class RecurringApplicationChargeTest < Test::Unit::TestCase
   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')
+    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'})
+    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')
+    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'})
+    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')
+    fake "recurring_application_charges", method: :get, status: 201, body: load_fixture('recurring_application_charges')
 
     charge = ShopifyAPI::RecurringApplicationCharge.pending
 
@@ -55,7 +55,7 @@ class RecurringApplicationChargeTest < Test::Unit::TestCase
   end
 
   def test_cancelled_recurring_application_charge
-    fake "recurring_application_charges", :method => :get, :status => 201, :body => load_fixture('recurring_application_charges')
+    fake "recurring_application_charges", method: :get, status: 201, body: load_fixture('recurring_application_charges')
 
     charge = ShopifyAPI::RecurringApplicationCharge.cancelled
 
@@ -63,7 +63,7 @@ class RecurringApplicationChargeTest < Test::Unit::TestCase
   end
 
   def test_accepted_recurring_application_charge
-    fake "recurring_application_charges", :method => :get, :status => 201, :body => load_fixture('recurring_application_charges')
+    fake "recurring_application_charges", method: :get, status: 201, body: load_fixture('recurring_application_charges')
 
     charge = ShopifyAPI::RecurringApplicationCharge.accepted
 
@@ -72,7 +72,7 @@ class RecurringApplicationChargeTest < Test::Unit::TestCase
   end
 
   def test_declined_recurring_application_charge
-    fake "recurring_application_charges", :method => :get, :status => 201, :body => load_fixture('recurring_application_charges')
+    fake "recurring_application_charges", method: :get, status: 201, body: load_fixture('recurring_application_charges')
 
     charge = ShopifyAPI::RecurringApplicationCharge.declined
 
@@ -80,22 +80,51 @@ class RecurringApplicationChargeTest < Test::Unit::TestCase
   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 => "{}"
+    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_adjust_recurring_application_charge
+    fake "recurring_application_charges/654381177", method: :get, status: 201, body: load_fixture('recurring_application_charge')
+    fake "recurring_application_charges/654381177/customize.json?recurring_application_charge%5Bcapped_amount%5D=200", method: :put, body: load_fixture('recurring_application_charge_adjustment'), extension: false
+
+    charge = ShopifyAPI::RecurringApplicationCharge.find(654381177)
+
+    assert charge.customize(capped_amount: 200)
+  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 => "{}"
+    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_usage_charges_recurring_application_charge_found
+    fake "recurring_application_charges/654381177", method: :get, status: 201, body: load_fixture('recurring_application_charge')
+    fake "recurring_application_charges/654381177/usage_charges", method: :get, status: 201, body: load_fixture('usage_charges')
+
+    charge = ShopifyAPI::RecurringApplicationCharge.find(654381177)
+    usage_charges = charge.usage_charges
+
+    assert_equal 2, usage_charges.length
+  end
+
+  def test_usage_charges_recurring_application_charge_not_found
+    fake "recurring_application_charges/654381177", method: :get, status: 201, body: load_fixture('recurring_application_charge')
+    fake "recurring_application_charges/654381177/usage_charges", method: :get, status: 201, body: "[]"
+
+    charge = ShopifyAPI::RecurringApplicationCharge.find(654381177)
+    usage_charges = charge.usage_charges
+
+    assert_equal 0, usage_charges.length
+  end
+
   def test_no_recurring_application_charge_found
     fake "recurring_application_charges", body: {recurring_application_charges: []}.to_json
 
@@ -105,7 +134,7 @@ class RecurringApplicationChargeTest < Test::Unit::TestCase
   end
 
   def test_recurring_application_charge_not_found_error
-    fake "recurring_application_charges", :body => '{"errors":"Not Found"}', :status => 404
+    fake "recurring_application_charges", body: '{"errors":"Not Found"}', status: 404
 
     all_application_charges = ShopifyAPI::RecurringApplicationCharge.all
     if ActiveResource::VERSION::MAJOR >= 4 && ActiveResource::VERSION::MINOR >= 2
@@ -117,5 +146,4 @@ class RecurringApplicationChargeTest < Test::Unit::TestCase
     assert_equal nil, ShopifyAPI::RecurringApplicationCharge.current
     assert_equal [],  ShopifyAPI::RecurringApplicationCharge.pending
   end
-
 end

data/test/usage_charge_test.rb

@@ -0,0 +1,21 @@
+require 'test_helper'
+
+class UsageChargeTest < Test::Unit::TestCase
+
+  def test_create_usage_charges
+    fake "recurring_application_charges/654381177/usage_charges", method: :post, body: load_fixture('usage_charge')
+
+    usage_charge = ShopifyAPI::UsageCharge.new(description: '1000 emails', price: 1.0)
+    usage_charge.prefix_options = {recurring_application_charge_id: 654381177}
+    assert usage_charge.save
+  end
+
+  def test_get_usage_charges
+    fake "recurring_application_charges/654381177/usage_charges/359376002", method: :get, status: 201, body: load_fixture('usage_charge')
+
+    usage_charge = ShopifyAPI::UsageCharge.find(359376002, params: {recurring_application_charge_id: 654381177})
+
+    assert_equal "1000 emails", usage_charge.description
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify_api
 version: !ruby/object:Gem::Version
-  version: 4.0.7
+  version: 4.1.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-10 00:00:00.000000000 Z
+date: 2016-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -186,6 +186,7 @@ files:
 - lib/shopify_api/resources/tax_line.rb
 - lib/shopify_api/resources/theme.rb
 - lib/shopify_api/resources/transaction.rb
+- lib/shopify_api/resources/usage_charge.rb
 - lib/shopify_api/resources/variant.rb
 - lib/shopify_api/resources/webhook.rb
 - lib/shopify_api/session.rb
@@ -237,6 +238,7 @@ files:
 - test/fixtures/policies.json
 - test/fixtures/product.json
 - test/fixtures/recurring_application_charge.json
+- test/fixtures/recurring_application_charge_adjustment.json
 - test/fixtures/recurring_application_charges.json
 - test/fixtures/script_tag.json
 - test/fixtures/script_tags.json
@@ -244,6 +246,8 @@ files:
 - test/fixtures/shop.json
 - test/fixtures/tags.json
 - test/fixtures/transaction.json
+- test/fixtures/usage_charge.json
+- test/fixtures/usage_charges.json
 - test/fixtures/variant.json
 - test/fixtures/variants.json
 - test/fixtures/webhook.json
@@ -267,6 +271,7 @@ files:
 - test/shop_test.rb
 - test/test_helper.rb
 - test/transaction_test.rb
+- test/usage_charge_test.rb
 - test/variant_test.rb
 - test/webhook_test.rb
 homepage: http://www.shopify.com/partners/apps