json_api_resource 2.1.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa7a8562ec59679608e899b037a242b64e114959
-  data.tar.gz: 7bcdd0f4acacc40908fe073251c4e8c7c15a3667
+  metadata.gz: 9b9f3ccf729b8b0bfbc9493560e0395e61c8bdf0
+  data.tar.gz: cd57899d7f64b8543eeaa99922d6682efba9ddde
 SHA512:
-  metadata.gz: d6d46ca22cfe063c8352fc81d4435a8339784209804583c6cb3b3f46982190f68210a17af91ea151f0263bc5e55510dce386a2a52c4fd1caad4ca4a830a1783f
-  data.tar.gz: 9d013ba61fcefd2493f97e109413da4371618a18341e9e23903ff4d216e679c47d8cd7ba86842774c5455550163a243143923b32a8dcad090f46ced425e991b8
+  metadata.gz: d9ca5e0bead24edeb4a147d9873e3e972fe415db39342b61471fdbaa684b23c84160c0907e0ab11c3b24cc828e3bfe40614bf5f588bcb71aeac905757af2c2f1
+  data.tar.gz: d1659f6cf7efdcce11f51b4a2d6235fb65ae237708ce528ed18970168ee070e167a4df3f75d9a2486a23e97839d4edb4002b480d1ac0ac520c2e05970c55631c

data/README.md

@@ -140,6 +140,10 @@ NOTE: all properties are optional. If you don't have it defined and it's in the
 
 The object will still reply to `id`, `name` and `permissions`, but you won't be able to assume they are there, and they will not appear when you do `ResourceClass.new`.
 
+### Error Handling
+
+On an unsuccessful call to the server (this means that if you have multiple connections, they will *necessarily **all*** have to fail), errors will be routed through an overridable `handle_failed_request(e)` method. By default it will re-raise the error, but you can handle it any way you want.
+
 ### Other Features
 
 #### Caching

data/lib/json_api_resource/error_handleable.rb

@@ -0,0 +1,14 @@
+module JsonApiResource
+  module ErrorHandleable
+    extend ActiveSupport::Concern
+
+    included do
+      class << self
+
+        def handle_failed_request( e )
+          raise JsonApiResource::Errors::UnsuccessfulRequest.new(class: self, message: e.message)
+        end
+      end
+    end
+  end
+end

data/lib/json_api_resource/errors.rb

@@ -0,0 +1,17 @@
+module JsonApiResource
+  module Errors
+    class JsonApiResourceError < StandardError
+      def initialize(opts = {})
+        @klass    = opts.fetch :class, JsonApiResource::Resource
+        @message  = opts.fetch :message, ""
+      end
+
+      def message
+        "#{@klass}: #{@message}"
+      end
+    end
+
+    class UnsuccessfulRequest < JsonApiResourceError
+    end
+  end
+end

data/lib/json_api_resource/executable.rb

@@ -26,19 +26,7 @@ module JsonApiResource
             new(client: result)
           end
         rescue Multiconnect::Error::UnsuccessfulRequest => e
-          
-          empty_500_set
-          
-        end
-
-        def empty_500_set
-          result = JsonApiClient::ResultSet.new
-          result.meta = {status: 500}
-
-          result.errors = ActiveModel::Errors.new(result)
-          result.errors.add("ServerError", "Unable to connect to server or server returned 500")
-
-          result
+          handle_failed_request e
         end
       end
 

data/lib/json_api_resource/handlers/find_handler.rb

@@ -6,6 +6,8 @@ module JsonApiResource
       def initialize(results)
         self.result = results.first
 
+        return nil unless result
+
         self.result.meta = results.meta
 
         self.result.linked_data = results.try(:linked_data)

data/lib/json_api_resource/resource.rb

@@ -23,6 +23,7 @@ module JsonApiResource
     include JsonApiResource::Executable
     include JsonApiResource::Conversions
     include JsonApiResource::Cacheable
+    include JsonApiResource::ErrorHandleable
 
     attr_accessor :client, :cache_expires_in
     class_attribute :per_page
@@ -30,7 +31,7 @@ module JsonApiResource
     delegate :to_json, to: :attributes
 
     def initialize(opts={})
-      raise( JsonApiResourceError, class: self.class, message: "A resource must have a client class" ) unless client_class.present?
+      raise( JsonApiResource::Errors::JsonApiResourceError, class: self.class, message: "A resource must have a client class" ) unless client_class.present?
 
       self.client = self.client_class.new(self.schema)
       self.errors = ActiveModel::Errors.new(self)
@@ -87,7 +88,7 @@ module JsonApiResource
         super
       end
     rescue Multiconnect::Error::UnsuccessfulRequest => e
-      empty_500_set
+      handle_failed_request e
     end
 
     def respond_to_missing?(method_name, include_private = false)

data/lib/json_api_resource/version.rb

@@ -1,3 +1,3 @@
 module JsonApiResource
-  VERSION = "2.1.1"
+  VERSION = "3.0.0"
 end

data/lib/json_api_resource.rb

@@ -5,9 +5,10 @@ module JsonApiResource
   autoload :Clientable,             'json_api_resource/clientable'
   autoload :Connections,            'json_api_resource/connections'
   autoload :Conversions,            'json_api_resource/conversions'
+  autoload :ErrorHandleable,        'json_api_resource/error_handleable'
   autoload :ErrorNotifier,          'json_api_resource/error_notifier'
   autoload :Handlers,               'json_api_resource/handlers'
-  autoload :JsonApiResourceError,   'json_api_resource/json_api_resource_error'
+  autoload :Errors,                 'json_api_resource/errors'
   autoload :Queryable,              'json_api_resource/queryable'
   autoload :Resource,               'json_api_resource/resource'
   autoload :Executable,             'json_api_resource/executable'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_api_resource
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Brandon Sislow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_api_client
@@ -109,12 +109,13 @@ files:
 - lib/json_api_resource/connections.rb
 - lib/json_api_resource/connections/server_connection.rb
 - lib/json_api_resource/conversions.rb
+- lib/json_api_resource/error_handleable.rb
 - lib/json_api_resource/error_notifier.rb
 - lib/json_api_resource/error_notifier/base.rb
+- lib/json_api_resource/errors.rb
 - lib/json_api_resource/executable.rb
 - lib/json_api_resource/handlers.rb
 - lib/json_api_resource/handlers/find_handler.rb
-- lib/json_api_resource/json_api_resource_error.rb
 - lib/json_api_resource/queryable.rb
 - lib/json_api_resource/resource.rb
 - lib/json_api_resource/schemable.rb

data/lib/json_api_resource/json_api_resource_error.rb

@@ -1,12 +0,0 @@
-module JsonApiResource
-  class JsonApiResourceError < StandardError
-    def initialize(opts = {})
-      @klass    = opts.fetch :class, JsonApiResource::Resource
-      @message  = opts.fetch :message, ""
-    end
-
-    def message
-      "#{@klass}: #{@message}"
-    end
-  end
-end