Merge branch 'release-3.0.0'

CHANGELOG

@@ -7,6 +7,8 @@
   - cookies behave like a hash
   - added sprockets integration example
   - improved documentation
+  - Fixed inheritance behaviour for App (routes, filters, helpers, middlewares
+    will be passed down the inheritance chain)
 
 2.2.1
   - Added support for templates

Performance.md

@@ -1,46 +1,41 @@
 This output was generated by running benchmark.rb in repo root
 ```
-Comparing NYNY 2.2.1 with Sinatra 1.4.4
-
-Test: empty
-              user     system      total        real
-nyny:     0.070000   0.000000   0.070000 (  0.067279)
-sinatra:  0.390000   0.020000   0.410000 (  0.426609)
-NYNY is 6.34x faster than Sinatra in this test
+Comparing NYNY 3.0.0 with Sinatra 1.4.4
 
 Test: hello world
               user     system      total        real
-nyny:     0.110000   0.000000   0.110000 (  0.103838)
-sinatra:  0.240000   0.010000   0.250000 (  0.259423)
-NYNY is 2.50x faster than Sinatra in this test
+nyny:     0.110000   0.000000   0.110000 (  0.108916)
+sinatra:  0.260000   0.010000   0.270000 (  0.273225)
+NYNY is 2.51x faster than Sinatra in this test
 
 Test: filters
               user     system      total        real
-nyny:     0.120000   0.000000   0.120000 (  0.117447)
-sinatra:  0.250000   0.010000   0.260000 (  0.257431)
-NYNY is 2.19x faster than Sinatra in this test
+nyny:     0.120000   0.000000   0.120000 (  0.118976)
+sinatra:  0.250000   0.010000   0.260000 (  0.264279)
+NYNY is 2.22x faster than Sinatra in this test
 
 Test: helpers
               user     system      total        real
-nyny:     0.100000   0.000000   0.100000 (  0.103084)
-sinatra:  0.250000   0.010000   0.260000 (  0.257457)
-NYNY is 2.50x faster than Sinatra in this test
+nyny:     0.100000   0.000000   0.100000 (  0.105290)
+sinatra:  0.240000   0.000000   0.240000 (  0.249585)
+NYNY is 2.37x faster than Sinatra in this test
 
 Test: Url patterns
               user     system      total        real
-nyny:     0.110000   0.000000   0.110000 (  0.108765)
-sinatra:  0.270000   0.010000   0.280000 (  0.282336)
-NYNY is 2.60x faster than Sinatra in this test
+nyny:     0.120000   0.000000   0.120000 (  0.113535)
+sinatra:  0.260000   0.020000   0.280000 (  0.277098)
+NYNY is 2.44x faster than Sinatra in this test
 
 Test: A lot o Plain routes
               user     system      total        real
-nyny:     0.110000   0.000000   0.110000 (  0.109565)
-sinatra:  0.250000   0.020000   0.270000 (  0.265283)
-NYNY is 2.42x faster than Sinatra in this test
+nyny:     0.120000   0.000000   0.120000 (  0.113001)
+sinatra:  0.250000   0.000000   0.250000 (  0.262890)
+NYNY is 2.33x faster than Sinatra in this test
 
 Test: A lot of Pattern routes
               user     system      total        real
-nyny:     0.130000   0.000000   0.130000 (  0.125386)
-sinatra:  0.280000   0.010000   0.290000 (  0.291068)
-NYNY is 2.32x faster than Sinatra in this test
+nyny:     0.130000   0.000000   0.130000 (  0.133590)
+sinatra:  0.270000   0.010000   0.280000 (  0.284605)
+NYNY is 2.13x faster than Sinatra in this test
+
 ```

benchmark.rb

@@ -27,15 +27,6 @@ def run_test name, apps, &block
 
 puts "Comparing NYNY #{NYNY::VERSION} with Sinatra #{Sinatra::VERSION}"
 
-#
-# Empty app
-apps = build_apps do
-  #empty app
-end
-run_test 'empty', apps do |app|
-  app.get '/'
-end
-
 #
 # Hello World
 apps = build_apps do