shopify_api 5.1.0 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 613f6d8028571843ca524cae058a468ec0e496b6
-  data.tar.gz: b410fefaab43e2afe984aa7b50c019e15dea4a64
+  metadata.gz: 8c6dee9517f8b39f0509a1fc782c3fbd31f0acab
+  data.tar.gz: 9c7c14bccda5997dff52cfc9cfe102856896f134
 SHA512:
-  metadata.gz: 38de7545efafa728e251353506d6078a263af09a4b72504356394d5e35dcc08532ee5662c8edf132a2eacfe0d2c2ea213e9d4a97bbedf298d58d463cce1dbbee
-  data.tar.gz: 0c1e77dafdb01ec104f9345fab05be9c6c47e80357879f12709946fcb5d2872a9ae47109d3ac3daa48a8e80b9cace6f94f97f9a72e58af127aabded28dc2a2f1
+  metadata.gz: d4d18fbc6064f642bee7575ebbd4fd00919b852c201cebb0ee668e809163a13a289f22c5d886903479d71c0ee87dc3fa507abe14c210d9f9beecd6b418256cd2
+  data.tar.gz: a508c15999e3ca6b83a124fe5198200221bf76625cbc77755d23229b55950792ff6e45dcf547a6f933df0f627a84172aca5665f220fc0c98a2c1d13f1e67b6aa

data/CHANGELOG

@@ -1,3 +1,9 @@
+== Version 5.2.0
+
+* Added `ShopifyAPI::Currency` to fetch list of supported currencies on a shop
+* Added `ShopifyAPI::TenderTransaction` to fetch list of transactions on a shop
+* Fixed bug with X-Shopify-Checkout-Version on ShopifyAPI::Checkout header being applied to all requests
+
 == Version 5.1.0
 
 * Added `ShopifyAPI::Publications`

data/lib/shopify_api/resources/checkout.rb

@@ -3,7 +3,10 @@
 module ShopifyAPI
   class Checkout < Base
     self.primary_key = :token
-    headers['X-Shopify-Checkout-Version'] = '2016-09-06'
+
+    def self.headers
+      super.merge('X-Shopify-Checkout-Version' => '2016-09-06')
+    end
 
     def complete
       post(:complete)

data/lib/shopify_api/resources/currency.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module ShopifyAPI
+  class Currency < Base
+  end
+end

data/lib/shopify_api/resources/tender_transaction.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module ShopifyAPI
+  class TenderTransaction < Base
+  end
+end

data/lib/shopify_api/version.rb

@@ -1,3 +1,3 @@
 module ShopifyAPI
-  VERSION = "5.1.0"
+  VERSION = "5.2.0"
 end

data/test/checkouts_test.rb

@@ -9,6 +9,11 @@ class CheckoutsTest < Test::Unit::TestCase
     @expected_checkout_id = JSON.parse(load_fixture('checkout'))['checkout']['token']
   end
 
+  test ".headers includes a version" do
+    assert_equal "2016-09-06", ShopifyAPI::Checkout.headers["X-Shopify-Checkout-Version"]
+    assert_nil ShopifyAPI::Base.headers["X-Shopify-Checkout-Version"]
+  end
+
   test ":create creates a checkout" do
     fake 'checkouts', method: :post, status: 201, body: load_fixture('checkout')
 

data/test/currency_test.rb

@@ -0,0 +1,21 @@
+
+# frozen_string_literal: true
+require 'test_helper'
+class CurrencyTest < Test::Unit::TestCase
+  def setup
+    super
+    fake "currencies", method: :get, body: load_fixture('currencies')
+  end
+
+  context "Currency" do
+    should 'return a list of enabled currencies' do
+      currencies = ShopifyAPI::Currency.all
+      assert_equal 4, currencies.count
+      assert_equal %w(AUD EUR GBP HKD), currencies.map(&:currency)
+      assert_equal [true, true, true, false], currencies.map(&:enabled)
+      currencies.each do |currency|
+        assert_equal "2018-10-03T14:44:08-04:00", currency.rate_updated_at
+      end
+    end
+  end
+end

data/test/detailed_log_subscriber_test.rb

@@ -8,7 +8,6 @@ class LogSubscriberTest < Test::Unit::TestCase
     super
     @page = { :page => { :id => 1, :title => 'Shopify API' } }.to_json
     @ua_header = "\"User-Agent\"=>\"ShopifyAPI/#{ShopifyAPI::VERSION} ActiveResource/#{ActiveResource::VERSION::STRING} Ruby/#{RUBY_VERSION}\""
-    @ver_header = "\"X-Shopify-Checkout-Version\"=>\"2016-09-06\""
 
     ShopifyAPI::Base.clear_session
     ShopifyAPI::Base.site = "https://this-is-my-test-shop.myshopify.com/admin"
@@ -29,7 +28,7 @@ class LogSubscriberTest < Test::Unit::TestCase
     assert_equal 4, @logger.logged(:info).size
     assert_equal "GET https://this-is-my-test-shop.myshopify.com:443/admin/pages/1.json", @logger.logged(:info)[0]
     assert_match /\-\-\> 200/, @logger.logged(:info)[1]
-    assert_equal "Headers: {\"Accept\"=>\"application/json\", #{@ua_header}, #{@ver_header}}", @logger.logged(:info)[2]
+    assert_equal "Headers: {\"Accept\"=>\"application/json\", #{@ua_header}}", @logger.logged(:info)[2]
     assert_match /Response:\n\{\"page\"\:\{((\"id\"\:1)|(\"title\"\:\"Shopify API\")),((\"id\"\:1)|(\"title\"\:\"Shopify API\"))\}\}/,  @logger.logged(:info)[3]
 
   end
@@ -44,7 +43,7 @@ class LogSubscriberTest < Test::Unit::TestCase
     assert_equal 4, @logger.logged(:info).size
     assert_equal "GET https://this-is-my-test-shop.myshopify.com:443/admin/pages/2.json", @logger.logged(:info)[0]
     assert_match /\-\-\> 404/, @logger.logged(:info)[1]
-    assert_equal "Headers: {\"Accept\"=>\"application/json\", #{@ua_header}, #{@ver_header}}", @logger.logged(:info)[2]
+    assert_equal "Headers: {\"Accept\"=>\"application/json\", #{@ua_header}}", @logger.logged(:info)[2]
     assert_equal "Response:", @logger.logged(:info)[3]
   end
 end

data/test/fixtures/currencies.json

@@ -0,0 +1,25 @@
+{
+  "currencies": [
+    {
+        "currency": "AUD",
+        "rate_updated_at": "2018-10-03T14:44:08-04:00",
+        "enabled": true
+    },
+    {
+        "currency": "EUR",
+        "rate_updated_at": "2018-10-03T14:44:08-04:00",
+        "enabled": true
+    },
+    {
+        "currency": "GBP",
+        "rate_updated_at": "2018-10-03T14:44:08-04:00",
+        "enabled": true
+    },
+    {
+        "currency": "HKD",
+        "rate_updated_at": "2018-10-03T14:44:08-04:00",
+        "enabled": false
+    }
+  ]
+}
+

data/test/fixtures/tender_transactions.json

@@ -0,0 +1,52 @@
+{
+  "tender_transactions": [
+    {
+      "id": 1,
+      "order_id": 450789469,
+      "amount": "138.46",
+      "currency": "CAD",
+      "user_id": null,
+      "test": true,
+      "processed_at": "2018-08-09T15:43:39-04:00",
+      "updated_at": "2018-08-09T15:43:41-04:00",
+      "remote_reference": "1118366",
+      "payment_method": "credit_card",
+      "payment_details": {
+        "credit_card_number": "•••• •••• •••• 1",
+        "credit_card_company": "Bogus"
+      }
+    },
+    {
+      "id": 2,
+      "order_id": 450789469,
+      "amount": "128.16",
+      "currency": "CAD",
+      "user_id": null,
+      "test": true,
+      "processed_at": "2018-08-11T15:43:39-04:00",
+      "updated_at": "2018-08-09T15:43:41-04:00",
+      "remote_reference": "1118367",
+      "payment_method": "credit_card",
+      "payment_details": {
+        "credit_card_number": "•••• •••• •••• 2",
+        "credit_card_company": "Bogus"
+      }
+    },
+    {
+      "id": 3,
+      "order_id": 450789469,
+      "amount": "28.16",
+      "currency": "CAD",
+      "user_id": null,
+      "test": true,
+      "processed_at": "2018-08-12T15:43:39-04:00",
+      "updated_at": "2018-08-09T15:43:41-04:00",
+      "remote_reference": "1118368",
+      "payment_method": "credit_card",
+      "payment_details": {
+        "credit_card_number": "•••• •••• •••• 3",
+        "credit_card_company": "Bogus"
+      }
+    }
+  ]
+}

data/test/tender_transaction_test.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+class TenderTransactionTest < Test::Unit::TestCase
+  def setup
+    super
+    fake "tender_transactions", method: :get, body: load_fixture('tender_transactions')
+  end
+
+  context "Tender Transaction" do
+    should 'return a list of transactions' do
+      tender_transactions = ShopifyAPI::TenderTransaction.all
+      assert_equal 3, tender_transactions.length
+      assert_equal [1, 2, 3], tender_transactions.map(&:id)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify_api
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.2.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-12 00:00:00.000000000 Z
+date: 2018-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -187,6 +187,7 @@ files:
 - lib/shopify_api/resources/collection_publication.rb
 - lib/shopify_api/resources/comment.rb
 - lib/shopify_api/resources/country.rb
+- lib/shopify_api/resources/currency.rb
 - lib/shopify_api/resources/custom_collection.rb
 - lib/shopify_api/resources/customer.rb
 - lib/shopify_api/resources/customer_group.rb
@@ -244,6 +245,7 @@ files:
 - lib/shopify_api/resources/storefront_access_token.rb
 - lib/shopify_api/resources/tax_line.rb
 - lib/shopify_api/resources/tax_service.rb
+- lib/shopify_api/resources/tender_transaction.rb
 - lib/shopify_api/resources/theme.rb
 - lib/shopify_api/resources/transaction.rb
 - lib/shopify_api/resources/usage_charge.rb
@@ -271,6 +273,7 @@ files:
 - test/collection_listing_test.rb
 - test/collection_publication_test.rb
 - test/countable_test.rb
+- test/currency_test.rb
 - test/custom_collection_test.rb
 - test/customer_saved_search_test.rb
 - test/customer_test.rb
@@ -301,6 +304,7 @@ files:
 - test/fixtures/collection_listings.json
 - test/fixtures/collection_publication.json
 - test/fixtures/collection_publications.json
+- test/fixtures/currencies.json
 - test/fixtures/custom_collection.json
 - test/fixtures/customer_invite.json
 - test/fixtures/customer_saved_search.json
@@ -368,6 +372,7 @@ files:
 - test/fixtures/storefront_access_tokens.json
 - test/fixtures/tags.json
 - test/fixtures/tax_service.json
+- test/fixtures/tender_transactions.json
 - test/fixtures/transaction.json
 - test/fixtures/usage_charge.json
 - test/fixtures/usage_charges.json
@@ -412,6 +417,7 @@ files:
 - test/smart_collection_test.rb
 - test/storefront_access_token_test.rb
 - test/tax_service_test.rb
+- test/tender_transaction_test.rb
 - test/test_helper.rb
 - test/transaction_test.rb
 - test/usage_charge_test.rb