kylefang/sass
1
0
Fork 0
mirror of https://github.com/zhigang1992/sass.git synced 2026-04-29 09:45:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't override RUBY_VERSION in Sass::Util.

Browse Source
This commit is contained in:
Chris Eppstein
2014-07-02 16:08:15 -07:00
parent 31bca26cf4
commit 5051ec907d
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/sass/util.rb
View File

@@ -17,7 +17,7 @@ module Sass
# An array of ints representing the Ruby version number.
# @api public
RUBY_VERSION = ::RUBY_VERSION.split(".").map {|s| s.to_i}
RUBY_VERSION_COMPONENTS = RUBY_VERSION.split(".").map {|s| s.to_i}
# The Ruby engine we're running under. Defaults to `"ruby"`
# if the top-level constant is undefined.
@@ -668,7 +668,7 @@ module Sass
# @return [Boolean]
def ruby1?
return @ruby1 if defined?(@ruby1)
@ruby1 = Sass::Util::RUBY_VERSION[0] <= 1
@ruby1 = RUBY_VERSION_COMPONENTS[0] <= 1
end
# Whether or not this is running under Ruby 1.8 or lower.
@@ -682,7 +682,7 @@ module Sass
# We have to fall back to 1.8 behavior.
return @ruby1_8 if defined?(@ruby1_8)
@ruby1_8 = ironruby? ||
(Sass::Util::RUBY_VERSION[0] == 1 && Sass::Util::RUBY_VERSION[1] < 9)
(RUBY_VERSION_COMPONENTS[0] == 1 && RUBY_VERSION_COMPONENTS[1] < 9)
end
# Whether or not this is running under Ruby 1.8.6 or lower.
@@ -691,7 +691,7 @@ module Sass
# @return [Boolean]
def ruby1_8_6?
return @ruby1_8_6 if defined?(@ruby1_8_6)
@ruby1_8_6 = ruby1_8? && Sass::Util::RUBY_VERSION[2] < 7
@ruby1_8_6 = ruby1_8? && RUBY_VERSION_COMPONENTS[2] < 7
end
# Wehter or not this is running under JRuby 1.6 or lower.
@@ -977,7 +977,7 @@ MSG
# @param obj {Object}
# @return {String}
def inspect_obj(obj)
return obj.inspect unless version_geq(::RUBY_VERSION, "1.9.2")
return obj.inspect unless version_geq(RUBY_VERSION, "1.9.2")
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]} + '"'