newark 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fed1a9e5d5021c32f65e7813c10a5dbc1f409e83
-  data.tar.gz: aa12c7aba2fec27ac9bb7dcdb9e92202dcf1d03c
+  metadata.gz: 5b1b007d826796f975e53a238c1f3f8bec78b94d
+  data.tar.gz: 361aa3310e4bd3231f5cba710be13adbacf2a67a
 SHA512:
-  metadata.gz: ee6980bb5d7b94957b37ce3cb21bbdd19f0b65cd27d232aefbbaf2a563db3cdcbf81bae63edf36ecf73c4248209f70e01eda7f71900f0646092fc6298aebfc74
-  data.tar.gz: 6ff2442b777d6a93d3f2c4fc892729e1be9530ffef45e556f79bb7681420dc13cc15dffd9cb19b877ee8d5d99cd8368989f82eaf32f2efc761e3751a3e6f28de
+  metadata.gz: d1c10396d7c1182363d55352e3998b8549a396ca1b5ecbaa5fab7925001c67936b863e76acf052bc03d1ac890619cff74333e24d0e995602a724c9a93983af94
+  data.tar.gz: 90ad0f2f607cd75ff633392ce51e03c3ae0f858c07021067f2e42efa548f57cf84a4de904587cf448c9e4e23f272ec9bf9f36413122c638a55aa59751921f980

data/benchmark/benchmark_router.rb

@@ -1,6 +1,7 @@
 lib = File.expand_path('../../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
+require 'benchmark'
 require 'benchmark/ips'
 require 'rack/test'
 require 'newark'

data/lib/newark/app.rb

@@ -46,6 +46,13 @@ module Newark
 
     attr_reader :request, :response
 
+    def initialize(*)
+      super
+      @before_hooks = self.class.instance_variable_get(:@before_hooks)
+      @after_hooks  = self.class.instance_variable_get(:@after_hooks)
+      @routes       = self.class.instance_variable_get(:@routes)
+    end
+
     def call(env)
       dup._call(env)
     end
@@ -69,10 +76,12 @@ module Newark
       route = match_route
       if route
         request.params.merge!(route.params)
-        exec_before_hooks
-        response.body = exec_handler(route.handler)
-        exec_after_hooks
-        response.finish
+        if exec_before_hooks
+          response.body = exec(route.handler)
+          exec_after_hooks
+        end
+        status, headers, body = response.finish
+        [status, headers, body.respond_to?(:body) ? body.body : body]
       else
         FOUR_O_FOUR
       end
@@ -85,7 +94,7 @@ module Newark
     end
 
     def routes
-      self.class.instance_variable_get(:@routes)[@request.request_method]
+      @routes[@request.request_method]
     end
 
     def exec(action)
@@ -101,17 +110,17 @@ module Newark
     end
 
     def exec_before_hooks
-      exec_hooks self.class.instance_variable_get(:@before_hooks)
+      exec_hooks @before_hooks
     end
 
     def exec_after_hooks
-      exec_hooks self.class.instance_variable_get(:@after_hooks)
+      exec_hooks @after_hooks
     end
 
     def exec_hooks(hooks)
-      return if hooks.nil?
+      return true if hooks.nil?
       hooks.each do |hook|
-        exec(hook)
+        return false if exec(hook) == false
       end
     end
   end

data/lib/newark/request.rb

@@ -12,6 +12,10 @@ module Newark
       URI(URI.escape(uri))
     end
 
+    def path_info
+      @path_info ||= super == '/' ? super : super.sub(/\/$/, '')
+    end
+
     def params
       @params ||= ActiveSupport::HashWithIndifferentAccess.new(super)
     end

data/lib/newark/route.rb

@@ -41,7 +41,7 @@ module Newark
     def path_params(path)
       match_path(path)
       match_params(path)
-      path
+      path != '/' ? path.sub(/\/$/, '') : path
     end
 
     def match_path(path)

data/lib/newark/version.rb

@@ -1,3 +1,3 @@
 module Newark
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

data/newark.gemspec

@@ -27,4 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'benchmark-ips'
   spec.add_development_dependency 'multi_json'
+  spec.add_development_dependency 'minitest', '~> 4.2'
 end

data/test/helper.rb

@@ -6,6 +6,6 @@ require 'newark'
 require 'rack/test'
 require 'minitest/autorun'
 
-class Minitest::Unit::TestCase
+class MiniTest::Unit::TestCase
 
 end

data/test/test_app.rb

@@ -3,6 +3,13 @@ require 'helper'
 class NameApp
   include Newark
 
+  before do
+    if params[:key] && params[:key] != '23'
+      response.status = 403
+      false
+    end
+  end
+
   def upcase(str)
     str.upcase
   end
@@ -15,6 +22,10 @@ class NameApp
     hello
   end
 
+  get '/fail' do
+    'This should not be reached'
+  end
+
   get '/hello2', :hello
 
   private
@@ -24,7 +35,7 @@ class NameApp
   end
 end
 
-class TestApp < Minitest::Unit::TestCase
+class TestApp < MiniTest::Unit::TestCase
 
   include Rack::Test::Methods
 
@@ -48,11 +59,11 @@ class TestApp < Minitest::Unit::TestCase
     assert_equal 'Hello', last_response.body
   end
 
-  # def test_before_hooks_halting_execution
-  #   get '/'
-  #   refute last_response.ok?
-  #   assert_equal 403, last_response.status
-  #   assert_equal '', last_response.body
-  # end
+  def test_before_hooks_halting_execution
+    get '/fail', { key: '1234' }
+    refute last_response.ok?
+    assert_equal 403, last_response.status
+    assert_equal '', last_response.body
+  end
 
 end

data/test/test_request.rb

@@ -20,7 +20,7 @@ class RequestApp
   end
 end
 
-class TestRequest < Minitest::Unit::TestCase
+class TestRequest < MiniTest::Unit::TestCase
 
   include Rack::Test::Methods
 

data/test/test_response.rb

@@ -1,4 +1,5 @@
 require 'helper'
+require 'multi_json'
 
 class ResponseApp
   include Newark
@@ -8,7 +9,7 @@ class ResponseApp
   end
 end
 
-class TestResponse < Minitest::Unit::TestCase
+class TestResponse < MiniTest::Unit::TestCase
 
   include Rack::Test::Methods
 

data/test/test_router.rb

@@ -8,6 +8,12 @@ class TestingApp
     headers['X-Newark-Version'] = Newark::VERSION
   end
 
+  before do
+    if params[:token] && params[:token] == '123456'
+      redirect_to 'http://example.com' && return
+    end
+  end
+
   after do
     headers['X-Newark-Done'] = 'true'
   end
@@ -46,9 +52,17 @@ class TestingApp
     params[:rest_of_path]
   end
 
+  get '/trailing_slash/' do
+    'trailing_slash'
+  end
+
+  get '/no_trailing_slash' do
+    'no_trailing_slash'
+  end
+
 end
 
-class TestRouter < Minitest::Unit::TestCase
+class TestRouter < MiniTest::Unit::TestCase
 
   include Rack::Test::Methods
 
@@ -97,6 +111,12 @@ class TestRouter < Minitest::Unit::TestCase
     assert_equal Newark::VERSION, last_response.header['X-Newark-Version']
   end
 
+  def test_before_hook_stops_rendering
+    skip
+    get '/', token: '123456'
+    assert last_response.redirected?
+  end
+
   def test_after_hook
     get '/'
     assert_equal 'true', last_response.header['X-Newark-Done']
@@ -113,4 +133,24 @@ class TestRouter < Minitest::Unit::TestCase
     assert last_response.ok?
     assert_equal 'rest/of/path', last_response.body
   end
+
+  def test_deals_with_trailing_slashes
+    get '/trailing_slash/'
+    assert last_response.ok?
+    assert_equal 'trailing_slash', last_response.body
+
+    get '/trailing_slash'
+    assert last_response.ok?
+    assert_equal 'trailing_slash', last_response.body
+  end
+
+  def test_deals_with_no_trailing_slashes
+    get '/no_trailing_slash/'
+    assert last_response.ok?
+    assert_equal 'no_trailing_slash', last_response.body
+
+    get '/no_trailing_slash'
+    assert last_response.ok?
+    assert_equal 'no_trailing_slash', last_response.body
+  end
 end

metadata

@@ -1,127 +1,141 @@
 --- !ruby/object:Gem::Specification
 name: newark
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Mike Evans
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-26 00:00:00.000000000 Z
+date: 2014-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.2
-  name: rack
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.2
 - !ruby/object:Gem::Dependency
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: activesupport
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
-  name: bundler
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rake
-  prerelease: false
   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
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rack-test
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: pry
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: benchmark-ips
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: multi_json
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
 description: Because everyone should write their own framework.
 email:
 - mike@urlgonomics.com
@@ -129,8 +143,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -153,24 +167,24 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
+rubyforge_project: 
 rubygems_version: 2.2.2
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Pico Web Framework
 test_files: