slimmer 3.22.1 → 3.23.0

data/README.md

@@ -2,8 +2,8 @@ Slimmer provides rack middleware for applying a standard header and footer aroun
 returned by a ruby (rack) application. 
 
 It does this by taking the page rendered by the application, extracting the contents of
-a div with id 'wrapper' and inserting that into one of its templates. It also transfers
-various other details, such as meta, script, and style tags.
+a div with id 'wrapper' and inserting that into a div with the same id in one of its templates.
+It also transfers various other details, such as meta, script, and style tags.
 
 ## Use in a Rails app
 
@@ -29,25 +29,33 @@ or
 
     use Slimmer::App, :asset_host => "http://my.alternative.host"
 
+## Asset tag helpers
+
+To get asset tag helpers to point to your external asset server, add 
+
+    config.action_controller.asset_host = "http://my.alternative.host"
+    
+to application.rb.
+
 ## Specifying a template
 
-A specific template can be requested by giving its name in the X-Slimmer-Template HTTP header
+A specific template can be requested by giving its name in the X-Slimmer-Template HTTP header. 
 
-eg in a rails app
+In a controller action, you can do this by calling `slimmer_template`.
 
     class MyController < ApplicationController
       def index
-        headers['X-Slimmer-Template'] = 'homepage'
+        slimmer_template 'homepage'
       end
     end
 
-There's also a macro style method:
+There's also a macro style method which will affect all actions:
 
     class YourController < ApplicationController
       slimmer_template :admin
     end
 
-To get this, include Slimmer::Template in your controller:
+To get this, include Slimmer::Template in your ApplicationController:
 
     class ApplicationController < ActionController::Base
       include Slimmer::Template

data/lib/slimmer/template.rb

@@ -4,10 +4,15 @@ module Slimmer
       into.extend ClassMethods
     end
 
+    def slimmer_template template_name
+      response.headers[Slimmer::Headers::TEMPLATE_HEADER] = template_name.to_s
+    end
+
+
     module ClassMethods
       def slimmer_template template_name
         after_filter do
-          response.headers[Slimmer::Headers::TEMPLATE_HEADER] = template_name.to_s
+          response.headers[Slimmer::Headers::TEMPLATE_HEADER] ||= template_name.to_s
         end
       end
     end

data/lib/slimmer/version.rb

@@ -1,3 +1,3 @@
 module Slimmer
-  VERSION = '3.22.1'
+  VERSION = '3.23.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slimmer
 version: !ruby/object:Gem::Version
-  version: 3.22.1
+  version: 3.23.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-29 00:00:00.000000000 Z
+date: 2013-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -322,7 +322,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2843217311153724153
+      hash: -4371184538840629233
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -331,7 +331,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2843217311153724153
+      hash: -4371184538840629233
 requirements: []
 rubyforge_project: slimmer
 rubygems_version: 1.8.23