haml-edge 3.1.29 → 3.1.32

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-3.1.29
+3.1.32

data/VERSION

@@ -1 +1 @@
-3.1.29
+3.1.32

data/lib/haml/exec.rb

@@ -710,6 +710,8 @@ END
         end
         @options[:output] ||= @options[:input]
 
+        from = @options[:from]
+        from = :sass if from == :sass2
         if @options[:to] == @options[:from] && !@options[:in_place]
           fmt = @options[:from]
           raise "Error: converting from #{fmt} to #{fmt} without --in-place"

data/lib/haml/template.rb

@@ -46,7 +46,7 @@ unless Haml::Util.rails_env == "development"
   Haml::Template.options[:ugly] ||= true
 end
 
-if ActionPack::VERSION::MAJOR >= 3
+if Haml::Util.ap_geq_3?
   Haml::Template.options[:format] ||= :html5
 end
 

metadata

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