newark 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb71854d252f0cb1624e26254eedacf067804078
-  data.tar.gz: c97931ceba7ff07431537aa4b21f3aef4797f69d
+  metadata.gz: 1176c48b93363fe2bd3c113994b9a88fc1347212
+  data.tar.gz: cd767ff74a3c5e299de01841524bcfc0da42c5de
 SHA512:
-  metadata.gz: b75f48d5ccaa1478d5f5d6c31fa3e411dc44ed77beab91bde4ba6cee393a6575012a41bee6b4a35a908b815a2c51f6b122ec0a7f2e09c5174b59ecde325581b3
-  data.tar.gz: b9ca2a867c6b2e49db0e169c6cadb8f0d2fa9f577c0c2d42a5218db58cf98bdf88f5de17d3d96e633a5534b6d0f9356eb15324f9505b5b8af57365cd5fe0fc51
+  metadata.gz: 2cd14fe50f9ac849a30ad2036af27872bd2b07d722f19d69a87ef1fe29e8de8710ec66b014f9f1e26ed8c46879a8cb95b7d155ecf547f2db842883212bc9ad57
+  data.tar.gz: 13c9c7dd6dd9ec8977d2e2a4eb8ddefc7c22b2fc6896d3e3a07e075f4f38292193f90332175231fb1aee9f46c6860421099b0250163a16126ed51386ad6ebd43

data/Rakefile

@@ -9,3 +9,9 @@ Rake::TestTask.new(:test) do |test|
 end
 
 task :default => :test
+
+task :benchmark do
+  Dir.glob('benchmark/**/benchmark_*.rb').each do |benchmark|
+    require_relative benchmark
+  end
+end

data/benchmark/benchmark_router.rb

@@ -0,0 +1,71 @@
+lib = File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+require 'benchmark/ips'
+require 'rack/test'
+require 'newark'
+
+class App
+
+  include Newark
+
+  get '/', params: { user: 'frank' } do
+    'hello frank'
+  end
+
+  get '/' do
+    'hello'
+  end
+
+  get(/\/regexp/) do
+    'regexp'
+  end
+
+  get '/create' do
+    'whoops'
+  end
+
+  post '/create' do
+    'created'
+  end
+
+  get '/request_and_response' do
+    request && response
+    headers && params
+    'ok'
+  end
+
+  get '/variables/:a/:b' do
+    "#{params[:a]}:#{params[:b]}"
+  end
+end
+
+include Rack::Test::Methods
+
+def app
+  App.new
+end
+
+Benchmark.ips do |x|
+
+  x.report('match /') {
+    get '/'
+  }
+
+  x.report('match / with param') {
+    get '/', user: 'frank'
+  }
+
+  x.report('404') {
+    get '/not_found'
+  }
+
+  x.report('post') {
+    post '/create'
+  }
+
+  x.report('path params') {
+    get '/variables/fu/bar'
+  }
+
+end

data/lib/newark/app.rb

@@ -2,6 +2,11 @@
 module Newark
   module App
 
+    FOUR_O_FOUR = [ 404, {}, [] ].freeze
+
+    HTTP_VERBS = [ :delete, :get, :head, :options,
+                   :patch, :post, :put, :trace ].freeze
+
     def self.included(klass)
       klass.instance_variable_set :@routes,       []
       klass.instance_variable_set :@before_hooks, []
@@ -9,9 +14,6 @@ module Newark
       klass.extend ClassMethods
     end
 
-    HTTP_VERBS = [ :delete, :get, :head, :options,
-                   :patch, :post, :put, :trace ].freeze
-
     module ClassMethods
 
       HTTP_VERBS.each do |verb|
@@ -34,20 +36,62 @@ module Newark
       end
     end
 
+    attr_reader :request, :response
+
     def call(env)
-      Router.new(self, env).route!
+      dup._call(env)
+    end
+
+    def _call(env)
+      @env      = env
+      @request  = Request.new(@env)
+      @response = Response.new
+      route
+    end
+
+    def headers
+      response.headers
+    end
+
+    def params
+      request.params
+    end
+
+    def route
+      exec_before_hooks
+      route = match_route
+      if route
+        request.params.merge!(route.params)
+        response.body = instance_exec(&route.handler)
+        exec_after_hooks
+        response.finish
+      else
+        FOUR_O_FOUR
+      end
+    end
+
+    private
+
+    def match_route
+      Router.new(routes, request).route
     end
 
     def routes
-      self.class.instance_variable_get :@routes
+      self.class.instance_variable_get(:@routes)
     end
 
-    def before_hooks
-      self.class.instance_variable_get :@before_hooks
+    def exec_before_hooks
+      exec_hooks self.class.instance_variable_get(:@before_hooks)
     end
 
-    def after_hooks
-      self.class.instance_variable_get :@after_hooks
+    def exec_after_hooks
+      exec_hooks self.class.instance_variable_get(:@after_hooks)
+    end
+
+    def exec_hooks(hooks)
+      hooks.each do |hook|
+        instance_exec(&hook)
+      end
     end
   end
 end

data/lib/newark/request.rb

@@ -4,7 +4,9 @@ module Newark
   class Request < Rack::Request
 
     def uri
-      URI(base_url + fullpath)
+      uri = "#{scheme}://#{host_with_port}#{path_info}"
+      uri << "?#{query_string}" unless query_string.empty?
+      URI(uri)
     end
 
     def params

data/lib/newark/response.rb

@@ -1,9 +1,16 @@
 module Newark
   class Response < Rack::Response
 
+    JSON_MIME_TYPE = 'application/json'.freeze
+
     def body=(value)
       value = if value.respond_to?(:to_str)
                 [ value.to_str ]
+              elsif value.respond_to?(:to_hash) && defined?(MultiJson)
+                header['Content-Type'] = JSON_MIME_TYPE
+                [ MultiJson.dump(value) ]
+              elsif value.respond_to?(:to_ary)
+                value
               else
                 [ value ]
               end

data/lib/newark/route.rb

@@ -2,6 +2,9 @@ module Newark
   class Route
 
     PARAM_MATCHER = /:(?<param>[^\/]*)/.freeze
+    PARAM_SUB     = /:[^\/]*/.freeze
+    PATH_MATCHER  = /\*(?<path>.*)/.freeze
+    PATH_SUB      = /\*.*/.freeze
 
     attr_reader :handler, :params
 
@@ -9,7 +12,6 @@ module Newark
       @constraints = Constraint.load(constraints)
       @handler     = handler
       @path        = path_matcher(path)
-      @params      = nil
     end
 
     def match?(request)
@@ -26,7 +28,7 @@ module Newark
     end
 
     def path_match?(request)
-      @path.match(request.path)
+      @path.match(request.path_info)
     end
 
     def path_matcher(path)
@@ -35,12 +37,21 @@ module Newark
     end
 
     def path_params(path)
-      return path unless path =~ /:/
+      match_path(path)
+      match_params(path)
+      path
+    end
+
+    def match_path(path)
+      if match = PATH_MATCHER.match(path)
+        path.sub!(PATH_SUB, "(?<#{match[:path]}>.*)")
+      end
+    end
 
+    def match_params(path)
       while match = PARAM_MATCHER.match(path)
-        path.sub!(/:[^\/]*/, "(?<#{match[:param]}>[^\/]*)")
+        path.sub!(PARAM_SUB, "(?<#{match[:param]}>[^\/]*)")
       end
-      path
     end
 
     class Constraint

data/lib/newark/router.rb

@@ -1,57 +1,12 @@
 module Newark
   class Router
 
-    FOUR_O_FOUR = [ 404, {}, [] ].freeze
-
-    attr_reader :app, :env, :request, :response
-
-    def initialize(app, env)
-      @app      = app
-      @env      = env
-      @request  = Request.new(env)
-      @response = Response.new
-    end
-
-    def route!
-      exec_before_hooks
-      route = matched_route(@app.routes)
-      if route
-        request.params.merge!(route.params)
-        response.body = instance_exec(&route.handler)
-        exec_after_hooks
-        response.finish
-      else
-        FOUR_O_FOUR
-      end
-    end
-
-    def matched_route(routes)
-      routes.find { |route| route.match?(request) }
-    end
-
-    def headers
-      response.headers
+    def initialize(routes, request)
+      @routes, @request = routes, request
     end
 
-    def params
-      request.params
+    def route
+      @routes.find { |route| route.match?(@request) }
     end
-
-    private
-
-    def exec_before_hooks
-      exec_hooks @app.before_hooks
-    end
-
-    def exec_after_hooks
-      exec_hooks @app.after_hooks
-    end
-
-    def exec_hooks(hooks)
-      hooks.each do |hook|
-        instance_exec(&hook)
-      end
-    end
-
   end
 end

data/lib/newark/version.rb

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

data/newark.gemspec

@@ -25,4 +25,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rack-test'
   spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'benchmark-ips'
+  spec.add_development_dependency 'multi_json'
 end

data/test/helper.rb

@@ -3,52 +3,9 @@ Coveralls.wear!
 
 require 'pry'
 require 'newark'
+require 'rack/test'
 require 'minitest/autorun'
 
-class App
-
-  include Newark
-
-  before do
-    headers['X-Newark-Version'] = Newark::VERSION
-  end
-
-  after do
-    headers['X-Newark-Done'] = 'true'
-  end
-
-  get '/', params: { user: 'frank' } do
-    'hello frank'
-  end
-
-  get '/' do
-    'hello'
-  end
-
-  get(/\/regexp/) do
-    'regexp'
-  end
-
-  get '/create' do
-    'whoops'
-  end
-
-  post '/create' do
-    'created'
-  end
-
-  get '/request_and_response' do
-    request && response
-    headers && params
-    'ok'
-  end
-
-  get '/variables/:a/:b' do
-    "#{params[:a]}:#{params[:b]}"
-  end
-
-end
-
 class Minitest::Unit::TestCase
 
 end

data/test/test_app.rb

@@ -0,0 +1,29 @@
+require 'helper'
+
+class NameApp
+  include Newark
+
+  def upcase(str)
+    str.upcase
+  end
+
+  get '/upcaser' do
+    upcase(params[:name])
+  end
+end
+
+class TestApp < Minitest::Unit::TestCase
+
+  include Rack::Test::Methods
+
+  def app
+    NameApp.new
+  end
+
+  def test_instance_method_access
+    get '/upcaser', { name: 'mike' }
+    assert last_response.ok?
+    assert_equal 'MIKE', last_response.body
+  end
+
+end

data/test/test_request.rb

@@ -1,5 +1,4 @@
 require 'helper'
-require 'rack/test'
 
 class RequestApp
   include Newark

data/test/test_response.rb

@@ -0,0 +1,25 @@
+require 'helper'
+
+class ResponseApp
+  include Newark
+
+  get '/api' do
+    { ok: true }
+  end
+end
+
+class TestResponse < Minitest::Unit::TestCase
+
+  include Rack::Test::Methods
+
+  def app
+    ResponseApp.new
+  end
+
+  def test_json_api
+    get '/api'
+    assert_equal "{\"ok\":true}", last_response.body
+    assert_equal 'application/json', last_response.headers['Content-Type']
+  end
+
+end

data/test/test_router.rb

@@ -1,12 +1,59 @@
 require 'helper'
-require 'rack/test'
+
+class TestingApp
+
+  include Newark
+
+  before do
+    headers['X-Newark-Version'] = Newark::VERSION
+  end
+
+  after do
+    headers['X-Newark-Done'] = 'true'
+  end
+
+  get '/', params: { user: 'frank' } do
+    'hello frank'
+  end
+
+  get '/' do
+    'hello'
+  end
+
+  get(/\/regexp/) do
+    'regexp'
+  end
+
+  get '/create' do
+    'whoops'
+  end
+
+  post '/create' do
+    'created'
+  end
+
+  get '/request_and_response' do
+    request && response
+    headers && params
+    'ok'
+  end
+
+  get '/variables/:a/:b' do
+    "#{params[:a]}:#{params[:b]}"
+  end
+
+  get '/path_globbing/*rest_of_path' do
+    params[:rest_of_path]
+  end
+
+end
 
 class TestRouter < Minitest::Unit::TestCase
 
   include Rack::Test::Methods
 
   def app
-    App.new
+    TestingApp.new
   end
 
   def test_gets_root
@@ -60,4 +107,10 @@ class TestRouter < Minitest::Unit::TestCase
     assert last_response.ok?
     assert_equal 'fu:bar', last_response.body
   end
+
+  def test_path_globbing
+    get '/path_globbing/rest/of/path'
+    assert last_response.ok?
+    assert_equal 'rest/of/path', last_response.body
+  end
 end

metadata

@@ -1,99 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: newark
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Mike Evans
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-02-18 00:00:00.000000000 Z
+date: 2014-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.2
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rake
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   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
-  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   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
-  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: benchmark-ips
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: multi_json
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :development
 description: Because everyone should write their own framework.
 email:
 - mike@urlgonomics.com
@@ -101,12 +129,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- benchmark/benchmark_router.rb
 - lib/newark.rb
 - lib/newark/app.rb
 - lib/newark/request.rb
@@ -116,34 +145,37 @@ files:
 - lib/newark/version.rb
 - newark.gemspec
 - test/helper.rb
+- test/test_app.rb
 - test/test_request.rb
+- test/test_response.rb
 - test/test_router.rb
 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: 
-rubygems_version: 2.2.1
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.2.2
+signing_key:
 specification_version: 4
 summary: Pico Web Framework
 test_files:
 - test/helper.rb
+- test/test_app.rb
 - test/test_request.rb
+- test/test_response.rb
 - test/test_router.rb
-has_rdoc: