hyperdrive 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c23aaf5bdede85ba2269ab2a0baed51136d6a23
-  data.tar.gz: 3d944c9ca0fc9faada183ffc93d3b02829a05cb7
+  metadata.gz: 04b6a987be60798acd6c704f434fdaa56cb3fb0d
+  data.tar.gz: 95aa241cc63136f90a92dd1f115d9a734721aa68
 SHA512:
-  metadata.gz: 3ef076c40b1339ce9e2bd3243dc214c0cdb4f6d9340e8a71d98d0e1fa2befa60895b9b4adcc7a4df041f01453fc8ffbb0cc5c279be09ac1e6c9d137a2ed9663a
-  data.tar.gz: 4012e028e23f512d418486674755a29e87368c9d71c6f104a0ac815ba5466ef0ca2844d2b3ed1582466e983e9fadedac44493c76d5779c36d17a4d387e48f367
+  metadata.gz: 29266f937b957d845c83e7567b590506d490f45fe81c6a15bdcae619f4347be3495fe0b2a0aa08a26df7989260d471c7db53559420082ef3eaaf65eaface6f20
+  data.tar.gz: c4a3c6619520154ba6b75d8eb140baf941a924b62a6b81386b5cd1fde5f3228ad8fde1c296d9cbf6b1752ab4a18460ef9e758cbdcb64a6de88c87a83ae4e1905

data/lib/hyperdrive/endpoint.rb

@@ -10,7 +10,7 @@ module Hyperdrive
       @params = env['hyperdrive.params']
       @resource = env['hyperdrive.resource']
       @headers = Hyperdrive::Values.default_headers.dup
-      @headers.merge!('Allow' => resource.allowed_methods, 'Content-Type' => @media_type)
+      @headers.merge!('Allow' => resource.allowed_methods.join(', '), 'Content-Type' => @media_type)
 
       response.finish
     end
@@ -44,11 +44,13 @@ module Hyperdrive
         if json?
           MultiJson.dump(body)
         else
-          env['rack.errors'] << "ENDPOINT: Can't serialize response automatically"
+          env.logger.error "ENDPOINT: Can't serialize response automatically"
+          raise Errors::NoResponse.new
         end
       when String
         body
       else
+        env.logger.debug "ENDPOINT: Coerceing response to string. Probably not what you want"
         body.to_s
       end
     end
@@ -75,7 +77,7 @@ module Hyperdrive
     end
 
     def self.response
-      ::Rack::Response.new(body, status, headers)
+      ::Rack::Response.new(render(body), status, headers)
     end
   end
 end

data/lib/hyperdrive/errors/no_response.rb

@@ -0,0 +1,12 @@
+# encoding: utf-8
+
+module Hyperdrive
+  module Errors
+    class NoResponse < HTTPError
+      def initialize
+        @message = "No response could be generated for this request"
+        @http_status_code = 444
+      end
+    end
+  end
+end

data/lib/hyperdrive/errors/not_acceptable.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Hyperdrive
   module Errors
     class NotAcceptable < HTTPError
@@ -8,4 +10,3 @@ module Hyperdrive
     end
   end
 end
-

data/lib/hyperdrive/errors.rb

@@ -9,6 +9,7 @@ require 'hyperdrive/errors/bad_request' # 400 (Generic)
 require 'hyperdrive/errors/internal_server_error' # 500 (Generic)
 require 'hyperdrive/errors/method_not_allowed' # 405
 require 'hyperdrive/errors/missing_required_param' # 400 (Specific)
+require 'hyperdrive/errors/no_response' # 444
 require 'hyperdrive/errors/not_acceptable' # 406
 require 'hyperdrive/errors/not_found' # 404
 require 'hyperdrive/errors/not_implemented' # 501

data/lib/hyperdrive/middleware/pagination.rb

@@ -3,16 +3,19 @@
 module Hyperdrive
   module Middleware
     class Pagination
+      attr_reader :default_per_page
       def initialize(app)
         @app = app
+        @default_per_page = hyperdrive.config.fetch(:per_page) { 20 }
       end
 
       def call(env)
         if %(GET HEAD).include? env['REQUEST_METHOD']
-          env['hyperdrive.page'] = env['hyperdrive.params'].delete(:page) { 1 }
-          env['hyperdrive.page'] = 1 if env['hyperdrive.page'].to_i < 1
-          env['hyperdrive.per_page'] = env['hyperdrive.params'].delete(:per_page) { hyperdrive.config.fetch(:per_page) { 20 } }
-          env['hyperdrive.per_page'] = 20 if env['hyperdrive.per_page'].to_i == 0
+          params = Rack::Request.new(env).params
+          env['hyperdrive.page']     = params.delete('page') { 1 }.to_i
+          env['hyperdrive.page']     = 1 if env['hyperdrive.page'] < 1
+          env['hyperdrive.per_page'] = params.delete('per_page') { default_per_page }.to_i
+          env['hyperdrive.per_page'] = default_per_page if env['hyperdrive.per_page'] == 0
         end
         @app.call(env)
       end

data/lib/hyperdrive/version.rb

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

data/spec/hyperdrive/errors/no_response_spec.rb

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

data/spec/hyperdrive/middleware/pagination_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 
 describe Hyperdrive::Middleware::Pagination do
   def app
-    inner_app = ->(env) { [200, {}, [[env['hyperdrive.page'],env['hyperdrive.per_page'],env['hyperdrive.params'][:page],env['hyperdrive.params'][:per_page]].join(",")]] } 
+    inner_app = ->(env) { [200, {}, [[env['hyperdrive.page'],env['hyperdrive.per_page']].join(',')]] }
     Hyperdrive::Middleware::Pagination.new(inner_app)
   end
 
@@ -12,34 +12,34 @@ describe Hyperdrive::Middleware::Pagination do
     hyperdrive.send(:reset!)
   end
   
-  it "sets default values for page and per_page and removes them from hyperdrive.params" do
-    env = default_rack_env.merge('hyperdrive.params' => {})
-    get '/', {}, env
-    last_response.body.must_equal '1,20,,'
+  it "sets default values for page and per_page" do
+    get '/', {}
+    last_response.body.must_equal '1,20'
   end
 
   it "sets page to 1 if value is less than 1" do
-    env = default_rack_env.merge('hyperdrive.params' => { page: '' })
-    get '/', {}, env
-    last_response.body.must_equal '1,20,,'
+    get '/', { 'page' => '' }
+    last_response.body.must_equal '1,20'
+  end
+
+  it "returns page value if supplied" do
+    get '/', { 'page' => '2' }
+    last_response.body.must_equal '2,20'
   end
 
   it "returns per_page value if supplied" do
-    env = default_rack_env.merge('hyperdrive.params' => { per_page: 42 })
-    get '/', {}, env
-    last_response.body.must_equal '1,42,,'
+    get '/', { 'per_page' => 42 }
+    last_response.body.must_equal '1,42'
   end
 
   it "uses configured per_page value if per_page is not supplied" do
     hyperdrive.config[:per_page] = 13
-    env = default_rack_env.merge('hyperdrive.params' => {})
-    get '/', {}, env
-    last_response.body.must_equal '1,13,,'    
+    get '/', {}
+    last_response.body.must_equal '1,13'    
   end
 
   it "sets per_page to 20 if value is 0" do
-    env = default_rack_env.merge('hyperdrive.params' => { per_page: '' })
-    get '/', {}, env
-    last_response.body.must_equal '1,20,,'
+    get '/', { 'per_page' => '' }
+    last_response.body.must_equal '1,20'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyperdrive
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - StyleSeek Engineering
@@ -138,6 +138,7 @@ files:
 - lib/hyperdrive/errors/internal_server_error.rb
 - lib/hyperdrive/errors/method_not_allowed.rb
 - lib/hyperdrive/errors/missing_required_param.rb
+- lib/hyperdrive/errors/no_response.rb
 - lib/hyperdrive/errors/not_acceptable.rb
 - lib/hyperdrive/errors/not_found.rb
 - lib/hyperdrive/errors/not_implemented.rb
@@ -171,6 +172,7 @@ files:
 - spec/hyperdrive/errors/internal_server_error_spec.rb
 - spec/hyperdrive/errors/method_not_allowed_spec.rb
 - spec/hyperdrive/errors/missing_required_param_spec.rb
+- spec/hyperdrive/errors/no_response_spec.rb
 - spec/hyperdrive/errors/not_acceptable_spec.rb
 - spec/hyperdrive/errors/not_found_spec.rb
 - spec/hyperdrive/errors/not_implemented_spec.rb
@@ -228,6 +230,7 @@ test_files:
 - spec/hyperdrive/errors/internal_server_error_spec.rb
 - spec/hyperdrive/errors/method_not_allowed_spec.rb
 - spec/hyperdrive/errors/missing_required_param_spec.rb
+- spec/hyperdrive/errors/no_response_spec.rb
 - spec/hyperdrive/errors/not_acceptable_spec.rb
 - spec/hyperdrive/errors/not_found_spec.rb
 - spec/hyperdrive/errors/not_implemented_spec.rb