squarespace_api 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32478872cc1df7eec10067615d90da41fde3f1c24a53b983822ab88aaca9028a
-  data.tar.gz: c78a46681870051cc0c7295ba6f2228ebbf6f282948b7535aa5293136c86fe6b
+  metadata.gz: 7605a851dda2e468747c0133620edb3763d8961c935ca15b005e3a4b406fefa7
+  data.tar.gz: 1fb57f3e5cd318a7f3d0167927ee58521d3b76ecdd24ee5ea25daa408d2bb8e0
 SHA512:
-  metadata.gz: 1869f4331c33bec1534947d105beeec2eca1188fc647b8577423c01bc7711d80736e43084a9bbd8426f7abeb87e2cb450a28ee19731e539ad160ab547801322e
-  data.tar.gz: 85f777a4903afe12e310d248519db56136d843813e516967bb77675ecee32df6857cb2ba90f55e7113f33da2061175da596a3fd1401bc7900692b3a6e291d11f
+  metadata.gz: 334a4961dc1130524e539ae650ac7cb7697fadad88fa1509aa08b0b765e9d31683690b49ab7d5b9a03728e4b1832e5b46acdfaa66d1d9fc9129baaf77e578f5d
+  data.tar.gz: 3205784829d70dd252340dd7fa620066a380703a84f73be2f036b303d616b3b59886ce301bb8791ffc45afae6f101de4075672ff089e54a1c8da16573b7873d4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    squarespace_api (0.0.6)
+    squarespace_api (0.0.7)
       faraday
       faraday_middleware
       json
@@ -15,29 +15,33 @@ GEM
     crack (0.4.5)
       rexml
     diff-lcs (1.4.4)
-    faraday (1.7.0)
+    faraday (1.10.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
       faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
+      faraday-net_http_persistent (~> 1.0)
       faraday-patron (~> 1.0)
       faraday-rack (~> 1.0)
-      multipart-post (>= 1.2, < 3)
+      faraday-retry (~> 1.0)
       ruby2_keywords (>= 0.0.4)
     faraday-em_http (1.0.0)
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.3)
+      multipart-post (>= 1.2, < 3)
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
-    faraday_middleware (1.1.0)
+    faraday-retry (1.0.3)
+    faraday_middleware (1.2.0)
       faraday (~> 1.0)
     hashdiff (1.0.1)
-    json (2.5.1)
+    json (2.6.1)
     method_source (1.0.0)
     multipart-post (2.1.1)
     pry (0.14.1)

data/README.md

@@ -20,7 +20,7 @@ gem 'squarespace_api'
 
 
 
-## Simple Example Usage
+## Quick Example
 
 - Thread Safety Usage
 
@@ -90,7 +90,7 @@ client.products.delete(id)
 - ProductImages
 
 ```ruby
-# Noted that Path parameters should be passed in body params.
+# Noted that Path parameters should be passed in params.
 client.product_images.upload(file_path, { product_id: product_id })
 client.product_images.status(id, { product_id: product_id })
 client.product_images.order(id, { product_id: product_id, afterImageId: 'otherImageId' })
@@ -100,7 +100,7 @@ client.product_images.update(id, { product_id: product_id, altText: 'my_picture'
 - ProductVariants
 
 ```ruby
-# Noted that Path parameters should be passed in body params.
+# Noted that Path parameters should be passed in params.
 client.product_variants.create({ product_id: product_id })
 client.product_variants.update(id, { sku: 'P1234', product_id: product_id })
 ```
@@ -122,6 +122,7 @@ client.inventory_adjustments.create(params)
 ```
 
 - Profiles
+
 ```ruby
 client.profiles.all
 client.profiles.find(id)
@@ -129,6 +130,7 @@ client.profiles.create(params)
 ```
 
 - StorePages
+
 ```ruby
 client.store_pages.all
 ```
@@ -153,7 +155,8 @@ client.webhook_subscriptions.send_test_notification(id, params)
 client.webhook_subscriptions.rotate_secret(id)
 ```
 
-## Resource
+
+## Single Resource
 
 - Website
 
@@ -161,9 +164,11 @@ client.webhook_subscriptions.rotate_secret(id)
 client.website
 ```
 
-##  Oauth App
+## Oauth App
+
+### Configuration
 
-- ENV
+configure your oauth cerdentials in ENV:
 
 ```ruby
 # Auto load ENV
@@ -171,30 +176,44 @@ SQUARESPACE_CLIENT_ID = 'your client id'
 SQUARESPACE_CLIENT_SECRET = 'your client secret'
 ```
 
+Or configure in your initializer:
+
+```ruby
+SquarespaceApi.configure do |c|
+  c.client_id = 'your client id'
+  c.client_secret = 'your client secret'
+end
+```
+
+If you have multiple apps, consider thread safe usage:
+
+```ruby
+client = SquarespaceApi::Client.new(
+  SquarespaceApi::Config.new(
+    client_id: 'your client id',
+    client_secret: 'your client secret'
+  )
+)
+```
+
+### Oauth Actions
+
 - Construct Oauth Url
 
 ```ruby
-client.build_oauth_authorize_url(
+SquarespaceApi::Client.new.build_oauth_authorize_url(
   redirect_url: 'https://api.test.com/squarespace',
   scope: 'website.orders,website.orders.read',
   state: '1234',
   access_type: "offline"
 )
+
 => 'https://login.squarespace.com/api/1/login/oauth/provider/authorize?client_id=&redirect_url=https://api.test.com/squarespace&scope=website.orders,website.orders.read&state=1234&access_type=offline'
 ```
 
 - Request Access Token
 
 ```ruby
-client = SquarespaceApi::Client.new(
-  SquarespaceApi::Config.new(
-    # your can specifize application credentials if you have multiple apps
-    # otherwise it'll auto load env
-    client_id: 'your client id',
-    client_secret: 'your client secret'
-  )
-)
-
 # request access token
 client.tokens.create(
   code: 'code sent from Squaerspace',
@@ -203,6 +222,7 @@ client.tokens.create(
 ```
 
 - Request Refresh Token
+
 ```ruby
 client.tokens.create(
   refresh_token: 'some_refresh_token',

data/lib/squarespace_api/paginated_fetch.rb

@@ -2,11 +2,11 @@ module SquarespaceApi
   module PaginatedFetch
     def self.build(params = {}, &_block)
       loop do
-        response = yield(params)
+        pagination = yield(params)
 
-        has_next_page = response.dig('pagination', 'hasNextPage').to_s == 'true'
-        break unless has_next_page
-        params = { cursor:  response.dig('pagination', 'nextPageCursor') }
+        has_next_page = !!pagination&.dig('hasNextPage')
+        break if not has_next_page
+        params = { cursor:  pagination['nextPageCursor'] }
       end
     end
   end

data/lib/squarespace_api/resource_group.rb

@@ -24,6 +24,10 @@ module SquarespaceApi
       raise 'This method should be implemented in a subclass.'
     end
 
+    def parse_pagination(response)
+      response.body['pagination']
+    end
+
     class << self
       def allowed_actions(*args)
         args.each do |action|

data/lib/squarespace_api/resource_group_actions.rb

@@ -6,13 +6,14 @@ module SquarespaceApi
     module All
       def all(params = {}, &_block)
         PaginatedFetch.build(params) do |paginated_params|
-          response = parse_collection(
-            connection
+          query_result = connection
             .get(UriComponentBuidler.construct(resources_path, paginated_params), params: paginated_params)
-          )
+          response = parse_collection(query_result)
+          pagination = parse_pagination(query_result)
+
           return response unless block_given?
           yield(response)
-          response
+          pagination
         end
       end
 

data/lib/squarespace_api/version.rb

@@ -1,3 +1,3 @@
 module SquarespaceApi
-  VERSION = '0.0.6'.freeze
+  VERSION = '0.0.7'.freeze
 end

data/spec/squarespace_api/resource_group_actions_spec.rb

@@ -22,6 +22,33 @@ describe SquarespaceApi::ResourceGroupActions do
 
     it { expect(resource.all(status: 'pending')).to eq([]) }
     it { expect(resource.where(status: 'pending')).to eq([]) }
+
+    context "when pagination exists" do
+      before do
+        stub_request(:get, "https://api.squarespace.com/1.0/commerce/dummy?status=pending")
+          .to_return(status: 200, body: {
+            'dummy' => [{ 'id' => 1 }],
+            'pagination' => { "hasNextPage" => true, 'nextPageCursor' => "cursor"
+            }
+          }.to_json)
+
+        stub_request(:get, "https://api.squarespace.com/1.0/commerce/dummy?cursor=cursor")
+          .to_return(status: 200, body: {
+            'dummy' => [{ 'id' => 2 }],
+            'pagination' => { "hasNextPage" => false }
+          }.to_json)
+      end
+
+      it "should return all orders" do
+        orders = []
+
+        resource.all(status: 'pending') do |new_orders|
+          orders += new_orders
+        end
+
+        expect(orders).to eq([{ 'id' => 1 }, { 'id' => 2 }])
+      end
+    end
   end
 
   describe '#find' do

data/spec/squarespace_api_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe SquarespaceApi do
   it 'has a version number' do
-    expect(SquarespaceApi::VERSION).to eq('0.0.6')
+    expect(SquarespaceApi::VERSION).to eq('0.0.7')
   end
 
   context 'configure' do

data/squarespace_api.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name        = "squarespace_api"
-  spec.version     = "0.0.6"
+  spec.version     = "0.0.7"
   spec.summary     = "Ruby gem interacting with the Squarespace API."
   spec.description = "Ruby gem interacting with the Squarespace API."
   spec.authors     = ["cdragon"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squarespace_api
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - cdragon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-29 00:00:00.000000000 Z
+date: 2022-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -162,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.9
 signing_key:
 specification_version: 4
 summary: Ruby gem interacting with the Squarespace API.