haml 3.1.0.alpha.30 → 3.1.0.alpha.33

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-3.1.0.alpha.30
+3.1.0.alpha.33

data/VERSION

@@ -1 +1 @@
-3.1.0.alpha.30
+3.1.0.alpha.33

data/lib/haml/exec.rb

@@ -124,9 +124,18 @@ module Haml
       # @param color [Symbol] The name of the color to use for this action.
       #   Can be `:red`, `:green`, or `:yellow`.
       def puts_action(name, color, arg)
+        return if @options[:for_engine][:quiet]
         printf color(color, "%11s %s\n"), name, arg
       end
 
+      # Same as \{Kernel.puts}, but doesn't print anything if the `--quiet` option is set.
+      #
+      # @param args [Array] Passed on to \{Kernel.puts}
+      def puts(*args)
+        return if @options[:for_engine][:quiet]
+        Kernel.puts(*args)
+      end
+
       # Wraps the given string in terminal escapes
       # causing it to have the given color.
       # If terminal esapes aren't supported on this platform,

data/lib/haml/html.rb

@@ -103,13 +103,6 @@ require 'hpricot'
 # @private
 HAML_TAGS = %w[haml:block haml:loud haml:silent]
 
-Hpricot::ElementContent.keys.each do |k|
-  HAML_TAGS.each do |el|
-    val = Hpricot::ElementContent[k]
-    val[el.hash] = true if val.is_a?(Hash)
-  end
-end
-
 HAML_TAGS.each do |t|
   Hpricot::ElementContent[t] = {}
   Hpricot::ElementContent.keys.each do |key|
@@ -117,6 +110,13 @@ HAML_TAGS.each do |t|
   end
 end
 
+Hpricot::ElementContent.keys.each do |k|
+  HAML_TAGS.each do |el|
+    val = Hpricot::ElementContent[k]
+    val[el.hash] = true if val.is_a?(Hash)
+  end
+end
+
 module Haml
   # Converts HTML documents into Haml templates.
   # Depends on [Hpricot](http://github.com/whymirror/hpricot) for HTML parsing.

data/lib/haml/util.rb

@@ -16,6 +16,11 @@ module Haml
     # @api public
     RUBY_VERSION = ::RUBY_VERSION.split(".").map {|s| s.to_i}
 
+    # The Ruby engine we're running under. Defaults to `"ruby"`
+    # if the top-level constant is undefined.
+    # @api public
+    RUBY_ENGINE = defined?(::RUBY_ENGINE) ? ::RUBY_ENGINE : "ruby"
+
     # Returns the path of a file relative to the Haml root directory.
     #
     # @param file [String] The filename relative to the Haml root
@@ -476,13 +481,25 @@ WARNING
       RbConfig::CONFIG['host_os'] =~ /mswin|windows|mingw/i
     end
 
+    # Whether or not this is running on IronRuby.
+    #
+    # @return [Boolean]
+    def ironruby?
+      RUBY_ENGINE == "ironruby"
+    end
+
     ## Cross-Ruby-Version Compatibility
 
     # Whether or not this is running under Ruby 1.8 or lower.
     #
+    # Note that IronRuby counts as Ruby 1.8,
+    # because it doesn't support the Ruby 1.9 encoding API.
+    #
     # @return [Boolean]
     def ruby1_8?
-      Haml::Util::RUBY_VERSION[0] == 1 && Haml::Util::RUBY_VERSION[1] < 9
+      # IronRuby says its version is 1.9, but doesn't support any of the encoding APIs.
+      # We have to fall back to 1.8 behavior.
+      ironruby? || (Haml::Util::RUBY_VERSION[0] == 1 && Haml::Util::RUBY_VERSION[1] < 9)
     end
 
     # Whether or not this is running under Ruby 1.8.6 or lower.

data/test/haml/html2haml/erb_tests.rb

@@ -421,6 +421,20 @@ HAML
     <tr></tr>
   <% end %>
 </table>
+ERB
+  end
+
+  def test_silent_inside_block_inside_tag
+    assert_equal(<<HAML.rstrip, render_erb(<<ERB))
+%table
+  - foo.each do
+    - haml_puts "foo"
+HAML
+<table>
+  <% foo.each do %>
+    <% haml_puts "foo" %>
+  <% end %>
+</table>
 ERB
   end
 end

data/test/test_helper.rb

@@ -64,4 +64,12 @@ class Test::Unit::TestCase
   else
     flunk "Expected exception #{klass}, none raised"
   end
+
+  def assert_raise_line(line)
+    yield
+  rescue Sass::SyntaxError => e
+    assert_equal(line, e.sass_line)
+  else
+    flunk "Expected exception on line #{line}, none raised"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml
 version: !ruby/object:Gem::Version 
-  version: 3.1.0.alpha.30
+  version: 3.1.0.alpha.33
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-31 00:00:00 -04:00
+date: 2010-11-19 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,11 +51,11 @@ files:
 - lib/haml/error.rb
 - lib/haml/filters.rb
 - lib/haml/helpers.rb
-- lib/haml/util.rb
+- lib/haml/html.rb
 - lib/haml/helpers/action_view_extensions.rb
 - lib/haml/helpers/action_view_mods.rb
 - lib/haml/helpers/xss_mods.rb
-- lib/haml/html.rb
+- lib/haml/util.rb
 - lib/haml/html/erb.rb
 - lib/haml/railtie.rb
 - lib/haml/template.rb