haml-edge 3.1.10 → 3.1.11

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-3.1.10
+3.1.11

data/Rakefile

@@ -382,7 +382,7 @@ rails_versions << "v2.0.5" if RUBY_VERSION =~ /^1\.8/
 
 def test_rails_version(version)
   Dir.chdir "test/rails" do
-    `git checkout #{version}`
+    sh %{git checkout #{version}}
   end
   puts "Testing Rails #{version}"
   Rake::Task['test'].reenable
@@ -392,14 +392,14 @@ end
 namespace :test do
   desc "Test all supported versions of rails. This takes a while."
   task :rails_compatibility do
-    `rm -rf test/rails`
+    sh %{rm -rf test/rails}
     puts "Checking out rails. Please wait."
-    system("git clone git://github.com/rails/rails.git test/rails")
+    sh %{git clone git://github.com/rails/rails.git test/rails}
     begin
       rails_versions.each {|version| test_rails_version version}
 
       puts "Checking out rails_xss. Please wait."
-      system("git clone git://github.com/NZKoz/rails_xss.git test/plugins/rails_xss")
+      sh %{git clone git://github.com/NZKoz/rails_xss.git test/plugins/rails_xss}
       test_rails_version(rails_versions.find {|s| s =~ /^v2\.3/})
     ensure
       `rm -rf test/rails`

data/VERSION

@@ -1 +1 @@
-3.1.10
+3.1.11

data/test/haml/helper_test.rb

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../test_helper'
-require 'haml/template'
 
 class ActionView::Base
   def nested_tag
@@ -388,7 +387,7 @@ MESSAGE
     render("- something_that_uses_haml_concat")
     assert false, "Expected Haml::Error"
   rescue Haml::Error => e
-    assert_equal 13, e.backtrace[0].scan(/:(\d+)/).first.first.to_i
+    assert_equal 12, e.backtrace[0].scan(/:(\d+)/).first.first.to_i
   end
 
   class ActsLikeTag

data/test/haml/template_test.rb

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../test_helper'
-require 'haml/template'
 require 'sass/plugin'
 require File.dirname(__FILE__) + '/mocks/article'
 

data/test/linked_rails.rb

@@ -5,11 +5,18 @@ if File.exists?(linked_rails) && !$:.include?(linked_rails + '/activesupport/lib
   puts "[ using linked Rails ]"
   $:.unshift linked_rails + '/activesupport/lib'
   $:.unshift linked_rails + '/actionpack/lib'
+  $:.unshift linked_rails + '/railties/lib'
 end
 require 'rubygems'
 require 'action_controller'
 require 'action_view'
 
+begin
+  # Necessary for Rails 3
+  require 'rails'
+rescue LoadError
+end
+
 ActionController::Base.logger = Logger.new(nil)
 
 # Load plugins from test/plugins.

data/test/test_helper.rb

@@ -7,6 +7,7 @@ $:.unshift lib_dir unless $:.include?(lib_dir)
 require 'haml'
 require 'sass'
 
+require 'haml/template'
 Haml::Template.options[:ugly] = false
 
 Sass::RAILS_LOADED = true unless defined?(Sass::RAILS_LOADED)

metadata

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