haml-edge 2.3.243 → 2.3.244

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-2.3.243
+2.3.244

data/Rakefile

@@ -263,7 +263,8 @@ OPTS
 
   YARD::Rake::YardocTask.new do |t|
     t.files = FileList.new(scope('lib/**/*.rb')) do |list|
-      list.exclude('lib/haml/template/*.rb')
+      list.exclude('lib/haml/template/patch.rb')
+      list.exclude('lib/haml/template/plugin.rb')
       list.exclude('lib/haml/railtie.rb')
       list.exclude('lib/haml/helpers/action_view_mods.rb')
       list.exclude('lib/haml/helpers/xss_mods.rb')

data/VERSION

@@ -1 +1 @@
-2.3.243
+2.3.244

data/lib/sass/tree/import_node.rb

@@ -38,6 +38,11 @@ module Sass
         "#{'  ' * tabs}@import \"#{@imported_filename}\";\n"
       end
 
+      # @see Node#cssize
+      def cssize(*args)
+        super.first
+      end
+
       protected
 
       # @see Node#_cssize

data/lib/sass/tree/node.rb

@@ -120,17 +120,6 @@ module Sass
         self.class == other.class && other.children == children
       end
 
-      # Runs the dynamic Sass code *and* computes the CSS for the tree.
-      #
-      # @see #perform
-      # @see #to_s
-      def render
-        extends = Haml::Util::SubsetMap.new
-        result = perform(Environment.new).cssize(extends)
-        result = result.do_extend(extends) unless extends.empty?
-        result.to_s
-      end
-
       # True if \{#to\_s} will return `nil`;
       # that is, if the node shouldn't be rendered.
       # Should only be called in a static tree.

data/lib/sass/tree/root_node.rb

@@ -21,6 +21,16 @@ module Sass
         raise e
       end
 
+      # Runs the dynamic Sass code *and* computes the CSS for the tree.
+      #
+      # @see #perform
+      # @see #to_s
+      def render
+        result, extends = perform(Environment.new).cssize
+        result = result.do_extend(extends) unless extends.empty?
+        result.to_s
+      end
+
       # @see Node#perform
       def perform(environment)
         environment.options = @options if environment.options.nil? || environment.options.empty?
@@ -30,9 +40,14 @@ module Sass
         raise e
       end
 
-      # @see Node#cssize
-      def cssize(*args)
-        super
+      # Like {Node#cssize}, except that this method
+      # will create its own `extends` map if necessary,
+      # and it returns that map along with the cssized tree.
+      #
+      # @return [(Tree::Node, Haml::Util::SubsetMap)] The resulting tree of static nodes
+      #   *and* the extensions defined for this tree
+      def cssize(extends = Haml::Util::SubsetMap.new, parent = nil)
+        return super(extends), extends
       rescue Sass::SyntaxError => e
         e.sass_template = @template
         raise e

data/test/sass/less_conversion_test.rb

@@ -37,8 +37,8 @@ LESS
   end
 
   def test_import
-    path = File.dirname(__FILE__) + "/templates/importee.less"
-    resolved_path = File.dirname(__FILE__) + "/templates/importee"
+    path = relative_path_to(File.dirname(__FILE__) + "/templates/importee.less")
+    resolved_path = relative_path_to(File.dirname(__FILE__) + "/templates/importee")
     assert_renders <<SCSS, <<LESS
 @import "#{resolved_path}";
 @import "#{resolved_path}";
@@ -57,8 +57,8 @@ LESS
   end
 
   def test_mixins_found_through_import
-    path = File.dirname(__FILE__) + "/templates/importee.less"
-    resolved_path = File.dirname(__FILE__) + "/templates/importee"
+    path = relative_path_to(File.dirname(__FILE__) + "/templates/importee.less")
+    resolved_path = relative_path_to(File.dirname(__FILE__) + "/templates/importee")
     assert_renders <<SCSS, <<LESS
 @import "#{resolved_path}";
 
@@ -618,6 +618,13 @@ LESS
   def assert_renders(scss, less)
     assert_equal(scss, Less::Engine.new(less).to_tree.to_sass_tree.to_scss)
   end
+
+  # Necessary because Less can't import absolute files
+  def relative_path_to(file)
+    file = Pathname.new(file)
+    pwd = file.absolute? ? Dir.pwd : "."
+    file.relative_path_from(Pathname.new(pwd))
+  end
 end
 
 rescue LoadError => e

metadata

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