sass 3.1.0.alpha.4 → 3.1.0.alpha.5

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-3.1.0.alpha.4
+3.1.0.alpha.5

data/VERSION

@@ -1 +1 @@
-3.1.0.alpha.4
+3.1.0.alpha.5

data/lib/sass/script/color.rb

@@ -401,7 +401,8 @@ END
     end
 
     def rgba_str
-      "rgba(#{rgb.join(', ')}, #{alpha % 1 == 0.0 ? alpha.to_i : alpha})"
+      split = options[:style] == :compressed ? ',' : ', '
+      "rgba(#{rgb.join(split)}#{split}#{Number.round(alpha)})"
     end
 
     def hex_str

data/lib/sass/script/literal.rb

@@ -117,7 +117,7 @@ MSG
     # @return [Script::String] A string containing both literals
     #   separated by `", "`
     def comma(other)
-      Sass::Script::String.new("#{self.to_s}, #{other.to_s}")
+      Sass::Script::String.new("#{self.to_s},#{' ' unless options[:style] == :compressed}#{other.to_s}")
     end
 
     # The SassScript `=` operation

data/lib/sass/script/number.rb

@@ -248,15 +248,7 @@ module Sass::Script
     #
     # @return [String] The representation
     def inspect(opts = {})
-      value =
-        if self.value.is_a?(Float) && (self.value.infinite? || self.value.nan?)
-          self.value
-        elsif int?
-          self.value.to_i
-        else
-          (self.value * PRECISION).round / PRECISION
-        end
-      "#{value}#{unit_str}"
+      "#{self.class.round(self.value)}#{unit_str}"
     end
     alias_method :to_sass, :inspect
 
@@ -334,6 +326,17 @@ module Sass::Script
 
     private
 
+    # @private
+    def self.round(num)
+      if num.is_a?(Float) && (num.infinite? || num.nan?)
+        num
+      elsif num % 1 == 0.0
+        num.to_i
+      else
+        (num * PRECISION).round / PRECISION
+      end
+    end
+
     def operate(other, operation)
       this = self
       if [:+, :-, :<=, :<, :>, :>=].include?(operation)

data/lib/sass/tree/rule_node.rb

@@ -134,7 +134,7 @@ module Sass::Tree
       per_rule_indent, total_indent = [:nested, :expanded].include?(style) ? [rule_indent, ''] : ['', rule_indent]
 
       total_rule = total_indent + resolved_rules.members.
-        map {|seq| seq.to_a.join.gsub("\n", style == :compressed ? " " : "\n")}.
+        map {|seq| seq.to_a.join.gsub(/([^,])\n/m, style == :compressed ? '\1 ' : "\\1\n")}.
         join(rule_separator).split("\n").map do |line|
         per_rule_indent + line.strip
       end.join(line_separator)

data/lib/sass/util.rb

@@ -33,7 +33,7 @@ module Sass
     # @param arr [Array<(Object, Object)>] An array of pairs
     # @return [Hash] A hash
     def to_hash(arr)
-      arr.compact.inject({}) {|h, (k, v)| h[k] = v; h}
+      Hash[arr.compact]
     end
 
     # Maps the keys in a hash according to a block.
@@ -623,6 +623,19 @@ MSG
       set1.to_a.uniq.sort_by {|e| e.hash}.eql?(set2.to_a.uniq.sort_by {|e| e.hash})
     end
 
+    # Like `Object#inspect`, but preserves non-ASCII characters rather than escaping them under Ruby 1.9.2.
+    # This is necessary so that the precompiled Haml template can be `#encode`d into `@options[:encoding]`
+    # before being evaluated.
+    #
+    # @param obj {Object}
+    # @return {String}
+    def inspect(obj)
+      return obj.inspect unless version_geq(::RUBY_VERSION, "1.9.2")
+      return ':' + inspect(obj.to_s) if obj.is_a?(Symbol)
+      return obj.inspect unless obj.is_a?(String)
+      '"' + obj.gsub(/[\x00-\x7F]+/) {|s| s.inspect[1...-1]} + '"'
+    end
+
     ## Static Method Stuff
 
     # The context in which the ERB for \{#def\_static\_method} will be run.

data/test/sass/script_test.rb

@@ -79,9 +79,13 @@ class SassScriptTest < Test::Unit::TestCase
     assert_equal "rgba(100, 100, 100, 0.75)", resolve("rgba(50, 50, 50, 0.75) * 2")
   end
 
+  def test_rgba_rounding
+    assert_equal "rgba(10, 1, 0, 0.123)", resolve("rgba(10.0, 1.23456789, 0.0, 0.1234567)")
+  end
+
   def test_compressed_colors
     assert_equal "#123456", resolve("#123456", :style => :compressed)
-    assert_equal "rgba(1, 2, 3, 0.5)", resolve("rgba(1, 2, 3, 0.5)", :style => :compressed)
+    assert_equal "rgba(1,2,3,0.5)", resolve("rgba(1, 2, 3, 0.5)", :style => :compressed)
     assert_equal "#123", resolve("#112233", :style => :compressed)
     assert_equal "#000", resolve("black", :style => :compressed)
     assert_equal "red", resolve("#f00", :style => :compressed)
@@ -91,6 +95,12 @@ class SassScriptTest < Test::Unit::TestCase
     assert_equal "This color is #fff", resolve('"This color is #{ white }"', :style => :compressed)
   end
 
+  def test_compressed_comma
+    # assert_equal "foo,bar,baz", resolve("foo, bar, baz", :style => :compressed)
+    # assert_equal "foo,#baf,baz", resolve("foo, #baf, baz", :style => :compressed)
+    assert_equal "foo,#baf,red", resolve("foo, #baf, #f00", :style => :compressed)
+  end
+
   def test_implicit_strings
     assert_equal Sass::Script::String.new("foo"), eval("foo")
     assert_equal Sass::Script::String.new("foo bar"), eval("foo bar")
@@ -432,6 +442,7 @@ SASS
 
   def eval(str, opts = {}, environment = env)
     munge_filename opts
+    environment.options = opts
     Sass::Script.parse(str, opts.delete(:line) || 1,
       opts.delete(:offset) || 0, opts).perform(environment)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  version: 3.1.0.alpha.4
+  version: 3.1.0.alpha.5
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-22 00:00:00 -04:00
+date: 2010-09-29 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency