hobbit 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 944ab35171d45442e32e96a5587753f37ed50f0d
-  data.tar.gz: c1e65e014055647553c5eaf4e9c055f8cb43afe5
+  metadata.gz: f8fea5a3ee747290419ad304a7468743ae765533
+  data.tar.gz: 4eb29b6427502b999924fd293dcc88d93e3204aa
 SHA512:
-  metadata.gz: 6b5d57ba581c5676c1670f8eb6cece3d7442cf0a9d286d8848dc7726b806a493217c0ed8de6133da3c8596156e40f08e23bef60cab889c2915b1dd36972bd362
-  data.tar.gz: 995bf2aeb75e3a5f6116aad7715d5d4cffd92f84d0bd1cc58c9a36593ee604c678487f313f8912aae68b66a80a60db18c15951743391f9e28322a3848a914095
+  metadata.gz: 182223ff3e7dbc5fad224842851803d2fb6c72ee88077fbe790a733edfef827d712845c33162a8291d82168b8e380fe928e9031a9c0190f5ce898352c8ede349
+  data.tar.gz: 10ad33ce30a2a7bb9edd21737c33defbb6dd3d0db14e769064c8cb74258ff270b1ef03a6071d1ac0b60da222cb32d8771091b7c43d62cbe831d7d34a9475d146

data/.travis.yml

@@ -1,5 +1,9 @@
 ---
 rvm:
   - 2.0.0
-  - 2.1.0
+  - 2.1.2
   - ruby-head
