scorched 0.11 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5471fecce817d61997c06ba5a8b8837192ac675
-  data.tar.gz: ae192c4683cc8a68820b106932e79b4497320659
+  metadata.gz: 215f4c437938c37e309b465ec6fd685887e41fd5
+  data.tar.gz: 38795c31fe7f0395a78ebddc403e2fef586dcd9a
 SHA512:
-  metadata.gz: 1a53207a5993f65218855fcfb7501c45d0fc0924c3151bfadba17d36bd7b18fa02ece678f30e5c2842db29f88a8818b9b09f8128f971291c6258de1cf40a1480
-  data.tar.gz: 023d34b537a6b1626800abb434be8672d8e08132ebb5c527d59716b6b1306fda6fea7771e2a279652ce165418dbb7d7dd9436deb2ceedb03ac035adff3a974b0
+  metadata.gz: 4117536f2e361a2c432b49386f2def80528340d4d28055a50e5713e316fecdeffd93b2daa843af8dfdb8df447eb38b5379fa7fa7fc4253518ba7ad3129213829
+  data.tar.gz: 70dab536b62e324347442e19ca08fc7a13c02e7102d5fcdb051a41e32aa3c3286d008bf3fdea73b0f508360ce5cbc9cb1989d9401e1928b63c3705c2351cd725

data/Milestones.md

@@ -3,6 +3,10 @@ Milestones
 
 Changelog
 ---------
+### v0.11.1
+* Fixed issue where multiple nested render calls would incorrectly render the layout (issue #9).
+* Bumped Tilt dependancy to v1.4 and removed work-around for Tilt encoding issue.
+
 ### 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.

data/docs/02_fundamentals/03_routing.md

@@ -19,7 +19,7 @@ Route Helpers
 -------------
 Adding mappings manually can be a little verbose and painful, which is why Scorched includes a bunch of route helpers which are used in most code examples.
 
-The main route helper which all others delegate to, is the `route` class method. Here's what it looks like in both it's simple and advance form:
+The main route helper which all others delegate to, is the `route` class method. Here's what it looks like in both it's simple and advance forms:
 
 ```ruby
 route '/' do
@@ -53,10 +53,10 @@ 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 all characters excluding the forward slash.
-* `**` - Matches all characters including the forward slash.
-* `:param` - Same as `*` except the capture is named to whatever the string following the single-colon is.
-* `::param` - Same as `**` except the capture is named to whatever the string following the double-colon is.
+* `*` - Matches zero or more characters, excluding the forward slash.
+* `**` - Matches zero 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 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
@@ -65,7 +65,7 @@ Regex patterns offer more power and flexibility than string patterns (naturally)
 
 Conditions
 ----------
-Conditions are essentially just pre-requisites that must be met before a mapping is invoked to handle the current request. They're implemented as `Proc` objects which take a single argument, and return true if the condition is satisfied, or false otherwise. Scorched comes with a number of pre-defined conditions included, many of which are provided by _rack-accept_ - one of the few dependancies of Scorched.
+Conditions are essentially just pre-requisites that must be met before a mapping is invoked to handle the current request. They're implemented as `Proc` objects which take a single argument, and return true if the condition is satisfied, or false otherwise. Scorched comes with a number of pre-defined conditions included, some of which use functionality provided by _rack-accept_ - one of the few dependancies of Scorched.
 
 * `:charset` - Character sets accepted by the client.
 * `:config` - Takes a hash, each element of which must match the value of the corresponding config option.
@@ -80,6 +80,8 @@ Conditions are essentially just pre-requisites that must be met before a mapping
 * `:user_agent` - The user agent string provided with the request. Takes a Regexp or String.
 * `:status` - The response status of the request. Intended for use by _after_ filters.
 
+As of v0.11, Scorched also supports inverted/negated conditions by adding a trailing exclamation mark. For example, a route with the condition `method!: 'GET'` will match any HTTP request except for `GET` requests.
+
 Like configuration options, conditions are implemented using the `Scorched::Options` class, so they're inherited and can be overridden by child classes. You may easily add your own conditions as the example below demonstrates.
 
 ```ruby

data/lib/scorched/controller.rb

@@ -400,7 +400,7 @@ module Scorched
         file = File.join(dir, file) if dir
         # Tilt still has unresolved file encoding issues. Until that's fixed, we read the file manually.
         template_cache.fetch(:file, tilt_engine, file, tilt_options) do
-          tilt_engine.new(nil, nil, tilt_options) { File.read(file) }
+          tilt_engine.new(file, nil, tilt_options)
         end
       else
         template_cache.fetch(:string, tilt_engine, string_or_file, tilt_options) do
@@ -410,10 +410,11 @@ module Scorched
     
       # The following chunk of code is responsible for preventing the rendering of layouts within views.
       begin
+        original_no_default_layout = @_no_default_layout
         @_no_default_layout = true
         output = template.render(self, locals, &block)
       ensure
-        @_no_default_layout = false
+        @_no_default_layout = original_no_default_layout
       end
       
       if layout

data/lib/scorched/version.rb

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

data/scorched.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new 'scorched', Scorched::VERSION do |s|
 
   s.add_dependency 'rack', '~> 1.4'
   s.add_dependency 'rack-accept', '~> 0.4'
-  s.add_dependency 'tilt', '~> 1.3'
+  s.add_dependency 'tilt', '~> 1.4'
   s.add_development_dependency 'rack-test', '~> 0.6'
   s.add_development_dependency 'rspec', '~> 2.9'
 end

data/spec/controller_spec.rb

@@ -715,6 +715,10 @@ module Scorched
           File.open('views/temp.str', 'w') { |f| f.write 'hello world' }
         end
         
+        after(:all) {
+          File.unlink 'views/temp.str'
+        }
+        
         it "can cache templates" do
           app.config[:cache_templates] = true
           app.get('/') { render :'temp.str' }
@@ -890,7 +894,7 @@ module Scorched
         app.get('/') do
           render :composer
         end
-        rt.get('/').body.should == '({1 for none})'
+        rt.get('/').body.should == '({1 for none}{1 for none})'
       end
       
       it "can pass local variables through to view" do

data/spec/views/composer.erb

@@ -1 +1 @@
-{<%= render :partial %>}
+{<%= render :partial %>}{<%= render :partial %>}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scorched
 version: !ruby/object:Gem::Version
-  version: '0.11'
+  version: 0.11.1
 platform: ruby
 authors:
 - Tom Wardrop
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-23 00:00:00.000000000 Z
+date: 2013-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Light-weight, DRY as a desert, web framework for Ruby