compass 0.10.0.rc2 → 0.10.0.rc3

data/CHANGELOG.markdown

@@ -1,5 +1,8 @@
 COMPASS CHANGELOG
 =================
+0.10.0.rc3 (April 13, 2010)
+---------------------------
+* This release addresses several bugs in rc2.
 
 0.10.0.rc2 (April 12, 2010)
 ---------------------------

data/REVISION

@@ -1 +1 @@
-98908c49780d58a43681c484bb36c6ace0cc2d85
+6faed2049cb16d05cbf0c721d1e005045f078d6a

data/VERSION.yml

@@ -2,4 +2,4 @@
 :patch: 0
 :major: 0
 :minor: 10
-:build: rc2
+:build: rc3

data/lib/compass/installers/base.rb

@@ -85,7 +85,7 @@ module Compass
         contents = File.new(from).read
         if preferred_syntax.to_s != from[-4..-1]
           logger.record :convert, basename(from)
-          tree = Sass::Engine.new(contents, Compass.sass_engine_options).to_tree
+          tree = Sass::Engine.new(contents, Compass.sass_engine_options.merge(:syntax => from[-4..-1].intern)).to_tree
           contents = tree.send("to_#{preferred_syntax}")
           to[-4..-1] = preferred_syntax.to_s
         end

data/lib/compass/sass_extensions/functions/enumerate.rb

@@ -1,6 +1,7 @@
 module Compass::SassExtensions::Functions::Enumerate
-  def enumerate(prefix, from, through, separator = "-")
-    selectors = (from.value..through.value).map{|i| "#{prefix.value}#{separator}#{i}"}.join(", ")
+  def enumerate(prefix, from, through, separator = nil)
+    separator ||= Sass::Script::String.new("-", :string)
+    selectors = (from.value..through.value).map{|i| "#{prefix.value}#{separator.value}#{i}"}.join(", ")
     Sass::Script::String.new(selectors)
   end
 end

data/test/sass_extensions_test.rb

@@ -20,12 +20,32 @@ class SassExtensionsTest < Test::Unit::TestCase
     assert_equal "a b e, a b f, a c e, a c f, a d e, a d f", nest("a", "b, c, d", "e, f")
   end
 
+  def test_enumerate
+    assert_equal ".grid-1, .grid-2, .grid-3", enumerate(".grid", 1, 3, "-")
+  end
+  
+  def test_append_selector
+    assert_equal "div.bar", append_selector("div", ".bar")
+    assert_equal ".foo1.bar1, .foo1.bar2, .foo2.bar1, .foo2.bar2", append_selector(".foo1, .foo2", ".bar1, .bar2")
+  end
+
 protected
   def evaluation_content(options)
     Sass::Script::Functions::EvaluationContext.new(options)
   end
   def nest(*arguments)
     options = arguments.last.is_a?(Hash) ? arguments.pop : Hash.new
-    evaluation_content(options).nest(*arguments.map{|a| Sass::Script::String.new(a)}).to_s
+    evaluation_content(options).nest(*arguments.map{|a| Sass::Script::String.new(a, :string)}).to_s
+  end
+  def enumerate(prefix, from, through, separator = "-", options = {})
+    prefix = Sass::Script::String.new(prefix, :string)
+    from = Sass::Script::Number.new(from)
+    through = Sass::Script::Number.new(through)
+    separator = Sass::Script::String.new(separator, :string)
+    evaluation_content(options).enumerate(prefix, from, through, separator).to_s
+  end
+  def append_selector(*arguments)
+    options = arguments.last.is_a?(Hash) ? arguments.pop : Hash.new
+    evaluation_content(options).append_selector(*arguments.map{|a| Sass::Script::String.new(a, :string)}).to_s
   end
 end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 10
   - 0
-  - rc2
-  version: 0.10.0.rc2
+  - rc3
+  version: 0.10.0.rc3
 platform: ruby
 authors: 
 - Chris Eppstein
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-12 00:00:00 -07:00
+date: 2010-04-13 00:00:00 -07:00
 default_executable: compass
 dependencies: 
 - !ruby/object:Gem::Dependency