shopify_api 4.0.4 → 4.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23955d9a8ee5d523632bcb12220cb5c366516346
-  data.tar.gz: 0c2f364c901d280de601677340f045c7e77910c1
+  metadata.gz: be2ddfc285851f78ac986c70ebb82b79601fdbcf
+  data.tar.gz: 2e71f5b7c5c63cfc19ffd0822f114cf816df358d
 SHA512:
-  metadata.gz: 7f749d13957df809a2b68814b66e9db6dee6144da7b85e25d7d6c42c03c0bffff05c9427b57b58a92a8410ee97009a8d965f67c42d7441a5a878f55e3f07e541
-  data.tar.gz: e3e90a739fbea49071641aa89d677f63d3e9aed7ef6760218a8f26761fb5e468300a87bee1c905adf7adbf8459e27c5fbdf287fb32639f6aaf7bc8a11f580dfb
+  metadata.gz: c16a2590667b6b1ccccf1de2eed1cb00b1dae4858c4a99cb0325060e9c4ebfa50e9a52badea7a23a4264cec65f701cd2dfd6635097034bf9e1039fc4b10053fd
+  data.tar.gz: e5a2d83e326fb52ce98724152d67956d3c9bc8aa8cd9001aad4044c5da8fcfe8b90e818824656ec8d5cb44bd483cde9ccff1c7ec0bedca117afec11aafd1257a

data/.gitignore

@@ -6,3 +6,4 @@ doc
 pkg
 .ruby-version
 *.lock
+.idea

data/CHANGELOG

@@ -1,3 +1,7 @@
+== Version 4.0.5
+
+* Added `pending`, `cancelled`, `accepted`, `declined` helper methods to `ShopifyAPI::ApplicationCharge`
+
 == Version 4.0.4
 
 * Fixed truthiness for order cancellations. Requests are now sent in the request body and as JSON

data/lib/shopify_api/resources/application_charge.rb

@@ -2,6 +2,12 @@ module ShopifyAPI
   class ApplicationCharge < Base
     undef_method :test
 
+    class << self
+      [:pending, :cancelled, :accepted, :declined].each do |status|
+        define_method(status) { (all || []).select { |c| c.status == status.to_s } }
+      end
+    end
+
     def activate
       load_attributes_from_response(post(:activate))
     end

data/lib/shopify_api/version.rb

@@ -1,3 +1,3 @@
 module ShopifyAPI
-  VERSION = "4.0.4"
+  VERSION = "4.0.5"
 end

data/test/application_charge_test.rb

@@ -0,0 +1,79 @@
+require 'test_helper'
+
+class ApplicationChargeTest < Test::Unit::TestCase
+
+  def test_application_charge_create
+    fake "application_charges", :method => :post, :status => 201, :body => load_fixture('application_charge')
+
+    charge = ShopifyAPI::ApplicationCharge.create(
+        name: "iPod Cleaning",
+        price: 5.00,
+        return_url: "http://google.com"
+    )
+
+    assert_equal 'https://this-is-my-test-shop.myshopify.com/admin/charges/803742/confirm_application_charge?signature=BAhpA55DDA%3D%3D--55b44e274e438c619be4631c804abcbcb6ee915a', charge.confirmation_url
+  end
+
+  def test_get_application_charge
+    fake "application_charges/803742", :method => :get, :status => 201, :body => load_fixture('application_charge')
+
+    charge = ShopifyAPI::ApplicationCharge.find(803742)
+
+    assert_equal "iPod Cleaning", charge.name
+  end
+
+  def test_list_application_charges
+    fake "application_charges", :method => :get, :status => 201, :body => load_fixture('application_charges')
+
+    charges = ShopifyAPI::ApplicationCharge.find(:all)
+
+    assert_equal 4, charges.size
+    assert_equal "iPhone Case", charges.last.name
+  end
+
+  def test_list_pending_application_charges
+    fake "application_charges", :method => :get, :status => 201, :body => load_fixture('application_charges')
+
+    pending_charges = ShopifyAPI::ApplicationCharge.pending
+
+    assert_equal 1, pending_charges.size
+    assert_equal "Screen Replacement", pending_charges.first.name
+  end
+
+  def test_list_cancelled_application_charges
+    fake "application_charges", :method => :get, :status => 201, :body => load_fixture('application_charges')
+
+    cancelled_charges = ShopifyAPI::ApplicationCharge.cancelled
+
+    assert_equal 1, cancelled_charges.size
+    assert_equal "iPod Cleaning", cancelled_charges.first.name
+  end
+
+  def test_list_accepted_application_charges
+    fake "application_charges", :method => :get, :status => 201, :body => load_fixture('application_charges')
+
+    accepted_charges = ShopifyAPI::ApplicationCharge.accepted
+
+    assert_equal 1, accepted_charges.size
+    assert_equal "iPhone Case", accepted_charges.first.name
+  end
+
+  def test_list_declined_application_charges
+    fake "application_charges", :method => :get, :status => 201, :body => load_fixture('application_charges')
+
+    declined_charges = ShopifyAPI::ApplicationCharge.declined
+
+    assert_equal 1, declined_charges.size
+    assert_equal "Magic Mouse", declined_charges.first.name
+  end
+
+  def test_activate_application_charge
+    fake "application_charges", :method => :get, :status => 201, :body => load_fixture('application_charges')
+    fake "application_charges/803740/activate", :method => :post, :status => 200, :body => "{}"
+
+    charge = ShopifyAPI::ApplicationCharge.accepted
+
+    assert charge.last.activate
+  end
+
+end

data/test/fixtures/application_charge.json

@@ -0,0 +1,16 @@
+{
+  "application_charge": {
+    "api_client_id": 861378,
+    "created_at": "2015-07-10T15:03:51+10:00",
+    "id": 803742,
+    "name": "iPod Cleaning",
+    "price": "5.00",
+    "return_url": "http:\/\/google.com",
+    "status": "pending",
+    "test": null,
+    "updated_at": "2015-07-10T15:03:51+10:00",
+    "charge_type": null,
+    "decorated_return_url": "http:\/\/google.com?charge_id=803742",
+    "confirmation_url": "https://this-is-my-test-shop.myshopify.com\/admin\/charges\/803742\/confirm_application_charge?signature=BAhpA55DDA%3D%3D--55b44e274e438c619be4631c804abcbcb6ee915a"
+  }
+}

data/test/fixtures/application_charges.json

@@ -0,0 +1,57 @@
+{
+  "application_charges": [
+    {
+      "api_client_id": 861378,
+      "created_at": "2015-07-10T15:16:14+10:00",
+      "id": 803750,
+      "name": "Magic Mouse",
+      "price": "99.00",
+      "return_url": "http:\/\/google.com",
+      "status": "declined",
+      "test": null,
+      "updated_at": "2015-07-10T15:18:09+10:00",
+      "charge_type": null,
+      "decorated_return_url": "http:\/\/google.com?charge_id=803750"
+    },
+    {
+      "api_client_id": 861378,
+      "created_at": "2015-07-10T15:10:10+10:00",
+      "id": 803748,
+      "name": "Screen Replacement",
+      "price": "499.00",
+      "return_url": "http:\/\/google.com",
+      "status": "pending",
+      "test": null,
+      "updated_at": "2015-07-10T15:10:10+10:00",
+      "charge_type": null,
+      "decorated_return_url": "http:\/\/google.com?charge_id=803748",
+      "confirmation_url": "https:\/\/this-is-my-test-shop.myshopify.com\/admin\/charges\/803748\/confirm_application_charge?signature=BAhpA6RDDA%3D%3D--ef4769e2c1149de0ed19dee9ecddaa155baa7baf"
+    },
+    {
+      "api_client_id": 861378,
+      "created_at": "2015-07-10T15:03:51+10:00",
+      "id": 803742,
+      "name": "iPod Cleaning",
+      "price": "5.00",
+      "return_url": "http:\/\/google.com",
+      "status": "cancelled",
+      "test": null,
+      "updated_at": "2015-07-10T15:03:51+10:00",
+      "charge_type": null,
+      "decorated_return_url": "http:\/\/google.com?charge_id=803742"
+    },
+    {
+      "api_client_id": 861378,
+      "created_at": "2015-07-10T15:03:51+10:00",
+      "id": 803740,
+      "name": "iPhone Case",
+      "price": "23.00",
+      "return_url": "http:\/\/google.com",
+      "status": "accepted",
+      "test": null,
+      "updated_at": "2015-07-10T15:03:51+10:00",
+      "charge_type": null,
+      "decorated_return_url": "http:\/\/google.com?charge_id=803740"
+    }
+  ]
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify_api
 version: !ruby/object:Gem::Version
-  version: 4.0.4
+  version: 4.0.5
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-02 00:00:00.000000000 Z
+date: 2015-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -190,6 +190,7 @@ files:
 - shipit.rubygems.yml
 - shopify_api.gemspec
 - test/active_resource/json_errors_test.rb
+- test/application_charge_test.rb
 - test/article_test.rb
 - test/asset_test.rb
 - test/base_test.rb
@@ -200,6 +201,8 @@ files:
 - test/customer_saved_search_test.rb
 - test/customer_test.rb
 - test/detailed_log_subscriber_test.rb
+- test/fixtures/application_charge.json
+- test/fixtures/application_charges.json
 - test/fixtures/article.json
 - test/fixtures/articles.json
 - test/fixtures/asset.json