served 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9d112dbf8e70d5ece558892faf608955e7c63bd
-  data.tar.gz: 114c90343efa2eb1af73a09344483d588af63de2
+  metadata.gz: f16ed665b06a5042b1acf3658918c48c2dfebabd
+  data.tar.gz: 51638a8ecb500306975a9fb962abeb117c4aa7d5
 SHA512:
-  metadata.gz: 8c7c9b61fcdf251d352dd430201501fc5d7e6dbe2344eff0f1d4b226100b7d3b0f5a8d5e5566a61ae4ed881369c0c0e6632eca167266350c229ebb369185d6a5
-  data.tar.gz: 175df4779e4176ee9b15f4f9019a4cbde160ce34f0ad60af81eed8f70058056fedd3e813b2ef7a3a2a16e50abe791bf0279c186d023cc6cc11ecc949aa67bc67
+  metadata.gz: 8a582540ae2fe53989249f28cd5b0e6cadb81182837dbc6ab4321f9cce2fb939c22c57964158f0e1ab90dc911b0091092535ba07c94da6836948aff9b3a25753
+  data.tar.gz: f74a7473319e02a655a7b9b6a98066905f074eb383273e052d498e634900c288628d5d8d0c26054e6e1a695dca9b0ad3b7c0fca4326e4fb00e738c7a646ba404

data/.travis.yml

@@ -1,9 +1,11 @@
 language: ruby
 rvm:
-  - 2.1
-  - 2.2.2
-  - 2.3.3
-  - 2.4.0
+  - 2.1.9
+  - 2.1.10
+  - 2.2.7
+  - 2.3.2
+  - 2.3.4
+  - 2.4.1
 before_install: gem install bundler -v 1.10.5
 
 gemfile:
@@ -13,5 +15,8 @@ gemfile:
 
 matrix:
   exclude:
-    - gemfile: gemfiles/5.0.gemfile
-      rvm: 2.1
+    - rvm: 2.1.9
+      gemfile: gemfiles/5.0.gemfile
+    - rvm: 2.1.10
+      gemfile: gemfiles/5.0.gemfile
+

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.4.1
+* update CI to cover latest version so of ruby
+* Fixes unhandled exception when error response isn't valid JSON
+* Fix HTTP error handling to all codes are dealt with consistently.
+
 ## 0.4.0
 * Install rubocop and make everything compliant.
 * Improve error messaging for inclusion validations.

data/lib/served/resource/http_errors.rb

@@ -7,24 +7,20 @@ module Served
       attr_reader :response
       attr_reader :code
 
-      # Defined in individual error classes
-      def self.code
-        raise NotImplementedError
-      end
+      def initialize(code, resource, response)
+        @code = code
 
-      def initialize(resource, response)
         if resource.serializer.respond_to? :exception
           serialized = resource.serializer.exception(response.body).symbolize_keys!
 
           @error            = serialized[:error]
           @message          = serialized[:exception]
           @server_backtrace = serialized[:backtrace]
-          @code             = serialized[:code] || serialized[:code] = self.class.code
           @response         = OpenStruct.new(serialized) # TODO: remove in served 1.0, used for backwards compat
 
           super("An error '#{code} #{message}' occurred while making this request")
         end
-        super "An error occurred '#{self.class.code}'"
+        super "An error occurred '#{code}'"
       end
 
       def status
@@ -32,81 +28,60 @@ module Served
       end
     end
 
-    # 301 MovedPermanently
-    class MovedPermanently < HttpError
-      def self.code
-        301
-      end
+    # 302, 303, 307
+    class Redirection < HttpError
     end
 
-    # 400 BadRequest
-    class BadRequest < HttpError
-      def self.code
-        400
-      end
+    # 301 Moved Permanently
+    class MovedPermanently < Redirection
+    end
+
+    # 401-499
+    class ClientError < HttpError
+    end
+
+    # 400 Bad Request
+    class BadRequest < ClientError
     end
 
     # 401 Unauthorized
