hobbit 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ad21a4064eb73894490f6439b24759e4e205152
-  data.tar.gz: a39b6f89449f3f610b8ea689a9be411640491834
+  metadata.gz: 944ab35171d45442e32e96a5587753f37ed50f0d
+  data.tar.gz: c1e65e014055647553c5eaf4e9c055f8cb43afe5
 SHA512:
-  metadata.gz: f0d3165b578580625915845cc1c681c03edfcc6a9ab8aae7a8ef9cc009152fc533592be8479741f628ba65970562e9210cb771bd1c313fae13f309b7f29f7b17
-  data.tar.gz: f0ae8fb5175333c1bb06484141e0609cb34c0340315cef48c95fb79227529284cf657d15eabe49ce4b23d9cb63055791f70f6f4ba1754a42e0e0058f9d598228
+  metadata.gz: 6b5d57ba581c5676c1670f8eb6cece3d7442cf0a9d286d8848dc7726b806a493217c0ed8de6133da3c8596156e40f08e23bef60cab889c2915b1dd36972bd362
+  data.tar.gz: 995bf2aeb75e3a5f6116aad7715d5d4cffd92f84d0bd1cc58c9a36593ee604c678487f313f8912aae68b66a80a60db18c15951743391f9e28322a3848a914095

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# 0.5.0
+
+* Refactor `Hobbit::Base#halt`. It now sets the status, merges the headers and
+writes the body (using `Hobbit::Response#write`) when given a fixnum, a hash or
+a string.
+* `Hobbit::Response` headers and body are not accessors anymore. This is
+because when you set the body directly, the `Content-Length` is not calculated
+(it's calculated on `#write`).
+
 # 0.4.4
 
 * Refactor `Hobbit::Response`.

data/README.md

@@ -176,8 +176,8 @@ end
 
 #### Halting
 
-To immediately stop a request within a filter or route you must specify the
-status:
+To immediately stop a request within route you can use `halt`. You can also
+specify a status:
 
 ```ruby
 require 'hobbit'
@@ -195,7 +195,7 @@ class App < Hobbit::Base
 end
 ```
 
-And also you can add a body:
+Or body:
 
 ```ruby
 require 'hobbit'
@@ -208,7 +208,7 @@ class App < Hobbit::Base
   end
 
   get '/' do
-    halt 401, body: 'This will be the body' unless session['user_id']
+    halt 401, 'This will be the body' unless session['user_id']
   end
 end
 ```
@@ -226,7 +226,7 @@ class App < Hobbit::Base
   end
 
   get '/' do
-    halt 401, headers: { 'Content-Type' => 'text/html; charset=utf-8' }
+    halt 401, { 'Content-Type' => 'text/html; charset=utf-8' }
   end
 end
 ```
@@ -244,7 +244,7 @@ class App < Hobbit::Base
   end
 
   get '/' do
-    halt 401, headers: { 'Content-Type' => 'text/html; charset=utf-8' }, body: 'Woops'
+    halt 401, { 'Content-Type' => 'text/html; charset=utf-8' }, 'Woops'
   end
 end
 ```

data/lib/hobbit/base.rb

@@ -55,16 +55,10 @@ module Hobbit
       @response.finish
     end
 
-    # Stops the execution and returns a response.
-    #
-    # @param status [Fixnum] HTTP status code.
-    # @param headers [Hash] Response headers.
-    # @param body [Array] Response body.
-    # @return [Hobbit::Response] The Response.
-    def halt(status, headers: {}, body: [])
-      response.status = status
-      response.headers = headers
-      response.body = Array(body)
+    def halt(*res)
+      response.status = res.detect { |s| s.is_a? Fixnum } || 200
+      response.headers.merge! res.detect { |h| h.is_a? Hash } || {}
+      response.write res.detect { |b| b.is_a? String } || ''
 
       throw :halt, response
     end

data/lib/hobbit/response.rb

@@ -2,7 +2,8 @@ require 'forwardable'
 
 module Hobbit
   class Response
-    attr_accessor :body, :headers, :status
+    attr_accessor :status
+    attr_reader :headers, :body
     extend Forwardable
     def_delegators :headers, :[], :[]=
 
@@ -15,7 +16,7 @@ module Hobbit
       elsif body.respond_to? :each
         body.each { |i| write i.to_s }
       else
-        raise TypeError, 'body must #respond_to? :to_str or :each'
+        raise TypeError, 'body must #respond_to? #to_str or #each'
       end
     end
 

data/lib/hobbit/version.rb

@@ -1,3 +1,3 @@
 module Hobbit
-  VERSION = '0.4.4'
+  VERSION = '0.5.0'
 end

data/spec/base_spec.rb

@@ -205,61 +205,54 @@ EOS
     end
   end
 
-  describe '::halt' do
+  describe '#halt' do
     before do
       mock_app do
-        get '/halt' do
+        get '/halt_fixnum' do
           halt 501
           response.write 'Hello world'
         end
 
         get '/halt_string' do
-          halt 501, body: 'Halt!'
-        end
-
-        get '/halt_array' do
-          halt 501, body: ['Halt!']
+          halt 'Halt!'
         end
 
         get '/halt_hash' do
-          halt 501, body: { message: 'Halt!' }
+          halt({ header: 'OK' })
         end
 
-        get '/halt_headers' do
-          halt 501, headers: { header: 'OK' }
+        get '/halt_combined' do
+          halt 404, 'Not Found'
         end
       end
     end
 
     it 'returns the response given to halt function' do
-      get '/halt'
-      last_response.headers.must_equal({ 'Content-Length' => '0' })
+      get '/halt_fixnum'
       last_response.body.must_equal ''
+      last_response.headers.must_equal({ 'Content-Type' => 'text/html; charset=utf-8', 'Content-Length' => '0' })
       last_response.status.must_equal 501
     end
 
-    it 'accepts a string as body' do
+    it 'accepts body' do
       get '/halt_string'
       last_response.body.must_equal 'Halt!'
-      last_response.status.must_equal 501
-    end
-
-    it 'accepts an Array as body' do
-      get '/halt_array'
-      last_response.body.must_equal 'Halt!'
-      last_response.status.must_equal 501
+      last_response.headers.must_equal({ 'Content-Type' => 'text/html; charset=utf-8', 'Content-Length' => '5' })
+      last_response.status.must_equal 200
     end
 
-    it 'accepts a Hash as body' do
+    it 'accepts headers' do
       get '/halt_hash'
-      last_response.body.must_equal '[:message, "Halt!"]'
-      last_response.status.must_equal 501
+      last_response.body.must_equal ''
+      last_response.headers.must_equal({ 'Content-Type' => 'text/html; charset=utf-8', 'Content-Length' => '0', header: 'OK' })
+      last_response.status.must_equal 200
     end
-
-    it 'accepts headers' do
-      get '/halt_headers'
-      last_response.headers.must_equal({ header: 'OK', 'Content-Length' => '0' })
-      last_response.status.must_equal 501
+    
+    it 'accepts combinations' do
+      get '/halt_combined'
+      last_response.body.must_equal 'Not Found'
+      last_response.headers.must_equal({ 'Content-Type' => 'text/html; charset=utf-8', 'Content-Length' => '9' })
+      last_response.status.must_equal 404
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hobbit
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Patricio Mac Adden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-11 00:00:00.000000000 Z
+date: 2014-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler