slim 1.3.9 → 2.0.0

data/lib/slim/splat/builder.rb

@@ -0,0 +1,79 @@
+module Slim
+  module Splat
+    # @api private
+    class Builder
+      def initialize(options)
+        @options = options
+        @attrs = {}
+      end
+
+      def code_attr(name, escape, value)
+        if delim = @options[:merge_attrs][name]
+          value = Array === value ? value.join(delim) : value.to_s
+          attr(name, escape ? Temple::Utils.escape_html(value) : value) unless value.empty?
+        elsif @options[:hyphen_attrs].include?(name) && Hash === value
+          hyphen_attr(name, escape, value)
+        else
+          case value
+          when false, nil
+            # Boolean false attribute
+            return
+          when true
+            # Boolean true attribute
+            value = name
+          else
+            value = value.to_s
+          end
+          attr(name, escape ? Temple::Utils.escape_html(value) : value)
+        end
+      end
+
+      def splat_attrs(splat)
+        splat.each do |name, value|
+          code_attr(name.to_s, true, value)
+        end
+      end
+
+      def attr(name, value)
+        if @attrs[name]
+          if delim = @options[:merge_attrs][name]
+            @attrs[name] << delim << value
+          else
+            raise("Multiple #{name} attributes specified")
+          end
+        else
+          @attrs[name] = value
+        end
+      end
+
+      def build_tag
+        tag = @attrs.delete('tag').to_s
+        tag = @options[:default_tag] if tag.empty?
+        if block_given?
+          "<#{tag}#{build_attrs}>#{yield}</#{tag}>"
+        else
+          "<#{tag}#{build_attrs} />"
+        end
+      end
+
+      def build_attrs
+        attrs = @options[:sort_attrs] ? @attrs.sort_by(&:first) : @attrs
+        attrs.map do |k, v|
+          " #{k}=#{@options[:attr_quote]}#{v}#{@options[:attr_quote]}"
+        end.join
+      end
+
+      private
+
+      def hyphen_attr(name, escape, value)
+        if Hash === value
+          value.each do |n, v|
+            hyphen_attr("#{name}-#{n.to_s.gsub('_', '-')}", escape, v)
+          end
+        else
+          attr(name, escape ? Temple::Utils.escape_html(value) : value.to_s)
+        end
+      end
+    end
+  end
+end

data/lib/slim/splat/filter.rb

@@ -0,0 +1,93 @@
+module Slim
+  module Splat
+    # @api private
+    class Filter < ::Slim::Filter
+      OPTIONS = [:merge_attrs, :attr_quote, :sort_attrs, :default_tag, :hyphen_attrs]
+      define_options OPTIONS
+      default_options[:hyphen_attrs] = %w(data aria)
+
+      def call(exp)
+        @splat_options = nil
+        exp = compile(exp)
+        if @splat_options
+          opts = options.to_hash.reject {|k,v| !OPTIONS.include?(k) }.inspect
+          [:multi, [:code, "#{@splat_options} = #{opts}"], exp]
+        else
+          exp
+        end
+      end
+
+      # Handle tag expression `[:html, :tag, name, attrs, content]`
+      #
+      # @param [String] name Tag name
+      # @param [Array] attrs Temple expression
+      # @param [Array] content Temple expression
+      # @return [Array] Compiled temple expression
+      def on_html_tag(name, attrs, content = nil)
+        if name != '*'
+          super
+        elsif content
+          builder, block = make_builder(attrs[2..-1])
+          [:multi,
+           block,
+           [:slim, :output, false, "#{builder}.build_tag do",
+            compile(content)]]
+        else
+          builder, block = make_builder(attrs[2..-1])
+          [:multi,
+           block,
+           [:dynamic, "#{builder}.build_tag"]]
+        end
+      end
+
+      # Handle attributes expression `[:html, :attrs, *attrs]`
+      #
+      # @param [Array] attrs Array of temple expressions
+      # @return [Array] Compiled temple expression
+      def on_html_attrs(*attrs)
+        if attrs.any? {|attr| splat?(attr) }
+          builder, block = make_builder(attrs)
+          [:multi,
+           block,
+           [:dynamic, "#{builder}.build_attrs"]]
+        else
+          super
+        end
+      end
+
+      protected
+
+      def splat?(attr)
+        # Splat attribute given
+        attr[0] == :slim && attr[1] == :splat ||
+          # Hyphenated attribute also needs splat handling
+          (attr[0] == :html && attr[1] == :attr && options[:hyphen_attrs].include?(attr[2]) &&
+           attr[3][0] == :slim && attr[3][1] == :attrvalue)
+      end
+
+      def make_builder(attrs)
+        @splat_options ||= unique_name
+        builder = unique_name
+        result = [:multi, [:code, "#{builder} = ::Slim::Splat::Builder.new(#{@splat_options})"]]
+        attrs.each do |attr|
+          result <<
+            if attr[0] == :html && attr[1] == :attr
+              if attr[3][0] == :slim && attr[3][1] == :attrvalue
+                [:code, "#{builder}.code_attr(#{attr[2].inspect}, #{attr[3][2]}, (#{attr[3][3]}))"]
+              else
+                tmp = unique_name
+                [:multi,
+                 [:capture, tmp, compile(attr[3])],
+                 [:code, "#{builder}.attr(#{attr[2].inspect}, #{tmp})"]]
+              end
+            elsif attr[0] == :slim && attr[1] == :splat
+              [:code, "#{builder}.splat_attrs((#{attr[2]}))"]
+            else
+              attr
+            end
+        end
+        return builder, result
+      end
+    end
+  end
+end

data/lib/slim/version.rb

@@ -1,5 +1,5 @@
 module Slim
   # Slim version string
   # @api public
-  VERSION = '1.3.9'
+  VERSION = '2.0.0'
 end

data/slim.gemspec

@@ -17,6 +17,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = %w(lib)
 
-  s.add_runtime_dependency('temple', ['~> 0.6.3'])
+  s.add_runtime_dependency('temple', ['~> 0.6.5'])
   s.add_runtime_dependency('tilt', ['~> 1.3', '>= 1.3.3'])
 end

data/test/core/helper.rb

@@ -1,11 +1,9 @@
 # encoding: utf-8
 
-require 'minitest/unit'
+require 'minitest/autorun'
 require 'slim'
 require 'slim/grammar'
 
-MiniTest::Unit.autorun
-
 Slim::Engine.after  Slim::Parser, Temple::Filters::Validator, :grammar => Slim::Grammar
 Slim::Engine.before :Pretty, Temple::Filters::Validator
 

data/test/core/test_code_blocks.rb

@@ -11,6 +11,16 @@ p
     assert_html '<p>Hello Ruby! Hello from within a block! Hello Ruby!</p>', source
   end
 
+  def test_render_with_output_code_block_without_do
+    source = %q{
+p
+  = hello_world "Hello Ruby!"
+    | Hello from within a block!
+}
+
+    assert_html '<p>Hello Ruby! Hello from within a block! Hello Ruby!</p>', source
+  end
+
   def test_render_with_output_code_within_block
     source = %q{
 p
@@ -21,6 +31,16 @@ p
     assert_html '<p>Hello Ruby! Hello from within a block! Hello Ruby!</p>', source
   end
 
+  def test_render_with_output_code_within_block_without_do
+    source = %q{
+p
+  = hello_world "Hello Ruby!"
+    = hello_world "Hello from within a block!"
+}
+
+    assert_html '<p>Hello Ruby! Hello from within a block! Hello Ruby!</p>', source
+  end
+
   def test_render_with_output_code_within_block_2
     source = %q{
 p
@@ -32,6 +52,17 @@ p
     assert_html '<p>Hello Ruby! Hello from within a block! And another one! Hello from within a block! Hello Ruby!</p>', source
   end
 
+  def test_render_with_output_code_within_block_2_without_do
+    source = %q{
+p
+  = hello_world "Hello Ruby!"
+    = hello_world "Hello from within a block!"
+      = hello_world "And another one!"
+}
+
+    assert_html '<p>Hello Ruby! Hello from within a block! And another one! Hello from within a block! Hello Ruby!</p>', source
+  end
+
   def test_output_block_with_arguments
     source = %q{
 p
@@ -56,6 +87,16 @@ p
     assert_html '<p>Hey!Hey!Hey!</p>', source
   end
 
+  def test_render_with_control_code_loop_without_do
+    source = %q{
+p
+  - 3.times
+    | Hey!
+}
+
+    assert_html '<p>Hey!Hey!Hey!</p>', source
+  end
+
   def test_captured_code_block_with_conditional
     source = %q{
 = hello_world "Hello Ruby!" do
@@ -65,4 +106,14 @@ p
 
     assert_html 'Hello Ruby! Hello from within a block! Hello Ruby!', source
   end
+
+  def test_captured_code_block_with_conditional_without_do
+    source = %q{
+= hello_world "Hello Ruby!"
+  - if true
+    | Hello from within a block!
+}
+
+    assert_html 'Hello Ruby! Hello from within a block! Hello Ruby!', source
+  end
 end

data/test/core/test_code_evaluation.rb

@@ -116,7 +116,7 @@ p(id=hash[:a]) Test it
 
   def test_hash_call_in_attribute_with_ruby_evaluation
     source = %q{
-p id={hash[:a] + hash[:a]} Test it
+p id=(hash[:a] + hash[:a]) Test it
 }
 
     assert_html '<p id="The letter aThe letter a">Test it</p>', source
@@ -140,23 +140,15 @@ p[id=(hash[:a] + hash[:a])] Test it
 
   def test_hash_call_in_delimited_attribute_with_ruby_evaluation_3
     source = %q{
-p(id=[hash[:a] + hash[:a]]) Test it
-}
-
-    assert_html '<p id="The letter aThe letter a">Test it</p>', source
-  end
-
-  def test_hash_call_in_delimited_attribute_with_ruby_evaluation_4
-    source = %q{
-p(id=[hash[:a] + hash[:a]] class=[hash[:a]]) Test it
+p(id=(hash[:a] + hash[:a]) class=hash[:a]) Test it
 }
 
     assert_html '<p class="The letter a" id="The letter aThe letter a">Test it</p>', source
   end
 
-  def test_hash_call_in_delimited_attribute_with_ruby_evaluation_5
+  def test_hash_call_in_delimited_attribute_with_ruby_evaluation_4_
     source = %q{
-p(id=hash[:a] class=[hash[:a]]) Test it
+p(id=hash[:a] class=hash[:a]) Test it
 }
 
     assert_html '<p class="The letter a" id="The letter a">Test it</p>', source

data/test/core/test_embedded_engines.rb

@@ -25,44 +25,9 @@ asciidoc:
   * one
   * two
 }
-
-    expected = <<-EOS
-<div class="sect1">
-<h2 id="_header">Header</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Hello from AsciiDoc!</p>
-</div>
-<div class="paragraph">
-<p>3</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>one</p>
-</li>
-<li>
-<p>two</p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-    EOS
-    # render, then remove blank lines and unindent the remaining lines
-    output = render(source).gsub(/^ *(\n|(?=[^ ]))/, '')
-
-    assert_equal expected, output
-
-    Slim::Embedded.with_options(:asciidoc => {:compact => true, :attributes => {'sectids!' => ''}}) do
-      # render, then unindent lines
-      output = render(source).gsub(/^ *(?=[^ ])/, '')
-      assert_equal expected.gsub('<h2 id="_header">', '<h2>'), output
-    end
-
-    # render again, then remove blank lines and unindent the remaining lines
-    output = render(source).gsub(/^ *(\n|(?=[^ ]))/, '')
-    assert_equal expected, output
+    output = render(source)
+    assert_match 'sect1', output
+    assert_match 'Hello from AsciiDoc!', output
   end
 
   def test_render_with_markdown
@@ -76,13 +41,22 @@ markdown:
   * one
   * two
 }
-    assert_html "<h1 id=\"header\">Header</h1>\n<p>Hello from Markdown!</p>\n\n<p>3</p>\n\n<ul>\n  <li>one</li>\n  <li>two</li>\n</ul>\n", source
-
-    Slim::EmbeddedEngine.with_options(:markdown => {:auto_ids => false}) do
-      assert_html "<h1>Header</h1>\n<p>Hello from Markdown!</p>\n\n<p>3</p>\n\n<ul>\n  <li>one</li>\n  <li>two</li>\n</ul>\n", source
+    if ::Tilt['md'].name =~ /Redcarpet/
+      # redcarpet
+      assert_html "<h1>Header</h1>\n\n<p>Hello from Markdown!</p>\n\n<p>3</p>\n\n<ul>\n<li>one</li>\n<li>two</li>\n</ul>\n", source
+    elsif ::Tilt['md'].name =~ /RDiscount/
+      # rdiscount
+      assert_html "<h1>Header</h1>\n\n<p>Hello from Markdown!</p>\n\n<p>3</p>\n\n<ul>\n<li>one</li>\n<li>two</li>\n</ul>\n\n", source
+    else
+      # kramdown, :auto_ids by default
+      assert_html "<h1 id=\"header\">Header</h1>\n<p>Hello from Markdown!</p>\n\n<p>3</p>\n\n<ul>\n  <li>one</li>\n  <li>two</li>\n</ul>\n", source
+
+      Slim::Embedded.with_options(:markdown => {:auto_ids => false}) do
+        assert_html "<h1>Header</h1>\n<p>Hello from Markdown!</p>\n\n<p>3</p>\n\n<ul>\n  <li>one</li>\n  <li>two</li>\n</ul>\n", source
+      end
+
+      assert_html "<h1 id=\"header\">Header</h1>\n<p>Hello from Markdown!</p>\n\n<p>3</p>\n\n<ul>\n  <li>one</li>\n  <li>two</li>\n</ul>\n", source
     end
-
-    assert_html "<h1 id=\"header\">Header</h1>\n<p>Hello from Markdown!</p>\n\n<p>3</p>\n\n<ul>\n  <li>one</li>\n  <li>two</li>\n</ul>\n", source
   end
 
   def test_render_with_creole

data/test/core/test_encoding.rb

@@ -9,8 +9,15 @@ class TestSlimEncoding < TestSlim
 
   def test_binary
     source = "| \xFF\xFF"
+    source.force_encoding(Encoding::BINARY) if source.respond_to? :force_encoding
+
     result = "\xFF\xFF"
-    assert_html result, source
+    result.force_encoding(Encoding::BINARY) if source.respond_to? :force_encoding
+
+    out = render(source, :default_encoding => 'binary')
+    out.force_encoding(Encoding::BINARY) if source.respond_to? :force_encoding
+
+    assert_equal result, out
   end
 
   def test_bom

data/test/core/test_erb_converter.rb

@@ -0,0 +1,67 @@
+require 'helper'
+require 'slim/erb_converter'
+
+class TestSlimERBConverter < TestSlim
+  def test_converter
+        source = %q{
+doctype 5
+html
+  head
+    title Hello World!
+    /! Meta tags
+       with long explanatory
+       multiline comment
+    meta name="description" content="template language"
+    /! Stylesheets
+    link href="style.css" media="screen" rel="stylesheet" type="text/css"
+    link href="colors.css" media="screen" rel="stylesheet" type="text/css"
+    /! Javascripts
+    script src="jquery.js"
+    script src="jquery.ui.js"
+    /[if lt IE 9]
+      script src="old-ie1.js"
+      script src="old-ie2.js"
+    sass:
+      body
+        background-color: red
+  body
+    #container
+      p Hello
+        World!
+      p= "dynamic text with\nnewline"
+}
+
+    result = %q{<%
+%><!DOCTYPE html><%
+%><html><%
+%><head><%
+%><title>Hello World!</title><%
+%><!--Meta tags<%
+%>
+with long explanatory<%
+%>
+multiline comment--><%
+%><meta content="template language" name="description" /><%
+%><!--Stylesheets--><%
+%><link href="style.css" media="screen" rel="stylesheet" type="text/css" /><%
+%><link href="colors.css" media="screen" rel="stylesheet" type="text/css" /><%
+%><!--Javascripts--><%
+%><script src="jquery.js"><%
+%></script><script src="jquery.ui.js"><%
+%></script><!--[if lt IE 9]><%
+%><script src="old-ie1.js"><%
+%></script><script src="old-ie2.js"><%
+%></script><![endif]--><style type="text/css">body{background-color:red}<%
+%><%
+%></style><%
+%></head><body><%
+%><div id="container"><%
+%><p>Hello<%
+%>
+World!</p><%
+%><p><%= ::Temple::Utils.escape_html(("dynamic text with\nnewline")) %><%
+%></p></div></body></html>}
+
+    assert_equal result, Slim::ERBConverter.new.call(source)
+  end
+end