slim 0.6.1 → 0.7.0.beta.2

data/lib/slim/rails.rb

@@ -6,10 +6,10 @@ module ActionView
       include Compilable
 
       def compile(template)
-        return Slim::Engine.new(template.source).optimized
+        return Slim::Engine.new(template.source, use_html_safe: true).prepare
       end
     end
   end
 
   Template.register_default_template_handler :slim, TemplateHandlers::SlimHandler
-end
+end

data/lib/slim/template.rb

@@ -0,0 +1,18 @@
+module Slim
+  class Template < Tilt::Template
+    def prepare
+      @src = Engine.new(options).compile(data)
+    end
+
+    def evaluate(scope, locals, &block)
+      scope.instance_eval { extend Slim::Helpers } if options[:helpers]
+      super
+    end
+
+    def precompiled_template(locals)
+      @src
+    end
+  end
+
+  Tilt.register 'slim', Template
+end

data/lib/slim/version.rb

@@ -0,0 +1,3 @@
+module Slim
+  VERSION = "0.7.0.beta.2"
+end

data/slim.gemspec

@@ -1,73 +1,33 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+require File.dirname(__FILE__) + "/lib/slim/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{slim}
-  s.version = "0.6.1"
+  s.name              = "slim"
+  s.version           = Slim::VERSION
+  s.date              = Date.today.to_s
+  s.authors           = ["Andrew Stone", "Fred Wu"]
+  s.email             = ["andy@stonean.com", "ifredwu@gmail.com"]
+  s.summary           = %q{Slim is a template language.}
+  s.description       = %q{Slim is a template language whose goal is reduce the syntax to the essential parts without becoming cryptic.}
+  s.homepage          = %q{http://github.com/stonean/slim}
+  s.extra_rdoc_files  = ["README.md"]
+  s.rdoc_options      = ["--charset=UTF-8"]
+  s.require_paths     = ["lib"]
+  s.rubyforge_project = s.name
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Andrew Stone", "Fred Wu"]
-  s.date = %q{2010-10-17}
-  s.description = %q{Slim is a template language whose goal is reduce the syntax to the essential parts without becoming cryptic.}
-  s.email = ["andy@stonean.com", "ifredwu@gmail.com"]
-  s.extra_rdoc_files = [
-    "README.md"
-  ]
-  s.files = [
-    "Gemfile",
-     "Gemfile.lock",
-     "README.md",
-     "Rakefile",
-     "lib/slim.rb",
-     "lib/slim/compiler.rb",
-     "lib/slim/engine.rb",
-     "lib/slim/optimizer.rb",
-     "lib/slim/rails.rb",
-     "readme.html",
-     "slim.gemspec",
-     "test/helper.rb",
-     "test/slim/test_compiler.rb",
-     "test/slim/test_engine.rb",
-     "test/test_slim.rb"
-  ]
-  s.homepage = %q{http://github.com/stonean/slim}
-  s.rdoc_options = ["--charset=UTF-8"]
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{slim}
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Slim is a template language.}
-  s.test_files = [
-    "test/helper.rb",
-     "test/test_slim.rb",
-     "test/slim/test_engine.rb",
-     "test/slim/test_compiler.rb"
-  ]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<escape_utils>, [">= 0"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<haml>, [">= 0"])
-      s.add_development_dependency(%q<erubis>, [">= 0"])
-    else
-      s.add_dependency(%q<escape_utils>, [">= 0"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<haml>, [">= 0"])
-      s.add_dependency(%q<erubis>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<escape_utils>, [">= 0"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<haml>, [">= 0"])
-    s.add_dependency(%q<erubis>, [">= 0"])
-  end
+  s.add_runtime_dependency(%q<escape_utils>, [">= 0.1.9"]) unless RUBY_PLATFORM == "java"
+  s.add_runtime_dependency(%q<temple>, ["~> 0.1.2"])
+  s.add_runtime_dependency(%q<tilt>, ["~> 1.1"])
+  s.add_development_dependency(%q<rake>, [">= 0.8.7"])
+  s.add_development_dependency(%q<haml>, [">= 0"])
+  s.add_development_dependency(%q<erubis>, [">= 0"])
+  s.add_development_dependency(%q<minitest>, [">= 0"])
+  s.add_development_dependency(%q<rcov>, [">= 0"])
+  s.add_development_dependency(%q<rdiscount>, [">= 0"])
+  s.add_development_dependency(%q<liquid>, [">= 0"])
 end
-

data/test/helper.rb

@@ -1,12 +1,33 @@
 # encoding: utf-8
 
+require 'rubygems'
 require 'minitest/unit'
 
 MiniTest::Unit.autorun
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require File.dirname(__FILE__) + '/../lib/slim'
 
-require 'slim'
+class TestSlim < MiniTest::Unit::TestCase
+  def setup
+    @env = Env.new
+  end
+
+  def teardown
+    String.send(:undef_method, :html_safe?) if String.method_defined?(:html_safe?)
+    Slim::Filter::DEFAULT_OPTIONS.delete(:use_html_safe)
+  end
+
+  def assert_html(expected, source, options = {})
+    assert_equal expected, Slim::Engine.new(source, options).render(@env)
+  end
+
+  def assert_syntax_error(message, source, options = {})
+    Slim::Engine.new(source, options).render(@env)
+    raise 'Syntax error expected'
+  rescue Slim::Parser::SyntaxError => ex
+    assert_equal ex.message, message
+  end
+end
 
 class Env
   def id_helper
@@ -23,8 +44,15 @@ class Env
 
   def hello_world(text = "Hello World from @env", opts = {})
     text << opts.to_a * " " if opts.any?
-    yield if block_given?
-    text
+    if block_given?
+      "#{text} #{yield} #{text}"
+    else
+      text
+    end
+  end
+
+  def action_path(*args)
+    "/action-#{args.join('-')}"
   end
 
   def in_keyword

data/test/slim/test_code_blocks.rb

@@ -0,0 +1,33 @@
+require 'helper'
+
+class TestSlimCodeBlocks < TestSlim
+  def test_render_with_output_code_block
+    source = %q{
+p
+  = hello_world "Hello Ruby!" do
+    | Hello from within a block!
+}
+
+    assert_html '<p>Hello Ruby! Hello from within a block! Hello Ruby!</p>', source
+  end
+
+  def test_render_with_output_code_within_block
+    source = %q{
+p
+  = hello_world "Hello Ruby!" do
+    = hello_world "Hello from within a block! "
+}
+
+    assert_html '<p>Hello Ruby! Hello from within a block!  Hello Ruby!</p>', source
+  end
+
+  def test_render_with_control_code_loop
+    source = %q{
+p
+  - 3.times do
+    | Hey!
+}
+
+    assert_html '<p>Hey!Hey!Hey!</p>', source
+  end
+end

data/test/slim/test_code_escaping.rb

@@ -0,0 +1,69 @@
+require 'helper'
+
+class TestSlimCodeEscaping < TestSlim
+  def test_escaping_evil_method
+    source = %q{
+p = evil_method
+}
+
+    assert_html '<p>&lt;script&gt;do_something_evil();&lt;&#47;script&gt;</p>', source
+  end
+
+  def test_escape_interpolation
+    source = %q{
+p \\#{hello_world}
+}
+
+    assert_html '<p>#{hello_world}</p>', source
+  end
+
+  def test_render_without_html_safe
+    source = %q{
+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
+  end
+
+  def test_render_with_html_safe_false
+    String.send(:define_method, :html_safe?) { false }
+
+    source = %q{
+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, :use_html_safe => true
+  end
+
+  def test_render_with_html_safe_true
+    String.send(:define_method, :html_safe?) { true }
+
+    source = %q{
+p = "<strong>Hello World\\n, meet \\"Slim\\"</strong>."
+}
+
+    assert_html "<p><strong>Hello World\n, meet \"Slim\"</strong>.</p>", source, :use_html_safe => true
+  end
+
+  def test_render_with_global_html_safe_false
+    String.send(:define_method, :html_safe?) { false }
+    Slim::Filter::DEFAULT_OPTIONS[:use_html_safe] = false
+
+    source = %q{
+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
+  end
+
+  def test_render_with_global_html_safe_true
+    String.send(:define_method, :html_safe?) { true }
+    Slim::Filter::DEFAULT_OPTIONS[:use_html_safe] = true
+
+    source = %q{
+p = "<strong>Hello World\\n, meet \\"Slim\\"</strong>."
+}
+
+    assert_html "<p><strong>Hello World\n, meet \"Slim\"</strong>.</p>", source
+  end
+end

data/test/slim/test_code_evaluation.rb

@@ -0,0 +1,199 @@
+require 'helper'
+
+class TestSlimCodeEvaluation < TestSlim
+  def test_render_with_call_to_set_attributes
+    source = %q{
+p id="#{id_helper}" class="hello world" = hello_world
+}
+
+    assert_html '<p id="notice" class="hello world">Hello World from @env</p>', source
+  end
+
+  def test_render_with_call_to_set_custom_attributes
+    source = %q{
+p data-id="#{id_helper}" data-class="hello world"
+  = hello_world
+}
+
+    assert_html '<p data-id="notice" data-class="hello world">Hello World from @env</p>', source
+  end
+
+  def test_render_with_call_to_set_attributes_and_call_to_set_content
+    source = %q{
+p id="#{id_helper}" class="hello world" = hello_world
+}
+
+    assert_html '<p id="notice" class="hello world">Hello World from @env</p>', source
+  end
+
+  def test_render_with_parameterized_call_to_set_attributes_and_call_to_set_content
+    source = %q{
+p id="#{id_helper}" class="hello world" = hello_world("Hello Ruby!")
+}
+
+    assert_html '<p id="notice" class="hello world">Hello Ruby!</p>', source
+  end
+
+  def test_render_with_spaced_parameterized_call_to_set_attributes_and_call_to_set_content
+    source = %q{
+p id="#{id_helper}" class="hello world" = hello_world "Hello Ruby!"
+}
+
+    assert_html '<p id="notice" class="hello world">Hello Ruby!</p>', source
+  end
+
+  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"
+}
+
+    assert_html '<p id="notice" class="hello world">Hello Ruby!dummy value</p>', source
+  end
+
+  def test_hash_call_in_attribute
+    source = %q{
+p id="#{hash[:a]}" Test it
+}
+
+    assert_html '<p id="The letter a">Test it</p>', source
+  end
+
+  def test_method_call_in_attribute_without_quotes
+    source = %q{
+form action=action_path(:page, :save) method='post'
+}
+
+    assert_html '<form action="&#47;action-page-save" method="post"></form>', source
+  end
+
+  def test_method_call_in_delimited_attribute_without_quotes
+    source = %q{
+form(action=action_path(:page, :save) method='post')
+}
+
+    assert_html '<form action="&#47;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 method="post" action="&#47;action-page-save"></form>', source
+  end
+
+  def test_hash_call_in_attribute_without_quotes
+    source = %q{
+p id=hash[:a] Test it
+}
+
+    assert_html '<p id="The letter a">Test it</p>', source
+  end
+
+  def test_hash_call_in_delimited_attribute
+    source = %q{
+p(id=hash[:a]) Test it
+}
+
+    assert_html '<p id="The letter a">Test it</p>', source
+  end
+
+  def test_hash_call_in_attribute_with_ruby_evaluation
+    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
+    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_2
+    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_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
+}
+
+    assert_html '<p id="The letter aThe letter a" class="The letter a">Test it</p>', source
+  end
+
+  def test_hash_call_in_delimited_attribute_with_ruby_evaluation_5
+    source = %q{
+p(id=hash[:a] class=[hash[:a]]) Test it
+}
+
+    assert_html '<p id="The letter a" class="The letter a">Test it</p>', source
+  end
+
+  def test_computation_in_attribute
+    source = %q{
+p id=(1 + 1)*5 Test it
+}
+
+    assert_html '<p id="10">Test it</p>', source
+  end
+
+  def test_interpolation_in_text
+    source = %q{
+p
+ | #{hello_world}
+p
+ |
+  A message from the compiler: #{hello_world}
+}
+
+    assert_html '<p>Hello World from @env</p><p>A message from the compiler: Hello World from @env</p>', source
+  end
+
+  def test_interpolation_in_tag
+    source = %q{
+p #{hello_world}
+}
+
+    assert_html '<p>Hello World from @env</p>', source
+  end
+
+  def test_number_type_interpolation
+    source = %q{
+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_class_attribute_merging
+    source = %{
+.alpha class="beta" Test it
+}
+    assert_html '<div class="alpha beta">Test it</div>', source
+  end
+end