scorched 0.18 → 0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc448b9aca2411bb1687c2981fb9ba8d9f75429c
-  data.tar.gz: 66c20180446fd507f019c645d87cad07b2098f1c
+  metadata.gz: 126d0553639f9a33afab401c7084a573a28914c4
+  data.tar.gz: ca8aaba8a210a5b48ec91be131ec9d5432be489a
 SHA512:
-  metadata.gz: 2f48eea992d507bd058115c412b37c3c7e86697fad098d9be60872d983307e868cf0fd55d0f74b0d564c6c7c6fa22f745fa715e1382cbd966b5a208fa1ce6421
-  data.tar.gz: 3cb2c849244e1a3316689d62575e524d5a2aa77aa77a7109bad7f836777187dfd544d30f475e562fb5bfc5018543dc2b1b1280ca3b06833d17e51dd668e8751c
+  metadata.gz: def1aa2f26ef50000e5a6689a4eeb9f120119968c6604915618d12f3d22211dbdf3e4ba080f4d79525c98848e8729b4b022a843bcab159fb870899efed7511db
+  data.tar.gz: 35cb01c416ccb4ed8e328476b5a7a1a80b76570e5d0229b9c02e7082f4eb078fdc92e868adcfaf227546761f8827a6d8b658cf970be30ed1dda2ef8608c0d81a

data/CHANGES.md

@@ -1,6 +1,9 @@
 Changelog
 =========
 
+### v0.19
+* The behaviour of wildcards '*' and '**' (and their _named_ equivalents) have been reverted to their original behviour of matching one or more characters, instead of zero or more. This means `/*` will no longer match `/`. Adding a question mark directly after a wildcard will have that wildcard match zero or more character, instead of one or more. So the pattern `/*?` will match both `/` and `/about`.
+
 ### v0.18
 * Redirects now use a 303 or 302 HTTP status code by default, depending on HTTP version (similar logic to Sinatra). Trailing slash redirects (triggered by :strip_trailing_slash) still uses a 307 status.
 

data/Rakefile

@@ -26,7 +26,7 @@ desc 'Displays a pre-release message, requiring user input'
 task :prerelease do
   puts <<-MSG
 
-About to release Scorched v#{Scorched::VERSION}. Please ensure CHANGES log is up-to-date, all relevant documentation is updated, and that any new files not under version control have been added/staged. Press any key to continue...
+About to release Scorched v#{Scorched::VERSION}. Please ensure CHANGES log is up-to-date, all relevant documentation is updated, changes on Github master repository have been pulled and merged, and that any new files not under version control have been added/staged. Press any key to continue...
   MSG
   STDIN.gets
 end

data/docs/02_fundamentals/03_routing.md

@@ -13,7 +13,7 @@ map pattern: '/', priority: -99, conditions: {method: ['POST', 'PUT', 'DELETE']}
 
 The position the new mapping is inserted into the mapping hash is determined by it's priority, and the priority of the mappings already defined. This avoids re-sorting the mapping hash every time it's added to. This isn't a performance consideration, but is required to maintain the natural insert order of the mappings which have identical priorities (such as the default 0).
 
-A `mapping` method is also provided as means to access all defined mappings on a controller, but it should be considered read-only for the reasons just stated.
+A `mappings` method is also provided as means to access all defined mappings on a controller, but it should be considered read-only for the reasons just stated.
 
 Route Helpers
 -------------
@@ -57,10 +57,11 @@ Patterns can be defined as either a String or Regexp.
 ###String Patterns
 String patterns are compiled into Regexp patterns corresponding to the following rules:
 
-* `*` - Matches zero or more characters, excluding the forward slash.
-* `**` - Matches zero or more characters, including the forward slash.
+* `*` - Matches one or more characters, excluding the forward slash.
+* `**` - Matches one or more characters, including the forward slash.
 * `:param` - Same as `*` except the capture is named to whatever the string following the single-colon.
 * `::param` - Same as `**` except the capture is named to whatever the string following the double-colon.
+* `?` - If placed directly after a wildcard capture, matches zero or more characters instead of one or more. For example, the patterns `/*?` and `/::title?` would match both `/` and `/about`.
 * `$` - If placed at the end of a pattern, the pattern only matches if it matches the entire path. For patterns defined using the route helpers, e.g. `Controller.route`, `Controller.get`, this is implied. 
 
 ###Regex Patterns

data/lib/scorched/controller.rb

@@ -143,8 +143,8 @@ module Scorched
       # inherits from, a mapping hash for setting conditions and so on, and of course a block which defines the
       # controller class.
       #
-      # It's worth noting, however obvious, that the resulting class will only be a controller if the parent class is
-      # (or inherits from) a Scorched::Controller.
+      # It's worth noting, however obvious, that the resulting class will only be a Scorched::Controller if the parent 
+      # class is, or inherits from, a Scorched::Controller.
       def controller(pattern = '/', parent_class = self, **mapping, &block)
         c = Class.new(parent_class, &block)
         c.config[:auto_pass] = true if parent_class < Scorched::Controller
@@ -211,19 +211,20 @@ module Scorched
         return pattern if Regexp === pattern
         raise Error, "Can't compile URL of type #{pattern.class}. Must be String or Regexp." unless String === pattern
         match_to_end = !!pattern.sub!(/\$$/, '') || match_to_end
-        regex_pattern = pattern.split(%r{(\*{1,2}|(?<!\\):{1,2}[^/*$]+)}).each_slice(2).map { |unmatched, match|
+        compiled_pattern = pattern.split(%r{(\*{1,2}\??|(?<!\\):{1,2}[^/*$]+\??)}).each_slice(2).map { |unmatched, match|
           Regexp.escape(unmatched) << begin
+            op = (match && match[-1] == '?' && match.chomp!('?')) ? '*' : '+'
             if %w{* **}.include? match
-              match == '*' ? "([^/]*)" : "(.*)"
+              match == '*' ? "([^/]#{op})" : "(.#{op})"
             elsif match
-              match[0..1] == '::' ? "(?<#{match[2..-1]}>.*)" : "(?<#{match[1..-1]}>[^/]*)"
+              match[0..1] == '::' ? "(?<#{match[2..-1]}>.#{op})" : "(?<#{match[1..-1]}>[^/]#{op})"
             else
               ''
             end
           end
         }.join
-        regex_pattern << '$' if match_to_end
-        Regexp.new(regex_pattern)
+        compiled_pattern << '$' if match_to_end
+        Regexp.new(compiled_pattern)
       end
     end
     

data/lib/scorched/version.rb

@@ -1,3 +1,3 @@
 module Scorched
-  VERSION = '0.18'
+  VERSION = '0.19'
 end

data/spec/controller_spec.rb

@@ -122,20 +122,38 @@ module Scorched
         req.captures.should == {name: 'jeff', infliction: 'has/crabs'}
       end
       
-      example "wildcards match zero or more characters" do
+      example "wildcards match one or more characters" do
         app << {pattern: '/*', target: proc { |env| [200, {}, ['ok']] }}
-        rt.get('/').status.should == 200
+        rt.get('/').status.should == 404
         rt.get('/dog').status.should == 200
         app.mappings.clear
         app << {pattern: '/**', target: proc { |env| [200, {}, ['ok']] }}
-        rt.get('/').status.should == 200
+        rt.get('/').status.should == 404
         rt.get('/dog/cat').status.should == 200
         app.mappings.clear
         app << {pattern: '/:page', target: proc { |env| [200, {}, ['ok']] }}
-        rt.get('/').status.should == 200
+        rt.get('/').status.should == 404
         rt.get('/dog').status.should == 200
         app.mappings.clear
         app << {pattern: '/::page', target: proc { |env| [200, {}, ['ok']] }}
+        rt.get('/').status.should == 404
+        rt.get('/dog/cat').status.should == 200
+      end
+      
+      example "wildcards can optionally match zero or more characters" do
+        app << {pattern: '/*?', target: proc { |env| [200, {}, ['ok']] }}
+        rt.get('/').status.should == 200
+        rt.get('/dog').status.should == 200
+        app.mappings.clear
+        app << {pattern: '/**?', target: proc { |env| [200, {}, ['ok']] }}
+        rt.get('/').status.should == 200
+        rt.get('/dog/cat').status.should == 200
+        app.mappings.clear
+        app << {pattern: '/:page?', target: proc { |env| [200, {}, ['ok']] }}
+        rt.get('/').status.should == 200
+        rt.get('/dog').status.should == 200
+        app.mappings.clear
+        app << {pattern: '/::page?', target: proc { |env| [200, {}, ['ok']] }}
         rt.get('/').status.should == 200
         rt.get('/dog/cat').status.should == 200
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scorched
 version: !ruby/object:Gem::Version
-  version: '0.18'
+  version: '0.19'
 platform: ruby
 authors:
 - Tom Wardrop
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-04 00:00:00.000000000 Z
+date: 2013-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack