haml-edge 2.3.58 → 2.3.59

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-2.3.58
+2.3.59

data/VERSION

@@ -1 +1 @@
-2.3.58
+2.3.59

data/lib/haml/precompiler.rb

@@ -361,14 +361,14 @@ END
 
       no_format = @options[:ugly] &&
         !(opts[:preserve_script] || opts[:preserve_tag] || opts[:escape_html])
-      output_temp = "(haml_very_temp = haml_temp; haml_temp = nil; haml_very_temp)"
-      out = "_hamlout.#{static_method_name(:format_script, *args)}(#{output_temp});"
+      output_expr = "(#{text}\n)"
+      static_method = "_hamlout.#{static_method_name(:format_script, *args)}"
 
       # Prerender tabulation unless we're in a tag
       push_merged_text '' unless opts[:in_tag]
 
       unless block_opened?
-        @to_merge << [:script, no_format ? "#{text}\n" : "haml_temp = #{text}\n#{out}"]
+        @to_merge << [:script, no_format ? "#{text}\n" : "#{static_method}(#{output_expr});"]
         concat_merged_text("\n") unless opts[:in_tag] || opts[:nuke_inner_whitespace]
         @newlines -= 1
         return
@@ -378,7 +378,7 @@ END
 
       push_silent "haml_temp = #{text}"
       newline_now
-      push_and_tabulate([:loud, "_hamlout.buffer << #{no_format ? "#{output_temp}.to_s;" : out}",
+      push_and_tabulate([:loud, "_hamlout.buffer << #{no_format ? "haml_temp.to_s;" : "#{static_method}(haml_temp);"}",
         !(opts[:in_tag] || opts[:nuke_inner_whitespace] || @options[:ugly])])
     end
 

data/lib/haml/util.rb

@@ -122,6 +122,17 @@ module Haml
       end
     end
 
+    # Returns information about the caller of the previous method.
+    #
+    # @param entry [String] An entry in the `#caller` list, or a similarly formatted string
+    # @return [[String, Fixnum, (String, nil)]] An array containing the filename, line, and method name of the caller.
+    #   The method name may be nil
+    def caller_info(entry = caller[1])
+      info = entry.scan(/^(.*?):(-?.*?)(?::.*`(.+)')?$/).first
+      info[1] = info[1].to_i
+      info
+    end
+
     ## Rails XSS Safety
 
     # Whether or not ActionView's XSS protection is available and enabled,
@@ -246,9 +257,10 @@ MSG
     # @param erb [String] The template for the method code
     def def_static_method(klass, name, args, *vars)
       erb = vars.pop
+      info = caller_info
       powerset(vars).each do |set|
         context = StaticConditionalContext.new(set).instance_eval {binding}
-        klass.class_eval(<<METHOD)
+        klass.class_eval(<<METHOD, info[0], info[1])
 def #{static_method_name(name, *vars.map {|v| set.include?(v)})}(#{args.join(', ')})
   #{ERB.new(erb).result(context)}
 end

data/lib/sass/script/functions.rb

@@ -181,7 +181,7 @@ module Sass::Script
     # It yields a number to a block to perform the operation and return a number
     def numeric_transformation(value)
       unless value.is_a?(Sass::Script::Number)
-        calling_function = caller.first.scan(/`([^']+)'/).first.first
+        calling_function = Haml::Util.caller_info[2]
         raise Sass::SyntaxError.new("#{value} is not a number for `#{calling_function}'")
       end
       Sass::Script::Number.new(yield(value.value), value.numerator_units, value.denominator_units)

data/test/haml/helper_test.rb

@@ -240,7 +240,7 @@ MESSAGE
     render("%p foo\n= haml_concat 'foo'\n%p bar")
     assert false, "Expected Haml::Error"
   rescue Haml::Error => e
-    assert_equal 2, e.backtrace[0].scan(/:(\d+)/).first.first.to_i
+    assert_equal 2, e.backtrace[1].scan(/:(\d+)/).first.first.to_i
   end
 
   def test_error_return_line_in_helper

data/test/haml/util_test.rb

@@ -69,6 +69,14 @@ class UtilTest < Test::Unit::TestCase
       enum_with_index(%w[foo bar baz]).map {|s, i| "#{s}#{i}"})
   end
 
+  def test_caller_info
+    assert_equal(["/tmp/foo.rb", 12, "fizzle"], caller_info("/tmp/foo.rb:12: in `fizzle'"))
+    assert_equal(["/tmp/foo.rb", 12, nil], caller_info("/tmp/foo.rb:12"))
+    assert_equal(["(haml)", 12, "blah"], caller_info("(haml):12: in `blah'"))
+    assert_equal(["", 12, "boop"], caller_info(":12: in `boop'"))
+    assert_equal(["/tmp/foo.rb", -12, "fizzle"], caller_info("/tmp/foo.rb:-12: in `fizzle'"))
+  end
+
   def test_def_static_method
     klass = Class.new
     def_static_method(klass, :static_method, [:arg1, :arg2],

data/test/test_helper.rb

@@ -18,7 +18,7 @@ end
 class Test::Unit::TestCase
   def munge_filename(opts)
     return if opts[:filename]
-    test_name = caller[1].gsub(/^.*`(?:\w+ )*(\w+)'.*$/, '\1')
+    test_name = Haml::Util.caller_info(caller[1])[2]
     opts[:filename] = "#{test_name}_inline.sass"
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 2.3.58
+  version: 2.3.59
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-23 00:00:00 -04:00
+date: 2009-10-25 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency