haml 4.1.0.beta.1 → 5.0.0.beta.2

data/test/util_test.rb

@@ -1,20 +1,8 @@
 require 'test_helper'
 
-class UtilTest < MiniTest::Unit::TestCase
+class UtilTest < Haml::TestCase
   include Haml::Util
 
-  def test_powerset
-    assert_equal([[].to_set].to_set,
-      powerset([]))
-    assert_equal([[].to_set, [1].to_set].to_set,
-      powerset([1]))
-    assert_equal([[].to_set, [1].to_set, [2].to_set, [1, 2].to_set].to_set,
-      powerset([1, 2]))
-    assert_equal([[].to_set, [1].to_set, [2].to_set, [3].to_set,
-        [1, 2].to_set, [2, 3].to_set, [1, 3].to_set, [1, 2, 3].to_set].to_set,
-      powerset([1, 2, 3]))
-  end
-
   def test_silence_warnings
     old_stderr, $stderr = $stderr, StringIO.new
     warn "Out"
@@ -25,41 +13,6 @@ class UtilTest < MiniTest::Unit::TestCase
     $stderr = old_stderr
   end
 
-  def test_caller_info
-    assert_equal(["/tmp/foo.rb", 12, "fizzle"], caller_info("/tmp/foo.rb:12: in `fizzle'"))
-    assert_equal(["/tmp/foo.rb", 12, nil], caller_info("/tmp/foo.rb:12"))
-    assert_equal(["(haml)", 12, "blah"], caller_info("(haml):12: in `blah'"))
-    assert_equal(["", 12, "boop"], caller_info(":12: in `boop'"))
-    assert_equal(["/tmp/foo.rb", -12, "fizzle"], caller_info("/tmp/foo.rb:-12: in `fizzle'"))
-    assert_equal(["/tmp/foo.rb", 12, "fizzle"], caller_info("/tmp/foo.rb:12: in `fizzle {}'"))
-  end
-
-  def test_def_static_method
-    klass = Class.new
-    def_static_method(klass, :static_method, [:arg1, :arg2],
-      :sarg1, :sarg2, <<RUBY)
-      s = "Always " + arg1
-      s << " <% if sarg1 %>and<% else %>but never<% end %> " << arg2
-
-      <% if sarg2 %>
-        s << "."
-      <% end %>
-RUBY
-    c = klass.new
-    assert_equal("Always brush your teeth and comb your hair.",
-      c.send(static_method_name(:static_method, true, true),
-        "brush your teeth", "comb your hair"))
-    assert_equal("Always brush your teeth and comb your hair",
-      c.send(static_method_name(:static_method, true, false),
-        "brush your teeth", "comb your hair"))
-    assert_equal("Always brush your teeth but never play with fire.",
-      c.send(static_method_name(:static_method, false, true),
-        "brush your teeth", "play with fire"))
-    assert_equal("Always brush your teeth but never play with fire",
-      c.send(static_method_name(:static_method, false, false),
-        "brush your teeth", "play with fire"))
-  end
-
   def test_check_encoding_does_not_destoy_the_given_string
     string_with_bom = File.read(File.dirname(__FILE__) + '/templates/with_bom.haml', :encoding => Encoding::UTF_8)
     original = string_with_bom.dup

metadata

@@ -1,17 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: haml
 version: !ruby/object:Gem::Version
-  version: 4.1.0.beta.1
+  version: 5.0.0.beta.2
 platform: ruby
 authors:
-- Nathan Weizenbaum
+- Natalie Weizenbaum
 - Hampton Catlin
 - Norman Clarke
+- Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-07 00:00:00.000000000 Z
+date: 2017-02-26 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: temple
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -32,14 +47,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: rbench
   requirement: !ruby/object:Gem::Requirement
@@ -58,30 +73,30 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '0'
 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
@@ -105,40 +120,51 @@ files:
 - Rakefile
 - bin/haml
 - lib/haml.rb
+- lib/haml/attribute_builder.rb
+- lib/haml/attribute_compiler.rb
+- lib/haml/attribute_parser.rb
 - lib/haml/buffer.rb
 - lib/haml/compiler.rb
 - lib/haml/engine.rb
 - lib/haml/error.rb
+- lib/haml/escapable.rb
 - lib/haml/exec.rb
 - lib/haml/filters.rb
+- lib/haml/generator.rb
 - lib/haml/helpers.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_erubi_template.rb
 - lib/haml/helpers/safe_erubis_template.rb
 - lib/haml/helpers/xss_mods.rb
 - lib/haml/options.rb
 - lib/haml/parser.rb
+- lib/haml/plugin.rb
 - lib/haml/railtie.rb
 - lib/haml/sass_rails_filter.rb
 - lib/haml/template.rb
 - lib/haml/template/options.rb
