haml 4.0.3 → 4.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ad1bdf5a3b2dd7640c52431d20dfb27e66abe5c
-  data.tar.gz: 65f0b74296b54a195fc96ee9a38b981a17044d73
+  metadata.gz: 2f98f3effc98f443e754cd0baeafe8e9ce7d7aee
+  data.tar.gz: 1e56de3d8a174339197799814a2a4d9bcdd968b5
 SHA512:
-  metadata.gz: 80b52becc93a09815980961c99e5c8cea42fddd48eb21c6d446f840e1271459bc71f72d21cee9ab05954eb5bbbad21cab5ce3449b73892873880b9407aedeed3
-  data.tar.gz: 18f0b05ebaf47f777b76ee5979d9cb2253be69f0918b797fab8afb22b440275aea29c3e51b1fb02981646665cb29b85377484062c9ce9b5e888092f4ecaafed8
+  metadata.gz: 1795165acc4cd57c84e7c06184158f09b78a51c6e32c870366c90ab351e43d66f624b7928dd33238e17dcdfa8936bf14cdea0ff8a2e4462c5e4316111a052a92
+  data.tar.gz: 05f439cebe3f90c3f35aa418dd2064fea98884842ae6049761c54da10ce20da250768a300f8b0e3c29d91df84e349c1f1fac11dbebb2b0c86090146cda155956

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Haml Changelog
 
+=======
+
+## 4.0.4
+
+Released on November 5, 2013 ([diff](https://github.com/haml/haml/compare/4.0.3...4.0.4)).
+
+* Check for Rails::Railtie rather than Rails (thanks [Konstantin Shabanov](https://github.com/etehtsea)).
+* Parser fix to allow literal '#' with suppress_eval (Matt Wildig).
+* Helpers#escape_once works on frozen strings (as does
+  ERB::Util.html_escape_once for which it acts as a replacement in
+  Rails (thanks [Patrik Metzmacher](https://github.com/patrik)).
+* Minor test fix (thanks [Mircea Moise](https://github.com/mmircea16)).
+
 ## 4.0.3
 
 Released May 21, 2013 ([diff](https://github.com/haml/haml/compare/4.0.2...4.0.3)).

data/REFERENCE.md

@@ -622,6 +622,13 @@ is compiled to:
       Hello!
     </div>
 
+The `:class` attribute may be used in conjunction with an object
+reference.  The compiled element will have the union of all classes.
+
+    - user = User.find(1)
+    %p[user]{:class => 'alpha bravo'}
+    <p id="user_1" class="alpha bravo user"></p>
+
 ## Doctype: `!!!`
 
 When describing HTML documents with Haml, you can have a document type or XML
@@ -941,7 +948,7 @@ Ruby string interpolation. For example,
 
 is the same as
 
-    %p= "This is the #{h quality} cake!"
+    %p= "This is #{h quality} cake!"
 
 and might compile to:
 

data/lib/haml.rb

@@ -20,4 +20,4 @@ end
 
 require 'haml/util'
 require 'haml/engine'
-require 'haml/railtie' if defined?(Rails)
+require 'haml/railtie' if defined?(Rails::Railtie)

data/lib/haml/helpers.rb

@@ -564,14 +564,12 @@ MESSAGE
       # @return [String] The sanitized string
       def escape_once(text)
         text = text.to_s
-        text.gsub!(HTML_ESCAPE_ONCE_REGEX, HTML_ESCAPE)
-        text
+        text.gsub(HTML_ESCAPE_ONCE_REGEX, HTML_ESCAPE)
       end
     else
       def escape_once(text)
         text = text.to_s
-        text.gsub!(HTML_ESCAPE_ONCE_REGEX){|s| HTML_ESCAPE[s]}
-        text
+        text.gsub(HTML_ESCAPE_ONCE_REGEX){|s| HTML_ESCAPE[s]}
       end
     end
 

data/lib/haml/helpers/action_view_mods.rb

@@ -49,11 +49,11 @@ module ActionView
             elsif value.is_a?(String)
               value
             else
-              ''
+              nil
             end
           # NonCattingString is present in Rails less than 3.1.0. When support
           # for 3.0 is dropped, this can be removed.
-          return ActionView::NonConcattingString.new(str) if defined?(ActionView::NonConcattingString)
+          return ActionView::NonConcattingString.new(str) if str && defined?(ActionView::NonConcattingString)
           return str
         else
           capture_without_haml(*args, &block)

data/lib/haml/parser.rb

@@ -83,8 +83,7 @@ module Haml
     DOCTYPE_REGEX = /(\d(?:\.\d)?)?[\s]*([a-z]*)\s*([^ ]+)?/i
 
     # The Regex that matches a literal string or symbol value
-    LITERAL_VALUE_REGEX = /:(\w*)|(["'])((?![\\#]|\2).|\\.)*\2/
-
+    LITERAL_VALUE_REGEX = /:(\w*)|(["'])((?!\\|\#{|\#@|\#\$|\2).|\\.)*\2/
 
     def initialize(template, options)
       # :eod is a special end-of-document marker

data/lib/haml/version.rb

@@ -1,3 +1,3 @@
 module Haml
-  VERSION = "4.0.3"
+  VERSION = "4.0.4"
 end

data/test/engine_test.rb

@@ -1376,12 +1376,26 @@ HAML
     assert_equal("<a b='a, b'></a>\n", render("%a{:b => 'a, b'}", :suppress_eval => true))
     assert_equal("<a b='a\tb'></a>\n", render('%a{:b => "a\tb"}', :suppress_eval => true))
     assert_equal("<a b='a\#{foo}b'></a>\n", render('%a{:b => "a\\#{foo}b"}', :suppress_eval => true))
+    assert_equal("<a b='#f00'></a>\n", render("%a{:b => '#f00'}", :suppress_eval => true))
   end
 
   def test_dynamic_hashes_with_suppress_eval
     assert_equal("<a></a>\n", render('%a{:b => "a #{1 + 1} b", :c => "d"}', :suppress_eval => true))
   end
 
+  def test_interpolates_instance_vars_in_attribute_values
+    scope = Object.new
+    scope.instance_variable_set :@foo, 'bar'
+    assert_equal("<a b='a bar b'></a>\n", render('%a{:b => "a #@foo b"}', :scope => scope))
+  end
+
+  def test_interpolates_global_vars_in_attribute_values
+    # make sure the value isn't just interpolated in during template compilation
+    engine = Haml::Engine.new('%a{:b => "a #$global_var_for_testing b"}')
+    $global_var_for_testing = 'bar'
+    assert_equal("<a b='a bar b'></a>\n", engine.to_html)
+  end
+
   def test_utf8_attrs
     assert_equal("<a href='héllo'></a>\n", render("%a{:href => 'héllo'}"))
     assert_equal("<a href='héllo'></a>\n", render("%a(href='héllo')"))

data/test/helper_test.rb

@@ -403,6 +403,18 @@ HAML
     assert_equal("foo\n", render("= capture { 'foo' }", :action_view))
   end
 
+  def test_capture_with_non_string_value_reurns_nil
+    Haml::Helpers.module_eval do
+      def check_capture_returns_nil(&block)
+        contents = capture(&block)
+
+        contents << "ERROR" if contents
+      end
+    end
+
+    assert_equal("\n", render("= check_capture_returns_nil { 2 }", :action_view))
+  end
+
   def test_find_and_preserve_with_block
     assert_equal("<pre>Foo&#x000A;Bar</pre>\nFoo\nBar\n",
                  render("= find_and_preserve do\n  %pre\n    Foo\n    Bar\n  Foo\n  Bar"))
@@ -541,5 +553,13 @@ HAML
     $stderr = old_stderr
   end
 
+  def test_escape_once_should_work_on_frozen_strings
+    begin
+      Haml::Helpers.escape_once('foo'.freeze)
+    rescue => e
+      flunk e.message
+    end
+  end
+
 end
 

data/test/results/partial_layout_erb.xhtml

@@ -1,5 +1,5 @@
 <h1>Partial layout used with for block:</h1>
 <div class='partial-layout'>
   <h2>This is inside a partial layout</h2>
-  <p>Some content within a layout</p>
+  Some content within a layout
 </div>

data/test/templates/partial_layout_erb.erb

@@ -1,4 +1,4 @@
 <h1>Partial layout used with for block:</h1>
 <%= render :layout => 'layout_for_partial' do -%>
-<p>Some content within a layout</p>
+Some content within a layout
 <% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.0.4
 platform: ruby
 authors:
 - Nathan Weizenbaum
@@ -10,78 +10,78 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-21 00:00:00.000000000 Z
+date: 2013-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  type: :runtime
   name: tilt
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  type: :development
   name: rails
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
-  type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
+  type: :development
   name: rbench
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  type: :development
   name: minitest
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  type: :development
   name: nokogiri
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
+        version: 1.5.10
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.10
 description: |
   Haml (HTML Abstraction Markup Language) is a layer on top of HTML or XML that's
   designed to express the structure of documents in a non-repetitive, elegant, and
@@ -96,45 +96,47 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/haml.rb
 - lib/haml/buffer.rb
 - lib/haml/compiler.rb
 - lib/haml/engine.rb
 - lib/haml/error.rb
 - lib/haml/exec.rb
 - lib/haml/filters.rb
-- lib/haml/helpers/action_view_extensions.rb
-- lib/haml/helpers/action_view_mods.rb
-- lib/haml/helpers/action_view_xss_mods.rb
-- lib/haml/helpers/safe_erubis_template.rb
-- lib/haml/helpers/xss_mods.rb
 - lib/haml/helpers.rb
 - lib/haml/options.rb
 - lib/haml/parser.rb
 - lib/haml/railtie.rb
 - lib/haml/sass_rails_filter.rb
-- lib/haml/template/options.rb
-- lib/haml/template/plugin.rb
 - lib/haml/template.rb
 - lib/haml/util.rb
 - lib/haml/version.rb
-- lib/haml.rb
+- lib/haml/helpers/action_view_extensions.rb
+- lib/haml/helpers/action_view_mods.rb
+- lib/haml/helpers/action_view_xss_mods.rb
+- lib/haml/helpers/safe_erubis_template.rb
+- lib/haml/helpers/xss_mods.rb
+- lib/haml/template/options.rb
+- lib/haml/template/plugin.rb
 - bin/haml
 - test/engine_test.rb
+- test/filters_test.rb
+- test/helper_test.rb
+- test/parser_test.rb
+- test/template_test.rb
+- test/test_helper.rb
+- test/util_test.rb
 - test/erb/_av_partial_1.erb
 - test/erb/_av_partial_2.erb
 - test/erb/action_view.erb
 - test/erb/standard.erb
-- test/filters_test.rb
 - test/gemfiles/Gemfile.rails-3.0.x
 - test/gemfiles/Gemfile.rails-3.1.x
 - test/gemfiles/Gemfile.rails-3.2.x
-- test/gemfiles/Gemfile.rails-3.2.x.lock
 - 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
-- test/parser_test.rb
 - test/results/content_for_layout.xhtml
 - test/results/eval_suppressed.xhtml
 - test/results/helpers.xhtml
@@ -153,7 +155,6 @@ files:
 - test/results/tag_parsing.xhtml
 - test/results/very_basic.xhtml
 - test/results/whitespace_handling.xhtml
-- test/template_test.rb
 - test/templates/_av_partial_1.haml
 - test/templates/_av_partial_1_ugly.haml
 - test/templates/_av_partial_2.haml
@@ -186,10 +187,8 @@ files:
 - test/templates/tag_parsing.haml
 - test/templates/very_basic.haml
 - test/templates/whitespace_handling.haml
-- test/test_helper.rb
-- test/util_test.rb
 - Rakefile
-- .yardopts
+- ".yardopts"
 - CHANGELOG.md
 - FAQ.md
 - MIT-LICENSE
@@ -220,17 +219,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.5
 signing_key: 
 specification_version: 4
 summary: An elegant, structured (X)HTML/XML templating engine.

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

@@ -1,98 +0,0 @@
-PATH
-  remote: /Users/norman/work/haml
-  specs:
-    haml (4.0.3)
-      tilt
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (3.2.13)
-      actionpack (= 3.2.13)
-      mail (~> 2.5.3)
-    actionpack (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    builder (3.0.4)
-    erubis (2.7.0)
-    hike (1.2.2)
-    i18n (0.6.1)
-    journey (1.0.4)
-    json (1.8.0)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.23)
-    minitest (4.7.4)
-    multi_json (1.7.3)
-    nokogiri (1.5.9)
-    polyglot (0.3.3)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.3)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (3.2.13)
-      actionmailer (= 3.2.13)
-      actionpack (= 3.2.13)
-      activerecord (= 3.2.13)
-      activeresource (= 3.2.13)
-      activesupport (= 3.2.13)
-      bundler (~> 1.0)
-      railties (= 3.2.13)
-    railties (3.2.13)
-      actionpack (= 3.2.13)
-      activesupport (= 3.2.13)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.0.4)
-    rbench (0.2.3)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    sprockets (2.2.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    thor (0.18.1)
-    tilt (1.4.1)
-    treetop (1.4.12)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  haml!
-  minitest
-  nokogiri
-  rails (>= 3.2.0, < 3.3.0)
-  rbench