hobbit-contrib 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f338c24eef1f1138d3a0156b79bcad360882e454
-  data.tar.gz: dbbe040ee3d61f823fc4867b5baba1dc39d96d76
+  metadata.gz: 802654dd916d3a7a81d580faf85e0d5c1bf9eeb1
+  data.tar.gz: 769fec8b8f0a05d54ddb9e94481485642daa3186
 SHA512:
-  metadata.gz: 235309c1b90a30a6609fc691eea4b3a5f73f09a51d6883539087a0c5b5b894f94563f651129f24c40f746a23cf6fa82eb2110e6cf897e9f054346688aa2fdf7c
-  data.tar.gz: b2a5b5b597630b52aa930c81c4731c2054c518794cef2287cd8e9d4ab1b09331b422446d9808f0c1838803b37a971e4aa9336194d55dd8965d7723d2f16da0cd
+  metadata.gz: da0ff48b1b5d7f9682e149c6e056426f01c43ee03a2dbbb39417a7278778628e5a82c7b6b98a46050234a25c051fb2fefa2e2031526dbb3865cbfec8985cfdd9
+  data.tar.gz: f75f472b13d2b8bd52bcb1ccaf1650311a6fea541b97aff553ce001e8668c71e611e42016ecb926abf04ec0c169536a3ead2a4db2c4bd6b58e1d7dccf43e7b4b

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.6.0
+
+* Make it work with `hobbit` 0.6.0
+* Test hobbit with [oktobertest](https://github.com/patriciomacadden/oktobertest)
+instead of minitest (Because reasons!).
+
 # 0.5.2
 
 * Add `Hobbit::Mote`

data/hobbit-contrib.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'erubis'
   spec.add_development_dependency 'mote'
   spec.add_development_dependency 'oktobertest'
+  spec.add_development_dependency 'oktobertest-contrib'
   spec.add_development_dependency 'rack-test'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'tilt'

data/lib/hobbit/contrib/version.rb

@@ -1,5 +1,5 @@
 module Hobbit
   module Contrib
-    VERSION = '0.5.3'
+    VERSION = '0.6.0'
   end
 end

data/lib/hobbit/filter.rb

@@ -34,15 +34,15 @@ module Hobbit
         unless @response.status == 302
           # we have to do this because `super` will override @response and @request
           prev_response = @response
-          super
-          @response.headers.merge! prev_response.headers
+          current_response = super
+          @response = Hobbit::Response.new current_response[2], current_response[0], current_response[1].merge!(prev_response.headers)
           filter :after unless @halted
         end
+        @response.finish
       end
-      @response.finish
     end
 
-    def halt(*res)
+    def halt(response)
       @halted = true
       super
     end
@@ -57,6 +57,7 @@ module Hobbit
       filter = find_filter(kind)
       if filter
         instance_eval(&filter[:block])
+        response.finish if kind == :after
       end
     end
 

data/test/environment_test.rb

@@ -16,7 +16,7 @@ scope Hobbit::Environment do
   scope '::environment' do
     test 'returns the current environment' do
       with_env('development') do
-        assert app.to_app.class.environment == :development
+        assert_equal :development, app.to_app.class.environment
       end
     end
   end
@@ -24,7 +24,7 @@ scope Hobbit::Environment do
   scope '#environment' do
     test 'returns the current environment' do
       with_env('development') do
-        assert app.to_app.environment == :development
+        assert_equal :development, app.to_app.environment
       end
     end
   end
@@ -32,71 +32,71 @@ scope Hobbit::Environment do
   scope '::development?' do
     test "returns true if ENV['RACK_ENV'] = :development" do
       with_env('development') do
-        assert app.to_app.class.development? == true
+        assert app.to_app.class.development?
       end
     end
 
     test "returns false if ENV['RACK_ENV'] != :development" do
-      assert app.to_app.class.development? == false
+      assert !app.to_app.class.development?
     end
   end
 
   scope '#development?' do
     test "returns true if ENV['RACK_ENV'] = :development" do
       with_env('development') do
-        assert app.to_app.development? == true
+        assert app.to_app.development?
       end
     end
 
     test "returns false if ENV['RACK_ENV'] != :development" do
-      assert app.to_app.development? == false
+      assert !app.to_app.development?
     end
   end
 
   scope '::production?' do
     test "returns true if ENV['RACK_ENV'] = :production" do
       with_env('production') do
-        assert app.to_app.class.production? == true
+        assert app.to_app.class.production?
       end
     end
 
     test "returns false if ENV['RACK_ENV'] != :production" do
-      assert app.to_app.class.production? == false
+      assert !app.to_app.class.production?
     end
   end
 
   scope '#production?' do
     test "returns true if ENV['RACK_ENV'] = :production" do
       with_env('production') do
-        assert app.to_app.production? == true
+        assert app.to_app.production?
       end
     end
 
     test "returns false if ENV['RACK_ENV'] != :production" do
-      assert app.to_app.production? == false
+      assert !app.to_app.production?
     end
   end
 
   scope '::test?' do
     test "returns true if ENV['RACK_ENV'] = :test" do
-      assert app.to_app.class.test? == true
+      assert app.to_app.class.test?
     end
 
     test "returns false if ENV['RACK_ENV'] != :test" do
       with_env('development') do
-        assert app.to_app.class.test? == false
+        assert !app.to_app.class.test?
       end
     end
   end
 
   scope '#test?' do
     test "returns true if ENV['RACK_ENV'] = :test" do
-      assert app.to_app.test? == true
+      assert app.to_app.test?
     end
 
     test "returns false if ENV['RACK_ENV'] != :test" do
       with_env('development') do
-        assert app.to_app.test? == false
+        assert !app.to_app.test?
       end
     end
   end

data/test/error_handling_and_filter_test.rb

@@ -29,8 +29,8 @@ scope 'combine Hobbit::ErrorHandling and Hobbit::Filter' do
     test 'calls the before filter' do
       get '/'
       assert last_response.ok?
-      assert last_response.body == 'Sorry'
-      assert last_request.env.include? 'hobbit.before'
+      assert_equal 'Sorry', last_response.body
+      assert_includes last_request.env, 'hobbit.before'
       assert !last_request.env.include?('hobbit.after')
     end
   end
@@ -63,7 +63,7 @@ scope 'combine Hobbit::ErrorHandling and Hobbit::Filter' do
     test 'calls the before filter' do
       get '/'
       assert last_response.ok?
-      assert last_response.body == 'Sorry'
+      assert_equal 'Sorry', last_response.body
       assert !last_request.env.include?('hobbit.after')
     end
   end
@@ -96,8 +96,8 @@ scope 'combine Hobbit::ErrorHandling and Hobbit::Filter' do
     test 'calls the before filter' do
       get '/'
       assert last_response.ok?
-      assert last_response.body == 'this is written in the body. Sorry'
-      assert last_request.env.include? 'hobbit.before'
+      assert_equal 'this is written in the body. Sorry', last_response.body
+      assert_includes last_request.env, 'hobbit.before'
     end
   end
 
@@ -130,11 +130,11 @@ scope 'combine Hobbit::ErrorHandling and Hobbit::Filter' do
       test 'does not work as expected' do
         get '/'
         assert last_response.ok?
-        assert last_response.body == 'Sorry'
-        assert last_request.env.include? 'hobbit.before'
+        assert_equal 'Sorry', last_response.body
+        assert_includes last_request.env, 'hobbit.before'
         # this is contrary to a previous test, which is not the desired workflow
         # or is it?
-        assert last_request.env.include? 'hobbit.after'
+        assert_includes last_request.env, 'hobbit.after'
       end
     end
   end

data/test/error_handling_test.rb

@@ -57,14 +57,14 @@ scope Hobbit::ErrorHandling do
         error StandardError, &p
       end
 
-      assert app.to_app.class.errors.include? StandardError
-      assert app.to_app.class.errors[StandardError].call == p.call
+      assert_includes app.to_app.class.errors, StandardError
+      assert_equal p.call, app.to_app.class.errors[StandardError].call
     end
   end
 
   scope '::errors' do
     test 'returns a Hash' do
-      assert app.to_app.class.errors.kind_of? Hash
+      assert_kind_of Hash, app.to_app.class.errors
     end
   end
 
@@ -72,7 +72,7 @@ scope Hobbit::ErrorHandling do
     test 'works as expected' do
       get '/'
       assert last_response.ok?
-      assert last_response.body == 'hello'
+      assert_equal 'hello', last_response.body
     end
   end
 
@@ -94,25 +94,25 @@ scope Hobbit::ErrorHandling do
     test 'calls the block set in error' do
       get '/raises'
       assert last_response.ok?
-      assert last_response.body == 'StandardError'
+      assert_equal 'StandardError', last_response.body
     end
 
     test 'allows to define more than one exception' do
       get '/other_raises'
       assert last_response.ok?
-      assert last_response.body == 'Not Found'
+      assert_equal 'Not Found', last_response.body
     end
 
     test 'allows to define a general exception class to catch' do
       get '/same_other_raises'
       assert last_response.ok?
-      assert last_response.body == 'Not Found'
+      assert_equal 'Not Found', last_response.body
     end
 
     test 'sets the returned value of the error block as the body' do
       get '/other_raises'
       assert last_response.ok?
-      assert last_response.body == 'Not Found'
+      assert_equal 'Not Found', last_response.body
       assert last_response.body != 'not this'
     end
 
@@ -123,14 +123,14 @@ scope Hobbit::ErrorHandling do
 
       get '/raises'
       assert last_response.ok?
-      assert last_response.body == 'other handler!'
+      assert_equal 'other handler!', last_response.body
     end
 
     test 'uses the response object' do
       get '/must_use_response'
       assert last_response.redirection?
       follow_redirect!
-      assert last_response.body == 'hello'
+      assert_equal 'hello', last_response.body
     end
   end
 end

data/test/filter_test.rb

@@ -205,7 +205,8 @@ EOS
         include Hobbit::Filter
 
         before do
-          halt 401
+          response.status = 401
+          halt response.finish
         end
 
         get '/' do
@@ -216,7 +217,7 @@ EOS
 
     test 'does not execute the route' do
       get '/'
-      assert last_response.status == 401
+      assert_status 401
       assert last_response.body.empty?
     end
   end
@@ -235,17 +236,19 @@ EOS
         end
 
         get '/' do
-          halt 401, 'Unauthenticated'
+          response.status = 401
+          response.write 'Unauthenticated'
+          halt response.finish
         end
       end
     end
 
     test 'does not execute the after filter' do
       get '/'
-      assert last_response.status == 401
-      assert last_response.headers.include? 'Content-Type'
-      assert last_response.headers['Content-Type'] == 'text/plain'
-      assert last_response.body == 'Unauthenticated'
+      assert_status 401
+      assert_includes last_response.headers, 'Content-Type'
+      assert_header 'Content-Type', 'text/plain'
+      assert_equal 'Unauthenticated', last_response.body
     end
   end
 
@@ -255,7 +258,8 @@ EOS
         include Hobbit::Filter
 
         after do
-          halt 401
+          response.status = 401
+          halt response.finish
         end
 
         get '/' do
@@ -266,8 +270,8 @@ EOS
 
     test 'does not execute the route' do
       get '/'
-      assert last_response.status == 401
-      assert last_response.body == 'hello world'
+      assert_status 401
+      assert_equal 'hello world', last_response.body
     end
   end
 end

data/test/helper.rb

@@ -6,6 +6,7 @@ CodeClimate::TestReporter.start
 ENV['RACK_ENV'] ||= 'test'
 
 require 'oktobertest'
+require 'oktobertest/contrib'
 require 'rack'
 require 'rack/test'
 

data/test/mote_test.rb

@@ -22,19 +22,19 @@ scope Hobbit::Mote do
 
   scope '#default_layout' do
     test 'defaults to application.mote' do
-      assert app.to_app.default_layout == "#{app.to_app.layouts_path}/application.mote"
+      assert_equal "#{app.to_app.layouts_path}/application.mote", app.to_app.default_layout
     end
   end
 
   scope '#find_template' do
     test 'returns a template path' do
-      assert app.to_app.find_template('index') == "#{app.to_app.views_path}/index.mote"
+      assert_equal "#{app.to_app.views_path}/index.mote", app.to_app.find_template('index')
     end
   end
 
   scope '#layouts_path' do
     test 'returns the path to the layouts directory' do
-      assert app.to_app.layouts_path == "#{app.to_app.views_path}/layouts"
+      assert_equal "#{app.to_app.views_path}/layouts", app.to_app.layouts_path
     end
   end
 
@@ -72,7 +72,7 @@ scope Hobbit::Mote do
 
   scope '#views_path' do
     test 'returns the path to the views directory' do
-      assert app.to_app.views_path == File.expand_path('../fixtures/mote/views', __FILE__)
+      assert_equal File.expand_path('../fixtures/mote/views', __FILE__), app.to_app.views_path
     end
 
     test 'defaults to "views"' do
@@ -80,7 +80,7 @@ scope Hobbit::Mote do
         include Hobbit::Mote
       end
 
-      assert app.to_app.views_path == 'views'
+      assert_equal 'views', app.to_app.views_path
     end
   end
 end

data/test/render_test.rb

@@ -24,19 +24,19 @@ scope Hobbit::Render do
 
   scope '#default_layout' do
     test 'defaults to application.erb' do
-      assert app.to_app.default_layout == "#{app.to_app.layouts_path}/application.erb"
+      assert_equal "#{app.to_app.layouts_path}/application.erb", app.to_app.default_layout
     end
   end
 
   scope '#find_template' do
     test 'returns a template path' do
-      assert app.to_app.find_template('index') == "#{app.to_app.views_path}/index.#{app.to_app.template_engine}"
+      assert_equal "#{app.to_app.views_path}/index.#{app.to_app.template_engine}", app.to_app.find_template('index')
     end
   end
 
   scope '#layouts_path' do
     test 'returns the path to the layouts directory' do
-      assert app.to_app.layouts_path == "#{app.to_app.views_path}/layouts"
+      assert_equal "#{app.to_app.views_path}/layouts", app.to_app.layouts_path
     end
   end
 
@@ -74,13 +74,13 @@ scope Hobbit::Render do
 
   scope '#template_engine' do
     test 'defaults to erb' do
-      assert app.to_app.template_engine == 'erb'
+      assert_equal 'erb', app.to_app.template_engine
     end
   end
 
   scope '#views_path' do
     test 'returns the path to the views directory' do
-      assert app.to_app.views_path == File.expand_path('../fixtures/render/views', __FILE__)
+      assert_equal File.expand_path('../fixtures/render/views', __FILE__), app.to_app.views_path
     end
 
     test 'defaults to "views"' do
@@ -88,7 +88,7 @@ scope Hobbit::Render do
         include Hobbit::Render
       end
 
-      assert app.to_app.views_path == 'views'
+      assert_equal 'views', app.to_app.views_path
     end
   end
 end

data/test/session_test.rb

@@ -20,11 +20,11 @@ scope Hobbit::Session do
     test 'returns a session object' do
       get '/'
       assert last_response.ok?
-      assert last_response.body == 'hobbit'
+      assert_equal 'hobbit', last_response.body
 
       get '/name'
       assert last_response.ok?
-      assert last_response.body == 'hobbit'
+      assert_equal 'hobbit', last_response.body
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hobbit-contrib
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Patricio Mac Adden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-09 00:00:00.000000000 Z
+date: 2014-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: oktobertest-contrib
+  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: rack-test
   requirement: !ruby/object:Gem::Requirement