+addons:
+  code_climate:
+    repo_token:
+      secure: "bogVqPmJ2KlI2XK3Ln9Ki8vG08WTvKbKfvYm4ErD1A+2t3vg61utFKxJS8R3P5QKuDDIIX98eQC7r+gPeGEYwT+tDDFMnBsGQZcaeXJCYZQ3qLN36GpnPmpeZ3tTZwop5aT1AmMCF0IllDWYCjcWzeEZan23Eqt5YOyzTGAnr4g="

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+# 0.6.0
+
+* Change the implementation of `Hobbit::Base#halt`. This new implementation is
+more rack compliant.
+* Test hobbit with [oktobertest](https://github.com/patriciomacadden/oktobertest)
+instead of minitest (Because reasons!).
+
+# 0.5.1 (Unreleased)
+
+* A class is an object too, so allow to `run` classes.
+* Add `Hobbit::Request`, which sets the path info to `/` if its empty (instead
+of doing that on the call method).
+
 # 0.5.0
 
 * Refactor `Hobbit::Base#halt`. It now sets the status, merges the headers and

data/README.md

@@ -1,4 +1,4 @@
-# Hobbit [![Build Status](https://travis-ci.org/patriciomacadden/hobbit.png?branch=master)](https://travis-ci.org/patriciomacadden/hobbit) [![Code Climate](https://codeclimate.com/github/patriciomacadden/hobbit.png)](https://codeclimate.com/github/patriciomacadden/hobbit) [![Coverage Status](https://coveralls.io/repos/patriciomacadden/hobbit/badge.png?branch=master)](https://coveralls.io/r/patriciomacadden/hobbit) [![Dependency Status](https://gemnasium.com/patriciomacadden/hobbit.png)](https://gemnasium.com/patriciomacadden/hobbit) [![Gem Version](https://badge.fury.io/rb/hobbit.png)](http://badge.fury.io/rb/hobbit)
+# Hobbit [![Build Status](http://img.shields.io/travis/patriciomacadden/hobbit.svg)](https://travis-ci.org/patriciomacadden/hobbit) [![Code Climate](http://img.shields.io/codeclimate/github/patriciomacadden/hobbit.svg)](https://codeclimate.com/github/patriciomacadden/hobbit) [![Code Climate Coverage](http://img.shields.io/codeclimate/coverage/github/patriciomacadden/hobbit.svg)](https://codeclimate.com/github/patriciomacadden/hobbit) [![Dependency Status](http://img.shields.io/gemnasium/patriciomacadden/hobbit.svg)](https://gemnasium.com/patriciomacadden/hobbit) [![Gem Version](http://img.shields.io/gem/v/hobbit.svg)](http://badge.fury.io/rb/hobbit)
 
 A minimalistic microframework built on top of [Rack](http://rack.github.io/).
 
@@ -63,7 +63,7 @@ Create a `config.ru` file:
 ```ruby
 require './app'
 
-run App.new
+run App.new # or just `run App`
 ```
 
 Run it with `rackup`:
@@ -115,7 +115,7 @@ end
 When a route gets called you have this methods available:
 
 * `env`: The Rack environment.
-* `request`: a `Rack::Request` instance.
+* `request`: a `Hobbit::Request` instance.
 * `response`: a `Hobbit::Response` instance.
 
 And any other method defined in your application.
@@ -176,44 +176,7 @@ end
 
 #### Halting
 
-To immediately stop a request within route you can use `halt`. You can also
-specify a status:
-
-```ruby
-require 'hobbit'
-
-class App < Hobbit::Base
-  use Rack::Session::Cookie, secret: SecureRandom.hex(64)
-
-  def session
-    env['rack.session']
-  end
-
-  get '/' do
-    halt 401 unless session['user_id']
-  end
-end
-```
-
-Or body:
-
-```ruby
-require 'hobbit'
-
-class App < Hobbit::Base
-  use Rack::Session::Cookie, secret: SecureRandom.hex(64)
-
-  def session
-    env['rack.session']
-  end
-
-  get '/' do
-    halt 401, 'This will be the body' unless session['user_id']
-  end
-end
-```
-
-Or headers:
+To immediately stop a request within route you can use `halt`. 
 
 ```ruby
 require 'hobbit'
@@ -226,25 +189,8 @@ class App < Hobbit::Base
   end
 
   get '/' do
-    halt 401, { 'Content-Type' => 'text/html; charset=utf-8' }
-  end
-end
-```
-
-Or both:
-
-``` ruby
-require 'hobbit'
-
-class App < Hobbit::Base
-  use Rack::Session::Cookie, secret: SecureRandom.hex(64)
-
-  def session
-    env['rack.session']
-  end
-
-  get '/' do
-    halt 401, { 'Content-Type' => 'text/html; charset=utf-8' }, 'Woops'
+    response.status = 401
+    halt response.finish
   end
 end
 ```

data/Rakefile

@@ -2,8 +2,8 @@ require 'bundler/gem_tasks'
 require 'rake/testtask'
 
 Rake::TestTask.new do |t|
-  t.libs << 'spec'
-  t.pattern = 'spec/**/*_spec.rb'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
 end
 
 task default: :test

data/hobbit.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['patriciomacadden@gmail.com']
   spec.description   = %q{A minimalistic microframework built on top of rack}
   spec.summary       = %q{A minimalistic microframework built on top of rack}
-  spec.homepage      = ''
+  spec.homepage      = 'https://github.com/patriciomacadden/hobbit'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)
@@ -19,8 +19,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.3'
-  spec.add_development_dependency 'coveralls'
-  spec.add_development_dependency 'minitest'
+  spec.add_development_dependency 'codeclimate-test-reporter'
+  spec.add_development_dependency 'oktobertest'
+  spec.add_development_dependency 'oktobertest-contrib'
   spec.add_development_dependency 'rack-test'
   spec.add_development_dependency 'rake'
 

data/lib/hobbit.rb

@@ -1,3 +1,4 @@
 require 'hobbit/base'
+require 'hobbit/request'
 require 'hobbit/response'
 require 'hobbit/version'

data/lib/hobbit/base.rb

@@ -17,6 +17,10 @@ module Hobbit
         stack
       end
 
+      def call(env)
+        new.call env
+      end
+
       def routes
         @routes ||= Hash.new { |hash, key| hash[key] = [] }
       end
@@ -43,38 +47,32 @@ module Hobbit
     attr_reader :env, :request, :response
 
     def call(env)
-      dup._call(env)
+      dup._call env
     end
 
     def _call(env)
-      env['PATH_INFO'] = '/' if env['PATH_INFO'].empty?
       @env = env
-      @request = Rack::Request.new(@env)
+      @request = Hobbit::Request.new @env
       @response = Hobbit::Response.new
-      route_eval
-      @response.finish
+      catch(:halt) { route_eval }
     end
 
-    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 } || ''
-
+    def halt(response)
       throw :halt, response
     end
 
     private
 
     def route_eval
-      catch :halt do
-        if route = find_route
-          response.write instance_eval(&route[:block])
-        else
-          halt 404
-        end
+      route = find_route
 
-        response
+      if route
+        response.write instance_eval(&route[:block])
+      else
+        response.status = 404
       end
+
+      response.finish
     end
 
     def find_route

data/lib/hobbit/request.rb

@@ -0,0 +1,10 @@
+require 'rack/request'
+
+module Hobbit
+  class Request < Rack::Request
+    def initialize(env)
+      env['PATH_INFO'] = '/' if env['PATH_INFO'].empty?
+      super
+    end
+  end
+end

data/lib/hobbit/version.rb

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

data/test/base_test.rb

@@ -0,0 +1,239 @@
+require 'helper'
+
+scope Hobbit::Base do
+  setup do
+    mock_app do
+      %w(DELETE GET HEAD OPTIONS PATCH POST PUT).each do |verb|
+        class_eval "#{verb.downcase}('/') { '#{verb}' }"
+        class_eval "#{verb.downcase}('/route.json') { '#{verb} /route.json' }"
+        class_eval "#{verb.downcase}('/route/:id.json') { request.params[:id] }"
+        class_eval "#{verb.downcase}('/:name') { request.params[:name] }"
+      end
+    end
+  end
+
+  %w(DELETE GET HEAD OPTIONS PATCH POST PUT).each do |verb|
+    scope "::#{verb.downcase}" do
+      test 'adds a route to @routes' do
+        route = app.to_app.class.routes[verb].first
+        assert_equal '/', route[:path]
+      end
+
+      test 'extracts the extra_params' do
+        route = app.to_app.class.routes[verb].last
+        assert_equal [:name], route[:extra_params]
+      end
+    end
+  end
+
+  scope '::map' do
+    setup do
+      mock_app do
+        map '/map' do
+          run Proc.new { |env| [200, {}, ['from map']] }
+        end
+
+        get('/') { 'hello world' }
+      end
+    end
+
+    test 'mounts an application to the rack stack' do
+      get '/map'
+      assert_equal 'from map', last_response.body
+    end
+  end
+
+  scope '::new' do
+    test 'returns an instance of Rack::Builder' do
+      assert_kind_of Rack::Builder, app
+    end
+  end
+
+  scope '::call' do
+    test 'creates a new instance and sends the call message' do
+      a = Class.new(Hobbit::Base) do
+        get '/' do
+          'hello world'
+        end
+      end
+
+      env = { 'PATH_INFO' => '/', 'REQUEST_METHOD' => 'GET' }
+      status, headers, body = a.call env
+      assert_equal ['hello world'], body
+    end
+  end
+
+  scope '::routes' do
+    test 'returns a Hash' do
+      assert_kind_of Hash, app.to_app.class.routes
+    end
+  end
+
+  scope '::stack' do
+    test 'returns an instance of Rack::Builder' do
+      assert_kind_of Rack::Builder, app.to_app.class.stack
+    end
+  end
+
+  scope '::use' do
+    setup do
+      mock_app do
+        middleware = Class.new do
+          def initialize(app = nil)
+            @app = app
+          end
+
+          def call(env)
+            request = Rack::Request.new(env)
+            @app.call(env) unless request.path_info == '/use'
+            [200, {}, 'from use']
+          end
+        end
+
+        use middleware
+
+        get('/') { 'hello world' }
+      end
+    end
+
+    test 'adds a middleware to the rack stack' do
+      get '/use'
+      assert_equal 'from use', last_response.body
+    end
+  end
+
+  scope '::compile_route' do
+    def block
+      Proc.new { |env| [200, {}, []] }
+    end
+
+    test 'compiles /' do
+      path = '/'
+      route = Hobbit::Base.send :compile_route, path, &block
+      assert_equal block.call({}), route[:block].call({})
+      assert_equal /^\/$/.to_s, route[:compiled_path].to_s
+      assert_equal [], route[:extra_params]
+      assert_equal path, route[:path]
+    end
+
+    test 'compiles with .' do
+      path = '/route.json'
+      route = Hobbit::Base.send :compile_route, path, &block
+      assert_equal block.call({}), route[:block].call({})
+      assert_equal /^\/route.json$/.to_s, route[:compiled_path].to_s
+      assert_equal [], route[:extra_params]
+      assert_equal path, route[:path]
+    end
+
+    test 'compiles with -' do
+      path = '/hello-world'
+      route = Hobbit::Base.send :compile_route, path, &block
+      assert_equal block.call({}), route[:block].call({})
+      assert_equal /^\/hello-world$/.to_s, route[:compiled_path].to_s
+      assert_equal [], route[:extra_params]
+      assert_equal path, route[:path]
+    end
+
+    test 'compiles with params' do
+      path = '/hello/:name'
+      route = Hobbit::Base.send :compile_route, path, &block
+      assert_equal block.call({}), route[:block].call({})
+      assert_equal /^\/hello\/([^\/?#]+)$/.to_s, route[:compiled_path].to_s
+      assert_equal [:name], route[:extra_params]
+      assert_equal path, route[:path]
+
+      path = '/say/:something/to/:someone'
+      route = Hobbit::Base.send :compile_route, path, &block
+      assert_equal block.call({}), route[:block].call({})
+      assert_equal /^\/say\/([^\/?#]+)\/to\/([^\/?#]+)$/.to_s, route[:compiled_path].to_s
+      assert_equal [:something, :someone], route[:extra_params]
+      assert_equal path, route[:path]
+    end
+
+    test 'compiles with . and params' do
+      path = '/route/:id.json'
+      route = Hobbit::Base.send :compile_route, path, &block
+      assert_equal block.call({}), route[:block].call({})
+      assert_equal /^\/route\/([^\/?#]+).json$/.to_s, route[:compiled_path].to_s
+      assert_equal [:id], route[:extra_params]
+      assert_equal path, route[:path]
+    end
+  end
+
+  scope '#call' do
+    %w(DELETE GET HEAD OPTIONS PATCH POST PUT).each do |verb|
+      scope 'when the request matches a route' do
+        test "matches #{verb} ''" do
+          send verb.downcase, ''
+          assert last_response.ok?
+          assert_equal verb, last_response.body
+        end
+
+        test 'matches #{verb} /' do
+          send verb.downcase, '/'
+          assert last_response.ok?
+          assert_equal verb, last_response.body
+        end
+
+        test 'matches #{verb} /route.json' do
+          send verb.downcase, '/route.json'
+          assert last_response.ok?
+          assert_equal "#{verb} /route.json", last_response.body
+        end
+
+        test 'matches #{verb} /route/:id.json' do
+          send verb.downcase, '/route/1.json'
+          assert last_response.ok?
+          assert_equal '1', last_response.body
+        end
+
+        test 'matches #{verb} /:name' do
+          send verb.downcase, '/hobbit'
+          assert last_response.ok?
+          assert_equal 'hobbit', last_response.body
+
+          send verb.downcase, '/hello-hobbit'
+          assert last_response.ok?
+          assert_equal 'hello-hobbit', last_response.body
+        end
+      end
+
+      scope 'when the request not matches a route' do
+        test 'responds with 404 status code' do
+          send verb.downcase, '/not/found'
+          assert last_response.not_found?
+          assert_equal '', last_response.body
+        end
+      end
+    end
+  end
+
+  scope '#halt' do
+    setup do
+      mock_app do
+        get '/halt' do
+          response.status = 501
+          halt response.finish
+        end
+
+        get '/halt_finished' do
+          halt [404, {}, ['Not found']]
+        end
+      end
+    end
+
+    test 'halts the execution with a response' do
+      get '/halt'
+      assert_status 501
+    end
+
+    test 'halts the execution with a finished response' do
+      get '/halt_finished'
+      assert_status 404
+    end
+  end
+
+  test 'responds to call' do
+    assert app.to_app.respond_to? :call
+  end
+end

data/test/helper.rb

@@ -0,0 +1,25 @@
+require 'bundler/setup'
+
+require 'codeclimate-test-reporter'
+CodeClimate::TestReporter.start
+
+require 'oktobertest'
+require 'oktobertest/contrib'
+require 'rack'
+require 'rack/test'
+
+require 'hobbit'
+
+module Oktobertest
+  class Test
+    include Rack::Test::Methods
+
+    def mock_app(&block)
+      @app = Class.new(Hobbit::Base, &block).new
+    end
+
+    def app
+      @app
+    end
+  end
+end

data/test/request_test.rb

@@ -0,0 +1,17 @@
+require 'helper'
+
+scope Hobbit::Request do
+  scope '#initialize' do
+    test "sets the path info to / if it's empty" do
+      env = { 'PATH_INFO' => '', 'REQUEST_METHOD' => 'GET' }
+      request = Hobbit::Request.new env
+      assert_equal '/', request.path_info
+    end
+
+    test "doesn't change the path info if it's not empty" do
+      env = { 'PATH_INFO' => '/hello_world', 'REQUEST_METHOD' => 'GET' }
+      request = Hobbit::Request.new env
+      assert_equal '/hello_world', request.path_info
+    end
+  end
+end

data/test/response_test.rb

@@ -0,0 +1,129 @@
+require 'helper'
+
+scope Hobbit::Response do
+  scope '#initialize' do
+    def default_headers
+      { 'Content-Type' => 'text/html; charset=utf-8' }
+    end
+
+    test 'sets the body, status and headers with no arguments given' do
+      response = Hobbit::Response.new
+      assert_equal 200, response.status
+      assert_equal default_headers, response.headers
+      assert_equal [], response.body
+    end
+
+    test 'sets 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
+      assert_equal status, response.status
+      assert_equal headers, response.headers
+      assert_equal body, response.body
+    end
+
+    test 'sets the body if the body is a string' do
+      response = Hobbit::Response.new 'hello world'
+      assert 200, response.status
+      assert default_headers, response.headers
+      assert ['hello world'], response.body
+    end
+
+    test 'raises a TypeError if body does not respond to :to_str or :each' do
+      assert_raises TypeError do
+        Hobbit::Response.new 1
+      end
+    end
+  end
+
+  scope '#[]' do
+    def response
+      Hobbit::Response.new
+    end
+
+    test 'responds to #[]' do
+      assert response.respond_to? :[]
+    end
+
+    test 'returns a header' do
+      assert_equal 'text/html; charset=utf-8', response['Content-Type']
+    end
+  end
+
+  scope '#[]=' do
+    def response
+      Hobbit::Response.new
+    end
+
+    test 'responds to #[]=' do
+      assert response.respond_to? :[]=
+    end
+
+    test 'sets a header' do
+      content_type = 'text/html; charset=utf-8'
+      response['Content-Type'] = content_type
+      assert_equal content_type, response['Content-Type']
+    end
+  end
+
+  scope '#finish' do
+    def status
+      200
+    end
+
+    def headers
+      { 'Content-Type' => 'application/json', 'Content-Length' => '18' }
+    end
+
+    def body
+      ['{"name": "Hobbit"}']
+    end
+
+    test 'returns a 3 elements array with status, headers and body' do
+      response = Hobbit::Response.new body, status, headers
+      assert_equal [status, headers, body], response.finish
+    end
+
+    test 'calculates the Content-Length of the body' do
+      response = Hobbit::Response.new body, status, headers
+      s, h, b = response.finish
+      assert_includes h, 'Content-Length'
+      assert_equal '18', h['Content-Length']
+    end
+
+    test 'calculates the Content-Length of the body, even if the body is empty' do
+      response = Hobbit::Response.new
+      s, h, b = response.finish
+      assert_includes h, 'Content-Length'
+      assert_equal '0', h['Content-Length']
+    end
+  end
+
+  scope '#redirect' do
+    def response
+      @response ||= Hobbit::Response.new
+    end
+
+    test 'sets the Location header and the status code' do
+      response.redirect '/hello'
+      assert_equal '/hello', response.headers['Location']
+      assert_equal 302, response.status
+    end
+
+    test 'sets the Location header and the status code if given' do
+      response.redirect '/hello', 301
+      assert_equal '/hello', response.headers['Location']
+      assert_equal 301, response.status
+    end
+  end
+
+  scope '#write' do
+    def response
+      @response ||= Hobbit::Response.new
+    end
+
+    test 'appends the argument to the body of the response' do
+      response.write 'hello world'
+      assert_equal ['hello world'], response.body
+    end
+  end
+end

data/test/version_test.rb

@@ -0,0 +1,7 @@
+require 'helper'
+
+scope Hobbit::VERSION do
+  test "it's defined" do
+    assert defined? Hobbit::VERSION
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hobbit
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Patricio Mac Adden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2014-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: oktobertest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: oktobertest-contrib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -111,13 +125,15 @@ files:
 - hobbit.gemspec
 - lib/hobbit.rb
 - lib/hobbit/base.rb
+- lib/hobbit/request.rb
 - lib/hobbit/response.rb
 - lib/hobbit/version.rb
-- spec/base_spec.rb
-- spec/minitest_helper.rb
-- spec/response_spec.rb
-- spec/version_spec.rb
-homepage: ''
+- test/base_test.rb
+- test/helper.rb
+- test/request_test.rb
+- test/response_test.rb
+- test/version_test.rb
+homepage: https://github.com/patriciomacadden/hobbit
 licenses:
 - MIT
 metadata: {}
@@ -137,12 +153,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A minimalistic microframework built on top of rack
 test_files:
-- spec/base_spec.rb
-- spec/minitest_helper.rb
-- spec/response_spec.rb
-- spec/version_spec.rb
+- test/base_test.rb
+- test/helper.rb
+- test/request_test.rb
+- test/response_test.rb
+- test/version_test.rb

data/spec/base_spec.rb

@@ -1,262 +0,0 @@
-require 'minitest_helper'
-
-describe Hobbit::Base do
-  include Hobbit::Mock
-  include Rack::Test::Methods
-
-  def app
-    @app
-  end
-
-  before do
-    mock_app do
-      %w(DELETE GET HEAD OPTIONS PATCH POST PUT).each do |verb|
-        class_eval "#{verb.downcase}('/') { '#{verb}' }"
-        class_eval "#{verb.downcase}('/route.json') { '#{verb} /route.json' }"
-        class_eval "#{verb.downcase}('/route/:id.json') { request.params[:id] }"
-        class_eval "#{verb.downcase}('/:name') { request.params[:name] }"
-      end
-    end
-  end
-
-  %w(DELETE GET HEAD OPTIONS PATCH POST PUT).each do |verb|
-    str = <<EOS
-  describe "::#{verb.downcase}" do
-    it 'must add a route to @routes' do
-      route = app.to_app.class.routes['#{verb}'].first
-      route[:path].must_equal '/'
-    end
-
-    it 'must extract the extra_params' do
-      route = app.to_app.class.routes['#{verb}'].last
-      route[:extra_params].must_equal [:name]
-    end
-  end
-EOS
-    class_eval str
-  end
-
-  describe '::map' do
-    before do
-      mock_app do
-        map '/map' do
-          run Proc.new { |env| [200, {}, ['from map']] }
-        end
-
-        get('/') { 'hello world' }
-      end
-    end
-
-    it 'must mount a application to the rack stack' do
-      get '/map'
-      last_response.body.must_equal 'from map'
-    end
-  end
-
-  describe '::new' do
-    it 'should return an instance of Rack::Builder' do
-      app.must_be_kind_of Rack::Builder
-    end
-  end
-
-  describe '::routes' do
-    it 'must return a Hash' do
-      app.to_app.class.routes.must_be_kind_of Hash
-    end
-  end
-
-  describe '::stack' do
-    it 'must return an instance of Rack::Builder' do
-      app.to_app.class.stack.must_be_kind_of Rack::Builder
-    end
-  end
-
-  describe '::use' do
-    before do
-      mock_app do
-        middleware = Class.new do
-          def initialize(app = nil)
-            @app = app
-          end
-
-          def call(env)
-            request = Rack::Request.new(env)
-            @app.call(env) unless request.path_info == '/use'
-            [200, {}, 'from use']
-          end
-        end
-
-        use middleware
-
-        get('/') { 'hello world' }
-      end
-    end
-
-    it 'must add a middleware to the rack stack' do
-      get '/use'
-      last_response.body.must_equal 'from use'
-    end
-  end
-
-  describe '::compile_route' do
-    let(:block) { block = Proc.new { |env| [200, {}, []] } }
-
-    it 'must compile /' do
-      path = '/'
-      route = Hobbit::Base.send :compile_route, path, &block
-      route[:block].call({}).must_equal block.call({})
-      route[:compiled_path].to_s.must_equal /^\/$/.to_s
-      route[:extra_params].must_equal []
-      route[:path].must_equal path
-    end
-
-    it 'must compile with .' do
-      path = '/route.json'
-      route = Hobbit::Base.send :compile_route, path, &block
-      route[:block].call({}).must_equal block.call({})
-      route[:compiled_path].to_s.must_equal /^\/route.json$/.to_s
-      route[:extra_params].must_equal []
-      route[:path].must_equal path
-    end
-
-    it 'must compile with -' do
-      path = '/hello-world'
-      route = Hobbit::Base.send :compile_route, path, &block
-      route[:block].call({}).must_equal block.call({})
-      route[:compiled_path].to_s.must_equal /^\/hello-world$/.to_s
-      route[:extra_params].must_equal []
-      route[:path].must_equal path
-    end
-
-    it 'must compile with params' do
-      path = '/hello/:name'
-      route = Hobbit::Base.send :compile_route, path, &block
-      route[:block].call({}).must_equal block.call({})
-      route[:compiled_path].to_s.must_equal /^\/hello\/([^\/?#]+)$/.to_s
-      route[:extra_params].must_equal [:name]
-      route[:path].must_equal path
-
-      path = '/say/:something/to/:someone'
-      route = Hobbit::Base.send :compile_route, path, &block
-      route[:block].call({}).must_equal block.call({})
-      route[:compiled_path].to_s.must_equal /^\/say\/([^\/?#]+)\/to\/([^\/?#]+)$/.to_s
-      route[:extra_params].must_equal [:something, :someone]
-      route[:path].must_equal path
-    end
-
-    it 'must compile with . and params' do
-      path = '/route/:id.json'
-      route = Hobbit::Base.send :compile_route, path, &block
-      route[:block].call({}).must_equal block.call({})
-      route[:compiled_path].to_s.must_equal /^\/route\/([^\/?#]+).json$/.to_s
-      route[:extra_params].must_equal [:id]
-      route[:path].must_equal path
-    end
-  end
-
-  describe '#call' do
-    %w(DELETE GET HEAD OPTIONS PATCH POST PUT).each do |verb|
-      str = <<EOS
-    describe 'when the request matches a route' do
-      it 'must match #{verb} ""' do
-        #{verb.downcase} ''
-        last_response.must_be :ok?
-        last_response.body.must_equal '#{verb}'
-      end
-
-      it 'must match #{verb} /' do
-        #{verb.downcase} '/'
-        last_response.must_be :ok?
-        last_response.body.must_equal '#{verb}'
-      end
-
-      it 'must match #{verb} /route.json' do
-        #{verb.downcase} '/route.json'
-        last_response.must_be :ok?
-        last_response.body.must_equal '#{verb} /route.json'
-      end
-
-      it 'must match #{verb} /route/:id.json' do
-        #{verb.downcase} '/route/1.json'
-        last_response.must_be :ok?
-        last_response.body.must_equal '1'
-      end
-
-      it 'must match #{verb} /:name' do
-        #{verb.downcase} '/hobbit'
-        last_response.must_be :ok?
-        last_response.body.must_equal 'hobbit'
-
-        #{verb.downcase} '/hello-hobbit'
-        last_response.must_be :ok?
-        last_response.body.must_equal 'hello-hobbit'
-      end
-    end
-
-    describe 'when the request not matches a route' do
-      it 'must respond with 404 status code' do
-        #{verb.downcase} '/not/found'
-        last_response.must_be :not_found?
-        last_response.body.must_equal ''
-      end
-    end
-EOS
-      class_eval str
-    end
-  end
-
-  describe '#halt' do
-    before do
-      mock_app do
-        get '/halt_fixnum' do
-          halt 501
-          response.write 'Hello world'
-        end
-
-        get '/halt_string' do
-          halt 'Halt!'
-        end
-
-        get '/halt_hash' do
-          halt({ header: 'OK' })
-        end
-
-        get '/halt_combined' do
-          halt 404, 'Not Found'
-        end
-      end
-    end
-
-    it 'returns the response given to halt function' do
-      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 body' do
-      get '/halt_string'
-      last_response.body.must_equal 'Halt!'
-      last_response.headers.must_equal({ 'Content-Type' => 'text/html; charset=utf-8', 'Content-Length' => '5' })
-      last_response.status.must_equal 200
-    end
-
-    it 'accepts headers' do
-      get '/halt_hash'
-      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 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
-
-  it 'must respond to call' do
-    app.to_app.must_respond_to :call
-  end
-end

data/spec/minitest_helper.rb

@@ -1,22 +0,0 @@
-ENV['RACK_ENV'] ||= 'test'
-
-require 'bundler'
-Bundler.require :default, ENV['RACK_ENV'].to_sym
-
-require 'coveralls'
-Coveralls.wear!
-
-require 'minitest/autorun'
-require 'rack'
-require 'rack/test'
-
-require 'hobbit'
-
-module Hobbit
-  module Mock
-    def mock_app(&block)
-      app = Class.new Hobbit::Base, &block
-      @app = app.new
-    end
-  end
-end

data/spec/response_spec.rb

@@ -1,101 +0,0 @@
-require 'minitest_helper'
-
-describe Hobbit::Response do
-  describe '#initialize' do
-    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
-
-    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
-    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 '18'
-    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
-    let(:response) { Hobbit::Response.new }
-
-    it 'must set the Location header and the status code' do
-      response.redirect '/hello'
-      response.headers['Location'].must_equal '/hello'
-      response.status.must_equal 302
-    end
-
-    it 'must set the Location header and the status code if given' do
-      response.redirect '/hello', 301
-      response.headers['Location'].must_equal '/hello'
-      response.status.must_equal 301
-    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

data/spec/version_spec.rb

@@ -1,7 +0,0 @@
-require 'minitest_helper'
-
-describe Hobbit::VERSION do
-  it 'wont be nil' do
-    Hobbit::VERSION.wont_be_nil
-  end
-end