-    class Unauthorized < HttpError
-      def self.code
-        401
-      end
+    class Unauthorized < ClientError
     end
 
     # 403 Forbidden
-    class Forbidden < HttpError
-      def self.code
-        403
-      end
+    class Forbidden < ClientError
     end
 
-    # 404 NotFound
-    class NotFound < HttpError
-      def self.code
-        404
-      end
+    # 404 Not Found
+    class NotFound < ClientError
     end
 
-    # 405 MethodNotAllowed
-    class MethodNotAllowed < HttpError
-      def self.code
-        405
-      end
+    # 405 Method Not Allowed
+    class MethodNotAllowed < ClientError
     end
 
-    # 406 NotAcceptable
-    class NotAcceptable < HttpError
-      def self.code
-        406
-      end
+    # 406 Not Acceptable
+    class NotAcceptable < ClientError
     end
 
-    # 408 RequestTimeout
-    class RequestTimeout < HttpError
-      def self.code
-        408
-      end
+    # 408 Request Timeout
+    class RequestTimeout < ClientError
     end
 
-    # 422 UnprocessableEntity
-    class UnprocessableEntity < HttpError
-      def self.code
-        422
-      end
+    # 422 Unprocessable Entity
+    class UnprocessableEntity < ClientError
     end
 
-    # 500 InternalServerError
-    class InternalServerError < HttpError
-      def self.code
-        500
-      end
+    # 5xx Server Error
+    class ServerError < HttpError
     end
 
-    # 503 BadGateway
-    class BadGateway < HttpError
-      def self.code
-        503
-      end
+    # 500 Internal Server Error
+    class InternalServerError < ServerError
+    end
+
+    # 503 Bad Gateway
+    class BadGateway < ServerError
     end
   end
 end

data/lib/served/resource/requestable.rb

@@ -42,10 +42,12 @@ module Served
         end
 
         handle((200..201), :load)
-        handle([204, 202]) { attributes }
+        handle([202, 204]) { attributes }
 
-        # 400 level errors
         handle(301) { Resource::MovedPermanently }
+        handle([302, 303, 304, 305, 307, 308]) { Resource::Redirection }
+
+        # 400 level errors
         handle(400) { Resource::BadRequest }
         handle(401) { Resource::Unauthorized }
         handle(403) { Resource::Forbidden }
@@ -54,16 +56,18 @@ module Served
         handle(406) { Resource::NotAcceptable }
         handle(408) { Resource::RequestTimeout }
         handle(422) { Resource::UnprocessableEntity }
+        handle((400..499)) { Resource::ClientError }
 
         # 500 level errors
         handle(500) { Resource::InternalServerError }
         handle(503) { Resource::BadGateway }
+        handle((500..599)) { Resource::ServerError }
       end
 
       module ClassMethods
         def handle_response(response)
           if raise_on_exceptions
-            handler = handlers[response.code]
+            handler = handlers.fetch(response.code) { proc { HttpError } }
             if handler.is_a? Proc
               result = handler.call(response)
             else
@@ -71,7 +75,7 @@ module Served
             end
 
             if result.respond_to?(:ancestors) && result.ancestors.include?(HttpError)
-              raise result.new(self, response)
+              raise result.new(response.code, self, response)
             end
             result
           else
@@ -90,7 +94,7 @@ module Served
           raise HandlerRequired unless symbol_or_proc || block_given?
           if code_or_range.is_a?(Range) || code_or_range.is_a?(Array)
             code_or_range.each do |c|
-              handlers[c] = symbol_or_proc || block
+              handlers[c] = symbol_or_proc || block unless handlers.key?(c)
             end
           else
             handlers[code_or_range] = symbol_or_proc || block

data/lib/served/serializers/json.rb

@@ -26,6 +26,8 @@ module Served
 
       def self.exception(data)
         JSON.parse(data)
+      rescue
+        {}
       end
     end
   end

data/lib/served/version.rb

@@ -1,3 +1,3 @@
 module Served
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.4.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: served
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Jarod Reid
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-13 00:00:00.000000000 Z
+date: 2017-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport