slim 1.0.3 → 1.0.4

data/.travis.yml

@@ -8,7 +8,7 @@ rvm:
 env:
   - "TASK=test"
   - "TASK=test TEMPLE=master"
-#  - "TASK=test:rails RAILS=master"
+  - "TASK=test:rails RAILS=master"
   - "TASK=test:rails RAILS=3.0.10"
   - "TASK=test:rails RAILS=3.1.0"
 script: "bundle exec rake test:ci"

data/CHANGES

@@ -1,5 +1,13 @@
 master
 
+
+1.0.4
+
+  * Pass options to embedded Tilt engine
+    Slim::EmbeddedEngine.set_default_options :markdown => {...}
+  * Add test case for precompiled embedded engine 'builder'
+  * Bug #204 fixed, tabs were not parsed correctly
+
 1.0.3
 
   * Fix rubinius test cases

data/Gemfile

@@ -9,8 +9,17 @@ end
 if ENV['RAILS']
   if ENV['RAILS'] == 'master'
     gem 'rails', :git => 'git://github.com/rails/rails.git'
+    # FIXME: Rails Gemfile is invalid!
+    gem 'journey', :git => 'git://github.com/rails/journey.git'
   else
     gem 'rails', "= #{ENV['RAILS']}"
   end
-  gem 'sqlite3-ruby'
+
+  if defined?(JRUBY_VERSION)
+    gem 'jdbc-sqlite3'
+    gem 'activerecord-jdbc-adapter'
+    gem 'activerecord-jdbcsqlite3-adapter'
+  else
+    gem 'sqlite3-ruby'
+  end
 end

data/README.md

@@ -141,7 +141,7 @@ Here's a quick example to demonstrate what a Slim template looks like:
 #### If your ruby code needs to use multiple lines, append a `\` at the end of the lines, for example:
     = javascript_include_tag \
        "jquery", \
-       "application"`
+       "application"
 
 ### Wrap attributes with delimiters
 
@@ -348,12 +348,14 @@ with 'rake test' and the rails integration tests with 'rake test:rails'.
 
 Travis-CI is used for continous integration testing: http://travis-ci.org/#!/stonean/slim
 
-Slim is working well on the following ruby implementations:
+Slim is working well on all major Ruby implementations:
 
 * Ruby 1.8.7
 * Ruby 1.9.2
+* Ruby 1.9.3
 * Ruby EE
 * JRuby
+* Rubinius 2.0
 
 ## License
 

data/lib/slim/compiler.rb

@@ -19,7 +19,7 @@ module Slim
     # @param [Array] content Temple expression
     # @return [Array] Compiled temple expression
     def on_slim_condcomment(condition, content)
-      [:multi, [:static, "<!--[#{condition}]>"], compile(content), [:static, '<![endif]-->']]
+      [:html, :comment, [:multi, [:static, "[#{condition}]>"], compile(content), [:static, '<![endif]']]]
     end
 
     # Handle output expression `[:slim, :output, escape, code, content]`

data/lib/slim/embedded_engine.rb

@@ -79,25 +79,20 @@ module Slim
     end
 
     def on_slim_embedded(name, body)
-      new_engine(name).on_slim_embedded(name, body)
-    end
-
-    protected
-
-    def new_engine(name)
       name = name.to_s
       raise "Embedded engine #{name} is disabled" if (options[:enable_engines] && !options[:enable_engines].include?(name)) ||
                                                      (options[:disable_engines] && options[:disable_engines].include?(name))
       engine, option_filter, local_options = self.class.engines[name] || raise("Embedded engine #{name} not found")
       filtered_options = Hash[*option_filter.select {|k| options.include?(k) }.map {|k| [k, options[k]] }.flatten]
-      engine.new(Temple::ImmutableHash.new(local_options, filtered_options))
+      engine.new(Temple::ImmutableHash.new(local_options, filtered_options)).on_slim_embedded(name, body)
     end
 
     # Basic tilt engine
-    class TiltEngine < Filter
+    class TiltEngine < EmbeddedEngine
       def on_slim_embedded(engine, body)
-        engine = Tilt[engine] || raise("Tilt engine #{engine} is not available.")
-        [:multi, render(engine, collect_text(body)), CollectNewlines.new.call(body)]
+        tilt_engine = Tilt[engine] || raise("Tilt engine #{engine} is not available.")
+        tilt_options = options[engine.to_sym] || {}
+        [:multi, tilt_render(tilt_engine, tilt_options, collect_text(body)), CollectNewlines.new.call(body)]
       end
 
       protected
@@ -111,8 +106,8 @@ module Slim
     class StaticTiltEngine < TiltEngine
       protected
 
-      def render(engine, text)
-        [:static, engine.new { text }.render]
+      def tilt_render(tilt_engine, tilt_options, text)
+        [:static, tilt_engine.new(tilt_options) { text }.render]
       end
     end
 
@@ -120,8 +115,9 @@ module Slim
     class SassEngine < TiltEngine
       protected
 
-      def render(engine, text)
-        text = engine.new(:style => (options[:pretty] ? :expanded : :compressed), :cache => false) { text }.render
+      def tilt_render(tilt_engine, tilt_options, text)
+        text = tilt_engine.new(tilt_options.merge(
+          :style => (options[:pretty] ? :expanded : :compressed), :cache => false)) { text }.render
         text.chomp!
         [:static, options[:pretty] ? "\n#{text}\n" : text]
       end
@@ -131,9 +127,9 @@ module Slim
     class PrecompiledTiltEngine < TiltEngine
       protected
 
-      def render(engine, text)
+      def tilt_render(tilt_engine, tilt_options, text)
         # WARNING: This is a bit of a hack. Tilt::Engine#precompiled is protected
-        [:dynamic, engine.new { text }.send(:precompiled, {}).first]
+        [:dynamic, tilt_engine.new(tilt_options) { text }.send(:precompiled, {}).first]
       end
     end
 
@@ -149,13 +145,13 @@ module Slim
         @protect.call(text)
       end
 
-      def render(engine, text)
-        @protect.unprotect(engine.new { text }.render)
+      def tilt_render(tilt_engine, tilt_options, text)
+        @protect.unprotect(tilt_engine.new(tilt_options) { text }.render)
       end
     end
 
     # ERB engine (uses the Temple ERB implementation)
-    class ERBEngine < Filter
+    class ERBEngine < EmbeddedEngine
       def on_slim_embedded(engine, body)
         Temple::ERB::Parser.new.call(CollectText.new.call(body))
       end
@@ -163,7 +159,7 @@ module Slim
 
     # Tag wrapper engine
     # Generates a html tag and wraps another engine (specified via :engine option)
-    class TagEngine < Filter
+    class TagEngine < EmbeddedEngine
       def on_slim_embedded(engine, body)
         content = options[:engine] ? options[:engine].new(options).on_slim_embedded(engine, body) : body
         [:html, :tag, options[:tag], [:html, :attrs, *options[:attributes].map {|k, v| [:html, :attr, k, [:static, v]] }], content]
@@ -171,7 +167,7 @@ module Slim
     end
 
     # Embeds ruby code
-    class RubyEngine < Filter
+    class RubyEngine < EmbeddedEngine
       def on_slim_embedded(engine, body)
         [:code, CollectText.new.call(body) + "\n"]
       end

data/lib/slim/parser.rb

@@ -254,16 +254,14 @@ module Slim
           end
 
           next_line
+          @line.lstrip!
 
           # The text block lines must be at least indented
           # as deep as the first line.
-          if text_indent && indent < text_indent
-            @line.lstrip!
-            syntax_error!('Unexpected text indentation')
-          end
+          offset = text_indent ? indent - text_indent : 0
+          syntax_error!('Unexpected text indentation') if offset < 0
 
-          @line.slice!(0, text_indent || indent)
-          @stacks.last << [:slim, :interpolate, (text_indent ? "\n" : '') + @line] << [:newline]
+          @stacks.last << [:slim, :interpolate, (text_indent ? "\n" : '') + (' ' * offset) + @line] << [:newline]
 
           # The indentation of first line of the text block
           # determines the text base indentation.

data/lib/slim/version.rb

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

data/slim.gemspec

@@ -28,8 +28,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency('kramdown', ['>= 0'])
   s.add_development_dependency('yard', ['>= 0'])
   s.add_development_dependency('creole', ['>= 0'])
-
-  unless defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
-    s.add_development_dependency('rcov', ['>= 0'])
-  end
+  s.add_development_dependency('builder', ['>= 0'])
+  #s.add_development_dependency('rcov', ['>= 0'])
 end

data/test/slim/test_embedded_engines.rb

@@ -27,6 +27,12 @@ markdown:
   * two
 }
     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
+
+    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
 
   def test_render_with_creole
@@ -38,6 +44,16 @@ creole:
     assert_html "<h1>head1</h1><h2>head2</h2>", source
   end
 
+  def test_render_with_builder
+    source = %q{
+builder:
+  xml.p(:id => 'test') {
+    xml.text!('Hello')
+  }
+}
+    assert_html "<p id=\"test\">\nHello</p>\n", source
+  end
+
   def test_render_with_wiki
     source = %q{
 wiki:
@@ -60,6 +76,12 @@ p Hi
     assert_html %{<script type="text/javascript">$(function() {});\n\n\nalert('hello')</script><p>Hi</p>}, source
   end
 
+  def test_render_with_javascript_with_tabs
+    # Keep the trailing space behind "javascript:   "!
+    source = "javascript:\n\t$(function() {});\n\talert('hello')\np Hi"
+    assert_html "<script type=\"text/javascript\">$(function() {});\nalert('hello')</script><p>Hi</p>", source
+  end
+
   def test_render_with_javascript_including_variable
     # Keep the trailing space behind "javascript:   "!
     source = %q{

data/test/slim/test_pretty.rb

@@ -25,6 +25,9 @@ html
     /! Javascripts
     script src="jquery.js"
     script src="jquery.ui.js"
+    /[if lt IE 9]
+      script src="old-ie1.js"
+      script src="old-ie2.js"
     sass:
       body
         background-color: red
@@ -49,6 +52,8 @@ html
     <!--Javascripts-->
     <script src="jquery.js"></script>
     <script src="jquery.ui.js"></script>
+    <!--[if lt IE 9]><script src="old-ie1.js"></script>
+    <script src="old-ie2.js"></script><![endif]-->
     <style type="text/css">
       body {
         background-color: red;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slim
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -11,12 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-08 00:00:00.000000000 -04:00
-default_executable: 
+date: 2011-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
-  requirement: &2153286200 !ruby/object:Gem::Requirement
+  requirement: &2160332500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -24,10 +23,10 @@ dependencies:
         version: 0.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *2153286200
+  version_requirements: *2160332500
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &2153285680 !ruby/object:Gem::Requirement
+  requirement: &2160331940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -35,10 +34,10 @@ dependencies:
         version: 1.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *2153285680
+  version_requirements: *2160331940
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153285200 !ruby/object:Gem::Requirement
+  requirement: &2160331240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +45,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *2153285200
+  version_requirements: *2160331240
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &2153284720 !ruby/object:Gem::Requirement
+  requirement: &2160330540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +56,10 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *2153284720
+  version_requirements: *2160330540
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2153284240 !ruby/object:Gem::Requirement
+  requirement: &2160329940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +67,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153284240
+  version_requirements: *2160329940
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: &2153283760 !ruby/object:Gem::Requirement
+  requirement: &2160329440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +78,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153283760
+  version_requirements: *2160329440
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2153283280 !ruby/object:Gem::Requirement
+  requirement: &2160328920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,10 +89,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153283280
+  version_requirements: *2160328920
 - !ruby/object:Gem::Dependency
   name: creole
-  requirement: &2153282800 !ruby/object:Gem::Requirement
+  requirement: &2160328340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,10 +100,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153282800
+  version_requirements: *2160328340
 - !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &2153282280 !ruby/object:Gem::Requirement
+  name: builder
+  requirement: &2160327860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -112,7 +111,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153282280
+  version_requirements: *2160327860
 description: Slim is a template language whose goal is reduce the syntax to the essential
   parts without becoming cryptic.
 email:
@@ -214,7 +213,6 @@ files:
 - test/slim/test_slim_template.rb
 - test/slim/test_text_interpolation.rb
 - test/slim/test_wrapper.rb
-has_rdoc: true
 homepage: http://github.com/stonean/slim
 licenses: []
 post_install_message: 
@@ -236,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: slim
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Slim is a template language.