slim 0.7.0 → 0.7.1

data/test/slim/test_code_evaluation.rb

@@ -6,7 +6,7 @@ class TestSlimCodeEvaluation < TestSlim
 p id="#{id_helper}" class="hello world" = hello_world
 }
 
-    assert_html '<p id="notice" class="hello world">Hello World from @env</p>', source
+    assert_html '<p class="hello world" id="notice">Hello World from @env</p>', source
   end
 
   def test_render_with_call_to_set_custom_attributes
@@ -15,7 +15,7 @@ p data-id="#{id_helper}" data-class="hello world"
   = hello_world
 }
 
-    assert_html '<p data-id="notice" data-class="hello world">Hello World from @env</p>', source
+    assert_html '<p data-class="hello world" data-id="notice">Hello World from @env</p>', source
   end
 
   def test_render_with_call_to_set_attributes_and_call_to_set_content
@@ -23,7 +23,7 @@ p data-id="#{id_helper}" data-class="hello world"
 p id="#{id_helper}" class="hello world" = hello_world
 }
 
-    assert_html '<p id="notice" class="hello world">Hello World from @env</p>', source
+    assert_html '<p class="hello world" id="notice">Hello World from @env</p>', source
   end
 
   def test_render_with_parameterized_call_to_set_attributes_and_call_to_set_content
@@ -31,7 +31,7 @@ p id="#{id_helper}" class="hello world" = hello_world
 p id="#{id_helper}" class="hello world" = hello_world("Hello Ruby!")
 }
 
-    assert_html '<p id="notice" class="hello world">Hello Ruby!</p>', source
+    assert_html '<p class="hello world" id="notice">Hello Ruby!</p>', source
   end
 
   def test_render_with_spaced_parameterized_call_to_set_attributes_and_call_to_set_content
@@ -39,7 +39,7 @@ p id="#{id_helper}" class="hello world" = hello_world("Hello Ruby!")
 p id="#{id_helper}" class="hello world" = hello_world "Hello Ruby!"
 }
 
-    assert_html '<p id="notice" class="hello world">Hello Ruby!</p>', source
+    assert_html '<p class="hello world" id="notice">Hello Ruby!</p>', source
   end
 
   def test_render_with_spaced_parameterized_call_to_set_attributes_and_call_to_set_content_2
@@ -47,7 +47,7 @@ p id="#{id_helper}" class="hello world" = hello_world "Hello Ruby!"
 p id="#{id_helper}" class="hello world" = hello_world "Hello Ruby!", :dummy => "value"
 }
 
-    assert_html '<p id="notice" class="hello world">Hello Ruby!dummy value</p>', source
+    assert_html '<p class="hello world" id="notice">Hello Ruby!dummy value</p>', source
   end
 
   def test_hash_call_in_attribute
@@ -58,6 +58,14 @@ p id="#{hash[:a]}" Test it
     assert_html '<p id="The letter a">Test it</p>', source
   end
 
+  def test_instance_variable_in_attribute_without_quotes
+    source = %q{
+p id=@var
+}
+
+    assert_html '<p id="instance"></p>', source
+  end
+
   def test_method_call_in_attribute_without_quotes
     source = %q{
 form action=action_path(:page, :save) method='post'
@@ -79,7 +87,7 @@ form(action=action_path(:page, :save) method='post')
 form(method='post' action=action_path(:page, :save))
 }
 
-    assert_html '<form method="post" action="&#47;action-page-save"></form>', source
+    assert_html '<form action="&#47;action-page-save" method="post"></form>', source
   end
 
   def test_hash_call_in_attribute_without_quotes
@@ -135,7 +143,7 @@ p(id=[hash[:a] + hash[:a]]) Test it
 p(id=[hash[:a] + hash[:a]] class=[hash[:a]]) Test it
 }
 
-    assert_html '<p id="The letter aThe letter a" class="The letter a">Test it</p>', source
+    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
@@ -143,7 +151,7 @@ p(id=[hash[:a] + hash[:a]] class=[hash[:a]]) Test it
 p(id=hash[:a] class=[hash[:a]]) Test it
 }
 
-    assert_html '<p id="The letter a" class="The letter a">Test it</p>', source
+    assert_html '<p class="The letter a" id="The letter a">Test it</p>', source
   end
 
   def test_computation_in_attribute
@@ -196,4 +204,18 @@ p id="#{(false ? 'notshown' : 'shown')}" = output_number
 }
     assert_html '<div class="alpha beta">Test it</div>', source
   end
+
+  def test_id_attribute_merging
+    source = %{
+#alpha id="beta" Test it
+}
+    assert_html '<div id="alpha_beta">Test it</div>', source, :id_delimiter => '_'
+  end
+
+  def test_id_attribute_merging2
+    source = %{
+#alpha id="beta" Test it
+}
+    assert_html '<div id="alpha-beta">Test it</div>', source, :id_delimiter => '-'
+  end
 end

data/test/slim/test_code_output.rb

@@ -7,7 +7,7 @@ p
   = hello_world
 }
 
-    assert_html '<p>Hello World from @env</p>', source
+    assert_html '<p>Hello World from @env</p>', source #, :debug => true
   end
 
   def test_render_with_conditional_call
@@ -113,4 +113,12 @@ p = \
 
     assert_html '<p>Hello Ruby!</p>7', source
   end
+
+  def test_render_with_no_trailing_character
+    source = %q{
+p
+  = hello_world}
+
+    assert_html '<p>Hello World from @env</p>', source
+  end
 end

data/test/slim/test_code_structure.rb

@@ -13,19 +13,6 @@ div
     assert_html '<div><p>The second paragraph</p></div>', source
   end
 
-  def test_render_with_conditional_and_end
-    source = %q{
-div
-  - if show_first?
-      p The first paragraph
-  - else
-      p The second paragraph
-  - end
-}
-
-    assert_html '<div><p>The second paragraph</p></div>', source
-  end
-
   def test_render_with_consecutive_conditionals
     source = %q{
 div
@@ -50,6 +37,18 @@ div
     assert_html '<div><p>The second paragraph</p></div>', source
   end
 
+  def test_render_with_conditional_and_following_nonconditonal
+    source = %q{
+div
+  - if true
+      p The first paragraph
+  - var = 42
+  = var
+}
+
+    assert_html '<div><p>The first paragraph</p>42</div>', source
+  end
+
   def test_render_with_inline_condition
     source = %q{
 p = hello_world if true
@@ -82,4 +81,15 @@ p World
 
     assert_html '<p>Hello</p><p>World</p>', source
   end
+
+  def test_render_with_yield
+    source = %q{
+div
+  == yield :menu
+}
+
+    assert_html '<div>This is the menu</div>', source do
+      'This is the menu'
+    end
+  end
 end

data/test/slim/test_html_structure.rb

@@ -38,7 +38,7 @@ h1#title This is my title
   = hello_world
 }
 
-    assert_html '<h1 id="title">This is my title</h1><div id="notice" class="hello world">Hello World from @env</div>', source
+    assert_html '<h1 id="title">This is my title</h1><div class="hello world" id="notice">Hello World from @env</div>', source
   end
 
   def test_render_with_text_block
@@ -147,7 +147,7 @@ p#test class="paragraph" This is line one.
                          This is line two.
 }
 
-    assert_html '<p id="test" class="paragraph">This is line one.This is line two.</p>', source
+    assert_html '<p class="paragraph" id="test">This is line one.This is line two.</p>', source
   end
 
   def test_output_code_with_leading_spaces
@@ -173,7 +173,7 @@ p class='underscored_class_name' = output_number
 p id="dashed-id" class="underscored_class_name" = output_number
 }
 
-    assert_html '<p id="dashed-id" class="underscored_class_name">1337</p>', source
+    assert_html '<p class="underscored_class_name" id="dashed-id">1337</p>', source
   end
 
   def test_nonstandard_shortcut_attributes
@@ -181,7 +181,7 @@ p id="dashed-id" class="underscored_class_name" = output_number
 p#dashed-id.underscored_class_name = output_number
 }
 
-    assert_html '<p id="dashed-id" class="underscored_class_name">1337</p>', source
+    assert_html '<p class="underscored_class_name" id="dashed-id">1337</p>', source
   end
 
   def test_dashed_attributes
@@ -197,7 +197,7 @@ p data-info="Illudium Q-36" = output_number
 p#marvin.martian data-info="Illudium Q-36" = output_number
 }
 
-    assert_html '<p id="marvin" class="martian" data-info="Illudium Q-36">1337</p>', source
+    assert_html '<p class="martian" data-info="Illudium Q-36" id="marvin">1337</p>', source
   end
 
   def test_parens_around_attributes
