slim 0.6.1 → 0.7.0.beta.2

data/test/slim/test_parser_errors.rb

@@ -0,0 +1,98 @@
+require 'helper'
+
+class TestParserErrors < TestSlim
+  def test_unexpected_indentation
+    source = %q{
+p Indent 0
+  div Invalid
+}
+
+    assert_syntax_error "Unexpected indentation\n  Line 3\n    div Invalid\n    ^\n        ", source
+  end
+
+  def test_unexpected_text_indentation
+    source = %q{
+p
+  | text block
+   text
+}
+
+    assert_syntax_error "Unexpected text indentation\n  Line 4\n    text\n    ^\n        ", source
+  end
+
+  def test_malformed_indentation
+    source = %q{
+p
+  div Valid
+ div Invalid
+}
+
+    assert_syntax_error "Malformed indentation\n  Line 4\n    div Invalid\n    ^\n        ", source
+  end
+
+  def test_unknown_line_indicator
+    source = %q{
+p
+  div Valid
+  .valid
+  #valid
+  ?invalid
+}
+
+    assert_syntax_error "Unknown line indicator\n  Line 6\n    ?invalid\n    ^\n        ", source
+  end
+
+  def test_expected_closing_delimiter
+    source = %q{
+p
+  img(src="img.jpg" title={title}
+}
+
+    assert_syntax_error "Expected closing attribute delimiter )\n  Line 3\n    img(src=\"img.jpg\" title={title}\n                                   ^\n        ", source
+  end
+
+  def test_expected_closing_delimiter
+    source = %q{
+p
+  img src=[hash[1] + hash[2]
+}
+
+    assert_syntax_error "Expected closing attribute delimiter ]\n  Line 3\n    img src=[hash[1] + hash[2]\n    ^\n        ", source
+  end
+
+  def test_unexpected_closing
+    source = %q{
+p
+  img src=(1+1)]
+}
+
+    assert_syntax_error "Unexpected closing ]\n  Line 3\n    img src=(1+1)]\n    ^\n        ", source
+  end
+
+  def test_invalid_empty_attribute
+    source = %q{
+p
+  img{src= }
+}
+
+    assert_syntax_error "Invalid empty attribute\n  Line 3\n    img{src= }\n    ^\n        ", source
+  end
+
+  def test_invalid_empty_attribute2
+    source = %q{
+p
+  img{src=}
+}
+
+    assert_syntax_error "Invalid empty attribute\n  Line 3\n    img{src=}\n    ^\n        ", source
+  end
+
+  def test_invalid_empty_attribute3
+    source = %q{
+p
+  img src=
+}
+
+    assert_syntax_error "Invalid empty attribute\n  Line 3\n    img src=\n    ^\n        ", source
+  end
+end

data/test/slim/test_slim_template.rb

@@ -0,0 +1,128 @@
+require 'helper'
+
+class ::MockError < NameError
+end
+
+class TestSlimTemplate < MiniTest::Unit::TestCase
+  class Scope
+    include Tilt::CompileSite
+  end
+
+  def test_registered_extension
+    assert_equal Slim::Template, Tilt['test.slim']
+  end
+
+  def test_preparing_and_evaluating
+    template = Slim::Template.new { |t| "p Hello World!\n" }
+    assert_equal "<p>Hello World!</p>", template.render
+  end
+
+  def test_passing_locals
+    template = Slim::Template.new { "p = 'Hey ' + name + '!'\n" }
+    assert_equal "<p>Hey Joe!</p>", template.render(Object.new, :name => 'Joe')
+  end
+
+  def test_evaluating_in_an_object_scope
+    template = Slim::Template.new { "p = 'Hey ' + @name + '!'\n" }
+    scope = Object.new
+    scope.instance_variable_set :@name, 'Joe'
+    assert_equal "<p>Hey Joe!</p>", template.render(scope)
+  end
+
+  def test_passing_a_block_for_yield
+    template = Slim::Template.new { "p = 'Hey ' + yield + '!'\n" }
+    assert_equal "<p>Hey Joe!</p>", template.render { 'Joe' }
+  end
+
+  def test_backtrace_file_and_line_reporting_without_locals
+    data = File.read(__FILE__).split("\n__END__\n").last
+    fail unless data[0] == ?h
+    template = Slim::Template.new('test.slim', 10) { data }
+    begin
+      template.render
+      fail 'should have raised an exception'
+    rescue => boom
+      assert_kind_of NameError, boom
+      line = boom.backtrace.first
+      assert_equal 'test.slim', line.split(":").first
+    end
+  end
+
+  def test_backtrace_file_and_line_reporting_with_locals
+    data = File.read(__FILE__).split("\n__END__\n").last
+    fail unless data[0] == ?h
+    template = Slim::Template.new('test.slim') { data }
+    begin
+      res = template.render(Object.new, :name => 'Joe', :foo => 'bar')
+    rescue => boom
+      assert_kind_of MockError, boom
+      line = boom.backtrace.first
+      assert_equal 'test.slim', line.split(":").first
+    end
+  end
+
+  def test_compiling_template_source_to_a_method
+    template = Slim::Template.new { |t| "Hello World!" }
+    template.render(Scope.new)
+    method_name = template.send(:compiled_method_name, [])
+    method_name = method_name.to_sym if Symbol === Kernel.methods.first
+    assert Tilt::CompileSite.instance_methods.include?(method_name),
+      "CompileSite.instance_methods.include?(#{method_name.inspect})"
+    assert Scope.new.respond_to?(method_name),
+      "scope.respond_to?(#{method_name.inspect})"
+  end
+  
+
+  def test_passing_locals
+    template = Slim::Template.new { "p = 'Hey ' + name + '!'\n" }
+    assert_equal "<p>Hey Joe!</p>", template.render(Scope.new, :name => 'Joe')
+  end
+
+  def test_evaluating_in_an_object_scope
+    template = Slim::Template.new { "p = 'Hey ' + @name + '!'\n" }
+    scope = Scope.new
+    scope.instance_variable_set :@name, 'Joe'
+    assert_equal "<p>Hey Joe!</p>", template.render(scope)
+  end
+
+  def test_passing_a_block_for_yield
+    template = Slim::Template.new { "p = 'Hey ' + yield + '!'\n" }
+    assert_equal "<p>Hey Joe!</p>", template.render(Scope.new) { 'Joe' }
+  end
+
+  def backtrace_file_and_line_reporting_without_locals
+    data = File.read(__FILE__).split("\n__END__\n").last
+    fail unless data[0] == ?h
+    template = Slim::Template.new('test.slim', 10) { data }
+    begin
+      template.render(Scope.new)
+      fail 'should have raised an exception'
+    rescue => boom
+      assert_kind_of NameError, boom
+      line = boom.backtrace.first
+      assert_equal 'test.slim', line.split(":").first
+    end
+  end
+
+  def test_backtrace_file_and_line_reporting_with_locals
+    data = File.read(__FILE__).split("\n__END__\n").last
+    fail unless data[0] == ?h
+    template = Slim::Template.new('test.slim') { data }
+    begin
+      res = template.render(Scope.new, :name => 'Joe', :foo => 'bar')
+    rescue => boom
+      assert_kind_of MockError, boom
+      line = boom.backtrace.first
+      assert_equal 'test.slim', line.split(":").first
+    end
+  end
+end
+
+__END__
+html
+  body
+    h1 = "Hey #{name}"
+
+    = raise MockError
+
+    p we never get here

data/vim/slim.vim

@@ -0,0 +1,33 @@
+" Vim syntax file
+" Language: Slim
+" Maintainer: Andrew Stone <andy@stonean.com>
+" Version:  1
+" Last Change:  2010 Sep 25
+" TODO: Feedback is welcomed.
+
+" Quit when a syntax file is already loaded.
+if exists("b:current_syntax")
+  finish
+endif
+
+if !exists("main_syntax")
+  let main_syntax = 'slim'
+endif
+
+" Allows a per line syntax evaluation.
+let b:ruby_no_expensive = 1
+
+" Include Ruby syntax highlighting
+syn include @slimRuby syntax/ruby.vim
+
+" Include HTML 
+runtime! syntax/html.vim
+unlet! b:current_syntax
+
+syntax region slimHtml start="^\s*[^-=]\w" end="$" contains=htmlTagName, htmlArg, htmlString
+
+syntax region slimControl  start="-" end="$"  contains=@slimRuby keepend
+syntax region slimOutput   start=".*=\s" end="$"  contains=@slimRuby keepend
+
+
+let b:current_syntax = "slim"

data/vim/test.slim

@@ -0,0 +1,27 @@
+! doctype html
+  head
+    title Slim Vim Test
+    meta name="keywords" content="slim, vim, syntax"
+  body
+    h1 = @page_title
+    p id="notice"
+      '
+        Welcome to the the syntax test.  This file is to excercise the various markup.
+
+    - unless @users.empty?
+      table
+        - for user in users do 
+          tr
+            td = user.name
+    - else
+      p There are no users.
+
+    script type="text/javascript"
+     '
+      var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+        document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+
+    script type="text/javascript"
+     '
+      var pageTracker = _gat._getTracker("UA-12345678-9");
+      pageTracker._trackPageview();

metadata

@@ -1,12 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: slim
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 0
-  - 6
-  - 1
-  version: 0.6.1
+  - 7
+  - 0
+  - beta
+  - 2
+  version: 0.7.0.beta.2
 platform: ruby
 authors: 
 - Andrew Stone
@@ -15,11 +17,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-17 00:00:00 -04:00
+date: 2010-10-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: escape_utils
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -27,26 +30,59 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
+        - 1
+        - 9
+        version: 0.1.9
   type: :runtime
-  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: temple
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
-  type: :development
-  prerelease: false
+        - 1
+        - 2
+        version: 0.1.2
+  type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: tilt
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        version: "1.1"
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 8
+        - 7
+        version: 0.8.7
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: haml
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -55,11 +91,24 @@ dependencies:
         - 0
         version: "0"
   type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: erubis
   prerelease: false
-  version_requirements: *id003
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: haml
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  name: minitest
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -68,11 +117,24 @@ dependencies:
         - 0
         version: "0"
   type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rcov
   prerelease: false
-  version_requirements: *id004
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: erubis
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  name: rdiscount
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -81,8 +143,20 @@ dependencies:
         - 0
         version: "0"
   type: :development
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: liquid
   prerelease: false
-  version_requirements: *id005
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id010
 description: Slim is a template language whose goal is reduce the syntax to the essential parts without becoming cryptic.
 email: 
 - andy@stonean.com
@@ -94,21 +168,42 @@ extensions: []
 extra_rdoc_files: 
 - README.md
 files: 
+- .gitignore
 - Gemfile
 - Gemfile.lock
 - README.md
 - Rakefile
+- benchmarks/run.rb
+- benchmarks/src/complex.erb
+- benchmarks/src/complex.haml
+- benchmarks/src/complex.slim
+- benchmarks/src/complex_view.rb
 - lib/slim.rb
 - lib/slim/compiler.rb
+- lib/slim/embedded_engine.rb
+- lib/slim/end_inserter.rb
 - lib/slim/engine.rb
-- lib/slim/optimizer.rb
+- lib/slim/filter.rb
+- lib/slim/helpers.rb
+- lib/slim/parser.rb
 - lib/slim/rails.rb
-- readme.html
+- lib/slim/template.rb
+- lib/slim/version.rb
 - slim.gemspec
 - test/helper.rb
-- test/slim/test_compiler.rb
-- test/slim/test_engine.rb
-- test/test_slim.rb
+- test/slim/test_code_blocks.rb
+- test/slim/test_code_escaping.rb
+- test/slim/test_code_evaluation.rb
+- test/slim/test_code_helpers.rb
+- test/slim/test_code_output.rb
+- test/slim/test_code_structure.rb
+- test/slim/test_embedded_engines.rb
+- test/slim/test_html_escaping.rb
+- test/slim/test_html_structure.rb
+- test/slim/test_parser_errors.rb
+- test/slim/test_slim_template.rb
+- vim/slim.vim
+- vim/test.slim
 has_rdoc: true
 homepage: http://github.com/stonean/slim
 licenses: []
@@ -123,18 +218,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -160104932492896005
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: slim
@@ -142,8 +238,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Slim is a template language.
-test_files: 
-- test/helper.rb
-- test/test_slim.rb
-- test/slim/test_engine.rb
-- test/slim/test_compiler.rb
+test_files: []
+