slim 2.1.0 → 3.0.0.beta.2

data/test/literate/TESTS.md

@@ -259,7 +259,7 @@ Hello, World!
 You can also write loops like this
 
 ~~~ slim
-- items = [{:name => 'table', :price => 10}, {:name => 'chair', :price => 5}]
+- items = [{name: 'table', price: 10}, {name: 'chair', price: 5}]
 table#items
   - for item in items do
     tr
@@ -293,7 +293,7 @@ which renders as
 The `do` keyword can be omitted.
 
 ~~~ slim
-- items = [{:name => 'table', :price => 10}, {:name => 'chair', :price => 5}]
+- items = [{name: 'table', price: 10}, {name: 'chair', price: 5}]
 table#items
   - for item in items
     tr
@@ -1099,7 +1099,7 @@ with the :tag key.
 ~~~ slim
 ruby:
   def a_unless_current
-    @page_current ? {:tag => 'span'} : {:tag => 'a', :href => 'http://slim-lang.com/'}
+    @page_current ? {tag: 'span'} : {tag: 'a', href: 'http://slim-lang.com/'}
   end
 - @page_current = true
 *a_unless_current Link
@@ -1120,7 +1120,7 @@ renders as
 We add tag shortcuts by setting the option `:shortcut`.
 
 ~~~ options
-:shortcut => {'c' => {:tag => 'container'}, 'sec' => {:tag =>'section'}, '#' => {:attr => 'id'}, '.' => {:attr => 'class'} }
+:shortcut => {'c' => {tag: 'container'}, 'sec' => {tag:'section'}, '#' => {attr: 'id'}, '.' => {attr: 'class'} }
 ~~~
 
 ~~~ slim
@@ -1140,7 +1140,7 @@ renders to
 We add `&` to create a shortcut for the input elements with type attribute by setting the option `:shortcut`.
 
 ~~~ options
-:shortcut => {'&' => {:tag => 'input', :attr => 'type'}, '#' => {:attr => 'id'}, '.' => {:attr => 'class'} }
+:shortcut => {'&' => {tag: 'input', attr: 'type'}, '#' => {attr: 'id'}, '.' => {attr: 'class'} }
 ~~~
 
 ~~~ slim
@@ -1158,7 +1158,7 @@ renders to
 This is stupid, but you can also use multiple character shortcuts.
 
 ~~~ options
-:shortcut => {'&' => {:tag => 'input', :attr => 'type'}, '#<' => {:attr => 'id'}, '#>' => {:attr => 'class'} }
+:shortcut => {'&' => {tag: 'input', attr: 'type'}, '#<' => {attr: 'id'}, '#>' => {attr: 'class'} }
 ~~~
 
 ~~~ slim
@@ -1176,7 +1176,7 @@ renders to
 You can also set multiple attributes per shortcut.
 
 ~~~ options
-:shortcut => {'.' => {:attr => %w(id class)} }
+:shortcut => {'.' => {attr: %w(id class)} }
 ~~~
 
 ~~~ slim
@@ -1192,7 +1192,7 @@ renders to
 Shortcuts can also have multiple characters.
 
 ~~~ options
-:shortcut => {'.' => {:attr => 'class'}, '#' => {:attr => 'id'}, '.#' => {:attr => %w(class id)} }
+:shortcut => {'.' => {attr: 'class'}, '#' => {attr: 'id'}, '.#' => {attr: %w(class id)} }
 ~~~
 
 ~~~ slim
@@ -1254,6 +1254,35 @@ renders as
 </h1>
 ~~~
 
+## Pretty printing of XML
+
+We can enable XML mode with
+
+~~~ options
+:format => :xml
+~~~
+
+~~~ slim
+doctype xml
+document
+  closed-element/
+  element(boolean-attribute)
+    child attribute="value"
+      | content
+~~~
+
+~~~ html
+<?xml version="1.0" encoding="utf-8" ?>
+<document>
+  <closed-element />
+  <element boolean-attribute="">
+    <child attribute="value">
+      content
+    </child>
+  </element>
+</document>
+~~~
+
 ## Embedded engines
 
 ## Configuring Slim

data/test/literate/helper.rb

@@ -4,9 +4,9 @@ require 'slim/translator'
 require 'slim/grammar'
 require 'minitest/autorun'
 
-Slim::Engine.after  Slim::Parser, Temple::Filters::Validator, :grammar => Slim::Grammar
+Slim::Engine.after  Slim::Parser, Temple::Filters::Validator, grammar: Slim::Grammar
 Slim::Engine.before :Pretty, Temple::Filters::Validator
-Slim::Engine.set_default_options :tr => false, :logic_less => false
+Slim::Engine.set_options tr: false, logic_less: false
 
 class MiniTest::Spec
   def render(source, options = {}, &block)

data/test/logic_less/test_logic_less.rb

@@ -5,9 +5,9 @@ class TestSlimLogicLess < TestSlim
   class Scope
     def initialize
       @hash = {
-        :person => [
-                    { :name => 'Joe', :age => 1, :selected => true },
-                    { :name => 'Jack', :age => 2 }
+        person: [
+                    { name: 'Joe', age: 1, selected: true },
+                    { name: 'Jack', age: 2 }
                    ]
       }
     end
@@ -25,22 +25,22 @@ p
 }
 
     hash = {
-      :hello => 'Hello!',
-      :person => lambda do |&block|
+      hello: 'Hello!',
+      person: lambda do |&block|
         %w(Joe Jack).map do |name|
-          "<b>#{block.call(:name => name)}</b>"
+          "<b>#{block.call(name: name)}</b>"
         end.join
       end,
-      :simple => lambda do |&block|
+      simple: lambda do |&block|
         "<div class=\"simple\">#{block.call}</div>"
       end,
-      :list => lambda do |&block|
-        list = [{:key => 'First'}, {:key => 'Second'}]
+      list: lambda do |&block|
+        list = [{key: 'First'}, {key: 'Second'}]
         "<ul>#{block.call(*list)}</ul>"
       end
     }
 
-    assert_html '<p><b><div class="name">Joe</div></b><b><div class="name">Jack</div></b><div class="simple"><div class="hello">Hello!</div></div><ul><li>First</li><li>Second</li></ul></p>', source, :scope => hash
+    assert_html '<p><b><div class="name">Joe</div></b><b><div class="name">Jack</div></b><div class="simple"><div class="hello">Hello!</div></div><ul><li>First</li><li>Second</li></ul></p>', source, scope: hash
   end
 
   def test_symbol_hash
@@ -51,13 +51,13 @@ p
 }
 
     hash = {
-      :person => [
-        { :name => 'Joe', },
-        { :name => 'Jack', }
+      person: [
+        { name: 'Joe', },
+        { name: 'Jack', }
       ]
     }
 
-    assert_html '<p><div class="name">Joe</div><div class="name">Jack</div></p>', source, :scope => hash
+    assert_html '<p><div class="name">Joe</div><div class="name">Jack</div></p>', source, scope: hash
   end
 
   def test_string_access
@@ -74,7 +74,7 @@ p
       ]
     }
 
-    assert_html '<p><div class="name">Joe</div><div class="name">Jack</div></p>', source, :scope => hash, :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_symbol_access
@@ -85,13 +85,13 @@ p
 }
 
     hash = {
-      :person => [
-        { :name => 'Joe', },
-        { :name => 'Jack', }
+      person: [
+        { name: 'Joe', },
+        { name: 'Jack', }
       ]
     }
 
-    assert_html '<p><div class="name">Joe</div><div class="name">Jack</div></p>', source, :scope => hash, :dictionary_access => :symbol
+    assert_html '<p><div class="name">Joe</div><div class="name">Jack</div></p>', source, scope: hash, dictionary_access: :symbol
   end
 
   def test_method_access
@@ -113,7 +113,7 @@ p
       end
     end
 
-    assert_html '<p><div class="name">Joe</div><div class="name">Jack</div></p>', source, :scope => object, :dictionary_access => :method
+    assert_html '<p><div class="name">Joe</div><div class="name">Jack</div></p>', source, scope: object, dictionary_access: :method
   end
 
   def test_instance_variable_access
@@ -130,7 +130,7 @@ p
                                    person
                                  end)
 
-    assert_html '<p><div class="name">Joe</div><div class="name">Jack</div></p>', source, :scope => object, :dictionary_access => :instance_variable
+    assert_html '<p><div class="name">Joe</div><div class="name">Jack</div></p>', source, scope: object, dictionary_access: :instance_variable
   end
 
   def test_to_s_access
@@ -141,13 +141,13 @@ p
 }
 
     hash = {
-      :people => [
+      people: [
         'Joe',
         'Jack'
       ]
     }
 
-    assert_html '<p><div class="name">Joe</div><div class="name">Jack</div></p>', source, :scope => hash, :dictionary_access => :symbol
+    assert_html '<p><div class="name">Joe</div><div class="name">Jack</div></p>', source, scope: hash, dictionary_access: :symbol
   end
 
   def test_string_hash
@@ -164,7 +164,7 @@ p
       ]
     }
 
-    assert_html '<p><div class="name">Joe</div><div class="name">Jack</div></p>', source, :scope => hash
+    assert_html '<p><div class="name">Joe</div><div class="name">Jack</div></p>', source, scope: hash
   end
 
   def test_dictionary_option
@@ -174,7 +174,7 @@ p
   .name = name
 }
 
-    assert_html '<p><div class="name">Joe</div><div class="name">Jack</div></p>', source, :scope => Scope.new, :dictionary => '@hash'
+    assert_html '<p><div class="name">Joe</div><div class="name">Jack</div></p>', source, scope: Scope.new, dictionary: '@hash'
   end
 
   def test_flag_section
@@ -188,14 +188,14 @@ p
 }
 
     hash = {
-      :show_person => true,
-      :person => [
-        { :name => 'Joe', },
-        { :name => 'Jack', }
+      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
+    assert_html '<p><div class="name">Joe</div><div class="name">Jack</div>shown</p>', source, scope: hash
   end
 
   def test_inverted_section
@@ -211,7 +211,7 @@ p
 
     hash = {}
 
-    assert_html '<p>No person No person 2</p>', source, :scope => hash
+    assert_html '<p>No person No person 2</p>', source, scope: hash
   end
 
   def test_escaped_interpolation
@@ -232,7 +232,7 @@ p
     Person
 }
 
-    assert_html '<p><b name="Joe">Person</b><a id="Joe">1</a><span class="Joe"><Person></Person></span><b name="Jack">Person</b><a id="Jack">2</a><span class="Jack"><Person></Person></span></p>', source, :scope => Scope.new, :dictionary => '@hash'
+    assert_html '<p><b name="Joe">Person</b><a id="Joe">1</a><span class="Joe"><Person></Person></span><b name="Jack">Person</b><a id="Jack">2</a><span class="Jack"><Person></Person></span></p>', source, scope: Scope.new, dictionary: '@hash'
   end
 
   def test_boolean_attributes
@@ -242,7 +242,7 @@ p
    input checked=selected = name
 }
 
-    assert_html '<p><input checked="">Joe</input><input>Jack</input></p>', source, :scope => Scope.new, :dictionary => '@hash'
+    assert_html '<p><input checked="">Joe</input><input>Jack</input></p>', source, scope: Scope.new, dictionary: '@hash'
   end
 
   def test_sections
@@ -251,7 +251,7 @@ p
  - person
   .name = name
 }
-    assert_html '<p><div class="name">Joe</div><div class="name">Jack</div></p>', source, :dictionary => 'ViewEnv.new'
+    assert_html '<p><div class="name">Joe</div><div class="name">Jack</div></p>', source, dictionary: 'ViewEnv.new'
   end
 
   def test_with_array
@@ -261,14 +261,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, :dictionary => 'ViewEnv.new'
+    assert_html '<ul><li>Andy</li><li>Atlanta</li><li>Fred</li><li>Melbourne</li><li>Daniel</li><li>Karlsruhe</li></ul>', source, dictionary: 'ViewEnv.new'
   end
 
   def test_method
     source = %q{
 a href=output_number Link
 }
-    assert_html '<a href="1337">Link</a>', source, :dictionary => 'ViewEnv.new'
+    assert_html '<a href="1337">Link</a>', source, dictionary: 'ViewEnv.new'
   end
 
   def test_conditional_parent
@@ -279,7 +279,7 @@ a href=output_number Link
 - next_page
   li.next
     a href=next_page Newer}
-    assert_html'<li class="previous"><a href="prev">Older</a></li><li class="next"><a href="next">Newer</a></li>', source, :scope => {:prev_page => 'prev', :next_page => 'next'}
+    assert_html'<li class="previous"><a href="prev">Older</a></li><li class="next"><a href="next">Newer</a></li>', source, scope: {prev_page: 'prev', next_page: 'next'}
   end
 
   def test_render_with_yield

data/test/rails/app/controllers/slim_controller.rb

@@ -6,7 +6,7 @@ class SlimController < ApplicationController
   end
 
   def no_layout
-    render :layout => false
+    render layout: false
   end
 
   def variables
@@ -18,7 +18,7 @@ class SlimController < ApplicationController
 
   def streaming
     @hello = "Hello Streaming!"
-    render :content_for, :stream => true
+    render :content_for, stream: true
   end
 
   def integers
@@ -26,7 +26,7 @@ class SlimController < ApplicationController
   end
 
   def thread_options
-    Slim::Engine.with_options(:shortcut => {'@' => { :attr => params[:attr] }}) do
+    Slim::Engine.with_options(shortcut: {'@' => { attr: params[:attr] }}) do
       render
     end
   end

data/test/rails/config/initializers/session_store.rb

@@ -1,6 +1,6 @@
 # Be sure to restart your server when you modify this file.
 
-Dummy::Application.config.session_store :cookie_store, :key => '_dummy_session'
+Dummy::Application.config.session_store :cookie_store, key: '_dummy_session'
 
 # Use the database for sessions instead of the cookie-based default,
 # which shouldn't be used to store highly confidential information

data/test/rails/config/routes.rb

@@ -9,8 +9,8 @@ Dummy::Application.routes.draw do
   # Keep in mind you can assign values other than :controller and :action
 
   # Sample of named route:
-  #   match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
-  # This route can be invoked with purchase_url(:id => product.id)
+  #   match 'products/:id/purchase' => 'catalog#purchase', as: :purchase
+  # This route can be invoked with purchase_url(id: product.id)
 
   # Sample resource route (maps HTTP verbs to controller actions automatically):
   #   resources :products
@@ -37,7 +37,7 @@ Dummy::Application.routes.draw do
   #   resources :products do
   #     resources :comments
   #     resources :sales do
-  #       get 'recent', :on => :collection
+  #       get 'recent', on: :collection
   #     end
   #   end
 
@@ -50,7 +50,7 @@ Dummy::Application.routes.draw do
 
   # You can have the root of your site routed with "root"
   # just remember to delete public/index.html.
-  # root :to => "welcome#index"
+  # root to: "welcome#index"
 
   # See how all your routes lay out with "rake routes"
 

data/test/rails/test/test_slim.rb

@@ -33,7 +33,7 @@ class TestSlim < ActionDispatch::IntegrationTest
   test "view without a layout" do
     get "slim/no_layout"
     assert_template "slim/no_layout"
-    assert_html "<h1>Hello Slim without a layout!</h1>", :skip_layout => true
+    assert_html "<h1>Hello Slim without a layout!</h1>", skip_layout: true
   end
 
   test "view with variables" do
@@ -46,17 +46,11 @@ class TestSlim < ActionDispatch::IntegrationTest
     assert_html "<h1>Hello Slim!</h1><p>With a partial!</p>"
   end
 
-  #Disable streaming testing for rails 3.x and on jruby
-  if ::Rails::VERSION::MAJOR >= 4 ||
-      (::Rails::VERSION::MAJOR == 3 && ::Rails::VERSION::MINOR >= 1 && Object.const_defined?(:Fiber))
-    puts 'Streaming test enabled'
-    test "streaming" do
-      get "slim/streaming"
-      output = "2f\r\n<!DOCTYPE html><html><head><title>Dummy</title>\r\nd\r\n</head><body>\r\n17\r\nHeading set from a view\r\n15\r\n<div class=\"content\">\r\n53\r\n<p>Page content</p><h1><p>Hello Streaming!</p></h1><h2><p>Hello Streaming!</p></h2>\r\n14\r\n</div></body></html>\r\n0\r\n\r\n"
-      assert_equal output, @response.body
-    end
-  else
-    puts 'Streaming test disabled'
+  puts 'Streaming test enabled'
+  test "streaming" do
+    get "slim/streaming"
+    output = "2f\r\n<!DOCTYPE html><html><head><title>Dummy</title>\r\nd\r\n</head><body>\r\n17\r\nHeading set from a view\r\n15\r\n<div class=\"content\">\r\n53\r\n<p>Page content</p><h1><p>Hello Streaming!</p></h1><h2><p>Hello Streaming!</p></h2>\r\n14\r\n</div></body></html>\r\n0\r\n\r\n"
+    assert_equal output, @response.body
   end
 
   test "render integers" do
@@ -65,15 +59,15 @@ class TestSlim < ActionDispatch::IntegrationTest
   end
 
   test "render thread_options" do
-    get "slim/thread_options", :attr => 'role'
+    get "slim/thread_options", attr: 'role'
     assert_html '<p role="empty">Test</p>'
-    get "slim/thread_options", :attr => 'id' # Overwriting doesn't work because of caching
+    get "slim/thread_options", attr: 'id' # Overwriting doesn't work because of caching
     assert_html '<p role="empty">Test</p>'
   end
 
   test "content_for" do
     get "slim/content_for"
-    assert_html "<p>Page content</p><h1><p>Hello Slim!</p></h1><h2><p>Hello Slim!</p></h2>", :heading => 'Heading set from a view'
+    assert_html "<p>Page content</p><h1><p>Hello Slim!</p></h1><h2><p>Hello Slim!</p></h2>", heading: 'Heading set from a view'
   end
 
   test "form_for" do

data/test/smart/test_smart_text.rb

@@ -112,7 +112,7 @@ Escaped &amp;#xx; &amp;#1f; &amp;;.</p>}
   end
 
   def test_smart_text_disabled_escaping
-    Slim::Engine.with_options( :smart_text_escaping => false ) do
+    Slim::Engine.with_options( smart_text_escaping: false ) do
       source = %q{
 p Not escaped <&>.
 | Not escaped <&>.
@@ -250,7 +250,7 @@ which stops
 
     assert_html result, source
   end
-  
+
   # Without unicode support, we can't distinguish uppercase and lowercase
   # unicode characters reliably. So we only test the basic text, not tag names.
   def test_basic_unicode_smart_text
@@ -272,11 +272,8 @@ p
     assert_html result, source
   end
 
-  if ''.respond_to?(:encoding)
-
-    def test_unicode_smart_text
-    
-      source = %q{
+  def test_unicode_smart_text
+    source = %q{
 p
   是
   čip
@@ -294,7 +291,6 @@ p
 šíp
 <div class="řek">.</div></p>}
 
-      assert_html result, source
-    end
+    assert_html result, source
   end
 end