slim 1.3.0 → 1.3.2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slim
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,27 +11,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-04 00:00:00.000000000 Z
+date: 2012-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &18956260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.1
+  version_requirements: *18956260
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &18955320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -39,15 +34,10 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.3
+  version_requirements: *18955320
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &18970580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,15 +45,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.8.7
+  version_requirements: *18970580
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &18970100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -71,15 +56,10 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.1.0
+  version_requirements: *18970100
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &18969540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,15 +67,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *18969540
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &18968820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -103,15 +78,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *18968820
 - !ruby/object:Gem::Dependency
   name: creole
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &18967940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -119,15 +89,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *18967940
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &18966900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -135,12 +100,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *18966900
 description: Slim is a template language whose goal is reduce the syntax to the essential
   parts without becoming cryptic.
 email:
@@ -174,8 +134,9 @@ files:
 - benchmarks/view.slim
 - bin/slimrb
 - lib/slim.rb
+- lib/slim/boolean_attributes.rb
 - lib/slim/command.rb
-- lib/slim/compiler.rb
+- lib/slim/control_structures.rb
 - lib/slim/embedded_engine.rb
 - lib/slim/end_inserter.rb
 - lib/slim/engine.rb
@@ -186,10 +147,30 @@ files:
 - lib/slim/logic_less/filter.rb
 - lib/slim/logic_less/wrapper.rb
 - lib/slim/parser.rb
+- lib/slim/splat_attributes.rb
 - lib/slim/template.rb
 - lib/slim/translator.rb
 - lib/slim/version.rb
 - slim.gemspec
+- test/core/helper.rb
+- test/core/test_code_blocks.rb
+- test/core/test_code_escaping.rb
+- test/core/test_code_evaluation.rb
+- test/core/test_code_output.rb
+- test/core/test_code_structure.rb
+- test/core/test_embedded_engines.rb
+- test/core/test_encoding.rb
+- test/core/test_html_attributes.rb
+- test/core/test_html_escaping.rb
+- test/core/test_html_structure.rb
+- test/core/test_parser_errors.rb
+- test/core/test_pretty.rb
+- test/core/test_ruby_errors.rb
+- test/core/test_slim_template.rb
+- test/core/test_text_interpolation.rb
+- test/core/test_thread_options.rb
+- test/logic_less/test_logic_less.rb
+- test/logic_less/test_wrapper.rb
 - test/rails/Rakefile
 - test/rails/app/controllers/application_controller.rb
 - test/rails/app/controllers/parents_controller.rb
@@ -206,10 +187,10 @@ files:
 - test/rails/app/views/slim/content_for.html.slim
 - test/rails/app/views/slim/erb.html.erb
 - test/rails/app/views/slim/integers.html.slim
-- test/rails/app/views/slim/nil.html.slim
 - test/rails/app/views/slim/no_layout.html.slim
 - test/rails/app/views/slim/normal.html.slim
 - test/rails/app/views/slim/partial.html.slim
+- test/rails/app/views/slim/thread_options.html.slim
 - test/rails/app/views/slim/variables.html.slim
 - test/rails/config.ru
 - test/rails/config/application.rb
@@ -230,25 +211,7 @@ files:
 - test/rails/script/rails
 - test/rails/test/helper.rb
 - test/rails/test/test_slim.rb
-- test/slim/helper.rb
-- test/slim/logic_less/test_logic_less.rb
-- test/slim/logic_less/test_wrapper.rb
-- test/slim/test_chain_manipulation.rb
-- test/slim/test_code_blocks.rb
-- test/slim/test_code_escaping.rb
-- test/slim/test_code_evaluation.rb
-- test/slim/test_code_output.rb
-- test/slim/test_code_structure.rb
-- test/slim/test_embedded_engines.rb
-- test/slim/test_encoding.rb
-- test/slim/test_html_escaping.rb
-- test/slim/test_html_structure.rb
-- test/slim/test_parser_errors.rb
-- test/slim/test_pretty.rb
-- test/slim/test_ruby_errors.rb
-- test/slim/test_slim_template.rb
-- test/slim/test_text_interpolation.rb
-- test/slim/translator/test_translator.rb
+- test/translator/test_translator.rb
 homepage: http://slim-lang.com/
 licenses: []
 post_install_message: 
@@ -270,9 +233,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: slim
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Slim is a template language.
 test_files: []
-has_rdoc: 

data/lib/slim/compiler.rb

@@ -1,194 +0,0 @@
-module Slim
-  # @api private
-  class Compiler < Filter
-    def call(exp)
-      @attr_delimiter, @splat_used = unique_name, false
-      exp = compile(exp)
-      if @splat_used
-        [:multi, [:code, "#{@attr_delimiter} = #{@options[:attr_delimiter].inspect}"], exp]
-      else
-        exp
-      end
-    end
-
-    # Handle control expression `[:slim, :control, code, content]`
-    #
-    # @param [String] code Ruby code
-    # @param [Array] content Temple expression
-    # @return [Array] Compiled temple expression
-    def on_slim_control(code, content)
-      [:multi,
-        [:code, code],
-        compile(content)]
-    end
-
-    # Handle output expression `[:slim, :output, escape, code, content]`
-    #
-    # @param [Boolean] escape Escape html
-    # @param [String] code Ruby code
-    # @param [Array] content Temple expression
-    # @return [Array] Compiled temple expression
-    def on_slim_output(escape, code, content)
-      if empty_exp?(content)
-        [:multi, [:escape, escape, [:dynamic, code]], content]
-      else
-        tmp = unique_name
-
-        [:multi,
-         # Capture the result of the code in a variable. We can't do
-         # `[:dynamic, code]` because it's probably not a complete
-         # expression (which is a requirement for Temple).
-         [:block, "#{tmp} = #{code}",
-
-          # Capture the content of a block in a separate buffer. This means
-          # that `yield` will not output the content to the current buffer,
-          # but rather return the output.
-          #
-          # The capturing can be disabled with the option :disable_capture.
-          # Output code in the block writes directly to the output buffer then.
-          # Rails handles this by replacing the output buffer for helpers.
-          options[:disable_capture] ? compile(content) : [:capture, unique_name, compile(content)]],
-
-         # Output the content.
-         [:escape, escape, [:dynamic, tmp]]]
-      end
-    end
-
-    # Handle text expression `[:slim, :text, content]`
-    #
-    # @param [Array] content Temple expression
-    # @return [Array] Compiled temple expression
-    def on_slim_text(content)
-      compile(content)
-    end
-
-    # Handle tag expression `[:slim, :tag, name, attrs, content]`
-    #
-    # @param [String] name Tag name
-    # @param [Array] attrs Temple expression
-    # @param [Array] content Temple expression
-    # @return [Array] Compiled temple expression
-    def on_slim_tag(name, attrs, content = nil)
-      if name == '*'
-        hash, merger, formatter = splat_attributes(attrs[2..-1])
-        tmp = unique_name
-        tag = [:multi,
-               merger,
-               [:code, "#{tmp} = #{hash}.delete('tag').to_s"],
-               [:if, "#{tmp}.empty?",
-                [:code, "#{tmp} = #{@options[:default_tag].inspect}"]],
-               [:static, '<'],
-               [:dynamic, "#{tmp}"],
-               formatter]
-        tag << if content
-                 [:multi,
-                  [:static, '>'],
-                  compile(content),
-                  [:static, '</'],
-                  [:dynamic, "#{tmp}"],
-                  [:static, '>']]
-               else
-                 [:static, '/>']
-               end
-      else
-        tag = [:html, :tag, name, compile(attrs)]
-        content ? (tag << compile(content)) : tag
-      end
-    end
-
-    # Handle attributes expression `[:slim, :attrs, *attrs]`
-    #
-    # @param [Array] attrs Array of temple expressions
-    # @return [Array] Compiled temple expression
-    def on_slim_attrs(*attrs)
-      if attrs.any? {|attr| attr[1] == :splat}
-        hash, merger, formatter = splat_attributes(attrs)
-        [:multi, merger, formatter]
-      else
-        [:html, :attrs, *attrs.map {|a| compile(a) }]
-      end
-    end
-
-    # Handle attribute expression `[:slim, :attr, escape, code]`
-    #
-    # @param [Boolean] escape Escape html
-    # @param [String] code Ruby code
-    # @return [Array] Compiled temple expression
-    def on_slim_attr(name, escape, code)
-      value = case code
-      when 'true'
-        [:static, name]
-      when 'false', 'nil'
-        [:multi]
-      else
-        tmp = unique_name
-        [:multi,
-         [:code, "#{tmp} = #{code}"],
-         [:case, tmp,
-          ['true', [:static, name]],
-          ['false, nil', [:multi]],
-          [:else,
-           [:escape, escape, [:dynamic,
-            if delimiter = options[:attr_delimiter][name]
-              "#{tmp}.respond_to?(:join) ? #{tmp}.flatten.compact.join(#{delimiter.inspect}) : #{tmp}"
-            else
-              tmp
-            end
-           ]]]]]
-      end
-      [:html, :attr, name, value]
-    end
-
-    protected
-
-    def splat_attributes(attrs)
-      @splat_used = true
-
-      hash, name, value, tmp = unique_name, unique_name, unique_name, unique_name
-
-      merger = [:multi, [:code, "#{hash} = {}"]]
-      attrs.each do |attr|
-        merger << if attr[0] == :html && attr[1] == :attr
-          [:multi,
-           [:capture, tmp, compile(attr[3])],
-           [:code, "(#{hash}[#{attr[2].inspect}] ||= []) << #{tmp}"]]
-        elsif attr[0] == :slim
-          if attr[1] == :attr
-            [:code, "(#{hash}[#{attr[2].inspect}] ||= []) << (#{attr[4]})"]
-          elsif attr[1] == :splat
-            [:code, "(#{attr[2]}).each {|#{name},#{value}| (#{hash}[#{name}.to_s] ||= []) << (#{value}) }"]
-          else
-            attr
-          end
-        else
-          attr
-        end
-      end
-
-      merger << [:block, "#{hash}.keys.each do |#{name}|",
-                 [:multi,
-                  [:code, "#{value} = #{hash}[#{name}]"],
-                  [:code, "#{value}.flatten!"],
-                  [:block, "#{value}.map! do |#{tmp}|",
-                   [:case, tmp,
-                    ['true', [:code, name]],
-                    ['false, nil', [:multi]],
-                    [:else, [:code, tmp]]]],
-                  [:if, "#{value}.size > 1 && !#{@attr_delimiter}[#{name}]",
-                   [:code, "raise(\"Multiple #\{#{name}\} attributes specified\")"]],
-                  [:code, "#{hash}[#{name}] = #{value}.compact.join(#{@attr_delimiter}[#{name}].to_s)"]]]
-
-      attr = [:multi,
-              [:static, ' '],
-              [:dynamic, name],
-              [:static, "=#{options[:attr_wrapper]}"],
-              [:escape, true, [:dynamic, value]],
-              [:static, options[:attr_wrapper]]]
-      attr = [:if, "!#{value}.empty?", attr] if options[:remove_empty_attrs]
-      enumerator = options[:sort_attrs] ? "#{hash}.sort_by {|#{name},#{value}| #{name} }" : hash
-      formatter = [:block, "#{enumerator}.each do |#{name},#{value}|", attr]
-
-      return hash, merger, formatter
-    end
-  end
-end

data/test/rails/app/views/slim/nil.html.slim

@@ -1 +0,0 @@
-p= @nil

data/test/slim/test_chain_manipulation.rb

@@ -1,42 +0,0 @@
-require 'helper'
-
-class TestSlimChainManipulation < TestSlim
-  def test_replace
-    source = %q{
-p Test
-}
-    chain = proc do |engine|
-      engine.replace(:Pretty, :ReplacementFilter) do |exp|
-        [:dynamic, '1+1']
-      end
-    end
-
-    assert_html '2', source, :chain => chain
-  end
-
-  def test_before
-    source = %q{
-p Test
-}
-    chain = proc do |engine|
-      engine.before(Slim::Parser, :WrapInput) do |input|
-        "p Header\n#{input}\np Footer"
-      end
-    end
-
-    assert_html '<p>Header</p><p>Test</p><p>Footer</p>', source, :chain => chain
-  end
-
-  def test_after
-    source = %q{
-p Test
-}
-    chain = proc do |engine|
-      engine.after(Slim::Parser, :ReplaceParsedExp) do |exp|
-        [:slim, :output, false, '1+1', [:multi]]
-      end
-    end
-
-    assert_html '2', source, :chain => chain
-  end
-end