scorched 0.10 → 0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08889289c8e64bbfd860c495a1e0319c5c1c9310
-  data.tar.gz: 7c203bcdc50f2070e157302e6daa8b442c8a6694
+  metadata.gz: d5471fecce817d61997c06ba5a8b8837192ac675
+  data.tar.gz: ae192c4683cc8a68820b106932e79b4497320659
 SHA512:
-  metadata.gz: 5aaa29d4c05e8bc4b4a2e11381c6a6030f91cbe0e3d2d7d312eabceabcae3447d742485852bfc115938526e21d32fa1399777737eaae9e71a40fe1f2879e8f11
-  data.tar.gz: 17c71a09fb5cf953a3dd96b880be3d68332622002ca3dfe9c1393b72e3141c63ea1fb4009bb0044f18a923c6f5e95657781a4514e50745f2735895f830fff57f
+  metadata.gz: 1a53207a5993f65218855fcfb7501c45d0fc0924c3151bfadba17d36bd7b18fa02ece678f30e5c2842db29f88a8818b9b09f8128f971291c6258de1cf40a1480
+  data.tar.gz: 023d34b537a6b1626800abb434be8672d8e08132ebb5c527d59716b6b1306fda6fea7771e2a279652ce165418dbb7d7dd9436deb2ceedb03ac035adff3a974b0

data/Milestones.md

@@ -3,6 +3,11 @@ Milestones
 
 Changelog
 ---------
+### v0.11
+* Route wildcards '*' and '**' (and their named equivalents) now match zero or more characters, instead of one or more. This means `/*` will now match both `/` and `/about` for example. 
+* Conditions can now be inverted by appending an exclamation mark to the condition, e.g. `method!: 'GET'` matches all HTTP methods, excluding GET.
+* While not strictly Scorched related, one planned feature for Scorched was to implement a simple form population mechanism. This has instead been implemented as a stand-alone project, [Formless](https://github.com/Wardrop/Formless), which can be used with any framework or application, including Scorched.
+
 ### v0.10
 * Route matching internals have been refactored.
     * Match information is now stored in the `Match` struct for better formalisation.
@@ -92,12 +97,6 @@ Some of these remaining features may be reconsidered and either left out, or put
 
 * If one or more matches are found, but their conditions don't pass, a 403 should be returned instead of a 404.
 * Make specs for Collection and Options classes more thorough, e.g. test all non-reading modifiers such as clear, delete, etc.
-* Add more view helpers, maybe?
-  * Add helper to easily read and build HTTP query strings. Takes care of "?" and "&" logic, escaping, etc. This is
-    intended to make link building easier.
-  * Form populator implemented with Nokogiri. This would have to be added to a contrib library.
-* Add Verbose logging, including debug logging to show each routing hop and the current environment (variables, mode, etc)
-* I need feedback on what order _after_ filters should be run. While it's somewhat intuitive for them to run in the order they're defined, it could also be considered intuitive for the first defined _after_ filter to be the last to touch the outgoing response; to have priority.
 
 
 Unlikely
@@ -107,6 +106,7 @@ These features are unlikely to be implemented unless someone provides a good rea
 * Mutex locking option - I'm of the opinion that the web server should be configured for the concurrency model of the application, rather than the framework.
 * Using Rack::Protection by default - The problem here is that a good portion of Rack::Protection involves sessions, and given that Scorched doesn't itself load any session middleware, these components of Rack::Protection would have to be excluded. I wouldn't want to invoke a false sense of security
 * Filter priorities - They're technically possible, but I believe it would introduce the potential for _filter hell_; badly written filters and mass confusion. Filter order has to be logical and predictable. Adding prioritisation would undermine that, and make for lazy use of filters. By not having prioritisation, there's incentive to design filters to be order-agnostic.
+* Verbose logging - I originally intended to add some form of debug-style logging to show the complete flow of a request as it traverses through filters and controllers, etc. For a couple of reasons, I've decided to leave this out of Scorched. For those unfamiliar with the order in which filters and routes are invoked, it's better to learn through first-hand experience writing little test applications, rather than depending on debug logging.
 
 
 More things will be added as they're thought of and considered.

data/lib/scorched/controller.rb

@@ -191,9 +191,9 @@ module Scorched
         regex_pattern = pattern.split(%r{(\*{1,2}|(?<!\\):{1,2}[^/*$]+)}).each_slice(2).map { |unmatched, match|
           Regexp.escape(unmatched) << begin
             if %w{* **}.include? match
-              match == '*' ? "([^/]+)" : "(.+)"
+              match == '*' ? "([^/]*)" : "(.*)"
             elsif match
-              match[0..1] == '::' ? "(?<#{match[2..-1]}>.+)" : "(?<#{match[1..-1]}>[^/]+)"
+              match[0..1] == '::' ? "(?<#{match[2..-1]}>.*)" : "(?<#{match[1..-1]}>[^/]*)"
             else
               ''
             end
@@ -288,13 +288,19 @@ module Scorched
     
     # Tests the given conditions, returning the name of the first failed condition, or nil otherwise.
     def check_for_failed_condition(conds)
-      (conds || []).find { |c,v| check_condition?(c, v) ? false : c }
+      failed = (conds || []).find { |c, v| !check_condition?(c, v) }
+      if failed
+        failed[0] = failed[0][0..-2].to_sym if failed[0][-1] == '!'
+      end
+      failed
     end
     
     # Test the given condition, returning true if the condition passes, or false otherwise.
     def check_condition?(c, v)
+      c = c[0..-2].to_sym if invert = (c[-1] == '!')
       raise Error, "The condition `#{c}` either does not exist, or is not an instance of Proc" unless Proc === self.conditions[c]
-      instance_exec(v, &self.conditions[c])
+      retval = instance_exec(v, &self.conditions[c])
+      invert ? !retval : !!retval
     end
     
     def redirect(url, status = 307)

data/lib/scorched/version.rb

@@ -1,3 +1,3 @@
 module Scorched
-  VERSION = '0.10'
+  VERSION = '0.11'
 end

data/spec/controller_spec.rb

@@ -110,6 +110,24 @@ module Scorched
         req.captures.should == {name: 'jeff', infliction: 'has/crabs'}
       end
       
+      example "wildcards 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
+      
       it "can match regex and preserve anonymous captures" do
         req = nil
         app << {pattern: %r{/anon/([^/]+)/(.+)}, target: proc do |env|
@@ -175,6 +193,12 @@ module Scorched
         rt.get("/").body.should == 'get'
         rt.post("/").body.should == 'post'
       end
+      
+      it "inverts the conditions if it's referenced with a trailing exclamation mark" do
+        app << {pattern: '/', conditions: {method!: 'GET'}, target: proc { |env| [200, {}, ['ok']] }}
+        rt.get("/").status.should == 405
+        rt.post("/").status.should == 200
+      end
     end
     
     describe "route helpers" do
@@ -556,6 +580,34 @@ module Scorched
       end
     end
     
+    describe "status codes" do
+      it "returns 405 when :method condition fails" do
+        app.get('/') { }
+        rt.post('/').status.should == 405
+      end
+      
+      it "returns 404 when :host condition fails" do
+        app.get('/', host: 'somehost') { }
+        rt.get('/').status.should == 404
+      end
+      
+      it "returns 406 when accept-related conditions fail" do
+        app.get('/media_type', media_type: 'application/json') { }
+        app.get('/charset', charset: 'iso-8859-5') { }
+        app.get('/encoding', encoding: 'gzip') { }
+        app.get('/language', language: 'en') { }
+        
+        rt.get('/media_type', {}, 'HTTP_ACCEPT' => 'application/json').status.should == 200
+        rt.get('/media_type', {}, 'HTTP_ACCEPT' => 'text/html').status.should == 406
+        rt.get('/charset', {}, 'HTTP_ACCEPT_CHARSET' => 'iso-8859-5').status.should == 200
+        rt.get('/charset', {}, 'HTTP_ACCEPT_CHARSET' => 'iso-8859-5;q=0').status.should == 406
+        rt.get('/encoding', {}, 'HTTP_ACCEPT_ENCODING' => 'gzip').status.should == 200
+        rt.get('/encoding', {}, 'HTTP_ACCEPT_ENCODING' => 'compress').status.should == 406
+        rt.get('/language', {}, 'HTTP_ACCEPT_LANGUAGE' => 'en').status.should == 200
+        rt.get('/language', {}, 'HTTP_ACCEPT_LANGUAGE' => 'da').status.should == 406
+      end
+    end
+    
     describe "configuration" do
       describe :strip_trailing_slash do
         it "can be set to strip trailing slash and redirect" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scorched
 version: !ruby/object:Gem::Version
-  version: '0.10'
+  version: '0.11'
 platform: ruby
 authors:
 - Tom Wardrop
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-31 00:00:00.000000000 Z
+date: 2013-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -163,4 +163,3 @@ test_files:
 - spec/controller_spec.rb
 - spec/options_spec.rb
 - spec/request_spec.rb
-has_rdoc: