slim 1.2.2 → 1.3.0

data/lib/slim/version.rb

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

data/slim.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = %w(lib)
 
-  s.add_runtime_dependency('temple', ['~> 0.4.0'])
+  s.add_runtime_dependency('temple', ['~> 0.4.1'])
   s.add_runtime_dependency('tilt', ['~> 1.3.3'])
 
   s.add_development_dependency('rake', ['>= 0.8.7'])

data/test/slim/helper.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
 
-require 'rubygems'
 require 'minitest/unit'
 require 'slim'
 require 'slim/grammar'
@@ -16,10 +15,6 @@ class TestSlim < MiniTest::Unit::TestCase
     @env = Env.new
   end
 
-  def teardown
-    Slim::Sections.set_default_options(:dictionary_access => :wrapped)
-  end
-
   def render(source, options = {}, &block)
     Slim::Template.new(options[:file], options) { source }.render(options[:scope] || @env, &block)
   end

data/test/slim/{test_sections.rb → logic_less/test_logic_less.rb}

@@ -1,15 +1,8 @@
 require 'helper'
+require 'slim/logic_less'
 
 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
+  def test_symbol_access
     source = %q{
 p
  - person
@@ -23,10 +16,10 @@ p
       ]
     }
 
-    assert_html '<p><div class="name">Joe</div><div class="name">Jack</div></p>', source, :scope => hash, :sections => true
+    assert_html '<p><div class="name">Joe</div><div class="name">Jack</div></p>', source, :scope => hash, :dictionary_access => :symbol
   end
 
-  def test_sections_string_access
+  def test_string_access
     source = %q{
 p
  - person
@@ -40,7 +33,7 @@ p
       ]
     }
 
-    assert_html '<p><div class="name">Joe</div><div class="name">Jack</div></p>', source, :scope => hash, :sections => true, :dictionary_access => :string
+    assert_html '<p><div class="name">Joe</div><div class="name">Jack</div></p>', source, :scope => hash, :dictionary_access => :string
   end
 
   def test_flag_section
@@ -61,7 +54,7 @@ p
       ]
     }
 
-    assert_html '<p><div class="name">Joe</div><div class="name">Jack</div>shown</p>', source, :scope => hash, :sections => true
+    assert_html '<p><div class="name">Joe</div><div class="name">Jack</div>shown</p>', source, :scope => hash
   end
 
   def test_inverted_section
@@ -77,7 +70,7 @@ p
 
     hash = {}
 
-    assert_html '<p>No person No person 2</p>', source, :scope => hash, :sections => true
+    assert_html '<p>No person No person 2</p>', source, :scope => hash
   end
 
   def test_output_with_content
@@ -85,6 +78,14 @@ p
 p = method_with_block do
   block
 }
-    assert_runtime_error 'Output statements with content are forbidden in sections mode', source, :sections => true
+    assert_runtime_error 'Output statements with content are forbidden in logic less mode', source
+  end
+
+  def test_escaped_interpolation
+    source = %q{
+p text with \#{123} test
+}
+
+    assert_html '<p>text with #{123} test</p>', source
   end
 end

data/test/slim/{test_wrapper.rb → logic_less/test_wrapper.rb}

@@ -1,22 +1,14 @@
 require 'helper'
-
+require 'slim/logic_less'
 
 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
+    assert_html '<p><div class="name">Joe</div><div class="name">Jack</div></p>', source, :sections => true, :dictionary => 'ViewEnv.new'
   end
 
   def test_with_array
@@ -26,14 +18,14 @@ ul
   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
+    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, :dictionary => 'ViewEnv.new'
   end
 
   def test_method
     source = %q{
 a href=output_number Link
 }
-    assert_html '<a href="1337">Link</a>', source, :sections => true
+    assert_html '<a href="1337">Link</a>', source, :sections => true, :dictionary => 'ViewEnv.new'
   end
 
 end

data/test/slim/test_encoding.rb

@@ -1,6 +1,12 @@
 require 'helper'
 
 class TestSlimEncoding < TestSlim
+  def test_windows_crlf
+    source = "a href='#' something\r\nbr\r\na href='#' others\r\n"
+    result = "<a href=\"#\">something</a><br /><a href=\"#\">others</a>"
+    assert_html result, source
+  end
+
   def test_binary
     source = "| \xFF\xFF"
     result = "\xFF\xFF"

data/test/slim/test_slim_template.rb

@@ -7,6 +7,10 @@ class TestSlimTemplate < TestSlim
   class Scope
   end
 
+  def test_default_mime_type
+    assert_equal 'text/html', Slim::Template.default_mime_type
+  end
+
   def test_registered_extension
     assert_equal Slim::Template, Tilt['test.slim']
   end

data/test/slim/translator/test_translator.rb

@@ -0,0 +1,64 @@
+require 'helper'
+require 'slim/translator'
+
+class TestSlimTranslator < TestSlim
+  def setup
+    super
+    Slim::Engine.set_default_options :tr => true, :tr_fn => 'TestSlimTranslator.tr'
+  end
+
+  def self.tr(s)
+    s.upcase
+  end
+
+  def self.tr_reverse(s)
+    s.reverse.gsub(/(\d+)%/, '%\1')
+  end
+
+  def test_no_translation_of_embedded
+    source = %q{
+markdown:
+  #Header
+  Hello from #{"Markdown!"}
+
+  #{1+2}
+
+  * one
+  * 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, :tr_mode => :dynamic
+    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, :tr_mode => :static
+  end
+
+  def test_no_translation_of_attrs
+    source = %q{
+' this is
+  a link to
+a href="link" page
+}
+
+    assert_html "THIS IS\nA LINK TO <a href=\"link\">PAGE</a>", source, :tr_mode => :dynamic
+    assert_html "THIS IS\nA LINK TO <a href=\"link\">PAGE</a>", source, :tr_mode => :static
+  end
+
+  def test_translation_and_interpolation
+    source = %q{
+p translate #{hello_world} this
+  second line
+  third #{1+2} line
+}
+
+    assert_html "<p>translate Hello World from @env this\nsecond line\nthird 3 line</p>", source, :tr => false
+    assert_html "<p>TRANSLATE Hello World from @env THIS\nSECOND LINE\nTHIRD 3 LINE</p>", source, :tr_mode => :dynamic
+    assert_html "<p>TRANSLATE Hello World from @env THIS\nSECOND LINE\nTHIRD 3 LINE</p>", source, :tr_mode => :static
+  end
+
+  def test_translation_reverse
+    source = %q{
+' alpha #{1} beta #{2} gamma #{3}
+}
+
+    assert_html "3 ammag 2 ateb 1 ahpla ", source, :tr_mode => :dynamic, :tr_fn => 'TestSlimTranslator.tr_reverse'
+    assert_html "3 ammag 2 ateb 1 ahpla ", source, :tr_mode => :static, :tr_fn => 'TestSlimTranslator.tr_reverse'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slim
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,22 +11,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-21 00:00:00.000000000 Z
+date: 2012-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
-  requirement: &19629360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *19629360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &19628360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +39,15 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *19628360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &19627580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +55,15 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *19627580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &19626760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +71,15 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *19626760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &19626240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +87,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19626240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: &19625720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +103,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19625720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: creole
-  requirement: &19625040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +119,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19625040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &19624240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,7 +135,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19624240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Slim is a template language whose goal is reduce the syntax to the essential
   parts without becoming cryptic.
 email:
@@ -128,6 +168,7 @@ files:
 - benchmarks/profile-parser.rb
 - benchmarks/profile-render.rb
 - benchmarks/run-benchmarks.rb
+- benchmarks/run-diffbench.rb
 - benchmarks/view.erb
 - benchmarks/view.haml
 - benchmarks/view.slim
@@ -141,11 +182,13 @@ files:
 - lib/slim/filter.rb
 - lib/slim/grammar.rb
 - lib/slim/interpolation.rb
+- lib/slim/logic_less.rb
+- lib/slim/logic_less/filter.rb
+- lib/slim/logic_less/wrapper.rb
 - lib/slim/parser.rb
-- lib/slim/sections.rb
 - lib/slim/template.rb
+- lib/slim/translator.rb
 - lib/slim/version.rb
-- lib/slim/wrapper.rb
 - slim.gemspec
 - test/rails/Rakefile
 - test/rails/app/controllers/application_controller.rb
@@ -188,6 +231,8 @@ files:
 - test/rails/test/helper.rb
 - test/rails/test/test_slim.rb
 - test/slim/helper.rb
+- test/slim/logic_less/test_logic_less.rb
+- test/slim/logic_less/test_wrapper.rb
 - test/slim/test_chain_manipulation.rb
 - test/slim/test_code_blocks.rb
 - test/slim/test_code_escaping.rb
@@ -201,10 +246,9 @@ files:
 - test/slim/test_parser_errors.rb
 - test/slim/test_pretty.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_wrapper.rb
+- test/slim/translator/test_translator.rb
 homepage: http://slim-lang.com/
 licenses: []
 post_install_message: 
@@ -226,8 +270,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: slim
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Slim is a template language.
 test_files: []
+has_rdoc: