haml 3.2.0.beta.1 → 3.2.0.beta.2

data/CHANGELOG.md

@@ -13,7 +13,8 @@
 
 * Haml's internals have been refactored to move the parser, compiler and options
   handling into independent classes, rather than including them all in the
-  Engine module.
+  Engine module. You can also specify your own custom Haml parser or compiler
+  class in Haml::Options in order to extend or modify Haml reasonably easily.
 
 * The :sass filter now wraps its output in a script tag, as do the new :less and
   :scss filters. The :coffee filter wraps its output in a script tag.

data/REFERENCE.md

@@ -1,4 +1,4 @@
-# Haml (XHTML Abstraction Markup Language)
+# Haml (HTML Abstraction Markup Language)
 
 Haml is a markup language that's used to cleanly and simply describe the HTML of
 any web document, without the use of inline code. Haml functions as a

data/lib/haml/engine.rb

@@ -1,10 +1,10 @@
 require 'forwardable'
 
+require 'haml/parser'
+require 'haml/compiler'
 require 'haml/options'
 require 'haml/helpers'
 require 'haml/buffer'
-require 'haml/parser'
-require 'haml/compiler'
 require 'haml/filters'
 require 'haml/error'
 
@@ -60,8 +60,8 @@ module Haml
 
       initialize_encoding options[:encoding]
 
-      @parser   = Parser.new(@template, @options)
-      @compiler = Compiler.new(@options)
+      @parser   = @options.parser_class.new(@template, @options)
+      @compiler = @options.compiler_class.new(@options)
 
       @compiler.compile(@parser.parse)
     end

data/lib/haml/exec.rb

@@ -237,6 +237,11 @@ END
           @options[:for_engine][:attr_wrapper] = '"'
         end
 
+        opts.on('--cdata',
+                'Always add CDATA sections to javascript and css blocks.') do
+          @options[:for_engine][:cdata] = true
+        end
+
         opts.on('-r', '--require FILE', "Same as 'ruby -r'.") do |file|
           @options[:requires] << file
         end

data/lib/haml/options.rb

@@ -19,7 +19,9 @@ module Haml
       :remove_whitespace    => false,
       :suppress_eval        => false,
       :ugly                 => false,
-      :cdata                => false
+      :cdata                => false,
+      :parser_class         => ::Haml::Parser,
+      :compiler_class       => ::Haml::Compiler
     }
 
     @valid_formats = [:html4, :html5, :xhtml]
@@ -160,6 +162,12 @@ module Haml
     # xhtml.
     attr_accessor :cdata
 
+    # The parser class to use. Defaults to Haml::Parser.
+    attr_accessor :parser_class
+
+    # The compiler class to use. Defaults to Haml::Compiler.
+    attr_accessor :compiler_class
+
     def initialize(values = {}, &block)
       defaults.each {|k, v| instance_variable_set :"@#{k}", v}
       values.reject {|k, v| !defaults.has_key?(k) || v.nil?}.each {|k, v| send("#{k}=", v)}

data/lib/haml/parser.rb

@@ -444,7 +444,7 @@ module Haml
     end
 
     def close_silent_script(node)
-      @script_level_stack.pop if node.value[:keyword] == "if"
+      @script_level_stack.pop if ["if", "case", "unless"].include? node.value[:keyword]
 
       # Post-process case statements to normalize the nesting of "when" clauses
       return unless node.value[:keyword] == "case"

data/lib/haml/template/options.rb

@@ -8,7 +8,7 @@ module Haml
 
     @options = {}
     # The options hash for Haml when used within Rails.
-    # See {file:REFERENCE.md#haml_options the Haml options documentation}.
+    # See {file:REFERENCE.md#options the Haml options documentation}.
     #
     # @return [{Symbol => Object}]
     attr_accessor :options

data/lib/haml/template/plugin.rb

@@ -8,7 +8,7 @@ module Haml
     # the ERB handler does.
 
     # In Rails 3.1+, we don't need to include Compilable.
-    if ::Rails.version < "3.1"
+    if ActionPack::VERSION::MAJOR < 3 || (ActionPack::VERSION::MAJOR == 3 && ActionPack::VERSION::MINOR < 1)
       include ActionView::Template::Handlers::Compilable
     end
 

data/lib/haml/util.rb

@@ -301,8 +301,6 @@ METHOD
     # Formats a string for use in error messages about indentation.
     #
     # @param indentation [String] The string used for indentation
-    # @param was [Boolean] Whether or not to add `"was"` or `"were"`
-    #   (depending on how many characters were in `indentation`)
     # @return [String] The name of the indentation (e.g. `"12 spaces"`, `"1 tab"`)
     def human_indentation(indentation)
       if !indentation.include?(?\t)

data/lib/haml/version.rb

@@ -1,3 +1,3 @@
 module Haml
-  VERSION = "3.2.0.beta.1"
+  VERSION = "3.2.0.beta.2"
 end

data/test/engine_test.rb

@@ -1930,7 +1930,7 @@ HAML
 - foo.each do | item |
   = item
 HAML
-    rescue ::SyntaxError => e
+    rescue ::SyntaxError
       flunk("Should not have raised syntax error")
     end
   end

data/test/parser_test.rb

@@ -48,6 +48,25 @@ module Haml
       end
     end
 
+    test "else after if containing case is accepted" do
+      # see issue 572
+      begin
+        parse "- if true\n  - case @foo\n  - when 1\n    bar\n- else\n  bar"
+        assert true
+      rescue SyntaxError
+        flunk 'else clause after if containing case should be accepted'
+      end
+    end
+
+    test "else after if containing unless is accepted" do
+      begin
+        parse "- if true\n  - unless @foo\n  bar\n- else\n  bar"
+        assert true
+      rescue SyntaxError
+        flunk 'else clause after if containing unless should be accepted'
+      end
+    end
+
     private
 
     def parse(haml, options = nil)

data/test/templates/silent_script.haml

@@ -23,6 +23,11 @@
         Odd!
       - else
         Even!
+    - unless true
+      Testing else indent
+    - case 1
+    - when 2
+      Also testing else indent
   - else
     = "This can't happen!"
 - 13 |

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml
 version: !ruby/object:Gem::Version
-  version: 3.2.0.beta.1
+  version: 3.2.0.beta.2
   prerelease: 6
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-27 00:00:00.000000000 Z
+date: 2012-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -209,7 +209,7 @@ post_install_message: ! '
 
   * Support for Rails 2 dropped
 
-  * Sass filter now always outputs <script> tags
+  * Sass filter now always outputs <style> tags
 
   * Data attributes are now hyphenated, not underscored
 
@@ -234,9 +234,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1734032859910060370
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: