hobbit 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc695229b6dbea81ceaf3de386769ca9dff5ded5
-  data.tar.gz: f5444f4ca2eeb0edd6929bfe7058476a75690972
+  metadata.gz: 0ad21a4064eb73894490f6439b24759e4e205152
+  data.tar.gz: a39b6f89449f3f610b8ea689a9be411640491834
 SHA512:
-  metadata.gz: 6c7d75254bd0ae03006229ed7f665548eb7a5557dbdc0a866910d4ebf7aa9840b7bb2dcc93ec15d2f839219310ffc0e14b4ef2a7ac4b1449fc0a4b2ec0098af6
-  data.tar.gz: 4e5519917bbee84db20e22de8208e9776ec5bdeaef48b88c03f0158151373029ed695e015df5476e9ed34ca6e63b4dc1077bbdd6ab209949d8ed08c678643ca3
+  metadata.gz: f0d3165b578580625915845cc1c681c03edfcc6a9ab8aae7a8ef9cc009152fc533592be8479741f628ba65970562e9210cb771bd1c313fae13f309b7f29f7b17
+  data.tar.gz: f0ae8fb5175333c1bb06484141e0609cb34c0340315cef48c95fb79227529284cf657d15eabe49ce4b23d9cb63055791f70f6f4ba1754a42e0e0058f9d598228

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.4.4
+
+* Refactor `Hobbit::Response`.
+
 # 0.4.3
 
 * Calculate the `Content-Length` of a `Hobbit::Response` using `#bytesize`

data/lib/hobbit/response.rb

@@ -7,11 +7,20 @@ module Hobbit
     def_delegators :headers, :[], :[]=
 
     def initialize(body = [], status = 200, headers = { 'Content-Type' => 'text/html; charset=utf-8' })
-      @body, @headers, @status = body, headers, status
+      @body, @headers, @status = [], headers, status
+      @length = 0
+
+      if body.respond_to? :to_str
+        write body.to_str
+      elsif body.respond_to? :each
+        body.each { |i| write i.to_s }
+      else
+        raise TypeError, 'body must #respond_to? :to_str or :each'
+      end
     end
 
     def finish
-      headers['Content-Length'] = body.each.map { |i| i.is_a?(Array) ? i.map(&:to_s).map(&:bytesize) : i.bytesize }.flatten.inject(0, &:+).to_s
+      headers['Content-Length'] = @length.to_s
       [status, headers, body]
     end
 
@@ -21,7 +30,10 @@ module Hobbit
     end
 
     def write(string)
-      body << string
+      s = string.to_s
+      @length += s.bytesize
+
+      body << s
     end
   end
 end

data/lib/hobbit/version.rb

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

data/spec/response_spec.rb

@@ -11,12 +11,16 @@ describe Hobbit::Response do
     end
 
     it 'must set the body, status and headers with arguments given' do
-      status, headers, body = 200, { 'Content-Type' => 'application/json' }, ['{"name":"Hobbit"}']
+      status, headers, body = 200, { 'Content-Type' => 'application/json' }, ['{"name": "Hobbit"}']
       response = Hobbit::Response.new body, status, headers
       response.status.must_equal status
       response.headers.must_equal headers
       response.body.must_equal body
     end
+
+    it 'must raise a TypeError if body does not respond to :to_str or :each' do
+      proc { Hobbit::Response.new 1 }.must_raise TypeError
+    end
   end
 
   describe '#[]' do
@@ -48,7 +52,7 @@ describe Hobbit::Response do
   describe '#finish' do
     let(:status) { 200 }
     let(:headers) { { 'Content-Type' => 'application/json' } }
-    let(:body) { ['{"name":"Hobbit"}'] }
+    let(:body) { ['{"name": "Hobbit"}'] }
 
     it 'must return a 3 elements array with status, headers and body' do
       response = Hobbit::Response.new body, status, headers
@@ -59,7 +63,7 @@ describe Hobbit::Response do
       response = Hobbit::Response.new body, status, headers
       s, h, b = response.finish
       h.must_include 'Content-Length'
-      h['Content-Length'].must_equal '17'
+      h['Content-Length'].must_equal '18'
     end
 
     it 'must calculate the Content-Length of the body, even if the body is empty' do

metadata

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