haml 3.2.0.beta.3 → 3.2.0.rc.1

data/CHANGELOG.md

@@ -30,6 +30,12 @@
   a language change from 3.1 and is enabled by default.
   (thanks to [Andrew Smith](https://github.com/fullsailor))
 
+* All Hash attribute values are now treated as HTML5 data, regardless of key.
+  Previously only the "data" key was treated this way. Allowing arbitrary keys
+  means you can now easily use this feauture for Aria attributes, among other
+  uses.
+  (thanks to [Elvin Efendi](https://github.com/ElvinEfendi))
+
 * Added `remove_whitespace` option to always remove all whitespace around Haml
   tags. (thanks to [Tim van der Horst](https://github.com/vdh))
 
@@ -86,6 +92,11 @@
 * Fix multiline silent comments: Haml previously did not allow free indentation
   inside multline silent comments.
 
+* Fix ordering bug with partial layouts on Rails.
+  (thanks [Sam Pohlenz](https://github.com/spohlenz))
+
+* Add command-line option to suppress script evaluation.
+
 ## 3.1.6
 
 * In indented mode, don't reindent buffers that contain preserved tags, and

data/Rakefile

@@ -4,7 +4,7 @@ require "rubygems/package_task"
 
 task :default => :test
 
-CLEAN.replace %w(pkg doc coverage .yardoc)
+CLEAN.replace %w(pkg doc coverage .yardoc test/haml vendor)
 
 def silence_warnings
   the_real_stderr, $stderr = $stderr, StringIO.new

data/lib/haml.rb

@@ -6,7 +6,6 @@ require 'haml/version'
 # * {Haml::Compiler} is Haml's compiler.
 # * {Haml::Engine} is the class used to render Haml within Ruby code.
 # * {Haml::Options} is where Haml's runtime options are defined.
-# * {Haml::Engine} is the class used to render Haml within Ruby code.
 # * {Haml::Error} is raised when Haml encounters an error.
 #
 # Also see the {file:REFERENCE.md full Haml reference}.

data/lib/haml/compiler.rb

@@ -47,13 +47,18 @@ module Haml
       precompiled + ";" + precompiled_method_return_value
     end
 
-    # Returns the precompiled string with the preamble and postamble
+    # Returns the precompiled string with the preamble and postamble.
+    #
+    # Initializes to ActionView::OutputBuffer when available; this is necessary
+    # to avoid ordering issues with partial layouts in Rails. If not available,
+    # initializes to nil.
     def precompiled_with_ambles(local_names)
       preamble = <<END.gsub("\n", ";")
 begin
 extend Haml::Helpers
 _hamlout = @haml_buffer = Haml::Buffer.new(haml_buffer, #{options.for_buffer.inspect})
 _erbout = _hamlout.buffer
+@output_buffer = output_buffer ||= ActionView::OutputBuffer.new rescue nil
 END
       postamble = <<END.gsub("\n", ";")
 #{precompiled_method_return_value}
@@ -410,12 +415,14 @@ END
       other_quote_char = attr_wrapper == '"' ? "'" : '"'
       join_char        = hyphenate_data_attrs ? '-' : '_'
 
-      if attributes['data'].is_a?(Hash)
-        data_attributes = attributes.delete('data')
-        data_attributes = flatten_data_attributes(data_attributes, '', join_char)
-        data_attributes = build_data_keys(data_attributes, hyphenate_data_attrs)
-        attributes = data_attributes.merge(attributes)
-      end
+      attributes.each do |key, value|
+      	if value.is_a?(Hash)
+        	data_attributes = attributes.delete(key)
+        	data_attributes = flatten_data_attributes(data_attributes, '', join_char)
+        	data_attributes = build_data_keys(data_attributes, hyphenate_data_attrs, key)
+        	attributes = data_attributes.merge(attributes)
+      	end
+			end
 
       result = attributes.collect do |attr, value|
         next if value.nil?
@@ -465,14 +472,14 @@ END
       return !value.empty? && value
     end
 
-    def self.build_data_keys(data_hash, hyphenate)
+    def self.build_data_keys(data_hash, hyphenate, attr_name="data")
       Hash[data_hash.map do |name, value|
         if name == nil
-          ["data", value]
+          [attr_name, value]
         elsif hyphenate
-          ["data-#{name.to_s.gsub(/_/, '-')}", value]
+          ["#{attr_name}-#{name.to_s.gsub(/_/, '-')}", value]
         else
-          ["data-#{name}", value]
+          ["#{attr_name}-#{name}", value]
         end
       end]
     end

data/lib/haml/exec.rb

@@ -241,6 +241,11 @@ END
                 'Always add CDATA sections to javascript and css blocks.') do
           @options[:for_engine][:cdata] = true
         end
+        
+        opts.on('--suppress-eval',
+                'Don\'t evaluate Ruby scripts.') do
+          @options[:for_engine][:suppress_eval] = true
+        end
 
         opts.on('-r', '--require FILE', "Same as 'ruby -r'.") do |file|
           @options[:requires] << file

data/lib/haml/helpers.rb

@@ -611,8 +611,8 @@ MESSAGE
     # @return [Proc] A new proc with the new variables bound
     def haml_bind_proc(&proc)
       _hamlout = haml_buffer
-      _erbout = _hamlout.buffer
-      _erbout.to_s #"use" the variable to silence warnings
+      #double assignment is to avoid warnings
+      _erbout = _erbout = _hamlout.buffer
       proc { |*args| proc.call(*args) }
     end
   end

data/lib/haml/helpers/action_view_mods.rb

@@ -39,7 +39,8 @@ module ActionView
     module CaptureHelper
       def capture_with_haml(*args, &block)
         if Haml::Helpers.block_is_haml?(block)
-          _hamlout = eval('_hamlout', block.binding) # Necessary since capture_haml checks _hamlout
+          #double assignment is to avoid warnings
+          _hamlout = _hamlout = eval('_hamlout', block.binding) # Necessary since capture_haml checks _hamlout
           value = nil
           buffer = capture_haml(*args) { value = yield(*args) }
           str =

data/lib/haml/template/plugin.rb

@@ -16,7 +16,11 @@ module Haml
 
     def compile(template)
       options = Haml::Template.options.dup
-      options[:mime_type] = template.mime_type if template.respond_to? :mime_type
+      if template.respond_to? :type
+        options[:mime_type] = template.type
+      elsif template.respond_to? :mime_type
+        options[:mime_type] = template.mime_type
+      end
       options[:filename] = template.identifier
       Haml::Engine.new(template.source, options).compiler.precompiled_with_ambles([])
     end

data/lib/haml/version.rb

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

data/test/engine_test.rb

@@ -92,19 +92,23 @@ class EngineTest < MiniTest::Unit::TestCase
     end
   end
 
-  def render(text, options = {}, &block)
-    scope  = options.delete(:scope)  || Object.new
-    locals = options.delete(:locals) || {}
-    engine(text, options).to_html(scope, locals, &block)
-  end
-
-  def engine(text, options = {})
+  def use_test_tracing(options)
     unless options[:filename]
       # use caller method name as fake filename. useful for debugging
       i = -1
       caller[i+=1] =~ /`(.+?)'/ until $1 and $1.index('test_') == 0
       options[:filename] = "(#{$1})"
     end
+    options
+  end
+
+  def render(text, options = {}, &block)
+    options = use_test_tracing(options)
+    super
+  end
+
+  def engine(text, options = {})
+    options = use_test_tracing(options)
     Haml::Engine.new(text, options)
   end
 
@@ -1430,6 +1434,13 @@ HAML
       render("%div{:data => {:foo_bar => 'blip', :baz => 'bang'}}"))
   end
 
+	def test_html5_arbitrary_hash_valued_attributes_with
+    assert_equal("<div aria-foo='blip'></div>\n",
+      render("%div{:aria => {:foo => 'blip'}}"))
+    assert_equal("<div foo-baz='bang'></div>\n",
+      render("%div{:foo => {:baz => 'bang'}}"))
+	end
+
   def test_html5_data_attributes_with_nested_hash
     assert_equal("<div data-a-b='c'></div>\n", render(<<-HAML))
 - hash = {:a => {:b => 'c'}}

data/test/gemfiles/Gemfile.rails-master

@@ -0,0 +1,7 @@
+source :rubygems
+
+gem 'rails', git: 'git://github.com/rails/rails.git'
+gem 'journey', git: 'git://github.com/rails/journey.git'
+gem 'activerecord-deprecated_finders', git: 'git://github.com/rails/activerecord-deprecated_finders.git'
+gemspec :path => "../.."
+

data/test/gemfiles/Gemfile.rails-master.lock

@@ -0,0 +1,111 @@
+GIT
+  remote: git://github.com/rails/activerecord-deprecated_finders.git
+  revision: fe150f26f009cef370658b7c19db1629b2448952
+  specs:
+    activerecord-deprecated_finders (0.0.1)
+
+GIT
+  remote: git://github.com/rails/journey.git
+  revision: 850267edd7f19633a6868110d523f86f147c1653
+  specs:
+    journey (2.0.0.20120723141804)
+
+GIT
+  remote: git://github.com/rails/rails.git
+  revision: 8815de7b427196f00bd9f3406377928c2c269e22
+  specs:
+    actionmailer (4.0.0.beta)
+      actionpack (= 4.0.0.beta)
+      mail (~> 2.4.4)
+    actionpack (4.0.0.beta)
+      activesupport (= 4.0.0.beta)
+      builder (~> 3.1.0)
+      erubis (~> 2.7.0)
+      journey (~> 2.0.0)
+      rack (~> 1.4.1)
+      rack-test (~> 0.6.1)
+    activemodel (4.0.0.beta)
+      activesupport (= 4.0.0.beta)
+      builder (~> 3.1.0)
+    activerecord (4.0.0.beta)
+      activemodel (= 4.0.0.beta)
+      activerecord-deprecated_finders (= 0.0.1)
+      activesupport (= 4.0.0.beta)
+      arel (~> 3.0.2)
+    activesupport (4.0.0.beta)
+      i18n (~> 0.6)
+      minitest (~> 4.1)
+      multi_json (~> 1.3)
+      tzinfo (~> 0.3.33)
+    rails (4.0.0.beta)
+      actionmailer (= 4.0.0.beta)
+      actionpack (= 4.0.0.beta)
+      activerecord (= 4.0.0.beta)
+      activesupport (= 4.0.0.beta)
+      bundler (~> 1.2)
+      railties (= 4.0.0.beta)
+      sprockets-rails (~> 1.0)
+    railties (4.0.0.beta)
+      actionpack (= 4.0.0.beta)
+      activesupport (= 4.0.0.beta)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.15.4, < 2.0)
+
+PATH
+  remote: /Users/norman/work/haml/haml
+  specs:
+    haml (4.0.0.alpha.0)
+      tilt
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    arel (3.0.2)
+    builder (3.1.3)
+    erubis (2.7.0)
+    hike (1.2.1)
+    i18n (0.6.1)
+    json (1.7.5)
+    mail (2.4.4)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.19)
+    minitest (4.1.0)
+    multi_json (1.3.6)
+    nokogiri (1.5.5)
+    polyglot (0.3.3)
+    rack (1.4.1)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rake (0.9.2.2)
+    rbench (0.2.3)
+    rdoc (3.12)
+      json (~> 1.4)
+    sprockets (2.3.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (1.0.0)
+      railties (>= 4.0.0.beta, < 5.0)
+      sprockets (~> 2.3.1)
+    thor (0.16.0)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.33)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord-deprecated_finders!
+  haml!
+  journey!
+  minitest
+  nokogiri
+  rails!
+  rbench

data/test/helper_test.rb

@@ -43,12 +43,8 @@ class HelperTest < MiniTest::Unit::TestCase
   end
 
   def render(text, options = {})
-    if options == :action_view
-      @base.render :inline => text, :type => :haml
-    else
-      scope = options.delete :scope_object
-      Haml::Engine.new(text, options).to_html(scope ? scope : Object.new)
-    end
+    return @base.render :inline => text, :type => :haml if options == :action_view
+    super
   end
 
   def test_flatten
@@ -185,14 +181,12 @@ HAML
 
   def test_content_tag_error_wrapping
     def @base.protect_against_forgery?; false; end
-    assert_equal(<<HTML, render(<<HAML, :action_view))
-<form accept-charset="UTF-8" action="" method="post">#{rails_form_opener}
-  <div class="field_with_errors"><label for="post_error_field">Error field</label></div>
-</form>
-HTML
+    output = render(<<HAML, :action_view)
 = form_for @post, :as => :post, :html => {:class => nil, :id => nil}, :url => '' do |f|
   = f.label 'error_field'
 HAML
+    fragment = Nokogiri::HTML.fragment(output)
+    refute_nil fragment.css('form div.field_with_errors label[for=post_error_field]').first
   end
 
   def test_form_tag_in_helper_with_string_block
@@ -350,7 +344,7 @@ HAML
   def test_page_class
     controller = Struct.new(:controller_name, :action_name).new('troller', 'tion')
     scope = Struct.new(:controller).new(controller)
-    result = render("%div{:class => page_class} MyDiv", :scope_object => scope)
+    result = render("%div{:class => page_class} MyDiv", :scope => scope)
     expected = "<div class='troller tion'>MyDiv</div>\n"
     assert_equal expected, result
   end

data/test/results/partial_layout_erb.xhtml

@@ -0,0 +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>
+</div>

data/test/template_test.rb

@@ -44,7 +44,7 @@ class TemplateTest < MiniTest::Unit::TestCase
     whitespace_handling    original_engine   list        helpful
     silent_script          tag_parsing       just_stuff  partials
     nuke_outer_whitespace  nuke_inner_whitespace
-    render_layout partial_layout}
+    render_layout partial_layout partial_layout_erb}
 
   def setup
     @base = create_base
@@ -68,10 +68,10 @@ class TemplateTest < MiniTest::Unit::TestCase
     base
   end
 
-  def render(text, opts = {})
-    return @base.render(:inline => text, :type => :haml) if opts == :action_view
-    opts = opts.merge(:format => :xhtml)
-    Haml::Engine.new(text, opts).to_html(@base)
+  def render(text, options = {})
+    return @base.render(:inline => text, :type => :haml) if options == :action_view
+    options = options.merge(:format => :xhtml)
+    super(text, options, @base)
   end
 
   def load_result(name)
@@ -216,16 +216,13 @@ END
   end
 
   def test_form_builder_label_with_block
-    assert_equal(<<HTML, render(<<HAML, :action_view))
-<form accept-charset="UTF-8" action="" method="post">#{rails_form_opener}
-  <label for="article_title">Block content
-  </label>
-</form>
-HTML
+    output = render(<<HAML, :action_view)
 = form_for @article, :as => :article, :html => {:class => nil, :id => nil}, :url => '' do |f|
   = f.label :title do
     Block content
 HAML
+    fragment = Nokogiri::HTML.fragment output
+    assert_equal "Block content", fragment.css('form label').first.content.strip
   end
 
   ## XSS Protection Tests
@@ -310,23 +307,6 @@ HTML
 HAML
   end
 
-  def test_xss_protection_with_form_for
-    assert_equal(<<HTML, render(<<HAML, :action_view))
-<form accept-charset="UTF-8" action="" method="post">#{rails_form_opener}
-  Title:
-  <input id="article_title" name="article[title]" size="30" type="text" value="Hello" />
-  Body:
-  <input id="article_body" name="article[body]" size="30" type="text" value="World" />
-</form>
-HTML
-= form_for @article, :as => :article, :html => {:class => nil, :id => nil}, :url => '' do |f|
-  Title:
-  = f.text_field :title
-  Body:
-  = f.text_field :body
-HAML
-  end
-
   if defined?(ActionView::Helpers::PrototypeHelper)
     def test_rjs
       assert_equal(<<HTML, render(<<HAML, :action_view))

data/test/templates/partial_layout_erb.erb

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

data/test/test_helper.rb

@@ -10,6 +10,7 @@ require 'minitest/autorun'
 require 'action_pack'
 require 'action_controller'
 require 'action_view'
+require 'nokogiri'
 
 require 'rails'
 class TestApp < Rails::Application
@@ -39,10 +40,12 @@ class MiniTest::Unit::TestCase
 
   extend Declarative
 
-  def render(text, options = {}, &block)
+  def render(text, options = {}, base = nil, &block)
     scope  = options.delete(:scope)  || Object.new
     locals = options.delete(:locals) || {}
-    Haml::Engine.new(text, options).to_html(scope, locals, &block)
+    engine = Haml::Engine.new(text, options)
+    return engine.to_html(base) if base
+    engine.to_html(scope, locals, &block)
   end
 
   def assert_warning(message)
@@ -79,4 +82,4 @@ class MiniTest::Unit::TestCase
     Haml::Error.message(*args)
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml
 version: !ruby/object:Gem::Version
-  version: 3.2.0.beta.3
+  version: 3.2.0.rc.1
   prerelease: 6
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-19 00:00:00.000000000 Z
+date: 2012-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -77,6 +77,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! 'Haml (HTML Abstraction Markup Language) is a layer on top of HTML
   or XML that''s
 
@@ -97,7 +113,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- rails/init.rb
 - lib/haml/buffer.rb
 - lib/haml/compiler.rb
 - lib/haml/engine.rb
@@ -129,6 +144,8 @@ files:
 - 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-master
+- test/gemfiles/Gemfile.rails-master.lock
 - test/haml-spec/LICENSE
 - test/haml-spec/lua_haml_spec.lua
 - test/haml-spec/perl_haml_test.pl
@@ -149,6 +166,7 @@ files:
 - test/results/nuke_outer_whitespace.xhtml
 - test/results/original_engine.xhtml
 - test/results/partial_layout.xhtml
+- test/results/partial_layout_erb.xhtml
 - test/results/partials.xhtml
 - test/results/render_layout.xhtml
 - test/results/silent_script.xhtml
@@ -178,6 +196,7 @@ files:
 - test/templates/nuke_outer_whitespace.haml
 - test/templates/original_engine.haml
 - test/templates/partial_layout.haml
+- test/templates/partial_layout_erb.erb
 - test/templates/partialize.haml
 - test/templates/partials.haml
 - test/templates/render_layout.haml
@@ -190,7 +209,6 @@ files:
 - test/test_helper.rb
 - test/util_test.rb
 - Rakefile
-- init.rb
 - .yardopts
 - CHANGELOG.md
 - FAQ.md

data/init.rb

@@ -1 +0,0 @@
-require "haml"

data/rails/init.rb

@@ -1 +0,0 @@
-Kernel.load File.join(File.dirname(__FILE__), '..', 'init.rb')