RubyGems - slim - Versions diffs - 0.9.2 → 0.9.3 - Mend

slim 0.9.2 → 0.9.3

Files changed (36) hide show

data/.gitignore +18 -0
data/.yardopts +2 -0
data/CHANGES +147 -0
data/Gemfile +16 -0
data/LICENSE +21 -0
data/README.md +31 -36
data/benchmarks/run.rb +114 -0
data/benchmarks/src/complex.erb +23 -0
data/benchmarks/src/complex.haml +18 -0
data/benchmarks/src/complex.slim +17 -0
data/benchmarks/src/complex_view.rb +15 -0
data/extra/slim-mode.el +409 -0
data/extra/test.slim +49 -0
data/lib/slim/command.rb +0 -6
data/lib/slim/compiler.rb +40 -51
data/lib/slim/embedded_engine.rb +69 -41
data/lib/slim/end_inserter.rb +5 -3
data/lib/slim/engine.rb +9 -11
data/lib/slim/filter.rb +10 -13
data/lib/slim/grammar.rb +19 -0
data/lib/slim/interpolation.rb +7 -5
data/lib/slim/parser.rb +48 -33
data/lib/slim/sections.rb +22 -26
data/lib/slim/template.rb +7 -7
data/lib/slim/version.rb +3 -1
data/lib/slim/wrapper.rb +1 -0
data/slim.gemspec +34 -0
data/test/helper.rb +5 -1
data/test/slim/test_code_escaping.rb +3 -3
data/test/slim/test_code_evaluation.rb +49 -2
data/test/slim/test_embedded_engines.rb +3 -1
data/test/slim/test_html_escaping.rb +8 -0
data/test/slim/test_html_structure.rb +18 -0
data/test/slim/test_pretty.rb +8 -3
data/test/slim/test_ruby_errors.rb +27 -2
metadata +38 -46

data/test/slim/test_code_evaluation.rb CHANGED Viewed

@@ -90,6 +90,14 @@ form(method='post' action=action_path(:page, :save))
     assert_html '<form action="&#47;action-page-save" method="post"></form>', source
   end
+  def test_bypassing_escape_in_attribute
+    source = %q{
+form action==action_path(:page, :save) method='post'
+}
+    assert_html '<form action="/action-page-save" method="post"></form>', source
+  end
   def test_hash_call_in_attribute_without_quotes
     source = %q{
 p id=hash[:a] Test it
@@ -185,17 +193,56 @@ p id="#{(false ? 'notshown' : 'shown')}" = output_number
     assert_html '<div class="alpha beta">Test it</div>', source
   end
+  def test_class_attribute_merging_with_nil
+    source = %{
+.alpha class="beta" class=nil class="gamma" Test it
+}
+    assert_html '<div class="alpha beta gamma">Test it</div>', source
+  end
   def test_id_attribute_merging
     source = %{
 #alpha id="beta" Test it
 }
-    assert_html '<div id="alpha_beta">Test it</div>', source, :id_delimiter => '_'
+    assert_html '<div id="alpha_beta">Test it</div>', source, :attr_delimiter => {'class' => ' ', 'id' => '_' }
   end
   def test_id_attribute_merging2
     source = %{
 #alpha id="beta" Test it
 }
-    assert_html '<div id="alpha-beta">Test it</div>', source, :id_delimiter => '-'
+    assert_html '<div id="alpha-beta">Test it</div>', source, :attr_delimiter => {'class' => ' ', 'id' => '-' }
+  end
+  def test_boolean_attribute_true
+    source = %{
+option selected=1 Text
+}
+    assert_html '<option selected="selected">Text</option>', source
+  end
+  def test_boolean_attribute_false
+    source = %{
+option selected=false Text
+}
+    assert_html '<option>Text</option>', source
+  end
+  def test_non_boolean_attribute
+    source = %{
+.alpha class="beta" class=false
+}
+    assert_html '<div class="alpha beta false"></div>', source
+  end
+  def test_array_attribute
+    source = %{
+.alpha class="beta" class=[:gamma, nil, :delta, [true, false]]
+}
+    assert_html '<div class="alpha beta gamma delta true false"></div>', source
   end
 end

data/test/slim/test_embedded_engines.rb CHANGED Viewed

@@ -10,13 +10,15 @@ class TestSlimEmbeddedEngines < TestSlim
 p
   - text = 'haml'
   haml:
+    - passed_from_haml = 'from haml'
     %b Hello from #{text.upcase}!
     Second Line!
     - if true
       = true
+  = passed_from_haml
 }
-    assert_html "<p><b>Hello from HAML!</b>\nSecond Line!\ntrue\n</p>", source
+    assert_html "<p><b>Hello from HAML!</b>\nSecond Line!\ntrue\nfrom haml</p>", source
   end
   def test_render_with_erb

data/test/slim/test_html_escaping.rb CHANGED Viewed

@@ -29,4 +29,12 @@ p class="#{x}" test #{content}
     assert_html '<p class="&quot;">test &lt;x&gt;</p>', source
   end
+  def test_html_nested_escaping
+    source = %q{
+= hello_world do
+  | escaped &
+}
+    assert_html 'Hello World from @env escaped &amp; Hello World from @env', source
+  end
 end

data/test/slim/test_html_structure.rb CHANGED Viewed

@@ -338,4 +338,22 @@ p World
     assert_html "<p>Hello</p><!--This is a comment\n Another comment\nLast line of comment.--><p>World</p>", source
   end
+  def test_render_with_html_conditional_and_tag
+    source = %q{
+/[ if IE ]
+ p Get a better browser.
+}
+    assert_html "<!--[if IE]><p>Get a better browser.</p><![endif]-->", source
+  end
+  def test_render_with_html_conditional_and_method_output
+    source = %q{
+/[ if IE ]
+ = message 'hello'
+}
+    assert_html "<!--[if IE]>hello<![endif]-->", source
+  end
 end

data/test/slim/test_pretty.rb CHANGED Viewed

@@ -9,7 +9,7 @@ class TestSlimPretty < TestSlim
     Slim::Engine.set_default_options :pretty => false
   end
-  def test_pretty_sass
+  def test_pretty
     source = %q{
 doctype 5
 html
@@ -20,7 +20,9 @@ html
         background-color: red
   body
     #container
-      p Hello!
+      p Hello
+        World!
+      p= "dynamic text with\nnewline"
 }
     result = %q{<!DOCTYPE html>
@@ -35,7 +37,10 @@ html
   </head>
   <body>
     <div id="container">
-      <p>Hello!</p>
+      <p>Hello
+        World!</p>
+      <p>dynamic text with
+        newline</p>
     </div>
   </body>
 </html>}

data/test/slim/test_ruby_errors.rb CHANGED Viewed

@@ -82,7 +82,32 @@ ruby:
 = unknown_ruby_method
 }
-    assert_ruby_error NameError,"(__TEMPLATE__):5", source
+    assert_ruby_error NameError,"(__TEMPLATE__):6", source
+  end
+  def test_embedded_markdown
+    source = %q{
+markdown:
+  #Header
+  Hello from #{"Markdown!"}
+  "Second Line!"
+= unknown_ruby_method
+}
+    assert_ruby_error NameError,"(__TEMPLATE__):6", source
+  end
+  def test_embedded_liquid
+    source = %q{
+- text = 'before liquid block'
+liquid:
+  First
+  {{text}}
+  Third
+= unknown_ruby_method
+}
+    assert_ruby_error NameError,"(__TEMPLATE__):7", source
   end
   def test_embedded_javascript
@@ -139,6 +164,6 @@ div
     source = %{
 #alpha id="beta" Test it
 }
-    assert_runtime_error 'Multiple id attributes specified, but id concatenation disabled', source
+    assert_runtime_error 'Multiple id attributes specified', source
   end
 end

metadata CHANGED Viewed

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: slim
 version: !ruby/object:Gem::Version
-  prerelease: false
-  segments:
-  - 0
-  - 9
-  - 2
-  version: 0.9.2
+  prerelease:
+  version: 0.9.3
 platform: ruby
 authors:
 - Andrew Stone
@@ -16,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-03-30 00:00:00 -04:00
+date: 2011-05-15 00:00:00 -04:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -27,11 +23,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        segments:
-        - 0
-        - 2
-        - 0
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency
@@ -42,9 +34,6 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        segments:
-        - 1
-        - 2
         version: "1.2"
   type: :runtime
   version_requirements: *id002
@@ -56,10 +45,6 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        segments:
-        - 0
-        - 8
-        - 7
         version: 0.8.7
   type: :development
   version_requirements: *id003
@@ -71,89 +56,86 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        segments:
-        - 0
-        version: "0"
+        version: 3.1.0
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: sass
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        segments:
-        - 0
-        version: "0"
+        version: 3.1.0
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency
-  name: rcov
+  name: minitest
   prerelease: false
   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: rdiscount
+  name: rcov
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        segments:
-        - 0
         version: "0"
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency
-  name: liquid
+  name: rdiscount
   prerelease: false
   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: yard
+  name: liquid
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        segments:
-        - 0
         version: "0"
   type: :development
   version_requirements: *id009
 - !ruby/object:Gem::Dependency
-  name: creole
+  name: yard
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        segments:
-        - 0
         version: "0"
   type: :development
   version_requirements: *id010
+- !ruby/object:Gem::Dependency
+  name: creole
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: "0"
+  type: :development
+  version_requirements: *id011
 description: Slim is a template language whose goal is reduce the syntax to the essential parts without becoming cryptic.
 email:
 - andy@stonean.com
@@ -167,9 +149,21 @@ extra_rdoc_files:
 - README.md
 files:
 - .gemtest
+- .gitignore
+- .yardopts
+- CHANGES
+- Gemfile
+- LICENSE
 - README.md
 - Rakefile
+- benchmarks/run.rb
+- benchmarks/src/complex.erb
+- benchmarks/src/complex.haml
+- benchmarks/src/complex.slim
+- benchmarks/src/complex_view.rb
 - bin/slimrb
+- extra/slim-mode.el
+- extra/test.slim
 - lib/slim.rb
 - lib/slim/command.rb
 - lib/slim/compiler.rb
@@ -177,6 +171,7 @@ files:
 - lib/slim/end_inserter.rb
 - lib/slim/engine.rb
 - lib/slim/filter.rb
+- lib/slim/grammar.rb
 - lib/slim/interpolation.rb
 - lib/slim/parser.rb
 - lib/slim/rails.rb
@@ -184,6 +179,7 @@ files:
 - lib/slim/template.rb
 - lib/slim/version.rb
 - lib/slim/wrapper.rb
+- slim.gemspec
 - test/helper.rb
 - test/integration/rails/dummy/Rakefile
 - test/integration/rails/dummy/app/controllers/application_controller.rb
@@ -255,21 +251,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      segments:
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      segments:
-      - 0
       version: "0"
 requirements: []
 rubyforge_project: slim
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key:
 specification_version: 3
 summary: Slim is a template language.