hobbit 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7c486fc3d4a7a9ab2cf164da150c53e64dfea84
-  data.tar.gz: 1cd83cd0025ac0f255972ec361e644b2bcd3342f
+  metadata.gz: fc695229b6dbea81ceaf3de386769ca9dff5ded5
+  data.tar.gz: f5444f4ca2eeb0edd6929bfe7058476a75690972
 SHA512:
-  metadata.gz: aaaafbb99b619a7f4553c03183732e02c3a054977e21de5ac60e0078e73bddbbe8c3558b3d173bb119dd04beb7d941a33ed3b062f036a47973cad15ac77d6cbc
-  data.tar.gz: 240d21c02bc59f9e3a6916540d8b24b2d4bf7812786302a1e3f399a55af9ed0273cfef0e75124fe26bf4ba36c31cbba711f8b20934edf1c0807a6d4ad0676a52
+  metadata.gz: 6c7d75254bd0ae03006229ed7f665548eb7a5557dbdc0a866910d4ebf7aa9840b7bb2dcc93ec15d2f839219310ffc0e14b4ef2a7ac4b1449fc0a4b2ec0098af6
+  data.tar.gz: 4e5519917bbee84db20e22de8208e9776ec5bdeaef48b88c03f0158151373029ed695e015df5476e9ed34ca6e63b4dc1077bbdd6ab209949d8ed08c678643ca3

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.4.3
+
+* Calculate the `Content-Length` of a `Hobbit::Response` using `#bytesize`
+instead of `#size`.
+
 # 0.4.2
 
 * Add `Hobbit::Response#redirect`, that was missing since `Hobbit::Response`

data/README.md

@@ -27,7 +27,7 @@ $ gem install hobbit
 ## Features
 
 * DSL inspired by [Sinatra](http://www.sinatrarb.com/).
-* [Speed](https://github.com/patriciomacadden/microbenchmarks).
+* [Speed](https://github.com/luislavena/bench-micro).
 * Extensible with standard ruby classes and modules, with no extra logic. See
 [hobbit-contrib](https://github.com/patriciomacadden/hobbit-contrib).
 * Zero configuration.
@@ -174,65 +174,46 @@ class App < Hobbit::Base
 end
 ```
 
-### Built on top of rack
-
-Each Hobbit application is a Rack stack (See this
-[blog post](http://m.onkey.org/ruby-on-rack-2-the-builder) for more
-information).
-
-#### Mapping applications
+#### Halting
 
-You can mount any Rack application to the stack by using the `map` class
-method:
+To immediately stop a request within a filter or route you must specify the
+status:
 
 ```ruby
 require 'hobbit'
 
-class InnerApp < Hobbit::Base
-  # gets called when path_info = '/inner'
-  get do
-    'Hello InnerApp!'
-  end
-end
-
 class App < Hobbit::Base
-  map('/inner') { run InnerApp.new }
+  use Rack::Session::Cookie, secret: SecureRandom.hex(64)
+
+  def session
+    env['rack.session']
+  end
 
   get '/' do
-    'Hello App!'
+    halt 401 unless session['user_id']
   end
 end
 ```
 
-#### Using middleware
-
-You can add any Rack middleware to the stack by using the `use` class method:
+And also you can add a body:
 
 ```ruby
 require 'hobbit'
 
 class App < Hobbit::Base
   use Rack::Session::Cookie, secret: SecureRandom.hex(64)
-  use Rack::ShowExceptions
 
   def session
     env['rack.session']
   end
 
   get '/' do
-    session[:name] = 'hobbit'
+    halt 401, body: 'This will be the body' unless session['user_id']
   end
-
-  # more routes...
 end
-
-run App.new
 ```
 
-#### Halting
-
-To immediately stop a request within a filter or route you must specify the
-status:
+Or headers:
 
 ```ruby
 require 'hobbit'
@@ -245,14 +226,14 @@ class App < Hobbit::Base
   end
 
   get '/' do
-    halt 401 unless session['user_id']
+    halt 401, headers: { 'Content-Type' => 'text/html; charset=utf-8' }
   end
 end
 ```
 
-And also you can add a body:
+Or both:
 
-```ruby
+``` ruby
 require 'hobbit'
 
 class App < Hobbit::Base
@@ -263,45 +244,64 @@ class App < Hobbit::Base
   end
 
   get '/' do
-    halt 401, body: 'This will be the body' unless session['user_id']
+    halt 401, headers: { 'Content-Type' => 'text/html; charset=utf-8' }, body: 'Woops'
   end
 end
 ```
 
-Or headers:
+### Built on top of rack
+
+Each Hobbit application is a Rack stack (See this
+[blog post](http://m.onkey.org/ruby-on-rack-2-the-builder) for more
+information).
+
+#### Mapping applications
+
+You can mount any Rack application to the stack by using the `map` class
+method:
 
 ```ruby
 require 'hobbit'
 
-class App < Hobbit::Base
-  use Rack::Session::Cookie, secret: SecureRandom.hex(64)
-
-  def session
-    env['rack.session']
+class InnerApp < Hobbit::Base
+  # gets called when path_info = '/inner'
+  get do
+    'Hello InnerApp!'
   end
+end
+
+class App < Hobbit::Base
+  map('/inner') { run InnerApp.new }
 
   get '/' do
-    halt 401, headers: { 'Content-Type' => 'text/html; charset=utf-8' }
+    'Hello App!'
   end
 end
 ```
 
-Or both:
+#### Using middleware
 
-``` ruby
+You can add any Rack middleware to the stack by using the `use` class method:
+
+```ruby
 require 'hobbit'
 
 class App < Hobbit::Base
   use Rack::Session::Cookie, secret: SecureRandom.hex(64)
+  use Rack::ShowExceptions
 
   def session
     env['rack.session']
   end
 
   get '/' do
-    halt 401, headers: { 'Content-Type' => 'text/html; charset=utf-8' }, body: 'Woops'
+    session[:name] = 'hobbit'
   end
+
+  # more routes...
 end
+
+run App.new
 ```
 
 ### Security

data/lib/hobbit/response.rb

@@ -11,17 +11,17 @@ module Hobbit
     end
 
     def finish
-      headers['Content-Length'] = body.each.map(&:size).inject { |memo, current| memo += current }.to_s
+      headers['Content-Length'] = body.each.map { |i| i.is_a?(Array) ? i.map(&:to_s).map(&:bytesize) : i.bytesize }.flatten.inject(0, &:+).to_s
       [status, headers, body]
     end
 
     def redirect(target, status = 302)
-      headers['Location'] = target
       self.status = status
+      headers['Location'] = target
     end
 
     def write(string)
-      self.body << string
+      body << string
     end
   end
 end

data/lib/hobbit/version.rb

@@ -1,3 +1,3 @@
 module Hobbit
-  VERSION = '0.4.2'
+  VERSION = '0.4.3'
 end

data/spec/base_spec.rb

@@ -231,9 +231,9 @@ EOS
       end
     end
 
-    it 'return the response given to halt function' do
+    it 'returns the response given to halt function' do
       get '/halt'
-      last_response.headers.must_equal({ 'Content-Length' => '' })
+      last_response.headers.must_equal({ 'Content-Length' => '0' })
       last_response.body.must_equal ''
       last_response.status.must_equal 501
     end
@@ -258,7 +258,7 @@ EOS
 
     it 'accepts headers' do
       get '/halt_headers'
-      last_response.headers.must_equal({ header: 'OK', 'Content-Length' => '' })
+      last_response.headers.must_equal({ header: 'OK', 'Content-Length' => '0' })
       last_response.status.must_equal 501
     end
   end

data/spec/response_spec.rb

@@ -61,6 +61,13 @@ describe Hobbit::Response do
       h.must_include 'Content-Length'
       h['Content-Length'].must_equal '17'
     end
+
+    it 'must calculate the Content-Length of the body, even if the body is empty' do
+      response = Hobbit::Response.new
+      s, h, b = response.finish
+      h.must_include 'Content-Length'
+      h['Content-Length'].must_equal '0'
+    end
   end
 
   describe '#redirect' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hobbit
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Patricio Mac Adden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-29 00:00:00.000000000 Z
+date: 2014-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler