haml 3.0.5 → 3.0.6

data/VERSION

@@ -1 +1 @@
-3.0.5
+3.0.6

data/lib/haml/filters.rb

@@ -308,16 +308,10 @@ END
       # @see Base#compile
       def compile(precompiler, text)
         return if precompiler.options[:suppress_eval]
-        src = RealERB.new(text).src.sub(/^#coding:.*?\n/, '').
+        src = ::ERB.new(text).src.sub(/^#coding:.*?\n/, '').
           sub(/^_erbout = '';/, "")
         precompiler.send(:push_silent, src)
       end
-
-      # This is a dummy ERB subclass
-      # that's used to work around Rails 2.3.6's
-      # incompatible monkeypatches of ERB.
-      # It's modified in `haml/template.rb` if need be.
-      class RealERB < ::ERB; end
     end
 
     # Parses the filtered text with [Textile](http://www.textism.com/tools/textile).

data/lib/haml/helpers/action_view_mods.rb

@@ -97,22 +97,6 @@ module ActionView
       end
     end
 
-    # For some reason, Rails 2.3.6 uses #safe_concat in #capture
-    # even when XSS support is disabled.
-    if Haml::Util.ap_2_3_6?
-      module TextHelper
-        def concat_with_haml(string, binding = nil)
-          if is_haml?
-            haml_buffer.buffer.concat(string)
-          else
-            concat_without_haml(string, binding)
-          end
-        end
-        alias_method :concat_without_haml, :concat
-        alias_method :concat, :concat_with_haml
-      end
-    end
-
     module TagHelper
       def content_tag_with_haml(name, *args, &block)
         return content_tag_without_haml(name, *args, &block) unless is_haml?
@@ -254,24 +238,3 @@ module ActionView
     end
   end
 end
-
-# Rails 2.3.6 uses #safe_concat in #fragment_for
-# rather than using #concat with an #html_safe string.
-# This fixes that issue.
-if Haml::Util.ap_2_3_6?
-  module ActionController::Caching::Fragments
-    def fragment_for(buffer, name = {}, options = nil, &block) #:nodoc:
-      if perform_caching
-        if cache = read_fragment(name, options)
-          buffer.concat(cache.html_safe)
-        else
-          pos = buffer.length
-          block.call
-          write_fragment(name, buffer[pos..-1], options)
-        end
-      else
-        block.call
-      end
-    end
-  end
-end

data/lib/haml/template.rb

@@ -3,6 +3,11 @@ require 'haml/engine'
 require 'haml/helpers/action_view_mods'
 require 'haml/helpers/action_view_extensions'
 
+if defined?(ActionPack::VERSION::STRING) &&
+    ActionPack::VERSION::STRING == "2.3.6"
+  raise "Haml does not support Rails 2.3.6. Please upgrade to 2.3.7 or later."
+end
+
 module Haml
   # The class that keeps track of the global options for Haml within Rails.
   module Template
@@ -64,28 +69,6 @@ else
   Haml::Template.try_enabling_xss_integration
 end
 
-# Rails 2.3.6 monkeypatches ERB in incompatible ways.
-# We fix our own subclass of ERB here so the Haml ERB filter
-# will continue to work.
-if Haml::Util.ap_2_3_6?
-  class Haml::Filters::ERB::RealERB
-    def set_eoutvar(compiler, eoutvar = '_erbout')
-      compiler.put_cmd = "#{eoutvar}.concat"
-      compiler.insert_cmd = "#{eoutvar}.concat"
-
-      cmd = []
-      cmd.push "#{eoutvar} = ''"
-
-      compiler.pre_cmd = cmd
-
-      cmd = []
-      cmd.push(eoutvar)
-
-      compiler.post_cmd = cmd
-    end
-  end
-end
-
 if Haml::Util.rails_root
   # Update init.rb to the current version
   # if it's out of date.

data/lib/haml/util.rb

@@ -324,20 +324,6 @@ module Haml
           $1.to_i >= 3))
     end
 
-    # Returns whether this environment is using ActionPack
-    # version 2.3.6 (or greater, up until 3.0.0).
-    #
-    # @return [Boolean]
-    def ap_2_3_6?
-      # Hopefully Rails 2.3.7 will fix the issues that this method hacks around,
-      # but for now we'll assume it won't
-      require 'action_pack'
-      defined?(ActionPack::VERSION::MAJOR) &&
-        ActionPack::VERSION::MAJOR == 2 &&
-        ActionPack::VERSION::MINOR == 3 &&
-        ActionPack::VERSION::TINY >= 6
-    end
-
     # Returns an ActionView::Template* class.
     # In pre-3.0 versions of Rails, most of these classes
     # were of the form `ActionView::TemplateFoo`,

data/test/linked_rails.rb

@@ -14,6 +14,9 @@ require 'action_view'
 begin
   # Necessary for Rails 3
   require 'rails'
+rescue LoadError
+  # Necessary for Rails 2.3.7
+  require 'initializer'
 rescue LoadError
 end
 
@@ -22,6 +25,10 @@ if defined?(Rails::Application) # Rails 3
     config.root = File.join(File.dirname(__FILE__), "../..")
   end
   Rails.application = TestApp
+elsif defined?(RAILS_ROOT)
+  RAILS_ROOT.replace(File.join(File.dirname(__FILE__), "../.."))
+else
+  RAILS_ROOT = File.join(File.dirname(__FILE__), "../..")
 end
 
 ActionController::Base.logger = Logger.new(nil)
@@ -31,5 +38,5 @@ ActionController::Base.logger = Logger.new(nil)
 # since we don't want to load the entirety of Rails.
 Dir[File.dirname(__FILE__) + '/plugins/*'].each do |plugin|
   $: << plugin + '/lib'
-  Object.new.instance_eval(File.read(plugin + '/init.rb'))
+  eval(File.read(plugin + '/init.rb'))
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 3
   - 0
-  - 5
-  version: 3.0.5
+  - 6
+  version: 3.0.6
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-23 00:00:00 -07:00
+date: 2010-05-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency