fmrest 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7eb7073bb86836108750364857226e2ce6eaac9c88348c74b0c82ecb446f5d4e
-  data.tar.gz: 7e5d6bee538d00fce9feea4f0666014853fe4feba67ea11ff1841809a7d6c577
+  metadata.gz: 368ed06195288490b1388c451b00bb33f5c19e526348422a3760a14902459d76
+  data.tar.gz: a445ef1bd8ef708b6aea2c5f8c2362f77e8c1afbd80bb6ef1d354c669ef8c9f6
 SHA512:
-  metadata.gz: 2e59d89d5829d94566be859060c10e88c875b3298bdd15dbc61b289df64b69534f3d294528b6b3a697b1583cf149472030fcc370eee97ddd0af0d03804520bec
-  data.tar.gz: 057a8bca299892de5d4415b2c67bec71a15778c8e80567726e44c9413bd7b75cf7d422bf86626b24a0021b2c5ca9eb7e43cf4eb486217e176133c19d3a509554
+  metadata.gz: 1d2e8cb78c9a232f8ec13dde7ad3407f5dbfc14c49c0e5aadeb7a940c1fe07f14e919832b53841e4ac054f81c74a64fb7721614218c342835a2274c3b187aa96
+  data.tar.gz: 9695ef91a8eef005420c0003e62eb1712eda8f11667e87f345c311b008c712113b4ff52be31e1fc207237efc7e7279d5952b2d0b2ed3b4a26a2a8aa55ad38638

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## Changelog
 
+### 0.4.1
+
+* Prevent raising an exception when a /\_find request yields no results
+  ([#33](https://github.com/beezwax/fmrest-ruby/issues/33) and
+  [#34](https://github.com/beezwax/fmrest-ruby/issues/34))
+
 ### 0.4.0
 
 * Implement ability to set limit and offset for portals

data/lib/fmrest/errors.rb

@@ -18,6 +18,7 @@ module FmRest
   class APIError::AccountError < APIError; end         # error codes 200..299
   class APIError::LockError < APIError; end            # error codes 300..399
   class APIError::ParameterError < APIError; end       # error codes 400..499
+  class APIError::NoMatchingRecordsError < APIError::ParameterError; end
   class APIError::ValidationError < APIError; end      # error codes 500..599
   class APIError::SystemError < APIError; end          # error codes 800..899
   class APIError::ScriptError < APIError; end          # error codes 1200..1299

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

@@ -13,6 +13,10 @@ module FmRest
           class_attribute :default_limit, instance_accessor: false, instance_predicate: false
 
           class_attribute :default_sort, instance_accessor: false, instance_predicate: false
+
+          # Whether to raise an FmRest::APIError::NoMatchingRecordsError when a
+          # _find request has no results
+          class_attribute :raise_on_no_matching_records, instance_accessor: false, instance_predicate: false
         end
 
         class_methods do
@@ -42,7 +46,16 @@ module FmRest
             end
 
             previous, self.current_scope = current_scope, scope
-            current_scope.has_query? ? scoped_request(:post) : super
+
+            # The DAPI returns a 401 "No records match the request" error when
+            # nothing matches a _find request, so we need to catch it in order
+            # to provide sane behavior (i.e. return an empty resultset)
+            begin
+              current_scope.has_query? ? scoped_request(:post) : super
+            rescue FmRest::APIError::NoMatchingRecordsError => e
+              raise e if raise_on_no_matching_records
+              ::Spyke::Result.new({})
+            end
           ensure
             self.current_scope = previous
           end

data/lib/fmrest/v1/raise_errors.rb

@@ -18,7 +18,9 @@ module FmRest
         102..199   => APIError::ResourceMissingError,
         200..299   => APIError::AccountError,
         300..399   => APIError::LockError,
-        400..499   => APIError::ParameterError,
+        400        => APIError::ParameterError,
+        401        => APIError::NoMatchingRecordsError,
+        402..499   => APIError::ParameterError,
         500..599   => APIError::ValidationError,
         800..899   => APIError::SystemError,
         1200..1299 => APIError::ScriptError,

data/lib/fmrest/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FmRest
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fmrest
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Pedro Carbajal
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-10 00:00:00.000000000 Z
+date: 2019-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday