compass-core 1.0.0.alpha.15 → 1.0.0.alpha.16

data/lib/compass/core/sass_extensions/functions/image_size.rb

@@ -4,13 +4,13 @@ module Compass::Core::SassExtensions::Functions::ImageSize
   # Returns the width of the image relative to the images directory
   def image_width(image_file)
     width, _ = image_dimensions(image_file)
-    Sass::Script::Number.new(width,["px"])
+    number(width, "px")
   end
   
   # Returns the height of the image relative to the images directory
   def image_height(image_file)
     _, height = image_dimensions(image_file)
-    Sass::Script::Number.new(height, ["px"])
+    number(height, "px")
   end
 
   class ImageProperties

data/lib/compass/core/sass_extensions/functions/inline_image.rb

@@ -12,16 +12,16 @@ module Compass::Core::SassExtensions::Functions::InlineImage
       path = path.value
       real_path = File.join(Compass.configuration.fonts_path, path)
       data = inline_image_string(data(real_path), compute_mime_type(path))
-      files << "#{data} format('#{type}')"
+      files << list(data, unquoted_string("format('#{type}')"), :space)
     end
-    Sass::Script::String.new(files.join(", "))
+    list(files, :comma)
   end
 
 protected
   def inline_image_string(data, mime_type)
     data = [data].flatten.pack('m').gsub("\n","")
     url = "url('data:#{mime_type};base64,#{data}')"
-    Sass::Script::String.new(url)
+    unquoted_string(url)
   end
 
 private

data/lib/compass/core/sass_extensions/functions/lists.rb

@@ -3,26 +3,26 @@ module Compass::Core::SassExtensions::Functions::Lists
   # Returns true when the object is false, an empty string, or an empty list
   def blank(obj)
     case obj
-    when Sass::Script::Bool
-      Sass::Script::Bool.new !obj.to_bool
-    when Sass::Script::String
-      Sass::Script::Bool.new obj.value.strip.size == 0
-    when Sass::Script::List
-      Sass::Script::Bool.new obj.value.size == 0 || obj.value.all?{|el| blank(el).to_bool}
+    when Sass::Script::Value::Bool, Sass::Script::Value::Null
+      bool(!obj.to_bool)
+    when Sass::Script::Value::String
+      bool(obj.value.strip.size == 0)
+    when Sass::Script::Value::List
+      bool(obj.value.size == 0 || obj.value.all?{|el| blank(el).to_bool})
     else
-      Sass::Script::Bool.new false
+      bool(false)
     end
   end
 
   # Returns a new list after removing any non-true values
   def compact(*args)
     sep = :comma
-    if args.size == 1 && args.first.is_a?(Sass::Script::List)
+    if args.size == 1 && args.first.is_a?(Sass::Script::Value::List)
       list = args.first
       args = list.value
       sep = list.separator
     end
-    Sass::Script::List.new(args.reject{|a| !a.to_bool}, sep)
+    list(args.reject{|a| !a.to_bool}, sep)
   end
 
   # Get the nth value from a list
@@ -41,49 +41,50 @@ module Compass::Core::SassExtensions::Functions::Lists
   # This can be used to unpack a space separated list that got turned
   # into a string by sass before it was passed to a mixin.
   def _compass_list(arg)
-    if arg.is_a?(Sass::Script::List)
-      Sass::Script::List.new(arg.value.dup, arg.separator)
+    if arg.is_a?(Sass::Script::Value::List)
+      list(arg.value.dup, arg.separator)
     else
-      Sass::Script::List.new([arg], :space)
+      list(arg, :space)
     end
   end
 
   # If the argument is a list, it will return a new list that is space delimited
   # Otherwise it returns a new, single element, space-delimited list.
   def _compass_space_list(list)
-    if list.is_a?(Sass::Script::List)
-      Sass::Script::List.new(list.value.dup, :space)
+    if list.is_a?(Sass::Script::Value::List)
+      list(list.value.dup, :space)
     else
-      Sass::Script::List.new([list], :space)
+      list(list, :space)
     end
   end
 
   # Returns the size of the list.
   def _compass_list_size(list)
     assert_list list
-    Sass::Script::Number.new(list.value.size)
+    number(list.value.size)
   end
 
   # slice a sublist from a list
   def _compass_slice(list, start_index, end_index = nil)
-    end_index ||= Sass::Script::Number.new(-1)
+    end_index ||= number(-1)
     start_index = start_index.value
     end_index = end_index.value
     start_index -= 1 unless start_index < 0
     end_index -= 1 unless end_index < 0
-    Sass::Script::List.new list.values[start_index..end_index], list.separator
+    list(list.values[start_index..end_index], list.separator)
   end
 
   # removes the given values from the list.
   def reject(list, *values)
-    Sass::Script::List.new(list.value.reject{|v| values.any?{|o| v == o}}, list.separator)
+    list(list.value.reject{|v| values.any?{|o| v == o}}, list.separator)
   end
 
   # returns the first value of a space delimited list.
   def first_value_of(list)
-    if list.is_a?(Sass::Script::String)
-      Sass::Script::String.new(list.value.split(/\s+/).first)
-    elsif defined?(Sass::Script::List) && list.is_a?(Sass::Script::List)
+    if list.is_a?(Sass::Script::Value::String)
+      r = list.value.split(/\s+/).first
+      list.type == :identifier ? identifier(r) : quoted_string(r)
+    elsif list.is_a?(Sass::Script::Value::List)
       list.value.first
     else
       list
@@ -93,7 +94,7 @@ module Compass::Core::SassExtensions::Functions::Lists
   protected
 
   def assert_list(value)
-    unless value.is_a?(Sass::Script::List)
+    unless value.is_a?(Sass::Script::Value::List)
       raise ArgumentError.new("#{value.inspect} is not a list")
     end
   end

data/lib/compass/core/sass_extensions/functions/math.rb

@@ -1,7 +1,10 @@
 module Compass::Core::SassExtensions::Functions::Math
   extend Compass::Core::SassExtensions::Functions::SassDeclarationHelper
+  extend Sass::Script::Value::Helpers
+
+  PI = number(Math::PI)
+  E = number(Math::E)
 
-  PI = Sass::Script::Number.new(Math::PI)
   def pi()
     PI
   end
@@ -14,7 +17,7 @@ module Compass::Core::SassExtensions::Functions::Math
       range = (args.first.value..args.last.value).to_a
       range[rand(range.length)]
     end
-    Sass::Script::Number.new(value)
+    number(value)
   end
   declare :random, [:limit]
   declare :random, [:start, :limit]
@@ -50,7 +53,7 @@ module Compass::Core::SassExtensions::Functions::Math
   declare :atan, [:number]
 
   def e
-    Sass::Script::Number.new(Math::E)
+    E
   end
   declare :e, []
 
@@ -60,7 +63,7 @@ module Compass::Core::SassExtensions::Functions::Math
     raise Sass::SyntaxError, "base to logarithm must be unitless." unless base.unitless?
 
     result = Math.log(number.value, base.value) rescue Math.log(number.value) / Math.log(base.value)
-    Sass::Script::Number.new(result, number.numerator_units, number.denominator_units)
+    number(result, number.unit_str)
   end
   declare :logarithm, [:number]
   declare :logarithm, [:number, :base]
@@ -77,16 +80,16 @@ module Compass::Core::SassExtensions::Functions::Math
     assert_type number, :Number
     assert_type exponent, :Number
     raise Sass::SyntaxError, "exponent to pow must be unitless." unless exponent.unitless?
-    Sass::Script::Number.new(number.value**exponent.value, number.numerator_units, number.denominator_units)
+    number(number.value**exponent.value, number.unit_str)
   end
   declare :pow, [:number, :exponent]
 
   private
   def trig(operation, number)
-    if number.numerator_units == ["deg"] && number.denominator_units == []
-      Sass::Script::Number.new(Math.send(operation, Math::PI * number.value / 180))
+    if number.unit_str == "deg"
+      number(Math.send(operation, Math::PI * number.value / 180))
     else
-      Sass::Script::Number.new(Math.send(operation, number.value), number.numerator_units, number.denominator_units)
+      number(Math.send(operation, number.value), number.unit_str)
     end
   end
 end

data/lib/compass/core/sass_extensions/functions/selectors.rb

@@ -4,39 +4,54 @@ module Compass::Core::SassExtensions::Functions::Selectors
   # Permute multiple selectors each of which may be comma delimited, the end result is
   # a new selector that is the equivalent of nesting each under the previous selector.
   # To illustrate, the following mixins are equivalent:
-  # =mixin-a(!selector1, !selector2, !selector3)
-  #   #{!selector1}
-  #     #{selector2}
-  #       #{selector3}
+  #
+  #     @include mixin-a($selector1, $selector2, $selector3) {
+  #       #{$selector1} {
+  #         #{$selector2} {
+  #           #{$selector3} {
+  #             width: 2px
+  #           }
+  #         }
+  #       }
+  #     }
+  #     @include mixin-b($selector1, $selector2, $selector3) {
+  #       #{nest($selector, $selector2, $selector3)} {
   #         width: 2px
-  # =mixin-b(!selector1, !selector2)
-  #   #{nest(!selector, !selector2, !selector3)}
-  #     width: 2px
+  #       }
+  #     }
   def nest(*arguments)
     nested = arguments.map{|a| a.value}.inject do |memo,arg|
       ancestors = memo.split(COMMA_SEPARATOR)
       descendants = arg.split(COMMA_SEPARATOR)
       ancestors.map{|a| descendants.map{|d| "#{a} #{d}"}.join(", ")}.join(", ")
     end
-    Sass::Script::String.new(nested)
+    unquoted_string(nested)
   end
 
   # Permute two selectors, the first may be comma delimited.
   # The end result is a new selector that is the equivalent of nesting the second
   # selector under the first one in a sass file and preceding it with an &.
-  # To illustrate, the following mixins are equivalent:
-  # =mixin-a(!selector, !to_append)
-  #   #{!selector}
-  #     &#{!to_append}
-  #       width: 2px
-  # =mixin-b(!selector, !to_append)
-  #   #{append_selector(!selector, !to_append)}
-  #     width: 2px
+  # To illustrate, the following mixins are equivalent, except the second
+  # mixin handles:
+  #
+  #     @include mixin-a($selector, $to-append) {
+  #       #{$selector} {
+  #         &#{$to-append} {
+  #           width: 2px
+  #         }
+  #       }
+  #     }
+  #     
+  #     @include mixin-b($selector, $to-append) {
+  #       #{append_selector($selector, $to-append)} {
+  #         width: 2px
+  #       }
+  #     }
   def append_selector(selector, to_append)
     ancestors = selector.value.split(COMMA_SEPARATOR)
     descendants = to_append.value.split(COMMA_SEPARATOR)
     nested = ancestors.map{|a| descendants.map{|d| "#{a}#{d}"}.join(", ")}.join(", ")
-    Sass::Script::String.new(nested)
+    unquoted_string(nested)
   end
 
   # Return the header selectors for the levels indicated
@@ -47,18 +62,18 @@ module Compass::Core::SassExtensions::Functions::Selectors
   # headers(2,4) => h2, h3, h4
   def headers(from = nil, to = nil)
     if from && !to
-      if from.is_a?(Sass::Script::String) && from.value == "all"
-        from = Sass::Script::Number.new(1)
-        to = Sass::Script::Number.new(6)
+      if from.is_a?(Sass::Script::Value::String) && from.value == "all"
+        from = number(1)
+        to = number(6)
       else
         to = from
-        from = Sass::Script::Number.new(1)
+        from = number(1)
       end
     else
-      from ||= Sass::Script::Number.new(1)
-      to ||= Sass::Script::Number.new(6)
+      from ||= number(1)
+      to ||= number(6)
     end
-    Sass::Script::String.new((from.value..to.value).map{|n| "h#{n}"}.join(", "))
+    list((from.value..to.value).map{|n| identifier("h#{n}")}, :comma)
   end
   alias headings headers
 end

data/lib/compass/core/sass_extensions/functions/urls.rb

@@ -19,7 +19,7 @@ module Compass::Core::SassExtensions::Functions::Urls
         base.declare :stylesheet_url, [:path, :only_path]
       end
     end
-    def stylesheet_url(path, only_path = Sass::Script::Bool.new(false))
+    def stylesheet_url(path, only_path = bool(false))
       # Compute the path to the stylesheet, either root relative or stylesheet relative
       # or nil if the http_images_path is not set in the configuration.
       http_stylesheets_path = if relative?
@@ -32,7 +32,7 @@ module Compass::Core::SassExtensions::Functions::Urls
 
       path = "#{http_stylesheets_path}/#{path.value}"
       if only_path.to_bool
-        Sass::Script::String.new(clean_path(path))
+        unquoted_string(clean_path(path))
       else
         clean_url(path)
       end
@@ -47,12 +47,12 @@ module Compass::Core::SassExtensions::Functions::Urls
         base.declare :font_url,       [:path, :only_path, :cache_buster]
       end
     end
-    def font_url(path, only_path = Sass::Script::Bool.new(false), cache_buster = Sass::Script::Bool.new(true))
+    def font_url(path, only_path = bool(false), cache_buster = bool(true))
       path = path.value # get to the string value of the literal.
 
       # Short curcuit if they have provided an absolute url.
       if absolute_path?(path)
-        return Sass::Script::String.new("url(#{path})")
+        return unquoted_string("url(#{path})")
       end
 
       # Compute the path to the font file, either root relative or stylesheet relative
@@ -82,7 +82,7 @@ module Compass::Core::SassExtensions::Functions::Urls
       # Compute and append the cache buster if there is one.
       if cache_buster.to_bool
         path, anchor = path.split("#", 2)
-        if cache_buster.is_a?(Sass::Script::String)
+        if cache_buster.is_a?(Sass::Script::Value::String)
           path += "?#{cache_buster.value}"
         else
           path = cache_busted_path(path, real_path)
@@ -94,7 +94,7 @@ module Compass::Core::SassExtensions::Functions::Urls
       path = "#{asset_host}#{'/' unless path[0..0] == "/"}#{path}" if asset_host
 
       if only_path.to_bool
-        Sass::Script::String.new(clean_path(path))
+        unquoted_string(clean_path(path))
       else
         clean_url(path)
       end
@@ -109,7 +109,7 @@ module Compass::Core::SassExtensions::Functions::Urls
         base.declare :image_url,      [:path, :only_path, :cache_buster]
       end
     end
-    def image_url(path, only_path = Sass::Script::Bool.new(false), cache_buster = Sass::Script::Bool.new(true))
+    def image_url(path, only_path = bool(false), cache_buster = bool(true))
       path = path.value # get to the string value of the literal.
 
       if path =~ %r{^#{Regexp.escape(Compass.configuration.http_images_path)}/(.*)}
@@ -118,7 +118,7 @@ module Compass::Core::SassExtensions::Functions::Urls
         path = $1
       elsif absolute_path?(path)
         # Short curcuit if they have provided an absolute url.
-        return Sass::Script::String.new("url(#{path})")
+        return unquoted_string("url(#{path})")
       end
 
       # Compute the path to the image, either root relative or stylesheet relative
@@ -152,7 +152,7 @@ module Compass::Core::SassExtensions::Functions::Urls
       # Compute and append the cache buster if there is one.
       if cache_buster.to_bool
         path, anchor = path.split("#", 2)
-        if cache_buster.is_a?(Sass::Script::String)
+        if cache_buster.is_a?(Sass::Script::Value::String)
           path += "?#{cache_buster.value}"
         else
           path = cache_busted_path(path, real_path)
@@ -164,7 +164,7 @@ module Compass::Core::SassExtensions::Functions::Urls
       path = "#{asset_host}#{'/' unless path[0..0] == "/"}#{path}" if asset_host
 
       if only_path.to_bool
-        Sass::Script::String.new(clean_path(path))
+        unquoted_string(clean_path(path))
       else
         clean_url(path)
       end
@@ -178,7 +178,7 @@ module Compass::Core::SassExtensions::Functions::Urls
         base.declare :generated_image_url, [:path, :cache_buster]
       end
     end
-    def generated_image_url(path, cache_buster = Sass::Script::Bool.new(false))
+    def generated_image_url(path, cache_buster = bool(false))
       path = path.value # get to the string value of the literal.
 
       if path =~ %r{^#{Regexp.escape(Compass.configuration.http_generated_images_path)}/(.*)}
@@ -187,7 +187,7 @@ module Compass::Core::SassExtensions::Functions::Urls
         path = $1
       elsif absolute_path?(path)
         # Short curcuit if they have provided an absolute url.
-        return Sass::Script::String.new("url(#{path})")
+        return unquoted_string("url(#{path})")
       end
 
       # Compute the path to the image, either root relative or stylesheet relative
@@ -221,7 +221,7 @@ module Compass::Core::SassExtensions::Functions::Urls
       # Compute and append the cache buster if there is one.
       if cache_buster.to_bool
         path, anchor = path.split("#", 2)
-        if cache_buster.is_a?(Sass::Script::String)
+        if cache_buster.is_a?(Sass::Script::Value::String)
           path += "?#{cache_buster.value}"
         else
           path = cache_busted_path(path, real_path)
@@ -246,7 +246,7 @@ module Compass::Core::SassExtensions::Functions::Urls
 
   # Emits a url, taking off any leading "./"
   def clean_url(url)
-    Sass::Script::String.new("url('#{clean_path(url)}')")
+    unquoted_string("url('#{clean_path(url)}')")
   end
 
   def relative?

data/lib/compass/core/sass_extensions/monkey_patches/browser_support.rb

@@ -50,6 +50,7 @@ module Sass::Script
     attr_accessor :name, :args
 
     include HasSimpleCrossBrowserFunctionSupport
+    include Sass::Script::Value::Helpers
 
     def initialize(name, args)
       self.name = name
@@ -81,9 +82,9 @@ module Sass::Script
           end
           contents = prefixed_args.join(', ')
           if contents.size > 0
-            opts(Sass::Script::String.new("\#{prefixed_name}(\#{contents})"))
+            opts(identifier("\#{prefixed_name}(\#{contents})"))
           else
-            opts(Sass::Script::String.new(""))
+            opts(null)
           end
         end
       RUBY

data/stylesheets/compass/typography/lists/_inline-list.scss

@@ -4,8 +4,8 @@
 @mixin inline-list {
   list-style-type: none;
   &, & li {
-    margin: 0px;
-    padding: 0px;
+    margin: 0;
+    padding: 0;
     display: inline;
   }
 }