haml 4.0.1.rc.1 → 4.0.1

data/CHANGELOG.md

@@ -1,6 +1,8 @@
 # Haml Changelog
 
-## 4.0.1 (Unreleased)
+## 4.0.1
+
+Released March 21, 2013 ([diff](https://github.com/haml/haml/compare/4.0.0...4.0.1)).
 
 * Remove Rails 3.2.3+ textarea hack in favor of a more general solution.
 * Fix some performance regressions.
@@ -9,6 +11,10 @@
 (thanks [Alisdair McDiarmid](https://github.com/alisdair))
 * Fix support for sass-rails 4.0 beta.
 (thanks [Ryunosuke SATO](https://github.com/tricknotes))
+* Load "haml/template" in Railtie in order to prevent user options set in a
+  Rails initializer from being overwritten
+* Don't depend on Rails in haml/template to allow using Haml with ActionView
+  but without Rails itself. (thanks [Hunter Haydel](https://github.com/wedgex))
 
 ## 4.0.0
 

data/lib/haml/buffer.rb

@@ -156,7 +156,7 @@ module Haml
       <% end %>
 
       <% if ugly %>
-        fix_textareas!(result, nil) if toplevel? && result.include?('<textarea')
+        fix_textareas!(result) if toplevel? && result.include?('<textarea')
         return result
       <% else %>
         <% if !(in_tag && preserve_tag && !nuke_inner_whitespace) %>
@@ -184,7 +184,7 @@ module Haml
           <% if in_tag && !nuke_inner_whitespace %> result = tabs(tabulation) + result <% end %>
         end
 
-        fix_textareas!(result, tabs(tabulation)) if toplevel? && result.include?('<textarea')
+        fix_textareas!(result) if toplevel? && result.include?('<textarea')
 
         <% if in_tag && !nuke_inner_whitespace %>
           result = "\\n\#{result}\\n\#{tabs(tabulation-1)}"
@@ -271,14 +271,15 @@ RUBY
     # @param options [Hash] The options hash provided by the Haml::Buffer
     # @since Haml 4.0.1
     # @private
-    def fix_textareas!(input, tabs)
+    def fix_textareas!(input)
       pattern = /([ ]*)<(textarea)([^>]*)>(\n|&#x000A;)(.*?)(<\/\2>)/im
       input.gsub!(pattern) do |s|
         match = pattern.match(s)
         content = match[5]
-        unless tabs.nil?
-          content.sub!(match[1].to_s, '')
-          content.sub!(tabs, '')
+        if match[4] == '&#x000A;'
+          content.sub!(/\A /, '&#x0020;')
+        else
+          content.sub!(/\A[ ]*/, '')
         end
         "#{match[1]}<#{match[2]}#{match[3]}>\n#{content}</#{match[2]}>"
       end

data/lib/haml/railtie.rb

@@ -10,6 +10,7 @@ end
 module Haml
   class Railtie < ::Rails::Railtie
     initializer :haml do |app|
+      require "haml/template"
       if defined?(::Sass::Rails::SassTemplate) && app.config.assets.enabled
         require "haml/sass_rails_filter"
       end

data/lib/haml/template.rb

@@ -26,7 +26,7 @@ module Haml
 end
 
 
-Haml::Template.options[:ugly]        = !Rails.env.development?
+Haml::Template.options[:ugly] = defined?(Rails) ? !Rails.env.development? : true
 Haml::Template.options[:escape_html] = true
 
 require 'haml/template/plugin'

data/lib/haml/version.rb

@@ -1,3 +1,3 @@
 module Haml
-  VERSION = "4.0.1.rc.1"
+  VERSION = "4.0.1"
 end

data/test/helper_test.rb

@@ -33,6 +33,7 @@ class HelperTest < MiniTest::Unit::TestCase
   def setup
     @base = ActionView::Base.new
     @base.controller = ActionController::Base.new
+    @base.view_paths << File.expand_path("../templates", __FILE__)
 
     if defined?(ActionController::Response)
       # This is needed for >=3.0.0
@@ -137,24 +138,58 @@ HAML
                  render('= content_tag "pre", "Foo bar\n   baz"', :action_view))
   end
 
-  def test_text_area
-    regex = /<(textarea)[^>]*>(.*?)<\/\1>/im
-
-    # Rails >= 3.2.3 adds a newline after opening textarea tags.
+  # Rails >= 3.2.3 adds a newline after opening textarea tags.
+  def self.rails_text_area_helpers_emit_a_newline?
     major, minor, tiny = ActionPack::VERSION::MAJOR, ActionPack::VERSION::MINOR, ActionPack::VERSION::TINY
-    if major == 4 || ((major == 3) && (minor >= 2) && (tiny >= 3))
-      regex = /<(textarea)[^>]*>\n(.*?)<\/\1>/im
+    major == 4 || ((major == 3) && (minor >= 2) && (tiny >= 3))
+  end
+
+  def text_area_content_regex
+    @text_area_content_regex ||= if self.class.rails_text_area_helpers_emit_a_newline?
+      /<(textarea)[^>]*>\n(.*?)<\/\1>/im
+    else
+      /<(textarea)[^>]*>(.*?)<\/\1>/im
     end
+  end
 
+  def test_text_area_tag
     output = render('= text_area_tag "body", "Foo\nBar\n Baz\n   Boom"', :action_view)
-    match_data = output.match(regex)
+    match_data = output.match(text_area_content_regex)
     assert_equal "Foo&#x000A;Bar&#x000A; Baz&#x000A;   Boom", match_data[2]
+  end
 
+  def test_text_area
     output = render('= text_area :post, :body', :action_view)
-    match_data = output.match(regex)
+    match_data = output.match(text_area_content_regex)
     assert_equal "Foo bar&#x000A;baz", match_data[2]
   end
 
+  def test_partials_should_not_cause_textareas_to_be_indented
+    # non-indentation of textareas rendered inside partials
+    @base.instance_variable_set('@post', Post.new("Foo", nil, PostErrors.new))
+    output = render(".foo\n  .bar\n    = render '/text_area_helper'", :action_view)
+    match_data = output.match(text_area_content_regex)
+    assert_equal 'Foo', match_data[2]
+  end
+
+  if rails_text_area_helpers_emit_a_newline?
+    def test_textareas_should_prerve_leading_whitespace
+      # leading whitespace preservation
+      @base.instance_variable_set('@post', Post.new("    Foo", nil, PostErrors.new))
+      output = render(".foo\n  = text_area :post, :body", :action_view)
+      match_data = output.match(text_area_content_regex)
+      assert_equal '&#x0020;   Foo', match_data[2]
+    end
+
+    def test_textareas_should_prerve_leading_whitespace_in_partials
+      # leading whitespace in textareas rendered inside partials
+      @base.instance_variable_set('@post', Post.new("    Foo", nil, PostErrors.new))
+      output = render(".foo\n  .bar\n    = render '/text_area_helper'", :action_view)
+      match_data = output.match(text_area_content_regex)
+      assert_equal '&#x0020;   Foo', match_data[2]
+    end
+  end
+
   def test_capture_haml
     assert_equal(<<HTML, render(<<HAML))
 "<p>13</p>\\n"

data/test/templates/_text_area_helper.html.haml

@@ -0,0 +1,4 @@
+- defined?(text_area_helper) and nil # silence a warning
+.foo
+  .bar
+    = text_area :post, :body

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: haml
 version: !ruby/object:Gem::Version
-  prerelease: 6
-  version: 4.0.1.rc.1
+  prerelease: 
+  version: 4.0.1
 platform: ruby
 authors:
 - Nathan Weizenbaum
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000 Z
+date: 2013-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
@@ -144,10 +144,8 @@ files:
 - test/filters_test.rb
 - test/gemfiles/Gemfile.rails-3.0.x
 - test/gemfiles/Gemfile.rails-3.1.x
-- test/gemfiles/Gemfile.rails-3.1.x.lock
 - test/gemfiles/Gemfile.rails-3.2.x
 - test/gemfiles/Gemfile.rails-4.0.x
-- test/gemfiles/Gemfile.rails-4.0.x.lock
 - test/helper_test.rb
 - test/markaby/standard.mab
 - test/mocks/article.rb
@@ -179,6 +177,7 @@ files:
 - test/templates/_layout_for_partial.haml
 - test/templates/_partial.haml
 - test/templates/_text_area.haml
+- test/templates/_text_area_helper.html.haml
 - test/templates/action_view.haml
 - test/templates/action_view_ugly.haml
 - test/templates/breakage.haml
@@ -252,9 +251,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
   none: false
 requirements: []
 rubyforge_project: 

data/test/gemfiles/Gemfile.rails-3.1.x.lock

@@ -1,100 +0,0 @@
-PATH
-  remote: /Users/norman/work/haml
-  specs:
-    haml (4.0.1)
-      tilt
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (3.1.11)
-      actionpack (= 3.1.11)
-      mail (~> 2.3.3)
-    actionpack (3.1.11)
-      activemodel (= 3.1.11)
-      activesupport (= 3.1.11)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.6)
-      rack-cache (~> 1.2)
-      rack-mount (~> 0.8.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.0.4)
-    activemodel (3.1.11)
-      activesupport (= 3.1.11)
-      builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.11)
-      activemodel (= 3.1.11)
-      activesupport (= 3.1.11)
-      arel (~> 2.2.3)
-      tzinfo (~> 0.3.29)
-    activeresource (3.1.11)
-      activemodel (= 3.1.11)
-      activesupport (= 3.1.11)
-    activesupport (3.1.11)
-      multi_json (~> 1.0)
-    arel (2.2.3)
-    builder (3.0.4)
-    erubis (2.7.0)
-    hike (1.2.1)
-    i18n (0.6.2)
-    json (1.7.7)
-    mail (2.3.3)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.21)
-    minitest (4.6.1)
-    multi_json (1.6.1)
-    nokogiri (1.5.6)
-    polyglot (0.3.3)
-    rack (1.3.10)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
-    rack-ssl (1.3.3)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (3.1.11)
-      actionmailer (= 3.1.11)
-      actionpack (= 3.1.11)
-      activerecord (= 3.1.11)
-      activeresource (= 3.1.11)
-      activesupport (= 3.1.11)
-      bundler (~> 1.0)
-      railties (= 3.1.11)
-    railties (3.1.11)
-      actionpack (= 3.1.11)
-      activesupport (= 3.1.11)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (10.0.3)
-    rbench (0.2.3)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    sprockets (2.0.4)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    thor (0.14.6)
-    tilt (1.3.3)
-    treetop (1.4.12)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.35)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  haml!
-  minitest
-  nokogiri
-  rails (>= 3.1.0, < 3.2.0)
-  rbench

data/test/gemfiles/Gemfile.rails-4.0.x.lock

@@ -1,98 +0,0 @@
-PATH
-  remote: /Users/norman/work/haml
-  specs:
-    haml (4.0.1)
-      tilt
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (4.0.0.beta1)
-      actionpack (= 4.0.0.beta1)
-      mail (~> 2.5.3)
-    actionpack (4.0.0.beta1)
-      activesupport (= 4.0.0.beta1)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
-      rack (~> 1.5.2)
-      rack-test (~> 0.6.2)
-    activemodel (4.0.0.beta1)
-      activesupport (= 4.0.0.beta1)
-      builder (~> 3.1.0)
-    activerecord (4.0.0.beta1)
-      activemodel (= 4.0.0.beta1)
-      activerecord-deprecated_finders (~> 0.0.3)
-      activesupport (= 4.0.0.beta1)
-      arel (~> 4.0.0.beta1)
-    activerecord-deprecated_finders (0.0.3)
-    activesupport (4.0.0.beta1)
-      i18n (~> 0.6.2)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.33)
-    arel (4.0.0.beta1)
-    atomic (1.0.1)
-    builder (3.1.4)
-    erubis (2.7.0)
-    hike (1.2.1)
-    i18n (0.6.2)
-    json (1.7.7)
-    mail (2.5.3)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.21)
-    minitest (4.6.1)
-    multi_json (1.6.1)
-    nokogiri (1.5.6)
-    polyglot (0.3.3)
-    rack (1.5.2)
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (4.0.0.beta1)
-      actionmailer (= 4.0.0.beta1)
-      actionpack (= 4.0.0.beta1)
-      activerecord (= 4.0.0.beta1)
-      activesupport (= 4.0.0.beta1)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.0.beta1)
-      sprockets-rails (~> 2.0.0.rc3)
-    railties (4.0.0.beta1)
-      actionpack (= 4.0.0.beta1)
-      activesupport (= 4.0.0.beta1)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.17.0, < 2.0)
-    rake (10.0.3)
-    rbench (0.2.3)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    sprockets (2.9.0)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.0.0.rc3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (~> 2.8)
-    thor (0.17.0)
-    thread_safe (0.1.0)
-      atomic
-    tilt (1.3.3)
-    treetop (1.4.12)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.35)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.3.0)
-  haml!
-  minitest
-  nokogiri
-  rails (~> 4.0.0.beta.1)
-  rbench