-- lib/haml/template/plugin.rb
-- lib/haml/temple.rb
+- lib/haml/temple_engine.rb
+- lib/haml/temple_line_counter.rb
 - lib/haml/util.rb
 - lib/haml/version.rb
+- test/attribute_parser_test.rb
 - test/engine_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.2.x
 - test/gemfiles/Gemfile.rails-4.0.x
 - test/gemfiles/Gemfile.rails-4.0.x.lock
+- test/gemfiles/Gemfile.rails-4.1.x
+- test/gemfiles/Gemfile.rails-4.2.x
+- test/gemfiles/Gemfile.rails-5.0.x
 - test/helper_test.rb
 - test/markaby/standard.mab
 - test/mocks/article.rb
+- test/options_test.rb
 - test/parser_test.rb
 - test/results/content_for_layout.xhtml
 - test/results/eval_suppressed.xhtml
@@ -159,17 +185,15 @@ files:
 - test/results/very_basic.xhtml
 - test/results/whitespace_handling.xhtml
 - test/template_test.rb
+- test/template_test_helper.rb
 - test/templates/_av_partial_1.haml
-- test/templates/_av_partial_1_ugly.haml
 - test/templates/_av_partial_2.haml
-- test/templates/_av_partial_2_ugly.haml
 - test/templates/_layout.erb
 - 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
 - test/templates/content_for_layout.haml
 - test/templates/eval_suppressed.haml
@@ -192,28 +216,14 @@ files:
 - test/templates/very_basic.haml
 - test/templates/whitespace_handling.haml
 - test/templates/with_bom.haml
+- test/temple_line_counter_test.rb
 - test/test_helper.rb
 - test/util_test.rb
 homepage: http://haml.info/
 licenses:
 - MIT
 metadata: {}
-post_install_message: |2+
-
-  HEADS UP! Haml 4.0 has many improvements, but also has changes that may break
-  your application:
-
-  * Support for Ruby 1.8.6 dropped
-  * Support for Rails 2 dropped
-  * Sass filter now always outputs <style> tags
-  * Data attributes are now hyphenated, not underscored
-  * html2haml utility moved to the html2haml gem
-  * Textile and Maruku filters moved to the haml-contrib gem
-
-  For more info see:
-
-  http://rubydoc.info/github/haml/haml/file/CHANGELOG.md
-
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -221,7 +231,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
@@ -229,14 +239,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: An elegant, structured (X)HTML/XML templating engine.
 test_files:
+- test/attribute_parser_test.rb
 - test/engine_test.rb
 - test/filters_test.rb
 - test/helper_test.rb
+- test/options_test.rb
 - test/parser_test.rb
 - test/template_test.rb
+- test/temple_line_counter_test.rb
 - test/util_test.rb
+has_rdoc: false

data/lib/haml/temple.rb

@@ -1,85 +0,0 @@
-require 'haml'
-require 'temple'
-
-module Haml
-
-  module Temple
-
-    module Expressions
-      def on_plain
-        [:static, "\n" + value[:text]]
-      end
-
-      def on_root
-        [:multi]
-      end
-
-      def on_doctype
-        [:html, :doctype, value[:version] || 5]
-      end
-
-      def on_tag
-        exp = [:html, :tag, value[:name], [:html, :attrs]]
-        if value[:value] && value[:value] != ""
-          if value[:parse]
-            exp.push << [:dynamic, value[:value]]
-          else
-            exp.push << [:static, value[:value]]
-          end
-        end
-
-        if attribs = value[:attributes]
-          attribs.each do |key, value|
-            exp.last << [:html, :attr, key, [:static, value]]
-          end
-        end
-
-        exp
-      end
-    end
-
-    class Parser
-      def initialize(*args)
-        @options = Options.new
-      end
-
-      def call(haml)
-        parser = ::Haml::Parser.new(haml, @options)
-        tree = parser.parse.tap {|x| p x; puts '-' * 10}
-        compile(tree).tap {|x| p x; puts '-' * 10}
-      end
-
-      private
-
-      def compile(node)
-        exp = node.to_temple
-        return exp if node.children.empty?
-        if node.children.length == 1
-          exp.push compile(node.children[0])
-        else
-          exp.push [:multi, *node.children.map {|c| compile(c)}]
-        end
-        exp
-      end
-    end
-
-    class Engine < ::Temple::Engine
-      use ::Haml::Temple::Parser
-      html :Pretty
-      filter :ControlFlow
-      generator :ArrayBuffer
-    end
-  end
-
-  class Parser::ParseNode
-    include ::Haml::Temple::Expressions
-
-    def to_temple
-      begin
-        send "on_#{type}"
-      end
-    end
-  end
-end
-
-Haml::Temple::Template = Temple::Templates::Tilt(Haml::Temple::Engine, :register_as => :haml)

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

@@ -1,4 +0,0 @@
-source "https://rubygems.org"
-
-gem 'rails', '~> 3.2.0'
-gemspec :path => "../.."

data/test/templates/_av_partial_1_ugly.haml

@@ -1,9 +0,0 @@
-%h2 This is a pretty complicated partial
-.partial
-  %p It has several nested partials,
-  %ul
-    - 5.times do
-      %li
-        %strong Partial:
-        - @nesting = 5
-        = render :partial => 'templates/av_partial_2_ugly'

data/test/templates/_av_partial_2_ugly.haml

@@ -1,5 +0,0 @@
-- @nesting -= 1
-.partial{:level => @nesting}
-  %h3 This is a crazy deep-nested partial.
-  %p== Nesting level #{@nesting}
-  = render :partial => 'templates/av_partial_2_ugly' if @nesting > 0

data/test/templates/action_view_ugly.haml

@@ -1,47 +0,0 @@
-!!!
-%html{html_attrs}
-  %head
-    %title Hampton Catlin Is Totally Awesome
-    %meta{"http-equiv" => "Content-Type", :content => "text/html; charset=utf-8"}
-  %body
-    %h1
-      This is very much like the standard template,
-      except that it has some ActionView-specific stuff.
-      It's only used for benchmarking.
-    .crazy_partials= render :partial => 'templates/av_partial_1_ugly'
-    / You're In my house now!
-    .header
-      Yes, ladies and gentileman. He is just that egotistical.
-      Fantastic! This should be multi-line output
-      The question is if this would translate! Ahah!
-      = 1 + 9 + 8 + 2 #numbers should work and this should be ignored
-    #body= " Quotes should be loved! Just like people!"
-    - 120.times do |number|
-      - number
-    Wow.|
-    %p
-      = "Holy cow        " + |
-        "multiline       " + |      
-        "tags!           " + |
-        "A pipe (|) even!"   |
-      = [1, 2, 3].collect { |n| "PipesIgnored|" }
-      = [1, 2, 3].collect { |n|     |
-          n.to_s                    |
-        }.join("|")                 |
-    %div.silent
-      - foo = String.new
-      - foo << "this"
-      - foo << " shouldn't"
-      - foo << " evaluate"
-      = foo + " but now it should!"
-      -# Woah crap a comment!
-
-    -# That was a line that shouldn't close everything.
-    %ul.really.cool
-      - ('a'..'f').each do |a|
-        %li= a
-    #combo.of_divs_with_underscore= @should_eval = "with this text"
-    = [ 104, 101, 108, 108, 111 ].map do |byte|
-      - byte.chr
-    .footer
-      %strong.shout= "This is a really long ruby quote. It should be loved and wrapped because its more than 50 characters. This value may change in the future and this test may look stupid. \nSo, I'm just making it *really* long. God, I hope this works"

data/test/templates/standard_ugly.haml

@@ -1,43 +0,0 @@
-!!!
-%html{:xmlns => "http://www.w3.org/1999/xhtml", "xml:lang" => "en-US", "lang" => "en-US"}
-  %head
-    %title Hampton Catlin Is Totally Awesome
-    %meta{"http-equiv" => "Content-Type", :content => "text/html; charset=utf-8"}
-  %body
-    / You're In my house now!
-    .header
-      Yes, ladies and gentileman. He is just that egotistical.
-      Fantastic! This should be multi-line output
-      The question is if this would translate! Ahah!
-      = 1 + 9 + 8 + 2 #numbers should work and this should be ignored
-    #body= " Quotes should be loved! Just like people!"
-    - 120.times do |number|
-      = number
-    Wow.|
-    %p{:code => 1 + 2}
-      = "Holy cow        " + |
-        "multiline       " + |      
-        "tags!           " + |
-        "A pipe (|) even!"   |
-      = [1, 2, 3].collect { |n| "PipesIgnored|" }.join
-      = [1, 2, 3].collect { |n|     |
-          n.to_s                    |
-        }.join("|")                 |
-    - bar = 17
-    %div.silent{:foo => bar}
-      - foo = String.new
-      - foo << "this"
-      - foo << " shouldn't"
-      - foo << " evaluate"
-      = foo + " but now it should!"
-      -# Woah crap a comment!
-
-    -# That was a line that shouldn't close everything.
-    %ul.really.cool
-      - ('a'..'f').each do |a|
-        %li= a
-    #combo.of_divs_with_underscore= @should_eval = "with this text"
-    = "foo".each_line do |line|
-      - nil
-    .footer
-      %strong.shout= "This is a really long ruby quote. It should be loved and wrapped because its more than 50 characters. This value may change in the future and this test may look stupid. \nSo, I'm just making it *really* long. God, I hope this works"