slim 1.3.0 → 1.3.2

data/lib/slim/translator.rb

@@ -2,8 +2,9 @@ require 'slim'
 
 module Slim
   class Translator < Filter
-    set_default_options :tr_mode => :dynamic,
-                        :tr_fn   => '_'
+    define_options :tr_mode => :dynamic,
+                   :tr_fn   => '_',
+                   :tr      => false
 
     if Object.const_defined?(:I18n)
       set_default_options :tr_fn => '::Slim::Translator.i18n_text',
@@ -30,22 +31,18 @@ module Slim
     end
 
     def call(exp)
-      if options[:tr]
-        super
-      else
-        exp
-      end
+      options[:tr] ? super : exp
     end
 
-    def initialize(opts)
+    def initialize(opts = {})
       super
       case options[:tr_mode]
       when :static
-        @translator = StaticTranslator.new(options)
+        @translator = StaticTranslator.new(:tr_fn => options[:tr_fn])
       when :dynamic
-        @translator = DynamicTranslator.new(options)
+        @translator = DynamicTranslator.new(:tr_fn => options[:tr_fn])
       else
-        raise "Invalid translator mode #{options[:tr_mode].inspect}"
+        raise ArgumentError, "Invalid translator mode #{options[:tr_mode].inspect}"
       end
     end
 
@@ -56,7 +53,9 @@ module Slim
     private
 
     class StaticTranslator < Filter
-      def initialize(opts)
+      define_options :tr_fn
+
+      def initialize(opts = {})
         super
         @translate = eval("proc {|string| #{options[:tr_fn]}(string) }")
       end
@@ -86,6 +85,8 @@ module Slim
     end
 
     class DynamicTranslator < Filter
+      define_options :tr_fn
+
       def call(exp)
         @captures_count, @captures_var, @text = 0, unique_name, ''
 

data/lib/slim/version.rb

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

data/slim.gemspec

@@ -19,7 +19,7 @@ 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.4.1'])
+  s.add_runtime_dependency('temple', ['~> 0.5.0'])
   s.add_runtime_dependency('tilt', ['~> 1.3.3'])
 
   s.add_development_dependency('rake', ['>= 0.8.7'])

data/test/{slim → core}/helper.rb

@@ -7,8 +7,7 @@ require 'slim/grammar'
 MiniTest::Unit.autorun
 
 Slim::Engine.after  Slim::Parser, Temple::Filters::Validator, :grammar => Slim::Grammar
-Slim::Engine.before Slim::Compiler, Temple::Filters::Validator, :grammar => Slim::Grammar
-Slim::Engine.before :AttributeMerger, Temple::Filters::Validator
+Slim::Engine.before :Pretty, Temple::Filters::Validator
 
 class TestSlim < MiniTest::Unit::TestCase
   def setup
@@ -16,7 +15,8 @@ class TestSlim < MiniTest::Unit::TestCase
   end
 
   def render(source, options = {}, &block)
-    Slim::Template.new(options[:file], options) { source }.render(options[:scope] || @env, &block)
+    scope = options.delete(:scope)
+    Slim::Template.new(options[:file], options) { source }.render(scope || @env, &block)
   end
 
   def assert_html(expected, source, options = {}, &block)
@@ -133,10 +133,6 @@ class Env
     "<script>do_something_evil();</script>"
   end
 
-  def method_which_returns_true
-    true
-  end
-
   def output_number
     1337
   end

data/test/{slim → core}/test_code_escaping.rb

@@ -6,7 +6,7 @@ class TestSlimCodeEscaping < TestSlim
 p = evil_method
 }
 
-    assert_html '<p>&lt;script&gt;do_something_evil();&lt;&#47;script&gt;</p>', source
+    assert_html '<p>&lt;script&gt;do_something_evil();&lt;/script&gt;</p>', source
   end
 
   def test_render_without_html_safe
@@ -14,7 +14,7 @@ p = evil_method
 p = "<strong>Hello World\\n, meet \\"Slim\\"</strong>."
 }
 
-    assert_html "<p>&lt;strong&gt;Hello World\n, meet \&quot;Slim\&quot;&lt;&#47;strong&gt;.</p>", source
+    assert_html "<p>&lt;strong&gt;Hello World\n, meet \&quot;Slim\&quot;&lt;/strong&gt;.</p>", source
   end
 
   def test_render_with_html_safe_false
@@ -22,7 +22,7 @@ p = "<strong>Hello World\\n, meet \\"Slim\\"</strong>."
 p = HtmlUnsafeString.new("<strong>Hello World\\n, meet \\"Slim\\"</strong>.")
 }
 
-    assert_html "<p>&lt;strong&gt;Hello World\n, meet \&quot;Slim\&quot;&lt;&#47;strong&gt;.</p>", source, :use_html_safe => true
+    assert_html "<p>&lt;strong&gt;Hello World\n, meet \&quot;Slim\&quot;&lt;/strong&gt;.</p>", source, :use_html_safe => true
   end
 
   def test_render_with_html_safe_true
@@ -39,7 +39,7 @@ p = HtmlSafeString.new("<strong>Hello World\\n, meet \\"Slim\\"</strong>.")
 == "<p>World</p>"
 }
 
-    assert_html "&lt;p&gt;Hello&lt;&#47;p&gt;<p>World</p>", source
+    assert_html "&lt;p&gt;Hello&lt;/p&gt;<p>World</p>", source
   end
 
   def test_render_with_disable_escape_true

data/test/{slim → core}/test_code_evaluation.rb

@@ -71,7 +71,7 @@ p id=@var
 form action=action_path(:page, :save) method='post'
 }
 
-    assert_html '<form action="&#47;action-page-save" method="post"></form>', source
+    assert_html '<form action="/action-page-save" method="post"></form>', source
   end
 
   def test_ruby_attribute_with_unbalanced_delimiters
@@ -79,7 +79,7 @@ form action=action_path(:page, :save) method='post'
 div crazy=action_path('[') id="crazy_delimiters"
 }
 
-    assert_html '<div crazy="&#47;action-[" id="crazy_delimiters"></div>', source
+    assert_html '<div crazy="/action-[" id="crazy_delimiters"></div>', source
   end
 
   def test_method_call_in_delimited_attribute_without_quotes
@@ -87,20 +87,12 @@ div crazy=action_path('[') id="crazy_delimiters"
 form(action=action_path(:page, :save) method='post')
 }
 
-    assert_html '<form action="&#47;action-page-save" method="post"></form>', source
+    assert_html '<form action="/action-page-save" method="post"></form>', source
   end
 
   def test_method_call_in_delimited_attribute_without_quotes2
     source = %q{
 form(method='post' action=action_path(:page, :save))
-}
-
-    assert_html '<form action="&#47;action-page-save" method="post"></form>', source
-  end
-
-  def test_bypassing_escape_in_attribute
-    source = %q{
-form action==action_path(:page, :save) method='post'
 }
 
     assert_html '<form action="/action-page-save" method="post"></form>', source
@@ -185,105 +177,4 @@ p = output_number
 
     assert_html '<p>1337</p>', source
   end
-
-  def test_ternary_operation_in_attribute
-    source = %q{
-p id="#{(false ? 'notshown' : 'shown')}" = output_number
-}
-
-    assert_html '<p id="shown">1337</p>', source
-  end
-
-  def test_ternary_operation_in_attribute_2
-    source = %q{
-p id=(false ? 'notshown' : 'shown') = output_number
-}
-
-    assert_html '<p id="shown">1337</p>', source
-  end
-
-  def test_class_attribute_merging
-    source = %{
-.alpha class="beta" Test it
-}
-    assert_html '<div class="alpha beta">Test it</div>', source
-  end
-
-  def test_class_attribute_merging_with_nil
-    source = %{
-.alpha class="beta" class=nil class="gamma" Test it
-}
-    assert_html '<div class="alpha beta gamma">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, :attr_delimiter => {'class' => ' ', 'id' => '_' }
-  end
-
-  def test_id_attribute_merging2
-    source = %{
-#alpha id="beta" Test it
-}
-    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=true Text
-}
-
-    assert_html '<option selected="selected">Text</option>', source
-  end
-
-  def test_boolean_attribute_dynamic
-    source = %{
-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_boolean_attribute_string2
-    source = %{
-option selected="selected" Text
-}
-
-    assert_html '<option selected="selected">Text</option>', source
-  end
-
-  def test_boolean_attribute_shortcut
-    source = %{
-option(class="clazz" selected) Text
-option(selected class="clazz") Text
-}
-
-    assert_html '<option class="clazz" selected="selected">Text</option><option class="clazz" selected="selected">Text</option>', source
-  end
-
-  def test_array_attribute
-    source = %{
-.alpha class="beta" class=[:gamma, nil, :delta, [true, false]]
-}
-
-    assert_html '<div class="alpha beta gamma delta true false"></div>', source
-  end
 end

data/test/{slim → core}/test_embedded_engines.rb

@@ -27,9 +27,9 @@ markdown:
 }
     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.default_options[:markdown] = {:auto_ids => false}
