slim 0.9.0 → 0.9.1.alpha.1

data/test/slim/test_ruby_errors.rb

@@ -0,0 +1,144 @@
+require 'helper'
+
+class TestSlimRubyErrors < TestSlim
+  def test_broken_output_line
+    source = %q{
+p = hello_world + \
+  hello_world + \
+  unknown_ruby_method
+}
+
+    assert_ruby_error NameError, "test.slim:4", source, :file => 'test.slim'
+  end
+
+  def test_broken_output_line2
+    source = %q{
+p = hello_world + \
+  hello_world
+p Hello
+= unknown_ruby_method
+}
+
+    assert_ruby_error NameError,"(__TEMPLATE__):5", source
+  end
+
+  def test_output_block
+    source = %q{
+p = hello_world "Hello Ruby" do
+  = unknown_ruby_method
+}
+
+    assert_ruby_error NameError,"(__TEMPLATE__):3", source
+  end
+
+  def test_output_block2
+    source = %q{
+p = hello_world "Hello Ruby" do
+  = "Hello from block"
+p Hello
+= unknown_ruby_method
+}
+
+    assert_ruby_error NameError, "(__TEMPLATE__):5", source
+  end
+
+  def test_text_block
+    source = %q{
+p Text line 1
+  Text line 2
+= unknown_ruby_method
+}
+
+    assert_ruby_error NameError,"(__TEMPLATE__):4", source
+  end
+
+  def test_text_block2
+    source = %q{
+|
+  Text line 1
+  Text line 2
+= unknown_ruby_method
+}
+
+    assert_ruby_error NameError,"(__TEMPLATE__):5", source
+  end
+
+  def test_comment
+    source = %q{
+/ Comment line 1
+  Comment line 2
+= unknown_ruby_method
+}
+
+    assert_ruby_error NameError,"(__TEMPLATE__):4", source
+  end
+
+  def test_embedded_ruby
+    source = %q{
+ruby:
+  a = 1
+  b = 2
+= a + b
+= unknown_ruby_method
+}
+
+    assert_ruby_error NameError,"(__TEMPLATE__):5", source
+  end
+
+  def test_embedded_javascript
+    source = %q{
+javascript:
+  alert();
+  alert();
+= unknown_ruby_method
+}
+
+    assert_ruby_error NameError,"(__TEMPLATE__):5", source
+  end
+
+  def test_invalid_nested_code
+    source = %q{
+p
+  - test = 123
+    = "Hello from within a block! "
+}
+    assert_ruby_syntax_error "(__TEMPLATE__):5", source
+  end
+
+  def test_invalid_nested_output
+    source = %q{
+p
+  = "Hello Ruby!"
+    = "Hello from within a block! "
+}
+    assert_ruby_syntax_error "(__TEMPLATE__):5", source
+  end
+
+  def test_invalid_embedded_engine
+    source = %q{
+p
+  embed_unknown:
+    1+1
+}
+
+    assert_runtime_error 'Invalid embedded engine embed_unknown', source
+  end
+
+  def test_explicit_end
+    source = %q{
+div
+  - if show_first?
+      p The first paragraph
+  - end
+}
+
+    assert_runtime_error 'Explicit end statements are forbidden', source
+  end
+
+  def test_id_attribute_merging2
+    source = %{
+#alpha id="beta" Test it
+}
+    assert_runtime_error 'Multiple id attributes specified, but id concatenation disabled', source
+  end
+end

data/test/slim/test_sections.rb

@@ -0,0 +1,90 @@
+require 'helper'
+
+class TestSlimLogicLess < TestSlim
+  def setup
+    Slim::Sections.set_default_options(:dictionary_access => :symbol)
+  end
+
+  def teardown
+    Slim::Sections.set_default_options(:dictionary => 'self')
+  end
+
+  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, :scope => hash, :sections => true
+  end
+
+  def test_sections_string_access
+    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, :scope => hash, :sections => true, :dictionary_access => :string
+  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, :scope => 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, :scope => 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
+end

data/test/slim/test_slim_template.rb

@@ -0,0 +1,123 @@
+require 'helper'
+
+class ::MockError < NameError
+end
+
+class TestSlimTemplate < MiniTest::Unit::TestCase
+  class Scope
+  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 = template.send(:compiled_method, [])
+    assert_kind_of UnboundMethod, method
+  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/test/slim/test_text_interpolation.rb

@@ -0,0 +1,56 @@
+require 'helper'
+
+class TestSlimTextInterpolation < TestSlim
+
+  def test_interpolation_in_text
+    source = %q{
+p
+ | #{hello_world} with "quotes"
+p
+ |
+  A message from the compiler: #{hello_world}
+}
+
+    assert_html '<p>Hello World from @env with "quotes"</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_escape_interpolation
+    source = %q{
+p \\#{hello_world}
+}
+
+    assert_html '<p>#{hello_world}</p>', source
+  end
+
+  def test_complex_interpolation
+    source = %q{
+p Message: #{message('hello', "user #{output_number}")}
+}
+
+    assert_html '<p>Message: hello user 1337</p>', source
+  end
+
+  def test_interpolation_with_escaping
+    source = %q{
+| #{evil_method}
+}
+
+    assert_html '&lt;script&gt;do_something_evil();&lt;&#47;script&gt;', source
+  end
+
+  def test_interpolation_without_escaping
+    source = %q{
+| #{{evil_method}}
+}
+
+    assert_html '<script>do_something_evil();</script>', source
+  end
+end

data/test/slim/test_validator.rb

@@ -0,0 +1,47 @@
+require 'helper'
+
+class TestSlimValidator < TestSlim
+  def test_valid_true?
+    source = %q{
+p Slim
+}
+    assert_valid? true, source
+  end
+
+  def test_valid_false?
+    source = %q{
+ p
+  Slim
+}
+    assert_valid? false, source
+  end
+
+  def test_valid!
+    source = %q{
+p Slim
+}
+    assert_valid! false, source
+  end
+
+  def test_invalid!
+    source = %q{
+ p
+  Slim
+}
+    assert_invalid! Slim::Parser::SyntaxError, source
+  end
+
+  private
+
+  def assert_valid?(expected, source)
+    assert_equal expected, Slim::Validator.valid?(source)
+  end
+
+  def assert_valid!(expected, source)
+    assert_equal true, Slim::Validator.validate!(source)
+  end
+
+  def assert_invalid!(expected, source)
+    assert_equal expected, Slim::Validator.validate!(source).class
+  end
+end

data/test/slim/test_wrapper.rb

@@ -0,0 +1,32 @@
+require 'helper'
+
+
+class TestSlimWrapper < TestSlim
+  def setup
+    Slim::Sections.set_default_options(:dictionary => 'ViewEnv.new')
+  end
+
+  def teardown
+    Slim::Sections.set_default_options(:dictionary => 'self')
+  end
+
+  def test_sections
+    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
+
+end

metadata

@@ -1,12 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: slim
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 0
   - 9
-  - 0
-  version: 0.9.0
+  - 1
+  - alpha
+  - 1
+  version: 0.9.1.alpha.1
 platform: ruby
 authors: 
 - Andrew Stone
@@ -16,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-30 00:00:00 -05:00
+date: 2011-02-03 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -154,6 +156,7 @@ extra_rdoc_files:
 - README.md
 files: 
 - README.md
+- Rakefile
 - bin/slimrb
 - lib/slim.rb
 - lib/slim/command.rb
@@ -170,6 +173,62 @@ files:
 - lib/slim/validator.rb
 - lib/slim/version.rb
 - lib/slim/wrapper.rb
+- test/helper.rb
+- test/integration/rails/dummy/Rakefile
+- test/integration/rails/dummy/app/controllers/application_controller.rb
+- test/integration/rails/dummy/app/controllers/parents_controller.rb
+- test/integration/rails/dummy/app/controllers/slim_controller.rb
+- test/integration/rails/dummy/app/helpers/application_helper.rb
+- test/integration/rails/dummy/app/models/child.rb
+- test/integration/rails/dummy/app/models/parent.rb
+- test/integration/rails/dummy/app/views/layouts/application.html.slim
+- test/integration/rails/dummy/app/views/parents/_form.html.slim
+- test/integration/rails/dummy/app/views/parents/edit.html.slim
+- test/integration/rails/dummy/app/views/parents/new.html.slim
+- test/integration/rails/dummy/app/views/parents/show.html.slim
+- test/integration/rails/dummy/app/views/slim/_partial.html.slim
+- test/integration/rails/dummy/app/views/slim/content_for.html.slim
+- test/integration/rails/dummy/app/views/slim/erb.html.erb
+- test/integration/rails/dummy/app/views/slim/integers.html.slim
+- test/integration/rails/dummy/app/views/slim/nil.html.slim
+- test/integration/rails/dummy/app/views/slim/no_layout.html.slim
+- test/integration/rails/dummy/app/views/slim/normal.html.slim
+- test/integration/rails/dummy/app/views/slim/partial.html.slim
+- test/integration/rails/dummy/app/views/slim/variables.html.slim
+- test/integration/rails/dummy/config.ru
+- test/integration/rails/dummy/config/application.rb
+- test/integration/rails/dummy/config/boot.rb
+- test/integration/rails/dummy/config/database.yml
+- test/integration/rails/dummy/config/environment.rb
+- test/integration/rails/dummy/config/environments/development.rb
+- test/integration/rails/dummy/config/environments/production.rb
+- test/integration/rails/dummy/config/environments/test.rb
+- test/integration/rails/dummy/config/initializers/backtrace_silencers.rb
+- test/integration/rails/dummy/config/initializers/inflections.rb
+- test/integration/rails/dummy/config/initializers/mime_types.rb
+- test/integration/rails/dummy/config/initializers/secret_token.rb
+- test/integration/rails/dummy/config/initializers/session_store.rb
+- test/integration/rails/dummy/config/locales/en.yml
+- test/integration/rails/dummy/config/routes.rb
+- test/integration/rails/dummy/db/migrate/20101220223037_parents_and_children.rb
+- test/integration/rails/dummy/script/rails
+- test/integration/rails/test_helper.rb
+- test/integration/rails/test_slim_rails.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_html_escaping.rb
+- test/slim/test_html_structure.rb
+- test/slim/test_parser_errors.rb
+- test/slim/test_ruby_errors.rb
+- test/slim/test_sections.rb
+- test/slim/test_slim_template.rb
+- test/slim/test_text_interpolation.rb
+- test/slim/test_validator.rb
+- test/slim/test_wrapper.rb
 has_rdoc: true
 homepage: http://github.com/stonean/slim
 licenses: []
@@ -190,11 +249,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
 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