RubyGems - slim - Versions diffs - 0.9.4 → 1.0.0 - Mend

slim 0.9.4 → 1.0.0

Files changed (21) hide show

data/CHANGES +8 -1
data/README.md +9 -5
data/lib/slim/compiler.rb +20 -23
data/lib/slim/embedded_engine.rb +86 -25
data/lib/slim/end_inserter.rb +2 -2
data/lib/slim/engine.rb +1 -2
data/lib/slim/grammar.rb +1 -2
data/lib/slim/interpolation.rb +8 -6
data/lib/slim/parser.rb +295 -258
data/lib/slim/sections.rb +1 -1
data/lib/slim/version.rb +1 -1
data/test/helper.rb +4 -0
data/test/slim/test_code_evaluation.rb +31 -6
data/test/slim/test_code_output.rb +22 -3
data/test/slim/test_embedded_engines.rb +7 -2
data/test/slim/test_html_structure.rb +79 -10
data/test/slim/test_parser_errors.rb +22 -13
data/test/slim/test_ruby_errors.rb +11 -0
data/test_ruby_errors.rb +191 -0
metadata +107 -111
data/lib/slim/rails.rb +0 -3

data/lib/slim/sections.rb CHANGED Viewed

@@ -29,7 +29,7 @@ module Slim
     # Interpret control blocks as sections or inverted sections
     def on_slim_control(name, content)
-      if name =~ /^!\s*(.*)/
+      if name =~ /\A!\s*(.*)/
         on_slim_inverted_section($1, content)
       else
         on_slim_section(name, content)

data/lib/slim/version.rb CHANGED Viewed

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

data/test/helper.rb CHANGED Viewed

@@ -125,6 +125,10 @@ class Env
     "<script>do_something_evil();</script>"
   end
+  def method_which_returns_true
+    true
+  end
   def output_number
     1337
   end

data/test/slim/test_code_evaluation.rb CHANGED Viewed

@@ -214,28 +214,53 @@ p id="#{(false ? 'notshown' : 'shown')}" = output_number
     assert_html '<div id="alpha-beta">Test it</div>', source, :attr_delimiter => {'class' => ' ', 'id' => '-' }
   end
+  def test_boolean_attribute_false
+    source = %{
+option selected=false Text
+}
+    assert_html '<option>Text</option>', source
+  end
   def test_boolean_attribute_true
     source = %{
-option selected=1 Text
+option selected=true Text
 }
     assert_html '<option selected="selected">Text</option>', source
   end
-  def test_boolean_attribute_false
+  def test_boolean_attribute_dynamic
     source = %{
-option selected=false Text
+option selected=method_which_returns_true Text
+}
+    assert_html '<option selected="selected">Text</option>', source
+  end
+  def test_boolean_attribute_nil
+    source = %{
+option selected=nil Text
 }
     assert_html '<option>Text</option>', source
   end
-  def test_non_boolean_attribute
+  def test_boolean_attribute_string2
+    source = %{
+option selected="selected" Text
+}
+    assert_html '<option selected="selected">Text</option>', source
+  end
+  def test_boolean_attribute_shortcut
     source = %{
-.alpha class="beta" class=false
+option(class="clazz" selected) Text
+option(selected class="clazz") Text
 }
-    assert_html '<div class="alpha beta false"></div>', source
+    assert_html '<option class="clazz" selected="selected">Text</option><option class="clazz" selected="selected">Text</option>', source
   end
   def test_array_attribute

data/test/slim/test_code_output.rb CHANGED Viewed

@@ -7,7 +7,25 @@ p
   = hello_world
 }
-    assert_html '<p>Hello World from @env</p>', source #, :debug => true
+    assert_html '<p>Hello World from @env</p>', source
+  end
+  def test_render_with_trailing_whitespace
+    source = %q{
+p
+  =' hello_world
+}
+    assert_html '<p>Hello World from @env </p>', source
+  end
+  def test_no_escape_render_with_trailing_whitespace
+    source = %q{
+p
+  ==' hello_world
+}
+    assert_html '<p>Hello World from @env </p>', source
   end
   def test_render_with_conditional_call
@@ -100,9 +118,10 @@ p(id="test")==hello_world
   end
   def test_render_with_backslash_end
+# Keep trailing spaces!
     source = %q{
-p = \
-"Hello" + \
+p = \
+"Hello" + \
 " Ruby!"
 - variable = 1 + \
       2 + \

data/test/slim/test_embedded_engines.rb CHANGED Viewed

@@ -35,13 +35,18 @@ p
   end
   def test_render_with_markdown
+    # Keep the trailing spaces.
     source = %q{
 markdown:
   #Header
   Hello from #{"Markdown!"}
-  "Second Line!"
+  #{1+2}
+  * one
+  * two
 }
-    assert_html "<h1>Header</h1>\n\n<p>Hello from Markdown!\n\"Second Line!\"</p>\n", source
+    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
   end
   def test_render_with_creole

data/test/slim/test_html_structure.rb CHANGED Viewed

@@ -25,7 +25,7 @@ html:body
   def test_doctype
     source = %q{
-! doctype 1.1
+doctype 1.1
 html
 }
@@ -50,15 +50,6 @@ html
     assert_html '<!DOCTYPE html><html></html>', source, :format => :xhtml
   end
-  def test_capitalized_doctype
-    source = %q{
-! DOCTYPE 5
-html
-}
-    assert_html '<!DOCTYPE html><html></html>', source
-  end
   def test_render_with_shortcut_attributes
     source = %q{
 h1#title This is my title
@@ -356,4 +347,82 @@ p World
     assert_html "<!--[if IE]>hello<![endif]-->", source
   end
+  def test_multiline_attributes_with_method
+    source = %q{
+p<id="marvin"
+class="martian"
+ data-info="Illudium Q-36"> = output_number
+}
+    Slim::Parser::DELIMITERS.each do |k,v|
+      str = source.sub('<',k).sub('>',v)
+      assert_html '<p class="martian" data-info="Illudium Q-36" id="marvin">1337</p>', str
+    end
+  end
+  def test_multiline_attributes_with_text_on_same_line
+    source = %q{
+p<id="marvin"
+  class="martian"
+ data-info="Illudium Q-36"> THE space modulator
+}
+    Slim::Parser::DELIMITERS.each do |k,v|
+      str = source.sub('<',k).sub('>',v)
+      assert_html '<p class="martian" data-info="Illudium Q-36" id="marvin">THE space modulator</p>', str
+    end
+  end
+  def test_multiline_attributes_with_nested_text
+    source = %q{
+p<id="marvin"
+  class="martian"
+data-info="Illudium Q-36">
+  | THE space modulator
+}
+    Slim::Parser::DELIMITERS.each do |k,v|
+      str = source.sub('<',k).sub('>',v)
+      assert_html '<p class="martian" data-info="Illudium Q-36" id="marvin">THE space modulator</p>', str
+    end
+  end
+  def test_multiline_attributes_with_dynamic_attr
+    source = %q{
+p<id=id_helper
+  class="martian"
+  data-info="Illudium Q-36">
+  | THE space modulator
+}
+    Slim::Parser::DELIMITERS.each do |k,v|
+      str = source.sub('<',k).sub('>',v)
+      assert_html '<p class="martian" data-info="Illudium Q-36" id="notice">THE space modulator</p>', str
+    end
+  end
+  def test_multiline_attributes_with_nested_tag
+    source = %q{
+p<id=id_helper
+  class="martian"
+  data-info="Illudium Q-36">
+  span.emphasis THE
+  |  space modulator
+}
+    Slim::Parser::DELIMITERS.each do |k,v|
+      str = source.sub('<',k).sub('>',v)
+      assert_html '<p class="martian" data-info="Illudium Q-36" id="notice"><span class="emphasis">THE</span> space modulator</p>', str
+    end
+  end
+  def test_multiline_attributes_with_nested_text_and_extra_indentation
+    source = %q{
+li< id="myid"
+    class="myclass"
+data-info="myinfo">
+  a href="link" My Link
+}
+    Slim::Parser::DELIMITERS.each do |k,v|
+      str = source.sub('<',k).sub('>',v)
+      assert_html '<li class="myclass" data-info="myinfo" id="myid"><a href="link">My Link</a></li>', str
+    end
+  end
 end

data/test/slim/test_parser_errors.rb CHANGED Viewed

@@ -3,20 +3,20 @@ require 'helper'
 class TestParserErrors < TestSlim
   def test_correct_filename
     source = %q{
-! doctype 5
+doctype 5
   div Invalid
 }
-    assert_syntax_error "Unexpected indentation\n  test.slim, Line 3\n    div Invalid\n    ^\n        ", source, :file => 'test.slim'
+    assert_syntax_error "Unexpected indentation\n  test.slim, Line 3\n    div Invalid\n    ^\n", source, :file => 'test.slim'
   end
   def test_unexpected_indentation
     source = %q{
-! doctype 5
+doctype 5
   div Invalid
 }
-    assert_syntax_error "Unexpected indentation\n  (__TEMPLATE__), Line 3\n    div Invalid\n    ^\n        ", source
+    assert_syntax_error "Unexpected indentation\n  (__TEMPLATE__), Line 3\n    div Invalid\n    ^\n", source
   end
   def test_unexpected_text_indentation
@@ -26,7 +26,7 @@ p
    text
 }
-    assert_syntax_error "Unexpected text indentation\n  (__TEMPLATE__), Line 4\n    text\n    ^\n        ", source
+    assert_syntax_error "Unexpected text indentation\n  (__TEMPLATE__), Line 4\n    text\n    ^\n", source
   end
   def test_malformed_indentation
@@ -36,7 +36,7 @@ p
  div Invalid
 }
