easy_esi 0.2.2 → 0.2.3

data/Gemfile

@@ -1,8 +1,8 @@
 source :rubygems
 
 group :dev do
-  gem 'actionpack', '~>3.1.0.rc4'
-  gem 'redgreen'
+  gem 'actionpack', ENV['RAILS'] || '~>3'
+  gem 'mynyml-redgreen'
   gem 'rake'
   gem 'rspec', '~>2'
   gem 'jeweler'

data/Gemfile.lock

@@ -1,67 +1,65 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionpack (3.1.0.rc4)
-      activemodel (= 3.1.0.rc4)
-      activesupport (= 3.1.0.rc4)
+    actionpack (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       i18n (~> 0.6)
-      rack (~> 1.3.0)
-      rack-cache (~> 1.0.1)
-      rack-mount (~> 0.8.1)
-      rack-test (~> 0.6.0)
-      sprockets (~> 2.0.0.beta.10)
-      tzinfo (~> 0.3.27)
-    activemodel (3.1.0.rc4)
-      activesupport (= 3.1.0.rc4)
-      bcrypt-ruby (~> 2.1.4)
+      rack (~> 1.3.2)
+      rack-cache (~> 1.1)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.2)
+    activemodel (3.1.1)
+      activesupport (= 3.1.1)
       builder (~> 3.0.0)
       i18n (~> 0.6)
-    activesupport (3.1.0.rc4)
+    activesupport (3.1.1)
       multi_json (~> 1.0)
-    bcrypt-ruby (2.1.4)
     builder (3.0.0)
-    diff-lcs (1.1.2)
+    diff-lcs (1.1.3)
     erubis (2.7.0)
     git (1.2.5)
-    hike (1.1.0)
+    hike (1.2.1)
     i18n (0.6.0)
-    jeweler (1.6.2)
+    jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
     multi_json (1.0.3)
-    rack (1.3.0)
-    rack-cache (1.0.2)
+    mynyml-redgreen (0.7.1)
+      term-ansicolor (>= 1.0.4)
+    rack (1.3.5)
+    rack-cache (1.1)
       rack (>= 0.4)
-    rack-mount (0.8.1)
+    rack-mount (0.8.3)
       rack (>= 1.0.0)
-    rack-test (0.6.0)
+    rack-test (0.6.1)
       rack (>= 1.0)
-    rake (0.9.2)
-    redgreen (1.2.2)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
+    rake (0.9.2.2)
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.1)
+    rspec-expectations (2.7.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    sprockets (2.0.0.beta.10)
-      hike (~> 1.0)
+    rspec-mocks (2.7.0)
+    sprockets (2.0.3)
+      hike (~> 1.2)
       rack (~> 1.0)
-      tilt (!= 1.3.0, ~> 1.1)
-    tilt (1.3.2)
-    tzinfo (0.3.28)
+      tilt (~> 1.1, != 1.3.0)
+    term-ansicolor (1.0.5)
+    tilt (1.3.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionpack (~> 3.1.0.rc4)
+  actionpack (~> 3)
   jeweler
+  mynyml-redgreen
   rake
-  redgreen
   rspec (~> 2)

data/Rakefile

@@ -1,10 +1,15 @@
 require 'rake/testtask'
-Rake::TestTask.new(:default) do |test|
+Rake::TestTask.new(:test) do |test|
   test.libs << 'lib'
   test.pattern = 'test/**/*_test.rb'
   test.verbose = true
 end
 
+task :default do
+  sh "RAILS=3.0.10 && (bundle || bundle install) && bundle exec rake test"
+  sh "RAILS=3.1.0  && (bundle || bundle install) && bundle exec rake test"
+end
+
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|

data/Readme.md

@@ -31,7 +31,7 @@ Has no effect for non-esi controllers!
     IS NOW
     <%= esi_render :partial => 'profile', :locals => {:local_variable => :foo} %>
 
-### Realize that its that simple (10s)
+### Realize that it's that simple (10s)
 
 Behind the scenes
 =================

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/easy_esi.gemspec

@@ -4,13 +4,13 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{easy_esi}
-  s.version = "0.2.2"
+  s.name = "easy_esi"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-06-19}
-  s.email = %q{michael@grosser.it}
+  s.date = "2011-10-27"
+  s.email = "michael@grosser.it"
   s.files = [
     "CHANGELOG",
     "Gemfile",
@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
     "init.rb",
     "lib/easy_esi.rb",
     "test/easy_esi_test.rb",
+    "test/test_helper.rb",
     "test/views/esi_disabled/_a_partial.erb",
     "test/views/esi_disabled/show.erb",
     "test/views/esi_disabled/test_filter.erb",
@@ -32,10 +33,10 @@ Gem::Specification.new do |s|
     "test/views/esi_enabled/show.erb",
     "test/views/esi_enabled/with_hash.erb"
   ]
-  s.homepage = %q{http://github.com/grosser/easy_esi}
+  s.homepage = "http://github.com/grosser/easy_esi"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Rails: Cached pages with updated partials}
+  s.rubygems_version = "1.8.10"
+  s.summary = "Rails: Cached pages with updated partials"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/easy_esi.rb

@@ -1,6 +1,6 @@
 class EasyEsi
   VERSION = File.read( File.join(File.dirname(__FILE__),'..','VERSION') ).strip
-  
+
   def self.include_for(data)
     %{<esi:include src="#{serialize(data)}"/>}.html_safe
   end
@@ -60,7 +60,11 @@ class ActionController::Caching::Actions::ActionCacheFilter
 end
 
 class ActionController::Base
-  class_inheritable_accessor :esi_enabled
+  if respond_to?(:class_attribute)
+    class_attribute :esi_enabled
+  else
+    class_inheritable_accessor :esi_enabled
+  end
 
   def self.enable_esi
     self.esi_enabled = true
@@ -70,8 +74,17 @@ class ActionController::Base
   protected
 
   def render_esi
-    return if @do_not_replace_esi or not response_body.kind_of?(String)
-    self.response_body = EasyEsi.replace_includes(response_body) do |data|
+    return if @do_not_replace_esi
+
+    if response_body.kind_of?(Array) # Ruby 1.9
+      self.response_body = response_body.map { |body| render_and_replace_esi(body) }
+    elsif response_body.kind_of?(String)
+      self.response_body = render_and_replace_esi(response_body)
+    end
+  end
+
+  def render_and_replace_esi text
+    EasyEsi.replace_includes(text) do |data|
       data = {:partial => data} if data.kind_of?(String)
       _render_template(data)
     end

data/test/easy_esi_test.rb

@@ -1,31 +1,4 @@
-require 'rubygems'
-require 'rspec'
-require 'active_support/all'
-require 'action_pack'
-require 'action_controller'
-require 'action_dispatch/testing/test_process'
-require 'test/unit'
-require 'redgreen'
-$LOAD_PATH << 'lib'
-require 'init'
-
-# fake checks
-require 'ostruct'
-module ActionController::UrlFor
-  def _routes
-    helpers = OpenStruct.new
-    helpers.url_helpers = Module.new
-    helpers
-  end
-end
-
-ActionController::Base.cache_store = :memory_store
-
-ROUTES = ActionDispatch::Routing::RouteSet.new
-ROUTES.draw do
-  match ':controller(/:action(/:id(.:format)))'
-end
-ROUTES.finalize!
+require './test/test_helper'
 
 class EsiDisabledController < ActionController::Base
   self.view_paths = 'test/views'
@@ -44,23 +17,6 @@ class EsiDisabledController < ActionController::Base
   def uncached
     render :action => :show
   end
-
-  def self._routes
-    ROUTES
-  end
-
-  def url_for(*args)
-    'xxx'
-  end
-end
-
-# funky patch to get @routes working, in 'setup' did not work
-module ActionController::TestCase::Behavior
-  def process_with_routes(*args)
-    @routes = ROUTES
-    process_without_routes(*args)
-  end
-  alias_method_chain :process, :routes
 end
 
 class EsiDisabledTest < ActionController::TestCase
@@ -118,10 +74,6 @@ class EsiEnabledController < EsiDisabledController
   def send_a_file
     send_file "VERSION"
   end
-
-  def url_for(*args)
-    'xxx'
-  end
 end
 
 class EsiEnabledTest < ActionController::TestCase
@@ -164,7 +116,7 @@ class EsiEnabledTest < ActionController::TestCase
   end
 
   test "it can serialize arbitrary data" do
-    data = {'src' => 'something else', 1 => :x, 2 => ['"','/','___----']}
+    data = {'src' => 'something else', 1 => 'x', 2 => ['"','/','___----']}
     get :serialize, :render_data => data
     @response.body.strip.should == data.inspect
   end

data/test/test_helper.rb

@@ -0,0 +1,65 @@
+require 'rubygems'
+require 'rspec'
+require 'active_support/all'
+require 'action_pack'
+require 'action_controller'
+require 'test/unit'
+require 'redgreen'
+$LOAD_PATH << 'lib'
+require './init'
+
+ActionController::Base.cache_store = :memory_store
+
+if ActionPack::VERSION::MAJOR > 2
+  require 'action_dispatch/testing/test_process'
+
+# fake checks
+  require 'ostruct'
+  module ActionController::UrlFor
+    def _routes
+      helpers = OpenStruct.new
+      helpers.url_helpers = Module.new
+      helpers
+    end
+  end
+
+  ROUTES = ActionDispatch::Routing::RouteSet.new
+  ROUTES.draw do
+    match ':controller(/:action(/:id(.:format)))'
+  end
+  ROUTES.finalize!
+
+# funky patch to get @routes working, in 'setup' did not work
+  module ActionController::TestCase::Behavior
+    def process_with_routes(*args)
+      @routes = ROUTES
+      process_without_routes(*args)
+    end
+    alias_method_chain :process, :routes
+  end
+
+  class ActionController::Base
+    self.view_paths = 'test/views'
+
+    def self._routes
+      ROUTES
+    end
+
+    def url_for(*args)
+      'xxx'
+    end
+  end
+else
+  require 'action_controller/test_process'
+
+  ActionController::Routing::Routes.reload rescue nil
+  ActionController::Base.cache_store = :memory_store
+
+  class ActionController::Base
+    before_filter :set_view_paths
+
+    def set_view_paths
+      @template.view_paths = 'test/views'
+    end
+  end
+end

metadata

@@ -1,46 +1,33 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: easy_esi
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 0.2.3
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 2
-  version: 0.2.2
 platform: ruby
-authors: 
+authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-19 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2011-10-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &74588230 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  name: activerecord
-  version_requirements: *id001
   prerelease: false
+  version_requirements: *74588230
 description: 
 email: michael@grosser.it
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - CHANGELOG
 - Gemfile
 - Gemfile.lock
@@ -51,6 +38,7 @@ files:
 - init.rb
 - lib/easy_esi.rb
 - test/easy_esi_test.rb
+- test/test_helper.rb
 - test/views/esi_disabled/_a_partial.erb
 - test/views/esi_disabled/show.erb
 - test/views/esi_disabled/test_filter.erb
@@ -60,39 +48,31 @@ files:
 - test/views/esi_enabled/serialize.erb
 - test/views/esi_enabled/show.erb
 - test/views/esi_enabled/with_hash.erb
-has_rdoc: true
 homepage: http://github.com/grosser/easy_esi
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -437317745
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: "Rails: Cached pages with updated partials"
+summary: ! 'Rails: Cached pages with updated partials'
 test_files: []
-