sass 3.1.0.alpha.19 → 3.1.0.alpha.20

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-3.1.0.alpha.19
+3.1.0.alpha.20

data/VERSION

@@ -1 +1 @@
-3.1.0.alpha.19
+3.1.0.alpha.20

data/lib/sass/util.rb

@@ -631,9 +631,9 @@ MSG
     #
     # @param obj {Object}
     # @return {String}
-    def inspect(obj)
+    def inspect_obj(obj)
       return obj.inspect unless version_geq(::RUBY_VERSION, "1.9.2")
-      return ':' + inspect(obj.to_s) if obj.is_a?(Symbol)
+      return ':' + inspect_obj(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

data/lib/sass/version.rb

@@ -1,4 +1,6 @@
-require 'sass/util'
+# This is necessary for loading Sass when Haml is required in Rails 3.
+# Once the split is complete, we can remove it.
+require File.dirname(__FILE__) + '/../sass'
 
 module Sass
   # Handles Sass version-reporting.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  version: 3.1.0.alpha.19
+  version: 3.1.0.alpha.20
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-19 00:00:00 -04:00
+date: 2010-10-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -162,16 +162,16 @@ files:
 - test/sass/plugin_test.rb
 - test/sass/extend_test.rb
 - test/sass/functions_test.rb
+- test/sass/cache_test.rb
 - test/sass/less_conversion_test.rb
-- test/sass/script_conversion_test.rb
-- test/sass/util/subset_map_test.rb
+- test/sass/importer_test.rb
 - test/sass/more_results/more1.css
 - test/sass/more_results/more1_with_line_comments.css
 - test/sass/more_results/more_import.css
 - test/sass/more_templates/_more_partial.sass
 - test/sass/more_templates/more1.sass
 - test/sass/more_templates/more_import.sass
-- test/sass/cache_test.rb
+- test/sass/mock_importer.rb
 - test/sass/results/alt.css
 - test/sass/results/basic.css
 - test/sass/results/compact.css
@@ -193,7 +193,7 @@ files:
 - test/sass/results/units.css
 - test/sass/results/warn.css
 - test/sass/results/warn_imported.css
-- test/sass/importer_test.rb
+- test/sass/script_conversion_test.rb
 - test/sass/script_test.rb
 - test/sass/scss/css_test.rb
 - test/sass/scss/rx_test.rb
@@ -234,8 +234,8 @@ files:
 - test/sass/templates/units.sass
 - test/sass/templates/warn.sass
 - test/sass/templates/warn_imported.sass
-- test/sass/mock_importer.rb
 - test/sass/test_helper.rb
+- test/sass/util/subset_map_test.rb
 - test/sass/util_test.rb
 - test/test_helper.rb
 - extra/update_watch.rb
@@ -285,13 +285,13 @@ test_files:
 - test/sass/plugin_test.rb
 - test/sass/extend_test.rb
 - test/sass/functions_test.rb
-- test/sass/less_conversion_test.rb
-- test/sass/script_conversion_test.rb
-- test/sass/util/subset_map_test.rb
 - test/sass/cache_test.rb
+- test/sass/less_conversion_test.rb
 - test/sass/importer_test.rb
+- test/sass/script_conversion_test.rb
 - test/sass/script_test.rb
 - test/sass/scss/css_test.rb
 - test/sass/scss/rx_test.rb
 - test/sass/scss/scss_test.rb
+- test/sass/util/subset_map_test.rb
 - test/sass/util_test.rb