newark 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1176c48b93363fe2bd3c113994b9a88fc1347212
-  data.tar.gz: cd767ff74a3c5e299de01841524bcfc0da42c5de
+  metadata.gz: fed1a9e5d5021c32f65e7813c10a5dbc1f409e83
+  data.tar.gz: aa12c7aba2fec27ac9bb7dcdb9e92202dcf1d03c
 SHA512:
-  metadata.gz: 2cd14fe50f9ac849a30ad2036af27872bd2b07d722f19d69a87ef1fe29e8de8710ec66b014f9f1e26ed8c46879a8cb95b7d155ecf547f2db842883212bc9ad57
-  data.tar.gz: 13c9c7dd6dd9ec8977d2e2a4eb8ddefc7c22b2fc6896d3e3a07e075f4f38292193f90332175231fb1aee9f46c6860421099b0250163a16126ed51386ad6ebd43
+  metadata.gz: ee6980bb5d7b94957b37ce3cb21bbdd19f0b65cd27d232aefbbaf2a563db3cdcbf81bae63edf36ecf73c4248209f70e01eda7f71900f0646092fc6298aebfc74
+  data.tar.gz: 6ff2442b777d6a93d3f2c4fc892729e1be9530ffef45e556f79bb7681420dc13cc15dffd9cb19b877ee8d5d99cd8368989f82eaf32f2efc761e3751a3e6f28de

data/benchmark/benchmark_router.rb

@@ -17,6 +17,12 @@ class App
     'hello'
   end
 
+  get '/hello1' do
+    hello
+  end
+
+  get 'hello2', :hello
+
   get(/\/regexp/) do
     'regexp'
   end
@@ -38,6 +44,16 @@ class App
   get '/variables/:a/:b' do
     "#{params[:a]}:#{params[:b]}"
   end
+
+  get '/path/*globbing' do
+    params[:globbing]
+  end
+
+  private
+
+  def hello
+    'hello'
+  end
 end
 
 include Rack::Test::Methods
@@ -46,26 +62,43 @@ def app
   App.new
 end
 
+50_000.times do
+  get '/hello1'
+  get '/hello2'
+end
+
 Benchmark.ips do |x|
 
-  x.report('match /') {
+  x.report('match /') do
     get '/'
-  }
+  end
+
+  x.report('handler: block') do
+    get '/hello1'
+  end
 
-  x.report('match / with param') {
+  x.report('handler: method') do
+    get '/hello2'
+  end
+
+  x.report('match / with param') do
     get '/', user: 'frank'
-  }
+  end
 
-  x.report('404') {
+  x.report('404') do
     get '/not_found'
-  }
+  end
 
-  x.report('post') {
+  x.report('post') do
     post '/create'
-  }
+  end
 
-  x.report('path params') {
+  x.report('path params') do
     get '/variables/fu/bar'
-  }
+  end
+
+  x.report('path globbing') do
+    get '/path/a/b/c/d'
+  end
 
 end

data/lib/newark/app.rb

@@ -8,30 +8,38 @@ module Newark
                    :patch, :post, :put, :trace ].freeze
 
     def self.included(klass)
-      klass.instance_variable_set :@routes,       []
-      klass.instance_variable_set :@before_hooks, []
-      klass.instance_variable_set :@after_hooks,  []
+      klass.instance_variable_set :@routes, {}
       klass.extend ClassMethods
     end
 
     module ClassMethods
 
       HTTP_VERBS.each do |verb|
-        define_method verb do |path, options = {}, &block|
-          options.merge!(request_method: verb.to_s.upcase)
-          define_route(path, options, &block)
+        define_method verb do |path, *args, &block|
+          if block.is_a?(Proc)
+            handler = block
+            constraints = args[0] || {}
+          else
+            handler = args[0]
+            constraints = args[1] || {}
+          end
+
+          define_route(verb.to_s.upcase, path, constraints, handler)
         end
       end
 
-      def define_route(path, options, &block)
-        @routes << Route.new(path, options, block)
+      def define_route(verb, path, constraints, handler)
+        @routes[verb] ||= []
+        @routes[verb] << Route.new(path, constraints, handler)
       end
 
       def before(&block)
+        @before_hooks ||= []
         @before_hooks << block
       end
 
       def after(&block)
+        @after_hooks ||= []
         @after_hooks << block
       end
     end
@@ -58,11 +66,11 @@ module Newark
     end
 
     def route
-      exec_before_hooks
       route = match_route
       if route
         request.params.merge!(route.params)
-        response.body = instance_exec(&route.handler)
+        exec_before_hooks
+        response.body = exec_handler(route.handler)
         exec_after_hooks
         response.finish
       else
@@ -77,7 +85,19 @@ module Newark
     end
 
     def routes
-      self.class.instance_variable_get(:@routes)
+      self.class.instance_variable_get(:@routes)[@request.request_method]
+    end
+
+    def exec(action)
+      if action.respond_to? :to_sym
+        send(action)
+      else
+        instance_exec(&action)
+      end
+    end
+
+    def exec_handler(handler)
+      exec(handler)
     end
 
     def exec_before_hooks
@@ -89,8 +109,9 @@ module Newark
     end
 
     def exec_hooks(hooks)
+      return if hooks.nil?
       hooks.each do |hook|
-        instance_exec(&hook)
+        exec(hook)
       end
     end
   end

data/lib/newark/request.rb

@@ -1,4 +1,5 @@
 require 'active_support/hash_with_indifferent_access'
+require 'securerandom'
 
 module Newark
   class Request < Rack::Request
@@ -7,6 +8,8 @@ module Newark
       uri = "#{scheme}://#{host_with_port}#{path_info}"
       uri << "?#{query_string}" unless query_string.empty?
       URI(uri)
+    rescue URI::InvalidURIError
+      URI(URI.escape(uri))
     end
 
     def params
@@ -21,12 +24,17 @@ module Newark
       @headers ||= original_headers
     end
 
+    def request_id
+      @env['action_dispatch.request_id'] ||
+      (@env['rack.request_id'] ||= headers['X-Request-Id'] || SecureRandom.uuid)
+    end
+
     protected
 
     def original_headers
       {}.tap do |headers|
         env.select { |k, v| k.start_with?('HTTP_') }.each_pair do |k, v|
-          header = k.sub(/^HTTP_/, '').split('_').map(&:capitalize).join('-')
+          header = k.sub(/^HTTP_/, '').gsub(/_/, '-').split('-').map(&:capitalize).join('-')
           headers[header] = v
         end
       end

data/lib/newark/route.rb

@@ -9,6 +9,8 @@ module Newark
     attr_reader :handler, :params
 
     def initialize(path, constraints, handler)
+      fail ArgumentError, 'You must define a route handler' if handler.nil?
+
       @constraints = Constraint.load(constraints)
       @handler     = handler
       @path        = path_matcher(path)

data/lib/newark/version.rb

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

data/test/test_app.rb

@@ -10,6 +10,18 @@ class NameApp
   get '/upcaser' do
     upcase(params[:name])
   end
+
+  get '/hello1' do
+    hello
+  end
+
+  get '/hello2', :hello
+
+  private
+
+  def hello
+    'Hello'
+  end
 end
 
 class TestApp < Minitest::Unit::TestCase
@@ -26,4 +38,21 @@ class TestApp < Minitest::Unit::TestCase
     assert_equal 'MIKE', last_response.body
   end
 
+  def test_alternate_action_invocation
+    get '/hello1'
+    assert last_response.ok?
+    assert_equal 'Hello', last_response.body
+
+    get '/hello2'
+    assert last_response.ok?
+    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
+
 end

data/test/test_request.rb

@@ -14,6 +14,10 @@ class RequestApp
   post '/body' do
     request.body
   end
+
+  get '/request_id' do
+    request.request_id
+  end
 end
 
 class TestRequest < Minitest::Unit::TestCase
@@ -34,9 +38,25 @@ class TestRequest < Minitest::Unit::TestCase
     assert_equal 'Bar', last_response.body
   end
 
+  def test_headers_with_odd_format
+    get '/headers', {}, { 'HTTP_X-fu' => 'Bar' }
+    assert_equal 'Bar', last_response.body
+  end
+
   def test_body
     post '/body', {}, { 'rack.input' => StringIO.new('fubar') }
     assert_equal 'fubar', last_response.body
   end
 
+  def test_request_id
+    get '/request_id'
+    refute last_response.body.empty?
+  end
+
+  def test_request_id_when_passed
+    request_id = '1234567890'
+    get '/request_id', {}, { 'HTTP_X_REQUEST_ID' => request_id }
+    assert_equal request_id, last_response.body
+  end
+
 end

metadata

@@ -1,127 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: newark
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Mike Evans
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-03-14 00:00:00.000000000 Z
+date: 2014-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rack
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.5.2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.2
+  name: rack
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: activesupport
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.2
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: activesupport
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: bundler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
+  name: bundler
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: rake
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rack-test
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: rack-test
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: pry
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: pry
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: benchmark-ips
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: benchmark-ips
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: multi_json
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: multi_json
   prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Because everyone should write their own framework.
 email:
 - mike@urlgonomics.com