-    assert_syntax_error "Malformed indentation\n  (__TEMPLATE__), Line 4\n    div Invalid\n    ^\n        ", source
+    assert_syntax_error "Malformed indentation\n  (__TEMPLATE__), Line 4\n    div Invalid\n    ^\n", source
   end
   def test_unknown_line_indicator
@@ -48,7 +48,7 @@ p
   ?invalid
 }
-    assert_syntax_error "Unknown line indicator\n  (__TEMPLATE__), Line 6\n    ?invalid\n    ^\n        ", source
+    assert_syntax_error "Unknown line indicator\n  (__TEMPLATE__), Line 6\n    ?invalid\n    ^\n", source
   end
   def test_expected_closing_delimiter
@@ -57,7 +57,7 @@ p
   img(src="img.jpg" title={title}
 }
-    assert_syntax_error "Expected closing delimiter )\n  (__TEMPLATE__), Line 3\n    img(src=\"img.jpg\" title={title}\n                                   ^\n        ", source
+    assert_syntax_error "Expected closing delimiter )\n  (__TEMPLATE__), Line 3\n    img(src=\"img.jpg\" title={title}\n                                   ^\n", source
   end
   def test_expected_closing_attribute_delimiter
@@ -66,7 +66,16 @@ p
   img src=[hash[1] + hash[2]
 }
-    assert_syntax_error "Expected closing attribute delimiter ]\n  (__TEMPLATE__), Line 3\n    img src=[hash[1] + hash[2]\n    ^\n        ", source
+    assert_syntax_error "Expected closing attribute delimiter ]\n  (__TEMPLATE__), Line 3\n    img src=[hash[1] + hash[2]\n                              ^\n", source
+  end
+  def test_expected_attribute
+    source = %q{
+p
+  img(src='img.png' whatsthis?!)
+}
+    assert_syntax_error "Expected attribute\n  (__TEMPLATE__), Line 3\n    img(src='img.png' whatsthis?!)\n                      ^\n", source
   end
   def test_unexpected_closing
@@ -75,7 +84,7 @@ p
   img src=(1+1)]
 }
-    assert_syntax_error "Unexpected closing ]\n  (__TEMPLATE__), Line 3\n    img src=(1+1)]\n    ^\n        ", source
+    assert_syntax_error "Unexpected closing ]\n  (__TEMPLATE__), Line 3\n    img src=(1+1)]\n                 ^\n", source
   end
   def test_invalid_empty_attribute
@@ -84,7 +93,7 @@ p
   img{src= }
 }
-    assert_syntax_error "Invalid empty attribute\n  (__TEMPLATE__), Line 3\n    img{src= }\n    ^\n        ", source
+    assert_syntax_error "Invalid empty attribute\n  (__TEMPLATE__), Line 3\n    img{src= }\n            ^\n", source
   end
   def test_invalid_empty_attribute2
@@ -93,7 +102,7 @@ p
   img{src=}
 }
-    assert_syntax_error "Invalid empty attribute\n  (__TEMPLATE__), Line 3\n    img{src=}\n    ^\n        ", source
+    assert_syntax_error "Invalid empty attribute\n  (__TEMPLATE__), Line 3\n    img{src=}\n            ^\n", source
   end
   def test_invalid_empty_attribute3
@@ -102,6 +111,6 @@ p
   img src=
 }
-    assert_syntax_error "Invalid empty attribute\n  (__TEMPLATE__), Line 3\n    img src=\n    ^\n        ", source
+    assert_syntax_error "Invalid empty attribute\n  (__TEMPLATE__), Line 3\n    img src=\n            ^\n", source
   end
 end

data/test/slim/test_ruby_errors.rb CHANGED Viewed

@@ -1,6 +1,17 @@
 require 'helper'
 class TestSlimRubyErrors < TestSlim
