haml-edge 3.1.16 → 3.1.17

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-3.1.16
+3.1.17

data/VERSION

@@ -1 +1 @@
-3.1.16
+3.1.17

data/lib/haml/util.rb

@@ -219,6 +219,8 @@ module Haml
     def caller_info(entry = caller[1])
       info = entry.scan(/^(.*?):(-?.*?)(?::.*`(.+)')?$/).first
       info[1] = info[1].to_i
+      # This is added by Rubinius to designate a block, but we don't care about it.
+      info[2].sub!(/ \{\}\Z/, '') if info[2]
       info
     end
 

data/lib/haml/version.rb

@@ -25,7 +25,7 @@ module Haml
     #
     # If a prerelease version of Haml is being used,
     # the `:string` and `:number` fields will reflect the full version
-    # (e.g. `"2.2.beta.1"`), and the `:tiny` field will be `-1`.
+    # (e.g. `"2.2.beta.1"`), and the `:teeny` field will be `-1`.
     # A `:prerelease` key will contain the name of the prerelease (e.g. `"beta"`),
     # and a `:prerelease_number` key will contain the rerelease number.
     # For example:
@@ -33,7 +33,7 @@ module Haml
     #     {
     #       :string => "3.0.beta.1",
     #       :number => "3.0.beta.1",
-    #       :major => 3, :minor => 0, :tiny => -1,
+    #       :major => 3, :minor => 0, :teeny => -1,
     #       :prerelease => "beta",
     #       :prerelease_number => 1
     #     }

data/lib/sass/plugin/rails.rb

@@ -1,12 +1,13 @@
 unless defined?(Sass::RAILS_LOADED)
   Sass::RAILS_LOADED = true
 
-  Sass::Plugin.options.merge!(:template_location => Haml::Util.rails_root + '/public/stylesheets/sass',
-                              :css_location      => Haml::Util.rails_root + '/public/stylesheets',
-                              :cache_location    => Haml::Util.rails_root + '/tmp/sass-cache',
-                              :always_check      => Haml::Util.rails_env == "development",
-                              :quiet             => Haml::Util.rails_env != "production",
-                              :full_exception    => Haml::Util.rails_env != "production")
+  # Reverse-merging (we're in Rails, anyway) so we dont' clobber what's already been defined further up-stream
+  Sass::Plugin.options.reverse_merge!(:template_location => Haml::Util.rails_root + '/public/stylesheets/sass',
+                                      :css_location      => Haml::Util.rails_root + '/public/stylesheets',
+                                      :cache_location    => Haml::Util.rails_root + '/tmp/sass-cache',
+                                      :always_check      => Haml::Util.rails_env == "development",
+                                      :quiet             => Haml::Util.rails_env != "production",
+                                      :full_exception    => Haml::Util.rails_env != "production")
 
   if defined?(ActionController::Metal)
     # Rails >= 3.0

data/test/haml/util_test.rb

@@ -211,6 +211,7 @@ class UtilTest < Test::Unit::TestCase
     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'"))
+    assert_equal(["/tmp/foo.rb", 12, "fizzle"], caller_info("/tmp/foo.rb:12: in `fizzle {}'"))
   end
 
   def test_def_static_method

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 3.1.16
+  version: 3.1.17
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-14 00:00:00 -04:00
+date: 2010-05-17 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency