slim 2.1.0 → 3.0.0.beta.2

data/lib/slim/smart.rb

@@ -3,6 +3,6 @@ require 'slim/smart/filter'
 require 'slim/smart/escaper'
 require 'slim/smart/parser'
 
-Slim::Engine.replace(Slim::Parser, Slim::Smart::Parser, :file, :tabsize, :shortcut, :default_tag, :attr_delims, :attr_list_delims, :code_attr_delims, :implicit_text)
-Slim::Engine.after(Slim::Smart::Parser, Slim::Smart::Filter, :smart_text, :smart_text_end_chars, :smart_text_begin_chars)
-Slim::Engine.after(Slim::Interpolation, Slim::Smart::Escaper, :smart_text_escaping)
+Slim::Engine.replace Slim::Parser, Slim::Smart::Parser
+Slim::Engine.after Slim::Smart::Parser, Slim::Smart::Filter
+Slim::Engine.after Slim::Interpolation, Slim::Smart::Escaper

data/lib/slim/smart/escaper.rb

@@ -5,7 +5,7 @@ module Slim
     #
     # @api private
     class Escaper < ::Slim::Filter
-      define_options :smart_text_escaping => true
+      define_options smart_text_escaping: true
 
       def call(exp)
         if options[:smart_text_escaping]

data/lib/slim/smart/filter.rb

@@ -5,9 +5,9 @@ module Slim
     #
     # @api private
     class Filter < ::Slim::Filter
-      define_options :smart_text => true,
-                     :smart_text_end_chars => '([{',
-                     :smart_text_begin_chars => ',.;:!?)]}'
+      define_options smart_text: true,
+                     smart_text_end_chars: '([{',
+                     smart_text_begin_chars: ',.;:!?)]}'
 
       def initialize(opts = {})
         super

data/lib/slim/smart/parser.rb

@@ -1,15 +1,17 @@
+# coding: utf-8
+
 module Slim
   module Smart
     class Parser < ::Slim::Parser
-      define_options :implicit_text => true
+      define_options implicit_text: true
 
       def initialize(opts = {})
         super
-        word_re = options[:implicit_text] ? LC_WORD_RE : WORD_RE
+        word_re = options[:implicit_text] ? '[_a-z0-9]' : '\p{Word}'
         attr_keys = Regexp.union(@attr_shortcut.keys.sort_by {|k| -k.size } )
-        @attr_shortcut_re = /\A(#{attr_keys}+)((?:#{WORD_RE}|-)*)/
+        @attr_shortcut_re = /\A(#{attr_keys}+)((?:\p{Word}|-)*)/
         tag_keys = Regexp.union((@tag_shortcut.keys - @attr_shortcut.keys).sort_by {|k| -k.size } )
-        @tag_re = /\A(?:#{attr_keys}(?=-*#{WORD_RE})|#{tag_keys}|\*(?=[^\s]+)|(#{word_re}(?:#{word_re}|:|-)*#{word_re}|#{word_re}+))/
+        @tag_re = /\A(?:#{attr_keys}(?=-*\p{Word})|#{tag_keys}|\*(?=[^\s]+)|(#{word_re}(?:#{word_re}|:|-)*#{word_re}|#{word_re}+))/
       end
 
       def unknown_line_indicator

data/lib/slim/splat/builder.rb

@@ -10,11 +10,11 @@ module Slim
       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_safe(value, @options[:use_html_safe]) : value) unless value.empty?
+          attr(name, escape_html(escape, value)) unless value.empty?
         elsif @options[:hyphen_attrs].include?(name) && Hash === value
           hyphen_attr(name, escape, value)
         elsif value != false && value != nil
-          attr(name, value != true && escape ? Temple::Utils.escape_html_safe(value, @options[:use_html_safe]) : value)
+          attr(name, escape_html(value != true && escape, value))
         end
       end
 
@@ -27,7 +27,7 @@ module Slim
       def attr(name, value)
         if @attrs[name]
           if delim = @options[:merge_attrs][name]
-            @attrs[name] << delim << value.to_s
+            @attrs[name] += delim + value.to_s
           else
             raise("Multiple #{name} attributes specified")
           end
@@ -69,9 +69,14 @@ module Slim
             hyphen_attr("#{name}-#{n.to_s.gsub('_', '-')}", escape, v)
           end
         else
-          attr(name, value != true && escape ? Temple::Utils.escape_html_safe(value, @options[:use_html_safe]) : value)
+          attr(name, escape_html(value != true && escape, value))
         end
       end
+
+      def escape_html(escape, value)
+        return value unless escape
+        @options[:use_html_safe] ? Temple::Utils.escape_html_safe(value) : Temple::Utils.escape_html(value)
+      end
     end
   end
 end

data/lib/slim/splat/filter.rb

@@ -2,15 +2,14 @@ module Slim
   module Splat
     # @api private
     class Filter < ::Slim::Filter
-      OPTIONS = [:merge_attrs, :attr_quote, :sort_attrs, :default_tag, :hyphen_attrs, :format, :use_html_safe]
-      define_options OPTIONS
-      set_default_options :hyphen_attrs => %w(data aria), :use_html_safe => ''.respond_to?(:html_safe?)
+      define_options :merge_attrs, :attr_quote, :sort_attrs, :default_tag, :format,
+                     hyphen_attrs: %w(data aria), use_html_safe: ''.respond_to?(:html_safe?)
 
       def call(exp)
         @splat_options = nil
         exp = compile(exp)
         if @splat_options
-          opts = options.to_hash.reject {|k,v| !OPTIONS.include?(k) }.inspect
+          opts = options.to_hash.reject {|k,v| !Filter.options.valid_key?(k) }.inspect
           [:multi, [:code, "#{@splat_options} = #{opts}"], exp]
         else
           exp

data/lib/slim/template.rb

@@ -1,19 +1,19 @@
 module Slim
   # Tilt template implementation for Slim
   # @api public
-  Template = Temple::Templates::Tilt(Slim::Engine, :register_as => :slim)
+  Template = Temple::Templates::Tilt(Slim::Engine, register_as: :slim)
 
   if defined?(::ActionView)
     # Rails template implementation for Slim
     # @api public
     RailsTemplate = Temple::Templates::Rails(Slim::Engine,
-                                             :register_as => :slim,
+                                             register_as: :slim,
                                              # Use rails-specific generator. This is necessary
                                              # to support block capturing and streaming.
-                                             :generator => Temple::Generators::RailsOutputBuffer,
+                                             generator: Temple::Generators::RailsOutputBuffer,
                                              # Disable the internal slim capturing.
                                              # Rails takes care of the capturing by itself.
-                                             :disable_capture => true,
-                                             :streaming => defined?(::Fiber))
+                                             disable_capture: true,
+                                             streaming: true)
   end
 end

data/lib/slim/translator.rb

@@ -2,19 +2,19 @@ require 'slim'
 
 module Slim
   class Translator < Filter
-    define_options :tr_mode => :dynamic,
-                   :tr_fn   => '_',
-                   :tr      => false
+    define_options :tr,
+                   tr_mode: :dynamic,
+                   tr_fn: '_'
 
     if defined?(::I18n)
-      set_default_options :tr_fn => '::Slim::Translator.i18n_text',
-                          :tr => true
+      set_options tr_fn: '::Slim::Translator.i18n_text',
+                  tr: true
     elsif defined?(::GetText)
-      set_default_options :tr_fn => '::GetText._',
-                          :tr => true
+      set_options tr_fn: '::GetText._',
+                  tr: true
     elsif defined?(::FastGettext)
-      set_default_options :tr_fn => '::FastGettext::Translation._',
-                          :tr => true
+      set_options tr_fn: '::FastGettext::Translation._',
+                  tr: true
     end
 
     def self.i18n_text(text)
@@ -38,9 +38,9 @@ module Slim
       super
       case options[:tr_mode]
       when :static
-        @translator = StaticTranslator.new(:tr_fn => options[:tr_fn])
+        @translator = StaticTranslator.new(tr_fn: options[:tr_fn])
       when :dynamic
-        @translator = DynamicTranslator.new(:tr_fn => options[:tr_fn])
+        @translator = DynamicTranslator.new(tr_fn: options[:tr_fn])
       else
         raise ArgumentError, "Invalid translator mode #{options[:tr_mode].inspect}"
       end
@@ -114,5 +114,4 @@ module Slim
   end
 end
 
-# Insert plugin filter into Slim engine chain
-Slim::Engine.before(Slim::EndInserter, Slim::Translator, :tr, :tr_fn, :tr_mode)
+Slim::Engine.before Slim::EndInserter, Slim::Translator

data/lib/slim/version.rb

@@ -1,5 +1,5 @@
 module Slim
   # Slim version string
   # @api public
-  VERSION = '2.1.0'
+  VERSION = '3.0.0.beta.2'
 end

data/slim.gemspec

@@ -18,6 +18,8 @@ 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.9'])
+  s.required_ruby_version = '>=1.9.2'
+
+  s.add_runtime_dependency('temple', ['~> 0.7.1'])
   s.add_runtime_dependency('tilt', ['>= 1.3.3', '< 2.1'])
 end

data/test/core/helper.rb

@@ -4,7 +4,7 @@ require 'minitest/autorun'
 require 'slim'
 require 'slim/grammar'
 
-Slim::Engine.after  Slim::Parser, Temple::Filters::Validator, :grammar => Slim::Grammar
+Slim::Engine.after  Slim::Parser, Temple::Filters::Validator, grammar: Slim::Grammar
 Slim::Engine.before :Pretty, Temple::Filters::Validator
 
 class TestSlim < MiniTest::Unit::TestCase
@@ -99,7 +99,7 @@ class Env
   end
 
   def hash
-    {:a => 'The letter a', :b => 'The letter b'}
+    {a: 'The letter a', b: 'The letter b'}
   end
 
   def show_first?(show = false)
@@ -157,7 +157,7 @@ class ViewEnv
   end
 
   def person
-    [{:name => 'Joe'}, {:name => 'Jack'}]
+    [{name: 'Joe'}, {name: 'Jack'}]
   end
 
   def people

data/test/core/test_code_escaping.rb

@@ -31,7 +31,7 @@ p = "<strong>Hello World\\n, meet \\"Slim\\"</strong>."
 }
 
     with_html_safe do
-      assert_html "<p>&lt;strong&gt;Hello World\n, meet \&quot;Slim\&quot;&lt;/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
   end
 
@@ -41,27 +41,27 @@ p = "<strong>Hello World\\n, meet \\"Slim\\"</strong>.".html_safe
 }
 
     with_html_safe do
-      assert_html "<p><strong>Hello World\n, meet \"Slim\"</strong>.</p>", source, :use_html_safe => true
+      assert_html "<p><strong>Hello World\n, meet \"Slim\"</strong>.</p>", source, use_html_safe: true
     end
   end
 
   def test_render_splat_with_html_safe_true
     source = %q{
-p *{ :title => '&amp;'.html_safe }
+p *{ title: '&amp;'.html_safe }
 }
 
     with_html_safe do
-      assert_html "<p title=\"&amp;\"></p>", source, :use_html_safe => true
+      assert_html "<p title=\"&amp;\"></p>", source, use_html_safe: true
     end
   end
 
   def test_render_splat_with_html_safe_false
     source = %q{
-p *{ :title => '&' }
+p *{ title: '&' }
 }
 
     with_html_safe do
-      assert_html "<p title=\"&amp;\"></p>", source, :use_html_safe => true
+      assert_html "<p title=\"&amp;\"></p>", source, use_html_safe: true
     end
   end
 
@@ -72,7 +72,7 @@ p title=('&amp;'.html_safe)
 }
 
     with_html_safe do
-      assert_html "<p title=\"&amp;\"></p>", source, :use_html_safe => true
+      assert_html "<p title=\"&amp;\"></p>", source, use_html_safe: true
     end
   end
 
@@ -91,7 +91,7 @@ p title=('&amp;'.html_safe)
 == "<p>World</p>"
 }
 
-    assert_html "<p>Hello</p><p>World</p>", source, :disable_escape => true
+    assert_html "<p>Hello</p><p>World</p>", source, disable_escape: true
   end
 
   def test_escaping_evil_method_with_pretty
@@ -99,7 +99,7 @@ p title=('&amp;'.html_safe)
 p = evil_method
 }
 
-    assert_html "<p>\n  &lt;script&gt;do_something_evil();&lt;/script&gt;\n</p>", source, :pretty => true
+    assert_html "<p>\n  &lt;script&gt;do_something_evil();&lt;/script&gt;\n</p>", source, pretty: true
   end
 
   def test_render_without_html_safe_with_pretty
@@ -107,7 +107,7 @@ p = evil_method
 p = "<strong>Hello World\\n, meet \\"Slim\\"</strong>."
 }
 
-    assert_html "<p>\n  &lt;strong&gt;Hello World\n  , meet \&quot;Slim\&quot;&lt;/strong&gt;.\n</p>", source, :pretty => true
+    assert_html "<p>\n  &lt;strong&gt;Hello World\n  , meet \&quot;Slim\&quot;&lt;/strong&gt;.\n</p>", source, pretty: true
   end
 
   def test_render_with_html_safe_false_with_pretty
@@ -116,7 +116,7 @@ p = "<strong>Hello World\\n, meet \\"Slim\\"</strong>."
 }
 
     with_html_safe do
-      assert_html "<p>\n  &lt;strong&gt;Hello World\n  , meet \&quot;Slim\&quot;&lt;/strong&gt;.\n</p>", source, :use_html_safe => true, :pretty => true
+      assert_html "<p>\n  &lt;strong&gt;Hello World\n  , meet \&quot;Slim\&quot;&lt;/strong&gt;.\n</p>", source, use_html_safe: true, pretty: true
     end
   end
 
@@ -126,7 +126,7 @@ p = "<strong>Hello World\\n, meet \\"Slim\\"</strong>.".html_safe
 }
 
     with_html_safe do
-      assert_html "<p>\n  <strong>Hello World\n  , meet \"Slim\"</strong>.\n</p>", source, :use_html_safe => true, :pretty => true
+      assert_html "<p>\n  <strong>Hello World\n  , meet \"Slim\"</strong>.\n</p>", source, use_html_safe: true, pretty: true
     end
   end
 
@@ -136,7 +136,7 @@ p = "<strong>Hello World\\n, meet \\"Slim\\"</strong>.".html_safe
 == "<p>World</p>"
 }
 
-    assert_html "&lt;p&gt;Hello&lt;/p&gt;<p>World</p>", source, :pretty => true
+    assert_html "&lt;p&gt;Hello&lt;/p&gt;<p>World</p>", source, pretty: true
   end
 
   def test_render_with_disable_escape_true_with_pretty
@@ -145,6 +145,6 @@ p = "<strong>Hello World\\n, meet \\"Slim\\"</strong>.".html_safe
 == "<p>World</p>"
 }
 
-    assert_html "<p>Hello</p><p>World</p>", source, :disable_escape => true, :pretty => true
+    assert_html "<p>Hello</p><p>World</p>", source, disable_escape: true, pretty: true
   end
 end

data/test/core/test_code_evaluation.rb

@@ -44,7 +44,7 @@ p id="#{id_helper}" class="hello world" = hello_world "Hello Ruby!"
 
   def test_render_with_spaced_parameterized_call_to_set_attributes_and_call_to_set_content_2
     source = %q{
-p id="#{id_helper}" class="hello world" = hello_world "Hello Ruby!", :dummy => "value"
+p id="#{id_helper}" class="hello world" = hello_world "Hello Ruby!", dummy: "value"
 }
 
     assert_html '<p class="hello world" id="notice">Hello Ruby!dummy value</p>', source

data/test/core/test_code_output.rb

@@ -74,7 +74,7 @@ p
   def test_render_with_spaced_parameterized_call_2
     source = %q{
 p
-  = hello_world "Hello Ruby!", :dummy => "value"
+  = hello_world "Hello Ruby!", dummy: "value"
 }
 
     assert_html '<p>Hello Ruby!dummy value</p>', source

data/test/core/test_embedded_engines.rb

@@ -52,7 +52,7 @@ markdown:
       # 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
+      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
 
@@ -95,7 +95,7 @@ org:
   def test_render_with_builder
     source = %q{
 builder:
-  xml.p(:id => 'test') {
+  xml.p(id: 'test') {
     xml.text!('Hello')
   }
 }
@@ -155,28 +155,28 @@ javascript:
   end
 
   def test_render_with_javascript_with_explicit_html_comment
-    Slim::Engine.with_options(:js_wrapper => :comment) do
+    Slim::Engine.with_options(js_wrapper: :comment) do
       source = "javascript:\n\t$(function() {});\n\talert('hello')\np Hi"
       assert_html "<script type=\"text/javascript\"><!--\n$(function() {});\nalert('hello')\n//--></script><p>Hi</p>", source
     end
   end
 
   def test_render_with_javascript_with_explicit_cdata_comment
-    Slim::Engine.with_options(:js_wrapper => :cdata) do
+    Slim::Engine.with_options(js_wrapper: :cdata) do
       source = "javascript:\n\t$(function() {});\n\talert('hello')\np Hi"
       assert_html "<script type=\"text/javascript\">\n//<![CDATA[\n$(function() {});\nalert('hello')\n//]]>\n</script><p>Hi</p>", source
     end
   end
 
   def test_render_with_javascript_with_format_xhtml_comment
-    Slim::Engine.with_options(:js_wrapper => :guess, :format => :xhtml) do
+    Slim::Engine.with_options(js_wrapper: :guess, format: :xhtml) do
       source = "javascript:\n\t$(function() {});\n\talert('hello')\np Hi"
       assert_html "<script type=\"text/javascript\">\n//<![CDATA[\n$(function() {});\nalert('hello')\n//]]>\n</script><p>Hi</p>", source
     end
   end
 
   def test_render_with_javascript_with_format_html_comment
-    Slim::Engine.with_options(:js_wrapper => :guess, :format => :html) do
+    Slim::Engine.with_options(js_wrapper: :guess, format: :html) do
       source = "javascript:\n\t$(function() {});\n\talert('hello')\np Hi"
       assert_html "<script type=\"text/javascript\"><!--\n$(function() {});\nalert('hello')\n//--></script><p>Hi</p>", source
     end
@@ -206,22 +206,22 @@ 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)
+    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)
+    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)
+    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
 
   def test_enabled_embedded_engine
@@ -229,14 +229,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)
+    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)
+    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