engine.rb in slim-1.0.2

- old
+ new

@@ -8,34 +8,35 @@
     #     Slim::Engine.set_default_options :pretty => true
     #
     # This overwrites some temple default options.
     set_default_options :pretty => false,
                         :attr_wrapper => '"',
-                        :format => :html5,
                         :attr_delimiter => {'class' => ' '},
                         :generator => Temple::Generators::ArrayBuffer
 
     #
     # Document all supported options with purpose, type etc.
     #
     # Type        | Name               | Default value                 | Purpose
     # --------------------------------------------------------------------------------------------------------------------------------------------
     # String      | :file              | nil                           | Name of parsed file, set automatically by Slim::Template
     # Integer     | :tabsize           | 4                             | Number of whitespaces per tab (used by the parser)
-    # String      | :encoding          | utf-8                         | Set encoding of template
+    # String      | :encoding          | "utf-8"                       | Set encoding of template
+    # String      | :default_tag       | "div"                         | Default tag to be used if tag name is omitted
     # String list | :enable_engines    | All enabled                   | List of enabled embedded engines (whitelist)
     # String list | :disable_engines   | None disabled                 | List of disabled embedded engines (blacklist)
     # Boolean     | :sections          | false                         | Enable sections mode (logic-less)
     # String      | :dictionary        | "self"                        | Name of dictionary variable in sections mode
     # Symbol      | :dictionary_access | :wrapped                      | Access mode of dictionary variable (:wrapped, :symbol, :string)
-    # Boolean     | :disable_capture   | false (true in Rails)         | Disable capturing in blocks (blocks write to the default buffer then)
+    # Boolean     | :disable_capture   | false (true in Rails)         | Disable capturing in blocks (blocks write to the default buffer 
     # Boolean     | :disable_escape    | false                         | Disable automatic escaping of strings
     # Boolean     | :use_html_safe     | false (true in Rails)         | Use String#html_safe? from ActiveSupport (Works together with :disable_escape)
-    # Symbol      | :format            | :html5                        | HTML output format
+    # Symbol      | :format            | :xhtml                        | HTML output format
     # String      | :attr_wrapper      | '"'                           | Character to wrap attributes in html (can be ' or ")
     # Hash        | :attr_delimiter    | {'class' => ' '}              | Joining character used if multiple html attributes are supplied (e.g. id1_id2)
     # Boolean     | :pretty            | false                         | Pretty html indenting (This is slower!)
+    # Boolean     | :streaming         | false (true in Rails > 3.1)   | Enable output streaming
     # Class       | :generator         | ArrayBuffer/RailsOutputBuffer | Temple code generator (default generator generates array buffer)
     #
     # It is also possible to set all options supported by the generator (option :generator). The standard generators
     # support the options :buffer and :capture_generator.
     #
@@ -50,19 +51,21 @@
     # Slim::Compiler > Temple::Filter
     #
     # It is recommended to set the default settings only once in the code and avoid duplication. Only use
     # `set_default_options` when you have to override some default settings.
     #
-    use Slim::Parser, :file, :tabsize, :encoding
+    use Slim::Parser, :file, :tabsize, :encoding, :default_tag
     use Slim::EmbeddedEngine, :enable_engines, :disable_engines, :pretty
     use Slim::Interpolation
     use Slim::Sections, :sections, :dictionary, :dictionary_access
     use Slim::EndInserter
     use Slim::Compiler, :disable_capture, :attr_delimiter
-    use Temple::HTML::Pretty, :format, :attr_wrapper, :attr_delimiter, :pretty
+    use Temple::HTML::AttributeMerger, :attr_delimiter
+    use Temple::HTML::Pretty, :format, :attr_wrapper, :pretty
     filter :Escapable, :use_html_safe, :disable_escape
     filter :ControlFlow
     filter :MultiFlattener
-    filter :DynamicInliner
-    use(:Generator) {|exp| options[:generator].new(options).call(exp) }
+    wildcard(:Optimizer) { (options[:streaming] ? Temple::Filters::StaticMerger :
+                            Temple::Filters::DynamicInliner).new }
+    wildcard(:Generator) { options[:generator].new(options) }
   end
 end