ventilation 0.2.3 → 0.3.0

data/CHANGELOG.md

@@ -1 +1,11 @@
-  * Fixes issue with urls without paths.
+Version 0.3.0 - 12/4/2010
+-------------------------
+  * Optimize code for production esi.
+  * Add expire helper for setting cache control headers.
+  * Always use varnish if its available.
+  * Turn off esi resolution for environment except for development.
+
+Version 0.2.3 - 12/3/2010
+-------------------------
+  * Turn off esi resolution for staging by default.
+  * Fixes issue with urls without paths.

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.3.0

data/lib/app/helpers/esi_helper.rb

@@ -6,17 +6,28 @@ require 'ventilation/deep_stack'
 module Ventilation
   module EsiHelper
 
-    # Render resource on the edge
     def esi(resource, options = {})
-      env = ENV['RAILS_ENV']
-
-      # If we were passed a url...
       if resource =~ URI.regexp
-        # ...fetch and render an external resource...
-        case env
-        when 'production', 'staging'
-          %%<esi:include src="#{resource}" />%
-        else
+        %%<esi:include src="#{resource}" />%
+      else
+        %%<esi:include src="#{url_for options.merge(:action => resource)}" />%
+      end
+    end
+
+    # Only enable ventilation esi resolutioon features in development.
+    if 'development' == ENV['RAILS_ENV']
+
+      alias :esi_tag :esi
+
+      # Render resource on the edge
+      def esi(resource, options = {})
+
+        # Use esi if supported.
+        return esi_tag(resource, options) if esi_supported?
+
+        # If we were passed a url...
+        if resource =~ URI.regexp
+          # ...fetch and render an external resource...
           url = URI.parse(resource)
           res = Net::HTTP.start(url.host, url.port) {|http|
             path = url.path.blank? ? "/" : url.path
@@ -24,13 +35,8 @@ module Ventilation
             http.get(path)
           }
           res.body
-        end
-      else
-        # ...otherwise render as an action.
-        case env
-        when 'production', 'staging'
-          %%<esi:include src="#{url_for url_options.merge(:action => resource)}" />%
         else
+          # ...otherwise render as an action.
           if controller = options[:controller]
             controller = "#{controller.to_s.camelcase}Controller".constantize
           else
@@ -51,10 +57,21 @@ module Ventilation
       end
     end
 
-  end
-end
+    # Helper for setting expire headers.
+    #
+    # Examples:
+    #   <%- expire 5.minutes -%>
+    #   <%- expire 30.seconds -%>
+    def expire(duration)
+      headers['Cache-Control'] = 'max-age=#{duration.to_i}'
+      headers['Expires'] = duration.from_now.httpdate
+    end
+
+    private
+    def esi_supported?
+      # Enable esi if behind varnish.
+      request.env.has_key?('HTTP_X_VARNISH')
+    end
 
-# Include EsiHelper in the Application
-module ApplicationHelper
-  include Ventilation::EsiHelper
+  end
 end

data/lib/ventilation.rb

@@ -1 +1,8 @@
 require 'app/helpers/esi_helper'
+
+# Include EsiHelper in the Application
+module ApplicationHelper
+  include Ventilation::EsiHelper
+end
+
+

data/ventilation.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ventilation}
-  s.version = "0.2.3"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Blake Taylor"]
-  s.date = %q{2010-12-03}
+  s.date = %q{2010-12-04}
   s.description = %q{Helper methods for building esi tags, simplifies development bypassing the need for varnish.}
   s.email = %q{btaylor@agoragames.com}
   s.extra_rdoc_files = [

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ventilation
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
   - 3
-  version: 0.2.3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Blake Taylor
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-03 00:00:00 -05:00
+date: 2010-12-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -38,6 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 1
         - 2
@@ -53,6 +56,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 43
         segments: 
         - 0
         - 9
@@ -102,6 +106,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -110,6 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"