haml-edge 3.1.40 → 3.1.41

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-3.1.40
+3.1.41

data/VERSION

@@ -1 +1 @@
-3.1.40
+3.1.41

data/lib/haml/railtie.rb

@@ -1,29 +1,21 @@
+if Haml::Util.ap_geq_3? && !Haml::Util.ap_geq?("3.0.0.beta4")
+  raise <<ERROR
+Haml and Sass no longer support Rails 3 versions before beta 4.
+  Please upgrade to Rails 3.0.0.beta4 or later.
+ERROR
+end
+
 # Rails 3.0.0.beta.2+
 if defined?(ActiveSupport) && Haml::Util.has?(:public_method, ActiveSupport, :on_load)
   require 'haml/template/options'
   require 'sass/plugin/configuration'
-  ActiveSupport.on_load(:action_view) do
-    if Rails.application
+  ActiveSupport.on_load(:before_initialize) do
+    require 'sass'
+    require 'sass/plugin'
+
+    # Haml requires AV, but Sass doesn't
+    ActiveSupport.on_load(:action_view) do
       Haml.init_rails(binding)
-    else
-      # I can't believe we have to do this, but we do.
-      # Rails 3's lovely lazy-loading means that it's possible to load ActionView
-      # before the application has even begin loading.
-      # This means that Rails.root doesn't exist yet.
-      # So if the application isn't loaded, we use this arcane initializer stuff
-      # to load Haml/Sass *after* the application loads.
-      #
-      # Of course, it's also possible that the application is loaded before ActionView,
-      # so we can't *just* rely on this method of loading.
-      #
-      # Ugh.
-      module Haml
-        class Railtie < Rails::Railtie
-          initializer :haml do
-            Haml.init_rails(binding)
-          end
-        end
-      end
     end
   end
 end

data/lib/sass/plugin/rails.rb

@@ -1,13 +1,4 @@
 unless defined?(Sass::RAILS_LOADED)
-  if Haml::Util.ap_geq_3? && !Haml::Util.ap_geq?("3.0.0.beta4")
-    Haml::Util.haml_warn(<<WARNING)
-DEPRECATION WARNING:
-Haml/Sass support for Rails 3 versions before beta 4 is deprecated,
-  and will be removed in Haml/Sass 3.0.13.
-  Please upgrade to Rails 3.0.0.beta4 or later.
-WARNING
-  end
-
   Sass::RAILS_LOADED = true
 
   # Reverse-merging (we're in Rails, anyway) so we dont' clobber what's already been defined further up-stream
@@ -21,17 +12,7 @@ WARNING
   if defined?(ActionController::Metal)
     # Rails >= 3.0
     require 'sass/plugin/rack'
-    if Rails.application.instance_variable_get('@app')
-      # The application has already been built,
-      # so we need to hack the middleware in
-      Rails.application.instance_variable_set('@app',
-        Sass::Plugin::Rack.new(Rails.application.app))
-    else
-      # The application hasn't been built yet,
-      # so we can just add Sass::Plugin::Rack
-      # to the pending middleware stack.
-      Rails.configuration.middleware.use(Sass::Plugin::Rack)
-    end
+    Rails.configuration.middleware.use(Sass::Plugin::Rack)
   elsif defined?(ActionController::Dispatcher) &&
       defined?(ActionController::Dispatcher.middleware)
     # Rails >= 2.3

data/test/haml/helper_test.rb

@@ -165,7 +165,7 @@ HAML
 
   def test_content_tag_error_wrapping
     def @base.protect_against_forgery?; false; end
-    error_class = Haml::Util.ap_geq?("3.0.0.beta4") ? "field_with_errors" : "fieldWithErrors"
+    error_class = Haml::Util.ap_geq_3? ? "field_with_errors" : "fieldWithErrors"
     assert_equal(<<HTML, render(<<HAML, :action_view))
 <form action="" method="post">
   <div class="#{error_class}"><label for="post_error_field">Error field</label></div>
@@ -315,7 +315,7 @@ HAML
   end
 
   def test_indented_capture
-    prior = Haml::Util.ap_geq?("3.0.0.beta4") ? "" : "  \n"
+    prior = Haml::Util.ap_geq_3? ? "" : "  \n"
     assert_equal("#{prior}  Foo\n  ", @base.render(:inline => "  <% res = capture do %>\n  Foo\n  <% end %><%= res %>"))
   end
 

data/test/test_helper.rb

@@ -65,7 +65,7 @@ class Test::Unit::TestCase
   end
 
   def form_for_calling_convention(name)
-    return "@#{name}, :as => :#{name}, :html => {:class => nil, :id => nil}" if Haml::Util.ap_geq?("3.0.0.beta3")
+    return "@#{name}, :as => :#{name}, :html => {:class => nil, :id => nil}" if Haml::Util.ap_geq_3?
     return ":#{name}, @#{name}"
   end
 end

metadata

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