-    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
-    Slim::EmbeddedEngine.default_options[:markdown] = nil
+    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
+    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
@@ -114,18 +114,21 @@ scss:
 ruby:
   Embedded Ruby
 }
+    assert_runtime_error 'Embedded engine ruby is disabled', source, :enable_engines => [:javascript]
     assert_runtime_error 'Embedded engine ruby is disabled', source, :enable_engines => %w(javascript)
 
     source = %{
 ruby:
   Embedded Ruby
 }
+    assert_runtime_error 'Embedded engine ruby is disabled', source, :enable_engines => [:javascript]
     assert_runtime_error 'Embedded engine ruby is disabled', source, :enable_engines => %w(javascript)
 
     source = %{
 ruby:
   Embedded Ruby
 }
+    assert_runtime_error 'Embedded engine ruby is disabled', source, :disable_engines => [:ruby]
     assert_runtime_error 'Embedded engine ruby is disabled', source, :disable_engines => %w(ruby)
   end
 
@@ -134,12 +137,14 @@ ruby:
 javascript:
   $(function() {});
 }
+    assert_html '<script type="text/javascript">$(function() {});</script>', source, :disable_engines => [:ruby]
     assert_html '<script type="text/javascript">$(function() {});</script>', source, :disable_engines => %w(ruby)
 
     source = %q{
 javascript:
   $(function() {});
 }
+    assert_html '<script type="text/javascript">$(function() {});</script>', source, :enable_engines => [:javascript]
     assert_html '<script type="text/javascript">$(function() {});</script>', source, :enable_engines => %w(javascript)
   end
 end

data/test/core/test_html_attributes.rb

@@ -0,0 +1,218 @@
+require 'helper'
+
+class TestSlimHTMLAttributes < TestSlim
+  def test_ternary_operation_in_attribute
+    source = %q{
+p id="#{(false ? 'notshown' : 'shown')}" = output_number
+}
+
+    assert_html '<p id="shown">1337</p>', source
+  end
+
+  def test_ternary_operation_in_attribute_2
+    source = %q{
+p id=(false ? 'notshown' : 'shown') = output_number
+}
+
+    assert_html '<p id="shown">1337</p>', source
+  end
+
+  def test_class_attribute_merging
+    source = %{
+.alpha class="beta" Test it
+}
+    assert_html '<div class="alpha beta">Test it</div>', source
+  end
+
+  def test_class_attribute_merging_with_nil
+    source = %{
+.alpha class="beta" class=nil class="gamma" Test it
+}
+    assert_html '<div class="alpha beta gamma">Test it</div>', source
+  end
+
+  def test_class_attribute_merging_with_empty_static
+    source = %{
+.alpha class="beta" class="" class="gamma" Test it
+}
+    assert_html '<div class="alpha beta gamma">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, :attr_delimiter => {'class' => ' ', 'id' => '_' }
+  end
+
+  def test_id_attribute_merging2
+    source = %{
+#alpha id="beta" Test it
+}
+    assert_html '<div id="alpha-beta">Test it</div>', source, :attr_delimiter => {'class' => ' ', 'id' => '-' }
+  end
+
+  def test_boolean_attribute_false
+    source = %{
+- cond=false
+option selected=false Text
+option selected=cond Text2
+}
+
+    assert_html '<option>Text</option><option>Text2</option>', source
+  end
+
+  def test_boolean_attribute_true
+    source = %{
+- cond=true
+option selected=true Text
+option selected=cond Text2
+}
+
+    assert_html '<option selected="selected">Text</option><option selected="selected">Text2</option>', source
+  end
+
+  def test_boolean_attribute_nil
+    source = %{
+- cond=nil
+option selected=nil Text
+option selected=cond Text2
+}
+
+    assert_html '<option>Text</option><option>Text2</option>', source
+  end
+
+  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 = %{
+option(class="clazz" selected) Text
+option(selected class="clazz") Text
+}
+
+    assert_html '<option class="clazz" selected="selected">Text</option><option class="clazz" selected="selected">Text</option>', source
+  end
+
+  def test_array_attribute
+    source = %{
+.alpha class="beta" class=[:gamma, nil, :delta, [true, false]]
+}
+
+    assert_html '<div class="alpha beta gamma delta true false"></div>', source
+  end
+
+
+  def test_shortcut_splat
+    source = %q{
+*hash This is my title
+}
+
+    assert_html '<div a="The letter a" b="The letter b">This is my title</div>', source
+  end
+
+  def test_splat
+    source = %q{
+h1 *hash This is my title
+}
+
+    assert_html '<h1 a="The letter a" b="The letter b">This is my title</h1>', source
+  end
+
+  def test_splat_tag_name
+    source = %q{
+*{:tag => 'h1', :id => 'title'} This is my title
+}
+
+    assert_html '<h1 id="title">This is my title</h1>', source
+  end
+
+
+  def test_splat_empty_tag_name
+    source = %q{
+*{:tag => '', :id => 'test'} This is my title
+}
+
+    assert_html '<div id="test">This is my title</div>', source
+  end
+
+  def test_closed_splat_tag
+    source = %q{
+*hash / This is my title
+}
+
+    assert_html '<div a="The letter a" b="The letter b"/>', source
+  end
+
+  def test_splat_with_id_shortcut
+    source = %q{
+#myid*hash This is my title
+}
+
+    assert_html '<div a="The letter a" b="The letter b" id="myid">This is my title</div>', source
+  end
+
+  def test_splat_with_class_shortcut
+    source = %q{
+.myclass*hash This is my title
+}
+
+    assert_html '<div a="The letter a" b="The letter b" class="myclass">This is my title</div>', source
+  end
+
+  def test_splat_with_id_and_class_shortcuts
+    source = %q{
+#myid.myclass*hash This is my title
+}
+
+    assert_html '<div a="The letter a" b="The letter b" class="myclass" id="myid">This is my title</div>', source
+  end
+
+  def test_splat_with_class_merging
+    source = %q{
+#myid.myclass *{:class => [:secondclass, %w(x y z)]} *hash This is my title
+}
+
+    assert_html '<div a="The letter a" b="The letter b" class="myclass secondclass x y z" id="myid">This is my title</div>', source
+  end
+
+  def test_splat_with_boolean_attribute
+    source = %q{
+*{:disabled => true, :empty1 => false, :nonempty => '', :empty2 => nil} This is my title
+}
+
+    assert_html '<div disabled="disabled" nonempty="">This is my title</div>', source
+  end
+
+  def test_splat_merging_with_arrays
+    source = %q{
+*{:a => 1, :b => 2} *[[:c, 3], [:d, 4]] *[[:e, 5], [:f, 6]] This is my title
+}
+
+    assert_html '<div a="1" b="2" c="3" d="4" e="5" f="6">This is my title</div>', source
+  end
+
+  def test_splat_with_other_attributes
+    source = %q{
+h1 data-id="123" *hash This is my title
+}
+
+    assert_html '<h1 a="The letter a" b="The letter b" data-id="123">This is my title</h1>', source
+  end
+
+  def test_attribute_merging
+    source = %q{
+a class=true class=false
+a class=false *{:class=>true}
+a class=true
+a class=false
+}
+
+    assert_html '<a class="true false"></a><a class="false true"></a><a class="class"></a><a></a>', source
+  end
+end