hyperdrive 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0310c3ea9e2400fb9bb5527017453871e14b37e7
-  data.tar.gz: 2e6ae40c0d160e91f9c5b71587d9c69c6741b760
+  metadata.gz: 6c23aaf5bdede85ba2269ab2a0baed51136d6a23
+  data.tar.gz: 3d944c9ca0fc9faada183ffc93d3b02829a05cb7
 SHA512:
-  metadata.gz: 197285ed590fd3808b0fdec8f52418ef1bfaf6c55c7fd20dd8e5526450c37ffe4c99b127d8762212d46ca2a389472d7f821f2d0e1b1e082af9ffd73bc1b0458a
-  data.tar.gz: 9b37a124b0a2da5911ce56b13b64b16f6c76af173c348c78c1cf986227c5580e2e2d6c58d86babf5e2be42708a2f2bc80671400f068f9b52d1a0b19a81e57b12
+  metadata.gz: 3ef076c40b1339ce9e2bd3243dc214c0cdb4f6d9340e8a71d98d0e1fa2befa60895b9b4adcc7a4df041f01453fc8ffbb0cc5c279be09ac1e6c9d137a2ed9663a
+  data.tar.gz: 4012e028e23f512d418486674755a29e87368c9d71c6f104a0ac815ba5466ef0ca2844d2b3ed1582466e983e9fadedac44493c76d5779c36d17a4d387e48f367

data/.travis.yml

@@ -5,6 +5,9 @@ rvm:
   - 1.9.3
   - jruby-head
   - rbx
+matrix:
+  allow_failures:
+    - rvm: rbx
 env:
   global:
     secure: Tl3oBsBZRI5bMrtNH5mtTDvSTlTxNbsKaAnQ7KQ2KMyiH/eHolOSIbUYB9NB3GRMC6XSyFShRCaYPA/ET36HI+Jw3PFT/XADdiOdFqlk6VyJEUPznNQ1nlp8AsyNn+IexZXIl8DdqmZxGHlY6YKDbQV/U1v+FeW8X5j3TLN1mcw=

data/lib/hyperdrive/endpoint.rb

@@ -44,7 +44,7 @@ module Hyperdrive
         if json?
           MultiJson.dump(body)
         else
-          $stderr.puts "can't serialize response automatically"
+          env['rack.errors'] << "ENDPOINT: Can't serialize response automatically"
         end
       when String
         body
@@ -53,6 +53,10 @@ module Hyperdrive
       end
     end
 
+    def self.error(status, message)
+      raise Errors::HTTPError.new(message, status)
+    end
+
     def self.status
       case env['REQUEST_METHOD']
       when 'POST'

data/lib/hyperdrive/errors/bad_request.rb

@@ -1,13 +1,10 @@
 module Hyperdrive
   module Errors
     class BadRequest < HTTPError
-      def message
-        "The request cannot be fulfilled due to bad syntax."
-      end
-
-      def http_status_code
-        400
+      def initialize
+        @http_status_code = 400
+        @message = 'The request cannot be fulfilled due to bad syntax.'
       end
     end
   end
-end
+end

data/lib/hyperdrive/errors/http_error.rb

@@ -3,13 +3,12 @@
 module Hyperdrive
   module Errors 
     class HTTPError < RuntimeError
-      def message
-        'Unknown Error.'
-      end
-
-      def http_status_code
-        500
+      attr_reader :http_status_code, :message
+      def initialize(message, http_status_code = 500)
+        @message = message
+        @http_status_code = http_status_code
       end
     end
   end
 end
+

data/lib/hyperdrive/errors/internal_server_error.rb

@@ -1,13 +1,10 @@
 module Hyperdrive
   module Errors
     class InternalServerError < HTTPError
-      def message
-        "The server encountered an unexpected condition which prevented it from fulfilling the request."
-      end
-
-      def http_status_code
-        500
+      def initialize
+        @message = 'The server encountered an unexpected condition which prevented it from fulfilling the request.'
+        @http_status_code = 500
       end
     end
   end
-end
+end

data/lib/hyperdrive/errors/method_not_allowed.rb

@@ -3,14 +3,8 @@ module Hyperdrive
     class MethodNotAllowed < HTTPError
       def initialize(request_method)
         @request_method = request_method
-      end
-
-      def message
-        "#{@request_method.upcase} requests are not supported by this resource."
-      end
-
-      def http_status_code
-        405
+        @message = "#{request_method.upcase} requests are not supported by this resource."
+        @http_status_code = 405
       end
     end
   end

data/lib/hyperdrive/errors/missing_required_param.rb

@@ -1,18 +1,9 @@
 module Hyperdrive
   module Errors
     class MissingRequiredParam < HTTPError
-      attr_reader :param, :http_request_method
       def initialize(param, http_request_method)
-        @param = param
-        @http_request_method = http_request_method
-      end
-
-      def message
-        "The #{param} param is required by #{http_request_method} requests."
-      end
-
-      def http_status_code
-        400
+        @message = "The #{param} param is required by #{http_request_method} requests."
+        @http_status_code = 400
       end
     end
   end

data/lib/hyperdrive/errors/not_acceptable.rb

@@ -2,15 +2,8 @@ module Hyperdrive
   module Errors
     class NotAcceptable < HTTPError
       def initialize(http_accept)
-        @http_accept = http_accept
-      end
-
-      def message
-        "This resource is not capable of generating content in the format requested by the Accept headers (#{@http_accept})."
-      end
-
-      def http_status_code
-        406
+        @message = "This resource is not capable of generating content in the format requested by the Accept headers (#{http_accept})."
+        @http_status_code = 406
       end
     end
   end

data/lib/hyperdrive/errors/not_found.rb

@@ -1,13 +1,10 @@
 module Hyperdrive
   module Errors
     class NotFound < HTTPError
-      def message
-        "The requested resource could not be found."
-      end
-
-      def http_status_code
-        404
+      def initialize
+        @message = 'The requested resource could not be found.'
+        @http_status_code = 404
       end
     end
   end
-end
+end

data/lib/hyperdrive/errors/not_implemented.rb

@@ -2,16 +2,9 @@ module Hyperdrive
   module Errors
     class NotImplemented < HTTPError
       def initialize(request_method)
-        @request_method = request_method
-      end
-
-      def message
-        "The server either does not recognise the request method (#{@request_method}), or it lacks the ability to fulfill the request."
-      end
-
-      def http_status_code
-        501
+        @message = "The server either does not recognise the request method (#{request_method}), or it lacks the ability to fulfill the request."
+        @http_status_code = 501
       end
     end
   end
-end
+end

data/lib/hyperdrive/errors/unauthorized.rb

@@ -1,13 +1,10 @@
 module Hyperdrive
   module Errors
     class Unauthorized < HTTPError
-      def message
-        "The request requires user authentication."
-      end
-
-      def http_status_code
-        401
+      def initialize
+        @message = 'The request requires user authentication.'
+        @http_status_code = 401
       end
     end
   end
-end
+end

data/lib/hyperdrive/errors/unknown_error.rb

@@ -0,0 +1,12 @@
+# encoding: utf-8
+
+module Hyperdrive
+  module Errors
+    class UnknownError < HTTPError
+      def initialize
+        @http_status_code = 500
+        @message = 'Unknown Error.'
+      end
+    end
+  end
+end

data/lib/hyperdrive/errors.rb

@@ -4,7 +4,7 @@
 require 'hyperdrive/errors/dsl/unknown_argument'
 
 # HTTP Errors
-require 'hyperdrive/errors/http_error' # 500 (Catch All)
+require 'hyperdrive/errors/http_error'
 require 'hyperdrive/errors/bad_request' # 400 (Generic)
 require 'hyperdrive/errors/internal_server_error' # 500 (Generic)
 require 'hyperdrive/errors/method_not_allowed' # 405
@@ -13,3 +13,4 @@ require 'hyperdrive/errors/not_acceptable' # 406
 require 'hyperdrive/errors/not_found' # 404
 require 'hyperdrive/errors/not_implemented' # 501
 require 'hyperdrive/errors/unauthorized' # 401
+require 'hyperdrive/errors/unknown_error' # 500 (Catch All)

data/lib/hyperdrive/middleware/error.rb

@@ -19,7 +19,7 @@ module Hyperdrive
         else
           env['rack.errors'] << e
           status = 500
-          body = json_error(Hyperdrive::Errors::HTTPError.new)
+          body = json_error(Hyperdrive::Errors::UnknownError.new)
         end
         [status, headers, body]
       end

data/lib/hyperdrive/version.rb

@@ -1,3 +1,3 @@
 module Hyperdrive
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/hyperdrive/endpoint_spec.rb

@@ -19,4 +19,15 @@ describe Hyperdrive::Endpoint do
     get '/', {}, default_rack_env(hyperdrive.resources[:thing])
     last_response.successful?.must_equal true
   end
+
+  it "can raise an HTTPError" do
+    hyperdrive do
+      resource(:thing) do
+        request(:get) do
+          error(418, "I'M A TEAPOT")
+        end
+      end
+    end
+    ->{ get '/', {}, default_rack_env(hyperdrive.resources[:thing]) }.must_raise Hyperdrive::Errors::HTTPError
+  end
 end

data/spec/hyperdrive/errors/http_error_spec.rb

@@ -4,14 +4,15 @@ require 'spec_helper'
 
 describe Hyperdrive::Errors::HTTPError do
   before do
-    @error = Hyperdrive::Errors::HTTPError.new
+    @error = Hyperdrive::Errors::HTTPError.new("I'M A TEAPOT", 418)
   end
 
   it "returns a 500 status code" do
-    @error.http_status_code.must_equal 500
+    @error.http_status_code.must_equal 418
   end
 
   it "has a message" do
-    @error.message.must_match(/Unknown/)
+    @error.message.must_match(/TEAPOT/)
   end
 end
+

data/spec/hyperdrive/errors/unknown_error_spec.rb

@@ -0,0 +1,17 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Hyperdrive::Errors::UnknownError do
+  before do
+    @error = Hyperdrive::Errors::UnknownError.new
+  end
+
+  it "returns a 500 status code" do
+    @error.http_status_code.must_equal 500
+  end
+
+  it "has a message" do
+    @error.message.must_match(/Unknown/)
+  end
+end

data/spec/hyperdrive/middleware/error_spec.rb

@@ -6,7 +6,7 @@ describe Hyperdrive::Middleware::Error do
   before do
     get '/'
   end
- 
+
   context "Known Error" do
     def app
       Rack::Builder.new do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hyperdrive
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - StyleSeek Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-05 00:00:00.000000000 Z
+date: 2014-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: linguistics
@@ -142,6 +142,7 @@ files:
 - lib/hyperdrive/errors/not_found.rb
 - lib/hyperdrive/errors/not_implemented.rb
 - lib/hyperdrive/errors/unauthorized.rb
+- lib/hyperdrive/errors/unknown_error.rb
 - lib/hyperdrive/filter.rb
 - lib/hyperdrive/hateoas.rb
 - lib/hyperdrive/middleware.rb
@@ -174,6 +175,7 @@ files:
 - spec/hyperdrive/errors/not_found_spec.rb
 - spec/hyperdrive/errors/not_implemented_spec.rb
 - spec/hyperdrive/errors/unauthorized_spec.rb
+- spec/hyperdrive/errors/unknown_error_spec.rb
 - spec/hyperdrive/filter_spec.rb
 - spec/hyperdrive/hateoas_spec.rb
 - spec/hyperdrive/middleware/accept_spec.rb
@@ -230,6 +232,7 @@ test_files:
 - spec/hyperdrive/errors/not_found_spec.rb
 - spec/hyperdrive/errors/not_implemented_spec.rb
 - spec/hyperdrive/errors/unauthorized_spec.rb
+- spec/hyperdrive/errors/unknown_error_spec.rb
 - spec/hyperdrive/filter_spec.rb
 - spec/hyperdrive/hateoas_spec.rb
 - spec/hyperdrive/middleware/accept_spec.rb