+  def test_multline_attribute
+    source = %q{
+p(data-1=1
+data2-=1)
+  p
+    = unknown_ruby_method
+}
+    assert_ruby_error NameError, "test.slim:5", source, :file => 'test.slim'
+  end
   def test_broken_output_line
     source = %q{
 p = hello_world + \

data/test_ruby_errors.rb ADDED Viewed

@@ -0,0 +1,191 @@
+require 'helper'
+class TestSlimRubyErrors < TestSlim
+  def test_broken_output_line
+    source = %q{
+p = hello_world + \
+  hello_world + \
+  unknown_ruby_method
+}
+    assert_ruby_error NameError, "test.slim:4", source, :file => 'test.slim'
+  end
+  def test_broken_output_line2
+    source = %q{
+p = hello_world + \
+  hello_world
+p Hello
+= unknown_ruby_method
+}
+    assert_ruby_error NameError,"(__TEMPLATE__):5", source
+  end
+  def test_output_block
+    source = %q{
+p = hello_world "Hello Ruby" do
+  = unknown_ruby_method
+}
+    assert_ruby_error NameError,"(__TEMPLATE__):3", source
+  end
+  def test_output_block2
+    source = %q{
+p = hello_world "Hello Ruby" do
+  = "Hello from block"
+p Hello
+= unknown_ruby_method
+}
+    assert_ruby_error NameError, "(__TEMPLATE__):5", source
+  end
+  def test_text_block
+    source = %q{
+p Text line 1  Text line 2
+= unknown_ruby_method
+}
+    assert_ruby_error NameError,"(__TEMPLATE__):4", source
+  end
+  def test_text_block2
+    source = %q{
+|
+  Text line 1
+  Text line 2
+= unknown_ruby_method
+}
+    assert_ruby_error NameError,"(__TEMPLATE__):5", source
+  end
+  def test_comment
+    source = %q{
+/ Comment line 1
+  Comment line 2
+= unknown_ruby_method
+}
+    assert_ruby_error NameError,"(__TEMPLATE__):4", source
+  end
+  def test_embedded_ruby
+    source = %q{
+ruby:
+  a = 1
+  b = 2
+= a + b
+= unknown_ruby_method
+}
+    assert_ruby_error NameError,"(__TEMPLATE__):6", source
+  end
+  def test_embedded_markdown
+    source = %q{
+markdown:
+  #Header
+  Hello from #{"Markdown!"}
+  "Second Line!"
+= unknown_ruby_method
+}
+    assert_ruby_error NameError,"(__TEMPLATE__):6", source
+  end
+  def test_embedded_liquid
+    source = %q{
+- text = 'before liquid block'
+liquid:
+  First
+  {{text}}
+  Third
+= unknown_ruby_method
+}
+    assert_ruby_error NameError,"(__TEMPLATE__):7", source
+  end
+  def test_embedded_javascript
+    source = %q{
+javascript:
+  alert();
+  alert();
+= unknown_ruby_method
+}
+    assert_ruby_error NameError,"(__TEMPLATE__):5", source
+  end
+  def test_invalid_nested_code
+    source = %q{
+p
+  - test = 123
+    = "Hello from within a block! "
+}
+    assert_ruby_syntax_error "(__TEMPLATE__):5", source
+  end
+  def test_invalid_nested_output
+    source = %q{
+p
+  = "Hello Ruby!"
+    = "Hello from within a block! "
+}
+    assert_ruby_syntax_error "(__TEMPLATE__):5", source
+  end
+  def test_invalid_embedded_engine
+    source = %q{
+p
+  embed_unknown:
+    1+1
+}
+    assert_runtime_error 'Embedded engine embed_unknown not found', source
+  end
+  def test_explicit_end
+    source = %q{
+div
+  - if show_first?
+      p The first paragraph
+  - end
+}
+    assert_runtime_error 'Explicit end statements are forbidden', source
+  end
+  def test_id_attribute_merging2
+    source = %{
+#alpha id="beta" Test it
+}
+    assert_runtime_error 'Multiple id attributes specified', source
+  end
+  def test_multiline_attributes
+    source = %q{
+p(id="id"
+foo=1+1
+class=unknown_ruby_method)
+  p
+}
+    assert_ruby_error NameError,"(__TEMPLATE__):3", source
+  end
+  def test_multiline_ruby_attribute
+    source = %q{
+p id=(1+
++2
++unknown_ruby_method)
+  p
+}
+    assert_ruby_error NameError,"(__TEMPLATE__):4", source
+  end
+end