@@ -205,7 +205,7 @@ p#marvin.martian data-info="Illudium Q-36" = output_number
 p(id="marvin" class="martian" data-info="Illudium Q-36") = output_number
 }
 
-    assert_html '<p id="marvin" class="martian" data-info="Illudium Q-36">1337</p>', source
+    assert_html '<p class="martian" data-info="Illudium Q-36" id="marvin">1337</p>', source
   end
 
   def test_square_brackets_around_attributes
@@ -213,7 +213,7 @@ p(id="marvin" class="martian" data-info="Illudium Q-36") = output_number
 p[id="marvin" class="martian" data-info="Illudium Q-36"] = output_number
 }
 
-    assert_html '<p id="marvin" class="martian" data-info="Illudium Q-36">1337</p>', source
+    assert_html '<p class="martian" data-info="Illudium Q-36" id="marvin">1337</p>', source
   end
 
   def test_parens_around_attributes_with_equal_sign_snug_to_right_paren
@@ -221,6 +221,30 @@ p[id="marvin" class="martian" data-info="Illudium Q-36"] = output_number
 p(id="marvin" class="martian" data-info="Illudium Q-36")= output_number
 }
 
-    assert_html '<p id="marvin" class="martian" data-info="Illudium Q-36">1337</p>', source
+    assert_html '<p class="martian" data-info="Illudium Q-36" id="marvin">1337</p>', source
+  end
+
+  def test_closed_tag
+    source = %q{
+closed/
+}
+
+    assert_html '<closed />', source, :format => :xhtml
+  end
+
+  def test_closed_tag_with_attributes
+    source = %q{
+closed id="test" /
+}
+
+    assert_html '<closed id="test" />', source, :format => :xhtml
+  end
+
+  def test_closed_tag_with_attributes_and_parens
+    source = %q{
+closed(id="test")/
+}
+
+    assert_html '<closed id="test" />', source, :format => :xhtml
   end
 end

data/test/slim/test_parser_errors.rb

@@ -57,10 +57,10 @@ p
   img(src="img.jpg" title={title}
 }
 
-    assert_syntax_error "Expected closing attribute 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_delimiter
+  def test_expected_closing_attribute_delimiter
     source = %q{
 p
   img src=[hash[1] + hash[2]

data/test/slim/test_ruby_errors.rb

@@ -113,4 +113,32 @@ p
 }
     assert_ruby_syntax_error "(__TEMPLATE__):5", source
   end
+
+  def test_invalid_embedded_engine
+    source = %q{
+p
+  embed_unknown:
+    1+1
+}
+
+    assert_runtime_error 'Invalid embedded engine embed_unknown', 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, but id concatenation disabled', source
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - Andrew Stone
@@ -16,28 +16,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-25 00:00:00 -04:00
+date: 2010-11-03 00:00:00 -04:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: escape_utils
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 1
-        - 9
-        version: 0.1.9
-  type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: temple
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -45,14 +30,14 @@ dependencies:
         segments: 
         - 0
         - 1
-        - 3
-        version: 0.1.3
+        - 4
+        version: 0.1.4
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: tilt
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -62,11 +47,11 @@ dependencies:
         - 1
         version: "1.1"
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -77,11 +62,11 @@ dependencies:
         - 7
         version: 0.8.7
   type: :development
-  version_requirements: *id004
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: haml
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -90,11 +75,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: erubis
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -103,11 +88,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id006
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: minitest
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -116,11 +101,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id007
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rcov
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -129,11 +114,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id008
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rdiscount
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -142,11 +127,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id009
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: liquid
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -155,11 +140,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id010
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: yard
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -168,7 +153,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id011
+  version_requirements: *id010
 description: Slim is a template language whose goal is reduce the syntax to the essential parts without becoming cryptic.
 email: 
 - andy@stonean.com
@@ -202,7 +187,6 @@ files:
 - lib/slim/end_inserter.rb
 - lib/slim/engine.rb
 - lib/slim/filter.rb
-- lib/slim/helpers.rb
 - lib/slim/parser.rb
 - lib/slim/rails.rb
 - lib/slim/template.rb
@@ -212,7 +196,6 @@ files:
 - test/slim/test_code_blocks.rb
 - test/slim/test_code_escaping.rb
 - test/slim/test_code_evaluation.rb
-- test/slim/test_code_helpers.rb
 - test/slim/test_code_output.rb
 - test/slim/test_code_structure.rb
 - test/slim/test_embedded_engines.rb