RubyGems - slim - Versions diffs - 2.0.3 → 2.1.0 - Mend

slim 2.0.3 → 2.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (54) hide show

checksums.yaml +4 -4
data/.travis.yml +7 -8
data/.yardopts +1 -1
data/CHANGES +23 -0
data/Gemfile +2 -1
data/LICENSE +1 -1
data/README.jp.md +497 -268
data/README.md +505 -278
data/Rakefile +14 -2
data/benchmarks/view.haml +2 -2
data/doc/include.md +20 -0
data/doc/jp/include.md +20 -0
data/doc/jp/logic_less.md +137 -0
data/doc/jp/smart.md +102 -0
data/doc/jp/translator.md +28 -0
data/doc/smart.md +102 -0
data/lib/slim/command.rb +8 -2
data/lib/slim/controls.rb +4 -3
data/lib/slim/do_inserter.rb +1 -1
data/lib/slim/embedded.rb +26 -22
data/lib/slim/end_inserter.rb +1 -1
data/lib/slim/engine.rb +3 -2
data/lib/slim/filter.rb +2 -2
data/lib/slim/grammar.rb +3 -1
data/lib/slim/include.rb +54 -0
data/lib/slim/interpolation.rb +1 -1
data/lib/slim/parser.rb +61 -46
data/lib/slim/smart.rb +8 -0
data/lib/slim/smart/escaper.rb +42 -0
data/lib/slim/smart/filter.rb +96 -0
data/lib/slim/smart/parser.rb +33 -0
data/lib/slim/splat/builder.rb +3 -3
data/lib/slim/splat/filter.rb +2 -2
data/lib/slim/translator.rb +2 -2
data/lib/slim/version.rb +1 -1
data/slim.gemspec +1 -1
data/test/core/helper.rb +5 -3
data/test/core/test_code_blocks.rb +11 -0
data/test/core/test_code_escaping.rb +14 -4
data/test/core/test_embedded_engines.rb +26 -0
data/test/core/test_html_structure.rb +39 -0
data/test/core/test_parser_errors.rb +8 -25
data/test/core/test_pretty.rb +15 -0
data/test/core/test_ruby_errors.rb +0 -10
data/test/include/files/recursive.slim +1 -0
data/test/include/files/slimfile.slim +3 -0
data/test/include/files/subdir/test.slim +1 -0
data/test/include/files/textfile +1 -0
data/test/include/test_include.rb +23 -0
data/test/literate/TESTS.md +17 -2
data/test/rails/test/test_slim.rb +1 -1
data/test/smart/test_smart_text.rb +300 -0
data/test/translator/test_translator.rb +7 -6
metadata +22 -4

data/test/core/test_pretty.rb CHANGED

@@ -98,4 +98,19 @@ html
     assert_html result, source, :scope => self, :locals => {:body => body, :content => content }
   end
+  def test_correct_line_number
+    source = %q{
+html
+  head
+  body
+    p Slim
+    = ''
+    = ''
+    = ''
+    = unknown_ruby_method
+}
+    assert_ruby_error NameError,"(__TEMPLATE__):9", source
+  end
 end

data/test/core/test_ruby_errors.rb CHANGED

@@ -173,16 +173,6 @@ p
     assert_ruby_syntax_error "(__TEMPLATE__):3", 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

data/test/include/files/recursive.slim ADDED

	@@ -0,0 +1 @@
1	+ \| rec

data/test/include/files/slimfile.slim ADDED

@@ -0,0 +1,3 @@
+| slim1
+include recursive
+| slim2

data/test/include/files/subdir/test.slim ADDED

	@@ -0,0 +1 @@
1	+ \| subdir

data/test/include/files/textfile ADDED

	@@ -0,0 +1 @@
1	+ 1+2=#{1+2}

data/test/include/test_include.rb ADDED

@@ -0,0 +1,23 @@
+require 'helper'
+require 'slim/include'
+class TestSlimInclude < TestSlim
+  def test_include
+    source = %q{
+a: include slimfile
+b: include textfile
+c: include slimfile.slim
+d: include subdir/test
+}
+    assert_html '<a>slim1recslim2</a><b>1+2=3</b><c>slim1recslim2</c><d>subdir</d>', source, :include_dirs => [File.expand_path('files', File.dirname(__FILE__))]
+  end
+  def test_include_with_newline
+    source = %q{
+a: include slimfile
+.content
+}
+    assert_html '<a>slim1recslim2</a><div class="content"></div>', source, :include_dirs => [File.expand_path('files', File.dirname(__FILE__))]
+  end
+end

data/test/literate/TESTS.md CHANGED

@@ -911,12 +911,13 @@ You can use text interpolation in the quoted attributes:
 ~~~ slim
 - url='slim-lang.com'
 a href="http://#{url}" Goto the #{url}
+a href="{"test"}" Test of quoted text in braces
 ~~~
 renders as
 ~~~ html
-<a href="http://slim-lang.com">Goto the slim-lang.com</a>
+<a href="http://slim-lang.com">Goto the slim-lang.com</a><a href="{&quot;test&quot;}">Test of quoted text in braces</a>
 ~~~
 The attribute value will be escaped by default. Use == if you want to disable escaping in the attribute.
@@ -939,7 +940,21 @@ renders as
 </li>
 ~~~
-You can break quoted attributes with backslash `\`
+You can use newlines in quoted attributes
+~~~ slim
+a data-title="help" data-content="extremely long help text that goes on
+  and one and one and then starts over...." Link
+~~~
+renders as
+~~~ html
+<a data-content="extremely long help text that goes on
+and one and one and then starts over...." data-title="help">Link</a>
+~~~
+You can break quoted attributes with an backslash `\`
 ~~~ slim
 a data-title="help" data-content="extremely long help text that goes on\

data/test/rails/test/test_slim.rb CHANGED

@@ -89,4 +89,4 @@ class TestSlim < ActionDispatch::IntegrationTest
     expected = "<!DOCTYPE html><html><head><title>Dummy</title></head><body>#{options[:heading]}<div class=\"content\">#{expected}</div></body></html>" unless options[:skip_layout]
     assert_equal expected, @response.body
   end
-end
+end

data/test/smart/test_smart_text.rb ADDED

@@ -0,0 +1,300 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+require 'slim/smart'
+class TestSlimSmartText < TestSlim
+  def test_explicit_smart_text_recognition
+    source = %q{
+>
+  a
+>
+  b
+>
+  c
+>
+  d
+> e
+f
+> g
+  h
+i
+}
+    result = %q{a
+b
+c
+d
+e
+<f></f>
+g
+h
+<i></i>}
+    assert_html result, source
+  end
+  def test_implicit_smart_text_recognition
+    source = %q{
+p
+  A
+p
+  B
+p
+  C
+p
+  D
+p E
+F
+p G
+  H
+I
+}
+    result = %q{<p>A</p><p>B</p><p>C</p><p>D</p><p>E</p>
+F
+<p>G
+H</p>
+I}
+    assert_html result, source
+  end
+  def test_multi_line_smart_text
+    source = %q{
+p
+  First line.
+  Second line.
+  Third line
+   with a continuation
+   and one more.
+  Fourth line.
+}
+    result = %q{<p>First line.
+Second line.
+Third line
+with a continuation
+and one more.
+Fourth line.</p>}
+    assert_html result, source
+  end
+  def test_smart_text_escaping
+    source = %q{
+| Not escaped <&>.
+p Escaped <&>.
+p
+  Escaped <&>.
+  > Escaped <&>.
+  Protected &amp; &lt; &gt; &copy; &Aacute;.
+  Protected &#0129; &#x00ff;.
+  Escaped &#xx; &#1f; &;.
+}
+    result = %q{Not escaped <&>.<p>Escaped &lt;&amp;&gt;.</p><p>Escaped &lt;&amp;&gt;.
+Escaped &lt;&amp;&gt;.
+Protected &amp; &lt; &gt; &copy; &Aacute;.
+Protected &#0129; &#x00ff;.
+Escaped &amp;#xx; &amp;#1f; &amp;;.</p>}
+    assert_html result, source
+  end
+  def test_smart_text_disabled_escaping
+    Slim::Engine.with_options( :smart_text_escaping => false ) do
+      source = %q{
+p Not escaped <&>.
+| Not escaped <&>.
+p
+  Not escaped <&>.
+  > Not escaped <&>.
+  Not escaped &amp; &lt; &gt; &copy; &Aacute;.
+  Not escaped &#0129; &#x00ff;.
+  Not escaped &#xx; &#1f; &;.
+}
+    result = %q{<p>Not escaped <&>.</p>Not escaped <&>.<p>Not escaped <&>.
+Not escaped <&>.
+Not escaped &amp; &lt; &gt; &copy; &Aacute;.
+Not escaped &#0129; &#x00ff;.
+Not escaped &#xx; &#1f; &;.</p>}
+      assert_html result, source
+    end
+  end
+  def test_smart_text_in_tag_escaping
+    source = %q{
+p Escaped <&>.
+  Protected &amp; &lt; &gt; &copy; &Aacute;.
+  Protected &#0129; &#x00ff;.
+  Escaped &#xx; &#1f; &;.
+}
+    result = %q{<p>Escaped &lt;&amp;&gt;.
+Protected &amp; &lt; &gt; &copy; &Aacute;.
+Protected &#0129; &#x00ff;.
+Escaped &amp;#xx; &amp;#1f; &amp;;.</p>}
+    assert_html result, source
+  end
+  def test_smart_text_mixed_with_tags
+    source = %q{
+p
+  Text
+  br
+  >is
+  strong really
+  > recognized.
+  More
+  b text
+  .
+  And
+  i more
+  ...
+  span Really
+  ?!?
+  .bold Really
+  !!!
+  #id
+    #{'Good'}
+  !
+}
+    result = %q{<p>Text
+<br />
+is
+<strong>really</strong>
+recognized.
+More
+<b>text</b>.
+And
+<i>more</i>...
+<span>Really</span>?!?
+<div class="bold">Really</div>!!!
+<div id="id">Good</div>!</p>}
+    assert_html result, source
+  end
+  def test_smart_text_mixed_with_links
+    source = %q{
+p
+  Text with
+  a href="#1" link
+  .
+  Text with
+  a href="#2" another
+              link
+  > to somewhere else.
+  a href="#3"
+    This link
+  > goes
+    elsewhere.
+  See (
+  a href="#4" link
+  )?
+}
+    result = %q{<p>Text with
+<a href="#1">link</a>.
+Text with
+<a href="#2">another
+link</a>
+to somewhere else.
+<a href="#3">This link</a>
+goes
+elsewhere.
+See (<a href="#4">link</a>)?</p>}
+    assert_html result, source
+  end
+  def test_smart_text_mixed_with_code
+    source = %q{
+p
+  Try a list
+  ul
+    - 2.times do |i|
+      li
+        Item: #{i}
+  > which stops
+  b here
+  . Right?
+}
+    result = %q{<p>Try a list
+<ul><li>Item: 0</li><li>Item: 1</li></ul>
+which stops
+<b>here</b>. Right?</p>}
+    assert_html result, source
+  end
+  # Without unicode support, we can't distinguish uppercase and lowercase
+  # unicode characters reliably. So we only test the basic text, not tag names.
+  def test_basic_unicode_smart_text
+    source = %q{
+p
+  是
+  čip
+  Čip
+  Žůžo
+  šíp
+}
+        result = %q{<p>是
+čip
+Čip
+Žůžo
+šíp</p>}
+    assert_html result, source
+  end
+  if ''.respond_to?(:encoding)
+    def test_unicode_smart_text
+      source = %q{
+p
+  是
+  čip
+  Čip
+  Žůžo
+  šíp
+  .řek
+    .
+}
+          result = %q{<p>是
+čip
+Čip
+Žůžo
+šíp
+<div class="řek">.</div></p>}
+      assert_html result, source
+    end
+  end
+end

data/test/translator/test_translator.rb CHANGED

@@ -26,18 +26,19 @@ markdown:
   * one
   * two
 }
-    if !Gem::Specification::find_all_by_name('redcarpet').empty?
-      # redcarpet
+    case Tilt['md'].name.downcase
+    when /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, :tr_mode => :dynamic
       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, :tr_mode => :static
-    elsif !Gem::Specification::find_all_by_name('rdiscount').empty?
-      # rdiscount
+    when /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, :tr_mode => :dynamic
       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, :tr_mode => :static
-    else
-      # kramdown
+    when /kramdown/
       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, :tr_mode => :dynamic
       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, :tr_mode => :static
+    else
+      raise "Missing test for #{Tilt['md']}"
     end
   end

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slim
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.0
 platform: ruby
 authors:
 - Daniel Mendler
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-07-04 00:00:00.000000000 Z
+date: 2014-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.6
+        version: 0.6.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.6
+        version: 0.6.9
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -75,7 +75,13 @@ files:
 - benchmarks/view.haml
 - benchmarks/view.slim
 - bin/slimrb
+- doc/include.md
+- doc/jp/include.md
+- doc/jp/logic_less.md
+- doc/jp/smart.md
+- doc/jp/translator.md
 - doc/logic_less.md
+- doc/smart.md
 - doc/translator.md
 - lib/slim.rb
 - lib/slim/code_attributes.rb
@@ -88,11 +94,16 @@ files:
 - lib/slim/erb_converter.rb
 - lib/slim/filter.rb
 - lib/slim/grammar.rb
+- lib/slim/include.rb
 - lib/slim/interpolation.rb
 - lib/slim/logic_less.rb
 - lib/slim/logic_less/context.rb
 - lib/slim/logic_less/filter.rb
 - lib/slim/parser.rb
+- lib/slim/smart.rb
+- lib/slim/smart/escaper.rb
+- lib/slim/smart/filter.rb
+- lib/slim/smart/parser.rb
 - lib/slim/splat/builder.rb
 - lib/slim/splat/filter.rb
 - lib/slim/template.rb
@@ -119,6 +130,11 @@ files:
 - test/core/test_text_interpolation.rb
 - test/core/test_thread_options.rb
 - test/core/test_unicode.rb
+- test/include/files/recursive.slim
+- test/include/files/slimfile.slim
+- test/include/files/subdir/test.slim
+- test/include/files/textfile
+- test/include/test_include.rb
 - test/literate/TESTS.md
 - test/literate/helper.rb
 - test/literate/run.rb
@@ -158,6 +174,7 @@ files:
 - test/rails/script/rails
 - test/rails/test/helper.rb
 - test/rails/test/test_slim.rb
+- test/smart/test_smart_text.rb
 - test/translator/test_translator.rb
 homepage: http://slim-lang.com/
 licenses:
@@ -184,3 +201,4 @@ signing_key:
 specification_version: 4
 summary: Slim is a template language.
 test_files: []
+has_rdoc: