haml-edge 2.3.71 → 2.3.72

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-2.3.71
+2.3.72

data/VERSION

@@ -1 +1 @@
-2.3.71
+2.3.72

data/lib/haml/template.rb

@@ -61,14 +61,14 @@ else
   Haml::Template.try_enabling_xss_integration
 end
 
-if defined?(RAILS_ROOT)
+if Haml::Util.rails_root
   # Update init.rb to the current version
   # if it's out of date.
   #
   # We can probably remove this as of v1.9,
   # because the new init file is sufficiently flexible
   # to not need updating.
-  rails_init_file = File.join(RAILS_ROOT, 'vendor', 'plugins', 'haml', 'init.rb')
+  rails_init_file = File.join(Haml::Util.rails_root, 'vendor', 'plugins', 'haml', 'init.rb')
   haml_init_file = Haml::Util.scope('init.rb')
   begin
     if File.exists?(rails_init_file)
@@ -79,7 +79,7 @@ if defined?(RAILS_ROOT)
     warn <<END
 HAML WARNING:
 #{rails_init_file} is out of date and couldn't be automatically updated.
-Please run `haml --rails #{File.expand_path(RAILS_ROOT)}' to update it.
+Please run `haml --rails #{File.expand_path(Haml::Util.rails_root)}' to update it.
 END
   end
 end

data/lib/haml/util.rb

@@ -133,6 +133,19 @@ module Haml
       info
     end
 
+    ## Cross Rails Version Compatibility
+
+    # Returns the root of the Rails application,
+    # if this is running in a Rails context.
+    # Returns `nil` if no such root is defined.
+    #
+    # @return [String, nil]
+    def rails_root
+      return Rails.root if defined?(Rails.root)
+      return RAILS_ROOT if defined?(RAILS_ROOT)
+      return nil
+    end
+
     ## Rails XSS Safety
 
     # Whether or not ActionView's XSS protection is available and enabled,

data/lib/sass/plugin/rails.rb

@@ -1,9 +1,9 @@
 unless defined?(Sass::RAILS_LOADED)
   Sass::RAILS_LOADED = true
 
-  Sass::Plugin.options.merge!(:template_location => RAILS_ROOT + '/public/stylesheets/sass',
-                              :css_location      => RAILS_ROOT + '/public/stylesheets',
-                              :cache_location    => RAILS_ROOT + '/tmp/sass-cache',
+  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      => RAILS_ENV != "production",
                               :full_exception    => RAILS_ENV != "production")
 

data/test/haml/template_test.rb

@@ -144,16 +144,20 @@ class TemplateTest < Test::Unit::TestCase
     end
   end
 
-  def test_action_view_templates_render_correctly
-    proc = lambda do
-      @base.content_for(:layout) {'Lorem ipsum dolor sit amet'}
-      assert_renders_correctly 'content_for_layout'
-    end
-
-    if @base.respond_to?(:with_output_buffer)
-      @base.with_output_buffer("", &proc)
-    else
-      proc.call
+  if ActionPack::VERSION::MAJOR < 3
+    # Rails 3.0.0 deprecates the use of yield with a layout
+    # for calls to render :file
+    def test_action_view_templates_render_correctly
+      proc = lambda do
+        @base.content_for(:layout) {'Lorem ipsum dolor sit amet'}
+        assert_renders_correctly 'content_for_layout'
+      end
+
+      if @base.respond_to?(:with_output_buffer)
+        @base.with_output_buffer("", &proc)
+      else
+        proc.call
+      end
     end
   end
 
@@ -203,7 +207,7 @@ HTML
   - with_output_buffer do
     bar
     = "foo".gsub(/./) do |s|
-      - s.ord
+      - "flup"
   baz
 HAML
   end

data/test/test_helper.rb

@@ -9,12 +9,6 @@ require 'sass'
 
 Sass::RAILS_LOADED = true unless defined?(Sass::RAILS_LOADED)
 
-# required because of Sass::Plugin
-unless defined? RAILS_ROOT
-  RAILS_ROOT = '.'
-  MERB_ENV = RAILS_ENV  = 'testing'
-end
-
 class Test::Unit::TestCase
   def munge_filename(opts)
     return if opts[:filename]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 2.3.71
+  version: 2.3.72
 platform: ruby
 authors: 
 - Nathan Weizenbaum