skim 0.8.6 → 0.9.0

data/History.md

@@ -1,5 +1,10 @@
 # master
 
+# 0.9.0
+
+* Now uses/requires slim 2.0.0
+* Now requires Ruby 1.9.3+
+
 # 0.8.6
 
 * Restore compatibility with slim 1.2.2

data/README.md

@@ -1,4 +1,4 @@
-Skim [ ![Build status](http://travis-ci.org/jfirebaugh/skim.png) ](http://travis-ci.org/jfirebaugh/skim)
+Skim [ ![Build status](https://travis-ci.org/jfirebaugh/skim.png) ](https://travis-ci.org/jfirebaugh/skim)
 ====
 
 Take the fat out of your client-side templates with Skim. Skim is the [Slim](http://slim-lang.com/) templating engine
@@ -9,17 +9,23 @@ Sprockets-based asset pipeline.
 
 `gem install skim`, or add `skim` to your `Gemfile` in the `:assets` group:
 
-    group :assets do
-      gem 'skim'
-    end
+```ruby
+group :assets do
+  gem 'skim'
+end
+```
 
 Create template files with the extension `.jst.skim`. For example, `test.jst.skim`:
 
-    p Hello #{@world}!
+```jade
+p Hello #{@world}!
+```
 
 In your JavaScript or CoffeeScript, render the result, passing a context object:
 
-    $("body").html(JST["test"]({world: "World"}));
+```js
+$("body").html(JST["test"]({world: "World"}));
+```
 
 Order up a skinny latte and enjoy!
 
@@ -66,20 +72,26 @@ escaping. In addition, the special `safe` method on the context object tells Ski
 being escaped. You can use this in conjunction with `escape` context method to selectively sanitize parts of the string.
 For example, given the template:
 
-    = @linkTo(@project)
+```jade
+= @linkTo(@project)
+```
 
 you could render it with the following context:
 
-    JST["my_template"]
-      project: { id: 4, name: "Crate & Barrel" }
-      linkTo: (project) ->
-        url  = "/projects/#{project.id}"
-        name = @escape project.name
-        @safe "<a href='#{url}'>#{name}</a>"
+```coffeescript
+JST["my_template"]
+  project: { id: 4, name: "Crate & Barrel" }
+  linkTo: (project) ->
+    url  = "/projects/#{project.id}"
+    name = @escape project.name
+    @safe "<a href='#{url}'>#{name}</a>"
+```
 
 to produce:
 
-    <a href='/projects/4'>Crate &amp; Barrel</a>
+```html
+<a href='/projects/4'>Crate &amp; Barrel</a>
+```
 
 ## The Skim asset
 
@@ -89,11 +101,15 @@ and setting Skim's `:use_asset` option to true.
 
 In Rails, this can be done by adding the following to `application.js`:
 
-    //= require skim
+```js
+//= require skim
+```
 
 And the following in an initializer:
 
-    Skim::Engine.default_options[:use_asset] = true
+```ruby
+Skim::Engine.default_options[:use_asset] = true
+```
 
 # License (MIT)
 

data/lib/skim.rb

@@ -2,8 +2,9 @@ require "temple"
 require "temple/coffee_script"
 
 require "slim"
-require "skim/compiler"
-require "skim/sections"
+require "skim/controls"
+require "skim/code_attributes"
+require "skim/interpolation"
 require "skim/engine"
 require "skim/template"
 require "skim/version"

data/lib/skim/code_attributes.rb

@@ -0,0 +1,66 @@
+module Skim
+  class CodeAttributes < Slim::Filter
+    define_options :merge_attrs
+
+    # Handle attributes expression `[:html, :attrs, *attrs]`
+    #
+    # @param [Array] attrs Array of temple expressions
+    # @return [Array] Compiled temple expression
+    def on_html_attrs(*attrs)
+      [:multi, *attrs.map {|a| compile(a) }]
+    end
+
+    # Handle attribute expression `[:html, :attr, name, value]`
+    #
+    # @param [String] name Attribute name
+    # @param [Array] value Value expression
+    # @return [Array] Compiled temple expression
+    def on_html_attr(name, value)
+      if value[0] == :slim && value[1] == :attrvalue && !options[:merge_attrs][name]
+        # We handle the attribute as a boolean attribute
+        escape, code = value[2], value[3]
+        case code
+        when 'true'
+          [:html, :attr, name, [:static, name]]
+        when 'false', 'null'
+          [:multi]
+        else
+          tmp = unique_name
+          [:multi,
+           [:code, "#{tmp} = #{code}"],
+           [:case, tmp,
+            ['true', [:html, :attr, name, [:static, name]]],
+            ['false, null', [:multi]],
+            [:else, [:html, :attr, name, [:escape, escape, [:dynamic, tmp]]]]]]
+        end
+      else
+        # Attribute with merging
+        @attr = name
+        return super
+      end
+    end
+
+    # Handle attribute expression `[:slim, :attrvalue, escape, code]`
+    #
+    # @param [Boolean] escape Escape html
+    # @param [String] code Ruby code
+    # @return [Array] Compiled temple expression
+    def on_slim_attrvalue(escape, code)
+      # We perform attribute merging on Array values
+      if delimiter = options[:merge_attrs][@attr]
+        tmp = unique_name
+        [:multi,
+         [:code, "#{tmp} = #{code}"],
+         [:if, "@isArray(#{tmp})",
+          [:multi,
+           [:code, "#{tmp} = @flatten(#{tmp})"],
+           [:code, "#{tmp} = item.toString() for item in #{tmp} when item"],
+           [:code, "#{tmp} = item for item in #{tmp} when item.length > 0"],
+           [:escape, escape, [:dynamic, "#{tmp}.join(#{delimiter.inspect})"]]],
+          [:escape, escape, [:dynamic, tmp]]]]
+      else
+        [:escape, escape, [:dynamic, code]]
+      end
+    end
+  end
+end

data/lib/skim/controls.rb

@@ -0,0 +1,9 @@
+module Skim
+  class Controls < Slim::Controls
+    def on_slim_control(code, content)
+      [:multi,
+        [:code, code],
+        [:indent, compile(content)]]
+    end
+  end
+end

data/lib/skim/engine.rb

@@ -1,27 +1,38 @@
 module Skim
+  # Skim engine which transforms slim code to executable ruby code
+  # @api public
   class Engine < Temple::Engine
-    set_default_options :pretty => false,
-                        :sort_attrs => true,
-                        :attr_wrapper => '"',
-                        :attr_delimiter => {'class' => ' '},
-                        :remove_empty_attrs => true,
-                        :generator => Temple::CoffeeScript::Generator,
-                        :default_tag => 'div',
-                        :use_asset => false
+    # This overwrites some Temple default options or sets default options for Slim specific filters.
+    # It is recommended to set the default settings only once in the code and avoid duplication. Only use
+    # `define_options` when you have to override some default settings.
+    define_options :pretty => false,
+                   :sort_attrs => true,
+                   :attr_quote => '"',
+                   :merge_attrs => {'class' => ' '},
+                   :encoding => 'utf-8',
+                   :generator => Temple::CoffeeScript::Generator,
+                   :default_tag => 'div',
+                   :use_asset => false
 
-    use Slim::Parser, :file, :tabsize, :encoding, :default_tag
-    use Slim::EmbeddedEngine, :enable_engines, :disable_engines, :pretty
-    use Slim::Interpolation
-    use Skim::Sections, :sections
-    use Skim::Compiler, :disable_capture, :attr_delimiter
-    use Temple::CoffeeScript::AttributeMerger, :attr_delimiter
-    use Temple::HTML::AttributeSorter
-    use Temple::CoffeeScript::AttributeRemover
-    use Temple::HTML::Fast, :format, :attr_wrapper
-    use Temple::CoffeeScript::Filters::Escapable, :disable_escape
+    filter :Encoding, :encoding
+    filter :RemoveBOM
+    use Slim::Parser, :file, :tabsize, :shortcut, :default_tag
+    use Slim::Embedded, :enable_engines, :disable_engines, :pretty
+    use Skim::Interpolation
+    use Slim::Splat::Filter, :merge_attrs, :attr_quote, :sort_attrs, :default_tag, :hyphen_attrs
+    use Skim::Controls, :disable_capture
+    html :AttributeSorter, :sort_attrs
+    html :AttributeMerger, :merge_attrs
+    use Skim::CodeAttributes, :merge_attrs
+    use(:AttributeRemover) { Temple::CoffeeScript::AttributeRemover.new(:remove_empty_attrs => options[:merge_attrs].keys)}
+    html :Pretty, :format, :attr_quote, :pretty, :indent, :js_wrapper
+    use Temple::HTML::Fast, :format, :attr_quote
+    use Temple::CoffeeScript::Filters::Escapable, :use_html_safe, :disable_escape
     use Temple::CoffeeScript::Filters::ControlFlow
     filter :MultiFlattener
     use(:Optimizer) { Temple::Filters::StaticMerger.new }
-    use(:Generator) { options[:generator].new(options) }
+    use :Generator do
+      options[:generator].new(options.to_hash.reject {|k,v| !options[:generator].default_options.valid_keys.include?(k) })
+    end
   end
 end

data/lib/skim/interpolation.rb

@@ -0,0 +1,53 @@
+module Skim
+  # Perform interpolation of #{var_name} in the
+  # expressions `[:slim, :interpolate, string]`.
+  #
+  # @api private
+  class Interpolation < Slim::Filter
+    # Handle interpolate expression `[:slim, :interpolate, string]`
+    #
+    # @param [String] string Static interpolate
+    # @return [Array] Compiled temple expression
+    def on_slim_interpolate(string)
+      # Interpolate variables in text (#{variable}).
+      # Split the text into multiple dynamic and static parts.
+      block = [:multi]
+      begin
+        case string
+        when /\A\\#\{/
+          # Escaped interpolation
+          block << [:dynamic, "'\#{'"]
+          string = $'
+        when /\A#\{/
+          # Interpolation
+          string, code = parse_expression($')
+          escape = code !~ /\A\{.*\}\Z/
+          block << [:slim, :output, escape, escape ? code : code[1..-2], [:multi]]
+        when /\A([#\\]|[^#\\]*)/
+          # Static text
+          block << [:static, $&]
+          string = $'
+        end
+      end until string.empty?
+      block
+    end
+
+    protected
+
+    def parse_expression(string)
+      count, i = 1, 0
+      while i < string.size && count != 0
+        if string[i] == ?{
+          count += 1
+        elsif string[i] == ?}
+          count -= 1
+        end
+        i += 1
+      end
+
+      raise(Temple::FilterError, "Text interpolation: Expected closing }") if count != 0
+
+      return string[i..-1], string[0, i-1]
+    end
+  end
+end

data/lib/skim/template.rb

@@ -7,15 +7,18 @@ module Skim
     self.default_mime_type = "application/javascript"
 
     def coffee_script_src
-      engine = self.class.build_engine({
+
+      engine = Engine.new(options.merge({
         :streaming => false, # Overwrite option: No streaming support in Tilt
         :file => eval_file,
-        :indent => 2 }, options)
-      <<SRC
+        :indent => 2
+      }))
+      src = engine.call(data)
+<<-SRC
 #{self.class.skim_src unless engine.options[:use_asset]}
 return (context = {}) ->
   Skim.withContext.call {}, context, ->
-#{engine.call(data)}
+#{src}
 SRC
     end
 

data/lib/skim/version.rb

@@ -1,3 +1,3 @@
 module Skim
-  VERSION = "0.8.6"
+  VERSION = "0.9.0"
 end

data/lib/temple/coffee_script/filters/attribute_merger.rb

@@ -3,7 +3,7 @@ module Temple
     class AttributeMerger < Filter
       include Temple::HTML::Dispatcher
 
-      default_options[:attr_delimiter] = {'id' => '_', 'class' => ' '}
+      define_options :merge_attrs => {'id' => '_', 'class' => ' '}
 
       def on_html_attrs(*attrs)
         names = []
@@ -12,7 +12,7 @@ module Temple
         attrs.each do |html, attr, name, value|
           raise(InvalidExpression, 'Attribute is not a html attr') if html != :html || attr != :attr
           name = name.to_s
-          if delimiter = options[:attr_delimiter][name]
+          if delimiter = options[:merge_attrs][name]
             if current = result[name]
               current << [:static, delimiter] << value
             else

data/lib/temple/coffee_script/filters/attribute_remover.rb

@@ -1,19 +1,16 @@
 module Temple
   module CoffeeScript
-    class AttributeRemover < Filter
+    class AttributeRemover < Temple::HTML::AttributeRemover
       include Temple::HTML::Dispatcher
 
-      default_options[:remove_empty_attrs] = true
-
-      def on_html_attrs(*attrs)
-        [:multi, *(options[:remove_empty_attrs] ?
-                   attrs.map {|attr| compile(attr) } : attrs)]
-      end
+      define_options :remove_empty_attrs => %w(id class)
 
       def on_html_attr(name, value)
+        return super unless options[:remove_empty_attrs].include?(name.to_s)
+
         if empty_exp?(value)
           value
-        elsif contains_static?(value)
+        elsif contains_nonempty_static?(value)
           [:html, :attr, name, value]
         else
           tmp = unique_name

data/lib/temple/coffee_script/filters/escapable.rb

@@ -3,12 +3,14 @@ module Temple
     module Filters
       class Escapable < Filter
         # Activate the usage of html_safe? if it is available (for Rails 3 for example)
-        set_default_options :use_html_safe => ''.respond_to?(:html_safe?),
-                            :disable_escape => false
+        define_options :escape_code,
+                       :use_html_safe => ''.respond_to?(:html_safe?),
+                       :disable_escape => false
 
         def initialize(opts = {})
           super
-          @escape_code = "::Temple::Utils.escape_html#{options[:use_html_safe] ? '_safe' : ''}((%s))"
+          @escape_code = options[:escape_code] ||
+            "::Temple::Utils.escape_html#{options[:use_html_safe] ? '_safe' : ''}((%s))"
           @escaper = eval("proc {|v| #{@escape_code % 'v'} }")
           @escape = false
         end

data/lib/temple/coffee_script/generators.rb

@@ -1,13 +1,12 @@
-require "multi_json"
+require "json"
 
 module Temple
   module CoffeeScript
     class Generator < Temple::Generator
-      default_options[:indent] = 0
+      define_options :indent => 0
 
       def call(exp)
         @indent = options[:indent]
-
         compile [:multi,
                  [:code, "#{buffer} = []"],
                  exp,
@@ -19,7 +18,7 @@ module Temple
       end
 
       def on_static(text)
-        concat(MultiJson.encode(text))
+        concat(JSON.generate(text, :quirks_mode => true))
       end
 
       def on_dynamic(code)

data/skim.gemspec

@@ -17,15 +17,14 @@ Sprockets-based asset pipeline.}
   gem.require_paths = ["lib"]
   gem.version       = Skim::VERSION
 
-  gem.add_dependency "slim", "<= 1.2.2"
-  gem.add_dependency "temple", "<= 0.4.1"
+  gem.add_dependency "slim", "~> 2.0.0"
   gem.add_dependency "coffee-script"
   gem.add_dependency "coffee-script-source", ">= 1.2.0"
-  gem.add_dependency "multi_json"
   gem.add_dependency "sprockets"
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "execjs"
   gem.add_development_dependency "minitest-reporters", "~> 0.10"
   gem.add_development_dependency "therubyracer"
+  gem.add_development_dependency "libv8", "3.11.8.3"
 end

data/test/helper.rb

@@ -1,7 +1,6 @@
 require "rubygems"
 require "minitest/unit"
 require "minitest/reporters"
-require "temple"; Temple::Filter # Trigger #13
 require "skim"
 require "coffee_script"
 require "execjs"
@@ -28,11 +27,11 @@ class TestSkim < MiniTest::Unit::TestCase
   end
 
   def context(options)
-    case context = options[:context]
+    case context = options.delete(:context)
       when String
         context
       when Hash
-        MultiJson.encode(context)
+        JSON.dump(context)
       else
         "new Context()"
     end
@@ -52,6 +51,7 @@ class TestSkim < MiniTest::Unit::TestCase
     if Skim::Engine.default_options[:use_asset]
       code.unshift skim_source
     end
+
     context = ExecJS.compile(code.join(";"))
     context.call("evaluate")
   end

data/test/test_code_escaping.rb

@@ -6,7 +6,7 @@ class TestSkimCodeEscaping < TestSkim
 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_unsafe
@@ -14,7 +14,7 @@ p = @evil_method()
 p = "<strong>Hello World\\n, meet \\"Skim\\"</strong>."
 }
 
-    assert_html "<p>&lt;strong&gt;Hello World\n, meet \&quot;Skim\&quot;&lt;&#47;strong&gt;.</p>", source
+    assert_html "<p>&lt;strong&gt;Hello World\n, meet \&quot;Skim\&quot;&lt;/strong&gt;.</p>", source
   end
 
   def test_render_safe
@@ -31,7 +31,7 @@ p = @safe("<strong>Hello World\\n, meet \\"Skim\\"</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/test_code_evaluation.rb

@@ -68,10 +68,10 @@ p id=@var
 
   def test_method_call_in_attribute_without_quotes
     source = %q{
-form action=@action_path("page", "save") method='post'
+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,28 +79,20 @@ 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
     source = %q{
-form(action=@action_path("page", "save") method='post')
+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'
+form(method='post' action=@action_path('page', 'save'))
 }
 
     assert_html '<form action="/action-page-save" method="post"></form>', source
@@ -124,7 +116,7 @@ p(id=@hash()['a']) Test it
 
   def test_hash_call_in_attribute_with_ruby_evaluation
     source = %q{
-p id={@hash()['a'] + @hash()['a']} Test it
+p id=(@hash()['a'] + @hash()['a']) Test it
 }
 
     assert_html '<p id="The letter aThe letter a">Test it</p>', source
@@ -148,23 +140,15 @@ p[id=(@hash()['a'] + @hash()['a'])] Test it
 
   def test_hash_call_in_delimited_attribute_with_ruby_evaluation_3
     source = %q{
-p(id=[@hash()['a'] + @hash()['a']]) Test it
-}
-
-    assert_html '<p id="The letter aThe letter a">Test it</p>', source
-  end
-
-  def test_hash_call_in_delimited_attribute_with_ruby_evaluation_4
-    source = %q{
-p(id=[@hash()['a'] + @hash()['a']] class=[@hash()['a']]) Test it
+p(id=(@hash()['a'] + @hash()['a']) class=@hash()['a']) Test it
 }
 
     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
+  def test_hash_call_in_delimited_attribute_with_ruby_evaluation_4_
     source = %q{
-p(id=@hash()['a'] class=[@hash()['a']]) Test it
+p(id=@hash()['a'] class=@hash()['a']) Test it
 }
 
     assert_html '<p class="The letter a" id="The letter a">Test it</p>', source
@@ -185,101 +169,4 @@ p = @output_number()
 
     assert_html '<p>1337</p>', source
   end
-
-  def test_ternary_operation_in_attribute
-    source = %q{
-p id="#{(if false then 'notshown' else '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_null
-    skip "pending"
-
-    source = %{
-.alpha class="beta" class=null 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_null
-    source = %{
-option selected=null 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
-    skip "pending"
-
-    source = %{
-.alpha class="beta" class=['gamma', null, 'delta', [true, false]]
-}
-
-    assert_html '<div class="alpha beta gamma delta true false"></div>', source
-  end
 end

data/test/test_html_structure.rb

@@ -15,7 +15,6 @@ html
   end
 
   def test_html_tag_with_text_and_empty_line
-    # Keep the trailing space behind "body "!
     source = %q{
 p Hello
 
@@ -74,10 +73,21 @@ h1#title This is my title
   def test_render_with_overwritten_default_tag
     source = %q{
 #notice.hello.world
+   = @hello_world()
+ }
+
+    assert_html '<section class="hello world" id="notice">Hello World from @env</section>', source, :default_tag => 'section'
+  end
+
+  def test_render_with_custom_shortcut
+    source = %q{
+#notice.hello.world@test
+  = @hello_world()
+@abc
   = @hello_world()
 }
 
-    assert_html '<section class="hello world" id="notice">Hello World from @env</section>', source, :default_tag => 'section'
+    assert_html '<div class="hello world" id="notice" role="test">Hello World from @env</div><section role="abc">Hello World from @env</section>', source, :shortcut => {'#' => {:attr => 'id'}, '.' => {:attr => 'class'}, '@' => {:tag => 'section', :attr => 'role'}}
   end
 
   def test_render_with_text_block
@@ -215,7 +225,7 @@ p class='underscored_class_name' = @output_number()
 }
 
     assert_html '<p class="underscored_class_name">1337</p>', source
- end
+  end
 
   def test_nonstandard_attributes
     source = %q{
@@ -273,24 +283,6 @@ p(id="marvin" class="martian" data-info="Illudium Q-36")= @output_number()
     assert_html '<p class="martian" data-info="Illudium Q-36" id="marvin">1337</p>', source
   end
 
-  def test_static_empty_attribute
-    source = %q{
-p(id="marvin" class="" data-info="Illudium Q-36")= @output_number()
-}
-
-    assert_html '<p class="" data-info="Illudium Q-36" id="marvin">1337</p>', source
-  end
-
-  def test_dynamic_empty_attribute
-    skip "pending"
-
-    source = %q{
-p(id="marvin" class=null other_empty=("") data-info="Illudium Q-36")= @output_number()
-}
-
-    assert_html '<p data-info="Illudium Q-36" id="marvin">1337</p>', source
-  end
-
   def test_closed_tag
     source = %q{
 closed/
@@ -354,7 +346,7 @@ p World
   def test_render_with_html_conditional_and_method_output
     source = %q{
 /[ if IE ]
- = @message 'hello'
+ = @message('hello')
 }
 
     assert_html "<!--[if IE]>hello<![endif]-->", source
@@ -366,7 +358,7 @@ p<id="marvin"
 class="martian"
  data-info="Illudium Q-36"> = @output_number()
 }
-    Slim::Parser::DELIMITERS.each do |k,v|
+    Slim::Parser::DELIMS.each do |k,v|
       str = source.sub('<',k).sub('>',v)
       assert_html '<p class="martian" data-info="Illudium Q-36" id="marvin">1337</p>', str
     end
@@ -378,7 +370,7 @@ p<id="marvin"
   class="martian"
  data-info="Illudium Q-36"> THE space modulator
 }
-    Slim::Parser::DELIMITERS.each do |k,v|
+    Slim::Parser::DELIMS.each do |k,v|
       str = source.sub('<',k).sub('>',v)
       assert_html '<p class="martian" data-info="Illudium Q-36" id="marvin">THE space modulator</p>', str
     end
@@ -391,7 +383,7 @@ p<id="marvin"
 data-info="Illudium Q-36">
   | THE space modulator
 }
-    Slim::Parser::DELIMITERS.each do |k,v|
+    Slim::Parser::DELIMS.each do |k,v|
       str = source.sub('<',k).sub('>',v)
       assert_html '<p class="martian" data-info="Illudium Q-36" id="marvin">THE space modulator</p>', str
     end
@@ -404,7 +396,7 @@ p<id=@id_helper()
   data-info="Illudium Q-36">
   | THE space modulator
 }
-    Slim::Parser::DELIMITERS.each do |k,v|
+    Slim::Parser::DELIMS.each do |k,v|
       str = source.sub('<',k).sub('>',v)
       assert_html '<p class="martian" data-info="Illudium Q-36" id="notice">THE space modulator</p>', str
     end
@@ -418,7 +410,7 @@ p<id=@id_helper()
   span.emphasis THE
   |  space modulator
 }
-    Slim::Parser::DELIMITERS.each do |k,v|
+    Slim::Parser::DELIMS.each do |k,v|
       str = source.sub('<',k).sub('>',v)
       assert_html '<p class="martian" data-info="Illudium Q-36" id="notice"><span class="emphasis">THE</span> space modulator</p>', str
     end
@@ -431,7 +423,7 @@ li< id="myid"
 data-info="myinfo">
   a href="link" My Link
 }
-    Slim::Parser::DELIMITERS.each do |k,v|
+    Slim::Parser::DELIMS.each do |k,v|
       str = source.sub('<',k).sub('>',v)
       assert_html '<li class="myclass" data-info="myinfo" id="myid"><a href="link">My Link</a></li>', str
     end
@@ -470,4 +462,17 @@ input[value=@succ_x()]
     assert_html %{<input value="1" /><input value="2" />}, source
   end
 
+  def test_html_line_indicator
+    source = %q{
+<html>
+  head
+    meta name="keywords" content=@hello_world()
+  - if true
+    <p>#{@hello_world()}</p>
+      span = @hello_world()
+</html>
+    }
+
+    assert_html '<html><head><meta content="Hello World from @env" name="keywords" /></head><p>Hello World from @env</p><span>Hello World from @env</span></html>', source
+  end
 end

data/test/test_text_interpolation.rb

@@ -40,9 +40,10 @@ p #{@hello_world()}
   def test_escape_interpolation
     source = %q{
 p \\#{@hello_world()}
+p text1 \\#{@hello_world()} text2
 }
 
-    assert_html '<p>#{@hello_world()}</p>', source
+    assert_html '<p>#{@hello_world()}</p><p>text1 #{@hello_world()} text2</p>', source
   end
 
   def test_complex_interpolation
@@ -58,7 +59,7 @@ p Message: #{@message('hello', "user #{@output_number()}")}
 | #{@evil_method()}
 }
 
-    assert_html '&lt;script&gt;do_something_evil();&lt;&#47;script&gt;', source
+    assert_html '&lt;script&gt;do_something_evil();&lt;/script&gt;', source
   end
 
   def test_interpolation_without_escaping
@@ -73,6 +74,6 @@ p Message: #{@message('hello', "user #{@output_number()}")}
     source = %q{
 | #{(@evil_method())}
 }
-    assert_html '&lt;script&gt;do_something_evil();&lt;&#47;script&gt;', source
+    assert_html '&lt;script&gt;do_something_evil();&lt;/script&gt;', source
   end
 end

data/vendor/assets/javascripts/skim.js.coffee

@@ -22,6 +22,17 @@ this.Skim =
       result.skimSafe = true
       result
 
+    context.isArray = Array.isArray || ( value ) -> return {}.toString.call( value ) is '[object Array]'
+
+    context.flatten = flatten = (array) ->
+      flattened = []
+      for element in array
+        if element instanceof Array
+          flattened = flattened.concat flatten element
+        else
+          flattened.push element
+      flattened
+
     context.escape ||= @escape || (string) ->
       return '' unless string?
       return string if string.skimSafe
@@ -30,6 +41,5 @@ this.Skim =
         .replace(/</g, '&lt;')
         .replace(/>/g, '&gt;')
         .replace(/"/g, '&quot;')
-        .replace(/\//g,'&#47;')
 
     block.call(context)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: skim
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,40 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-25 00:00:00.000000000 Z
+date: 2013-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - <=
-      - !ruby/object:Gem::Version
-        version: 1.2.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - <=
-      - !ruby/object:Gem::Version
-        version: 1.2.2
-- !ruby/object:Gem::Dependency
-  name: temple
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - <=
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - <=
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement
@@ -75,22 +59,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.0
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
@@ -171,6 +139,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: libv8
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.11.8.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.11.8.3
 description: Fat-free client-side templates with Slim and CoffeeScript
 email:
 - john.firebaugh@gmail.com
@@ -186,10 +170,11 @@ files:
 - README.md
 - Rakefile
 - lib/skim.rb
-- lib/skim/compiler.rb
+- lib/skim/code_attributes.rb
+- lib/skim/controls.rb
 - lib/skim/engine.rb
+- lib/skim/interpolation.rb
 - lib/skim/rails.rb
-- lib/skim/sections.rb
 - lib/skim/template.rb
 - lib/skim/version.rb
 - lib/temple/coffee_script.rb
@@ -213,7 +198,6 @@ files:
 - test/test_code_structure.rb
 - test/test_html_escaping.rb
 - test/test_html_structure.rb
-- test/test_sections.rb
 - test/test_skim_template.rb
 - test/test_text_interpolation.rb
 - vendor/assets/javascripts/skim.js.coffee
@@ -229,21 +213,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2623561313365634861
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2623561313365634861
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Take the fat out of your client-side templates with Skim. Skim is the Slim
@@ -262,6 +240,5 @@ test_files:
 - test/test_code_structure.rb
 - test/test_html_escaping.rb
 - test/test_html_structure.rb
-- test/test_sections.rb
 - test/test_skim_template.rb
 - test/test_text_interpolation.rb

data/lib/skim/compiler.rb

@@ -1,36 +0,0 @@
-module Skim
-  class Compiler < Slim::Compiler
-    def on_slim_control(code, content)
-      [:multi,
-        [:code, code],
-        [:indent, compile(content)]]
-    end
-
-    def on_slim_attr(name, escape, code)
-      value = case code
-      when 'true'
-        escape = false
-        [:static, name]
-      when 'false', 'null'
-        escape = false
-        [:multi]
-      else
-        tmp = unique_name
-        [:multi,
-         [:code, "#{tmp} = #{code}"],
-         [:case, tmp,
-          ['true', [:static, name]],
-          ['false, null', [:multi]],
-          [:else,
-           [: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, [:escape, escape, value]]
-    end
-  end
-end

data/lib/skim/sections.rb

@@ -1,32 +0,0 @@
-require "multi_json"
-
-module Skim
-  class Sections < Slim::Sections
-    def call(exp)
-      if options[:sections]
-        compile(exp)
-      else
-        exp
-      end
-    end
-
-    protected
-
-    def on_slim_inverted_section(name, content)
-      [:if, "not #{access(name)}", compile(content)]
-    end
-
-    def on_slim_section(name, content)
-      tmp1, tmp2 = unique_name, unique_name
-      [:if, "#{tmp1} = #{access(name)}",
-       [:block, "for #{tmp2} in #{tmp1}",
-        [:block, "Skim.withContext.call @, #{tmp2}, ->", compile(content)]]]
-    end
-
-    private
-
-    def access(name)
-      "Skim.access.call(@, #{MultiJson.encode(name.to_s)})"
-    end
-  end
-end

data/test/test_sections.rb

@@ -1,157 +0,0 @@
-require 'helper'
-
-class TestSkimLogicLess < TestSkim
-  def test_sections
-    source = %q{
-p
- - person
-  .name = name
-}
-
-    hash = {
-      :person => [
-        { :name => 'Joe', },
-        { :name => 'Jack', }
-      ]
-    }
-
-    assert_html '<p><div class="name">Joe</div><div class="name">Jack</div></p>', source, :context => hash, :sections => true
-  end
-
-  def test_flag_section
-    source = %q{
-p
- - show_person
-   - person
-    .name = name
- - show_person
-   | shown
-}
-
-    hash = {
-      :show_person => true,
-      :person => [
-        { :name => 'Joe', },
-        { :name => 'Jack', }
-      ]
-    }
-
-    assert_html '<p><div class="name">Joe</div><div class="name">Jack</div>shown</p>', source, :context => hash, :sections => true
-  end
-
-  def test_inverted_section
-    source = %q{
-p
- - person
-  .name = name
- -! person
-  | No person
- - !person
-  |  No person 2
-}
-
-    hash = {}
-
-    assert_html '<p>No person No person 2</p>', source, :context => hash, :sections => true
-  end
-
-  def test_output_with_content
-    source = %{
-p = method_with_block do
-  block
-}
-    assert_runtime_error 'Output statements with content are forbidden in sections mode', source, :sections => true
-  end
-
-  def test_sections2
-    source = %q{
-p
- - person
-  .name = name
-}
-    assert_html '<p><div class="name">Joe</div><div class="name">Jack</div></p>', source, :sections => true
-  end
-
-  def test_with_array
-    source = %q{
-ul
- - people_with_locations
-  li = name
-  li = city
-}
-    assert_html '<ul><li>Andy</li><li>Atlanta</li><li>Fred</li><li>Melbourne</li><li>Daniel</li><li>Karlsruhe</li></ul>', source, :sections => true
-  end
-
-  def test_method
-    source = %q{
-a href=output_number Link
-}
-    assert_html '<a href="1337">Link</a>', source, :sections => true
-  end
-
-  SECTION = <<-SRC
-- test
-  | Test
-  SRC
-
-  INVERTED_SECTION = <<-SRC
--! test
-  | Test
-  SRC
-
-  def test_undefined_section
-    assert_html "", SECTION, :context => {}, :sections => true
-  end
-
-  def test_null_section
-    assert_html "", SECTION, :context => {:test => nil}, :sections => true
-  end
-
-  def test_false_section
-    assert_html "", SECTION, :context => {:test => false}, :sections => true
-  end
-
-  def test_empty_string_section
-    assert_html "Test", SECTION, :context => {:test => ""}, :sections => true
-  end
-
-  def test_empty_array_section
-    assert_html "", SECTION, :context => {:test => []}, :sections => true
-  end
-
-  def test_empty_object_section
-    assert_html "Test", SECTION, :context => {:test => {}}, :sections => true
-  end
-
-  def test_undefined_inverted_section
-    assert_html "Test", INVERTED_SECTION, :context => {}, :sections => true
-  end
-
-  def test_null_inverted_section
-    assert_html "Test", INVERTED_SECTION, :context => {:test => nil}, :sections => true
-  end
-
-  def test_false_inverted_section
-    assert_html "Test", INVERTED_SECTION, :context => {:test => false}, :sections => true
-  end
-
-  def test_empty_string_inverted_section
-    assert_html "", INVERTED_SECTION, :context => {:test => ""}, :sections => true
-  end
-
-  def test_empty_array_inverted_section
-    assert_html "Test", INVERTED_SECTION, :context => {:test => []}, :sections => true
-  end
-
-  def test_empty_object_inverted_section
-    assert_html "", INVERTED_SECTION, :context => {:test => {}}, :sections => true
-  end
-
-  def test_doesnt_modify_context
-    source = %q{
-- constant_object
-= constant_object_size
-}
-    assert_html '2', source, :sections => true
-  end
-end