hobbit 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 672fdf5ecb22bb543a996b77a3e9075a514ea07f
-  data.tar.gz: f6e93b013f31f18c4de763d10198f5c99fe7ec02
+  metadata.gz: 2a68ce23c8798644e29dae77f912930b9d862dec
+  data.tar.gz: 373a23fd64590f1691929adb749f7cf272789dbd
 SHA512:
-  metadata.gz: 4b67669025634a181383d1f3b01e6ddab23d90fccc1db1ff00c5c7fdae1dc8aa94c942adcf473e06463ad02fd68b0bd81b49c4d764c3f0b3ed81118b9354b2b1
-  data.tar.gz: fb0fe4d2c7e87d76f5adc8ab0dab1cdefd7d63b7fd987035d631a2c05fee99294c9294691eddaede31af0ccf1e0787cc63ea5b5b3bdb2440493bb6d411887b6b
+  metadata.gz: df6c35a1c894293ce4d6b05287b7bd7032cfe5c274fef9e20e682f09af6d2cdbd61e68918d1b8e5194715ebfad317164bf149317eb15b9bc5ed841d75d0b0eaa
+  data.tar.gz: f4723f82bd5e3036e9a93ca75aba09adccc13bfcfc56effaf5fc662eee1c47d00346953a370589151664f38c244a25f4e40b404d5d0981b91c7ba3833e3ad837

data/.travis.yml

@@ -1,12 +1,4 @@
 ---
 rvm:
-  - 1.9.3
   - 2.0.0
-  - rbx-19mode
-  - jruby-19mode
-  - jruby-20mode
-  - jruby-head
   - ruby-head
-matrix:
-  allow_failures:
-    - rvm: ruby-head

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+# 0.3.0
+
+* `Hobbit::Response` is no longer a subclass of `Rack::Response`.
+* Forward `#map` and `#use` methods to `Rack::Builder` instead of define these
+methods.

data/lib/hobbit/base.rb

@@ -1,14 +1,16 @@
+require 'forwardable'
+
 module Hobbit
   class Base
     class << self
+      extend Forwardable
+
+      def_delegators :stack, :map, :use
+
       %w(DELETE GET HEAD OPTIONS PATCH POST PUT).each do |verb|
         define_method(verb.downcase) { |path, &block| routes[verb] << compile_route(path, &block) }
       end
 
-      def map(path, &block)
-        stack.map(path, &block)
-      end
-
       alias :_new :new
       def new(*args, &block)
         stack.run _new(*args, &block)
@@ -23,10 +25,6 @@ module Hobbit
         @stack ||= Rack::Builder.new
       end
 
-      def use(middleware, *args, &block)
-        stack.use(middleware, *args, &block)
-      end
-
       private
 
       def compile_route(path, &block)

data/lib/hobbit/response.rb

@@ -1,10 +1,22 @@
-require 'rack'
+require 'forwardable'
 
 module Hobbit
-  class Response < Rack::Response
-    def initialize(body = [], status = 200, header = {})
-      header['Content-Type'] = 'text/html; charset=utf-8'
-      super
+  class Response
+    attr_accessor :body, :headers, :length, :status
+    extend Forwardable
+    def_delegators :headers, :[], :[]=
+
+    def initialize(body = [], status = 200, headers = { 'Content-Type' => 'text/html; charset=utf-8' })
+      @body, @headers, @status = body, headers, status
+    end
+
+    def finish
+      headers['Content-Length'] = body.each.map(&:size).inject { |memo, current| memo += current }
+      [status, headers, body]
+    end
+
+    def write(string)
+      self.body << string
     end
   end
 end

data/lib/hobbit/version.rb

@@ -1,3 +1,3 @@
 module Hobbit
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

data/spec/response_spec.rb

@@ -2,8 +2,73 @@ require 'minitest_helper'
 
 describe Hobbit::Response do
   describe '#initialize' do
-    it 'must initialize Content-Type with text/html; charset=utf-8' do
-      Hobbit::Response.new.headers['Content-Type'].must_equal 'text/html; charset=utf-8'
+    it 'must set the body, status and headers with no arguments given' do
+      default_headers = { 'Content-Type' => 'text/html; charset=utf-8' }
+      response = Hobbit::Response.new
+      response.status.must_equal 200
+      response.headers.must_equal default_headers
+      response.body.must_equal []
+    end
+
+    it 'must set the body, status and headers with arguments given' do
+      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
+  end
+
+  describe '#[]' do
+    let(:response) { Hobbit::Response.new }
+
+    it 'must respond to #[]' do
+      response.must_respond_to :[]
+    end
+
+    it 'must return a header' do
+      response['Content-Type'].must_equal 'text/html; charset=utf-8'
+    end
+  end
+
+  describe '#[]=' do
+    let(:response) { Hobbit::Response.new }
+
+    it 'must respond to #[]=' do
+      response.must_respond_to :[]=
+    end
+
+    it 'must set a header' do
+      content_type = 'text/html; charset=utf-8'
+      response['Content-Type'] = content_type
+      response['Content-Type'].must_equal content_type
+    end
+  end
+
+  describe '#finish' do
+    let(:status) { 200 }
+    let(:headers) { { 'Content-Type' => 'application/json' } }
+    let(:body) { ['{"name":"Hobbit"}'] }
+
+    it 'must return a 3 elements array with status, headers and body' do
+      response = Hobbit::Response.new body, status, headers
+      response.finish.must_equal [status, headers, body]
+    end
+
+    it 'must calculate the Content-Length of the body' do
+      response = Hobbit::Response.new body, status, headers
+      s, h, b = response.finish
+      h.must_include 'Content-Length'
+      h['Content-Length'].must_equal body.each.map(&:size).inject { |m, s| m += s }
+    end
+  end
+
+  describe '#write' do
+    let(:response) { Hobbit::Response.new }
+
+    it 'must append the argument to the body of the response' do
+      response.write 'hello world'
+      response.body.must_equal ['hello world']
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hobbit
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Patricio Mac Adden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-24 00:00:00.000000000 Z
+date: 2013-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -117,6 +117,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -150,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A minimalistic microframework built on top of rack