fmrest-spyke 0.18.0.rc3 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cede78f266ad81e49d80fcd0cbd423a824ebf630fafe562fc44c01544714c8e0
-  data.tar.gz: 5d290aa99e21e9b0c4f538ff6b17078a7de9da1cf34314bf44f9a6e8de988c05
+  metadata.gz: 19357358bdb618c8e8f600c7a427bd7b779d17a192145e040f455403fe53e000
+  data.tar.gz: da2227cf47f7c920e367fdfda08bb9e0ac19e696b73930beacf98d975dac8fee
 SHA512:
-  metadata.gz: e0b7cd1662a463f3a3a5cc938e9135f668cd137343b1256c128358efa18eb53597da2e96ac0c30616704401d7a1fdd4284bb22f8ec0d432a9221d73c9f856990
-  data.tar.gz: ced9d235187d687d72b799fcc1d2b350ea7e8bb8440e7dece6cc9ff98170dc3aaab9c21dd4f762bfde725b17950a3ae568487bc5a2350c201fe32b9d6a8c37a6
+  metadata.gz: b00414dc29c9ec01317b47210fd4808f766fcaaa2744ed56ffd943180dd80e994c67b7749c3a619b5d1176e7c5bb3bf0b884f82517617e3e39b963e4094d84e7
+  data.tar.gz: 45ba0c02eede56150923029863a6a6301271967b8c6cde342b0ab1baf6c6089f7452f763e463138e4095a6b2b9de1178e8135b0e1d045ed00913b774780a531f

data/CHANGELOG.md

@@ -7,6 +7,9 @@
 * Defining an attribute on a model that would collide with an existing method
   now raises an error
 * Cleared Faraday deprecation messages on authentication methods
+* Handle FileMaker Cloud case where HTTP 401 Unauthorized with content-type
+  text/html is returned after token expiry
+* Add retry option to Rescuable mixin
 * Added fmrest-ruby/VERSION to User-Agent headers
 
 ### 0.17.1

data/lib/fmrest/spyke/model/connection.rb

@@ -140,8 +140,8 @@ module FmRest
 
                 conn.use FmRest::V1::TypeCoercer, config
 
-                # FmRest::Spyke::JsonParse expects symbol keys
-                conn.response :json, parser_options: { symbolize_names: true }
+                # FmRest::Spyke::SpykeFormatter expects symbol keys
+                conn.response :json, parser_options: { symbolize_names: true }, content_type: /\bjson$/
               end
 
             @fmrest_connection = connection if memoize

data/lib/fmrest/spyke/model/rescuable.rb

@@ -3,9 +3,46 @@
 module FmRest
   module Spyke
     module Model
+      # This mixin allows rescuing from errors raised during HTTP requests,
+      # with optional retry (useful for solving expired auth). This is based
+      # off ActiveSupport::Rescuable, with minimal added functionality. Its
+      # usage is analogous to `rescue_from` in Rails' controllers.
+      #
+      # Example usage:
+      #
+      #   MyLayout < FmRest::Layout
+      #     # Mix-in module
+      #     include FmRest::Spyke::Model::Rescuable
+      #
+      #     # Define an error handler
+      #     rescue_from FmRest::APIError::SomeError, with: :report_error
+      #
+      #     # Define block-based error handler
+      #     rescue_from FmRest::APIError::SomeOtherError, with: -> { ... }
+      #
+      #     private
+      #
+      #     def report_error(exception)
+      #       ErrorNotifier.notify(exception)
+      #     ene
+      #   end
+      #
+      # This module also extends upon ActiveSupport's implementation by
+      # allowing to request a retry of the failed request, which can be useful
+      # in situations where an auth token has expired and credentials need to
+      # be manually reset.
+      #
+      # To request a retry use `throw :retry` within the handler method.
+      #
+      # Finally, since it's the most common use case, there's a shorthand
+      # method for handling Data API authentication errors:
+      #
+      #   rescue_account_error with: -> { CredentialsManager.refresh_credentials }
+      #
+      # This method will always issue a retry.
+      #
       module Rescuable
         extend ::ActiveSupport::Concern
-
         include ::ActiveSupport::Rescuable
 
         class_methods do
@@ -13,12 +50,19 @@ module FmRest
             begin
               super
             rescue => e
-              rescue_with_handler(e) || raise
+              catch :retry do
+                rescue_with_handler(e) || raise
+                return
+              end
+              super
             end
           end
 
-          def rescue_account_error(with: nil, &block)
-            rescue_from APIError::AccountError, with: with, &block
+          def rescue_account_error(with: nil)
+            rescue_from(APIError::AccountError, with: with) do
+              yield
+              throw :retry
+            end
           end
         end
       end

data/lib/fmrest/spyke/spyke_formatter.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "json"
 require "ostruct"
 
 module FmRest

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fmrest-spyke
 version: !ruby/object:Gem::Version
-  version: 0.18.0.rc3
+  version: 0.18.0
 platform: ruby
 authors:
 - Pedro Carbajal
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-08 00:00:00.000000000 Z
+date: 2021-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fmrest-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.0.rc3
+        version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.0.rc3
+        version: 0.18.0
 - !ruby/object:Gem::Dependency
   name: spyke
   requirement: !ruby/object:Gem::Requirement
@@ -88,9 +88,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.2.3
 signing_key: