cuba 2.0.0.rc1 → 2.0.0.rc2

data/README.markdown

@@ -84,7 +84,7 @@ Here's an example showcasing how different matchers work:
       end
 
       # /styles/basic.css
-      on "styles", extname("css") do |file|
+      on "styles", extension("css") do |file|
         res.write "Filename: #{file}" #=> "Filename: basic"
       end
 
@@ -142,4 +142,4 @@ To read more about testing, check the documentation for [Cutest][cutest] and
 Installation
 ------------
 
-    $ gem install cuba
+    $ gem install cuba

data/cuba.gemspec

@@ -1,12 +1,12 @@
 Gem::Specification.new do |s|
   s.name              = "cuba"
-  s.version           = "2.0.0.rc1"
+  s.version           = "2.0.0.rc2"
   s.summary           = "Rum based microframework for web applications."
   s.description       = "Cuba is a light wrapper for Rum, a microframework for Rack applications."
   s.authors           = ["Michel Martens"]
   s.email             = ["michel@soveran.com"]
   s.homepage          = "http://github.com/soveran/cuba"
-  s.files = ["LICENSE", "README.markdown", "Rakefile", "lib/cuba/ron.rb", "lib/cuba/test.rb", "lib/cuba/version.rb", "lib/cuba.rb", "cuba.gemspec", "test/accept.rb", "test/captures.rb", "test/extname.rb", "test/helper.rb", "test/host.rb", "test/integration.rb", "test/match.rb", "test/number.rb", "test/on.rb", "test/path.rb", "test/run.rb", "test/segment.rb"]
+  s.files = ["LICENSE", "README.markdown", "Rakefile", "lib/cuba/ron.rb", "lib/cuba/test.rb", "lib/cuba/version.rb", "lib/cuba.rb", "cuba.gemspec", "test/accept.rb", "test/captures.rb", "test/extension.rb", "test/helper.rb", "test/host.rb", "test/integration.rb", "test/match.rb", "test/number.rb", "test/on.rb", "test/path.rb", "test/run.rb", "test/segment.rb"]
   s.add_dependency "rack", "~> 1.2"
   s.add_dependency "tilt", "~> 1.2"
   s.add_development_dependency "cutest", "~> 1.0"

data/lib/cuba/ron.rb

@@ -90,7 +90,7 @@ module Cuba
     #     res.write "User: #{uid}"
     #   end
     #
-    #   on "styles", extname("css") do |file|
+    #   on "styles", extension("css") do |file|
     #     res.write render("styles/#{file}.sass")
     #   end
     #
@@ -133,12 +133,8 @@ module Cuba
 
       yield
 
-      env["SCRIPT_NAME"], env["PATH_INFO"] = script, path
-
     ensure
-      unless @matched
-        env["SCRIPT_NAME"], env["PATH_INFO"] = script, path
-      end
+      env["SCRIPT_NAME"], env["PATH_INFO"] = script, path
     end
     private :try
 
@@ -165,14 +161,14 @@ module Cuba
       end
     end
 
-    # A matcher for files with a certain extname.
+    # A matcher for files with a certain extension.
     #
     # @example
     #   # PATH_INFO=/style/app.css
-    #   on "style", extname("css") do |file|
+    #   on "style", extension("css") do |file|
     #     res.write file # writes app
     #   end
-    def extname(ext = "\\w+")
+    def extension(ext = "\\w+")
       lambda { consume("([^\\/]+?)\.#{ext}\\z") }
     end
 
@@ -257,4 +253,4 @@ module Cuba
       throw :ron_run_next_app, app
     end
   end
-end
+end

data/lib/cuba/version.rb

@@ -1,3 +1,3 @@
 module Cuba
-  VERSION = "2.0.0.rc1"
+  VERSION = "2.0.0.rc2"
 end

data/test/captures.rb

@@ -74,9 +74,9 @@ test "yields a number" do
   assert_equal ["101"], resp.body
 end
 
-test "yields an extname" do
+test "yield a file name with a matching extension" do
   Cuba.define do
-    on get, "css", extname("css") do |file|
+    on get, "css", extension("css") do |file|
       res.write file
     end
   end
@@ -139,4 +139,4 @@ test "consumes a slash if needed" do
   _, _, resp = Cuba.call(env)
 
   assert_equal ["foo/bar.css"], resp.body
-end
+end

data/test/{extname.rb → extension.rb}

@@ -3,7 +3,7 @@ require File.expand_path("helper", File.dirname(__FILE__))
 setup do
   Cuba.define do
     on "styles" do
-      on extname("css") do |file|
+      on extension("css") do |file|
         res.write file
       end
     end
@@ -18,4 +18,4 @@ test "/styles/reset.css" do |env|
   _, _, resp = Cuba.call(env)
 
   assert_equal ["reset"], resp.body
-end
+end

metadata

@@ -2,7 +2,7 @@
 name: cuba
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 2.0.0.rc1
+  version: 2.0.0.rc2
 platform: ruby
 authors: 
 - Michel Martens
@@ -77,7 +77,7 @@ files:
 - cuba.gemspec
 - test/accept.rb
 - test/captures.rb
-- test/extname.rb
+- test/extension.rb
 - test/helper.rb
 - test/host.rb
 - test/integration.rb