newark 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b1b007d826796f975e53a238c1f3f8bec78b94d
-  data.tar.gz: 361aa3310e4bd3231f5cba710be13adbacf2a67a
+  metadata.gz: 846aac93a0c6b2c08f5ce424b677ff56fc6a4b92
+  data.tar.gz: d7265afa0ff668bab4b6b81e7b5bb0a99dd15d15
 SHA512:
-  metadata.gz: d1c10396d7c1182363d55352e3998b8549a396ca1b5ecbaa5fab7925001c67936b863e76acf052bc03d1ac890619cff74333e24d0e995602a724c9a93983af94
-  data.tar.gz: 90ad0f2f607cd75ff633392ce51e03c3ae0f858c07021067f2e42efa548f57cf84a4de904587cf448c9e4e23f272ec9bf9f36413122c638a55aa59751921f980
+  metadata.gz: 07a01715c7df2648363dc34df83eda6b4000f2dfd2bba48c6f47cb17b05aee2672214f5726181ae578e89ed7c2aaa8161214ef4caa2e1333cc8e48f4d16be442
+  data.tar.gz: cfd18aef273a3a3cf18ca952848c51da0e056e7e5e033daed91b67bd22a341a43de56457606b95bac002d4c3919928acffd0ac24ba86e70884ed9b01cd39092f

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.ruby-version

data/lib/newark/app.rb

@@ -75,7 +75,6 @@ module Newark
     def route
       route = match_route
       if route
-        request.params.merge!(route.params)
         if exec_before_hooks
           response.body = exec(route.handler)
           exec_after_hooks

data/lib/newark/route.rb

@@ -6,7 +6,7 @@ module Newark
     PATH_MATCHER  = /\*(?<path>.*)/.freeze
     PATH_SUB      = /\*.*/.freeze
 
-    attr_reader :handler, :params
+    attr_reader :handler
 
     def initialize(path, constraints, handler)
       fail ArgumentError, 'You must define a route handler' if handler.nil?
@@ -18,8 +18,10 @@ module Newark
 
     def match?(request)
       path_data = path_match?(request)
-      if path_data && constraints_match?(request)
-        @params = Hash[ path_data.names.zip( path_data.captures ) ]
+      (path_data && constraints_match?(request)).tap do |matched|
+        if matched
+          request.params.merge! Hash[ path_data.names.zip( path_data.captures ) ]
+        end
       end
     end
 

data/lib/newark/version.rb

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

data/test/test_app.rb

@@ -40,7 +40,7 @@ class TestApp < MiniTest::Unit::TestCase
   include Rack::Test::Methods
 
   def app
-    NameApp.new
+    Rack::Lint.new(NameApp.new)
   end
 
   def test_instance_method_access

data/test/test_request.rb

@@ -25,7 +25,7 @@ class TestRequest < MiniTest::Unit::TestCase
   include Rack::Test::Methods
 
   def app
-    RequestApp.new
+    Rack::Lint.new(RequestApp.new)
   end
 
   def test_uri
@@ -44,7 +44,7 @@ class TestRequest < MiniTest::Unit::TestCase
   end
 
   def test_body
-    post '/body', {}, { 'rack.input' => StringIO.new('fubar') }
+    post '/body', 'fubar'
     assert_equal 'fubar', last_response.body
   end
 

data/test/test_response.rb

@@ -14,7 +14,7 @@ class TestResponse < MiniTest::Unit::TestCase
   include Rack::Test::Methods
 
   def app
-    ResponseApp.new
+    Rack::Lint.new(ResponseApp.new)
   end
 
   def test_json_api

data/test/test_router.rb

@@ -67,7 +67,7 @@ class TestRouter < MiniTest::Unit::TestCase
   include Rack::Test::Methods
 
   def app
-    TestingApp.new
+    Rack::Lint.new(TestingApp.new)
   end
 
   def test_gets_root

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: newark
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Mike Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-04 00:00:00.000000000 Z
+date: 2014-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack