compass 0.11.7 → 0.12.alpha.0

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

@@ -19,9 +19,10 @@ module Compass::SassExtensions::Functions::Trig
   private
   def trig(operation, number)
     if number.numerator_units == ["deg"] && number.denominator_units == []
-      Sass::Script::Number.new(Math.send(operation, Math::PI * number.value / 360))
+      Sass::Script::Number.new(Math.send(operation, (number.value * Math::PI / 180)))
     else
       Sass::Script::Number.new(Math.send(operation, number.value), number.numerator_units, number.denominator_units)
     end
   end
+  
 end

data/lib/compass/sass_extensions/functions/trig.rbc

@@ -1,5 +1,5 @@
 !RBIX
-9595534255132031488
+333337424968067900
 x
 M
 1
@@ -272,8 +272,8 @@ I
 I
 27
 x
-77
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/functions/trig.rb
+75
+/Users/chris/Projects/compass/lib/compass/sass_extensions/functions/trig.rb
 p
 0
 x
@@ -334,8 +334,8 @@ I
 I
 a
 x
-77
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/functions/trig.rb
+75
+/Users/chris/Projects/compass/lib/compass/sass_extensions/functions/trig.rb
 p
 1
 x
@@ -393,8 +393,8 @@ c
 I
 a
 x
-77
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/functions/trig.rb
+75
+/Users/chris/Projects/compass/lib/compass/sass_extensions/functions/trig.rb
 p
 1
 x
@@ -452,8 +452,8 @@ I
 I
 a
 x
-77
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/functions/trig.rb
+75
+/Users/chris/Projects/compass/lib/compass/sass_extensions/functions/trig.rb
 p
 1
 x
@@ -524,59 +524,59 @@ i
 11
 20
 0
-20
-1
-49
-12
-0
 45
 10
-13
+12
 43
+13
+20
+1
+49
 14
+0
 49
 15
 1
-4
-180
-49
+7
 16
-1
 49
 17
+1
+49
+18
 2
 47
 49
-18
+19
 1
 15
 8
 107
 45
 10
-19
 20
-0
 20
-1
-49
-12
 0
 45
 10
-20
+21
 43
+13
+20
+1
+49
 14
+0
 49
 15
 1
-4
-180
-49
+7
 16
-1
 49
 17
+1
+49
+18
 2
 49
 8
@@ -585,7 +585,7 @@ i
 183
 45
 4
-21
+22
 43
 6
 43
@@ -603,16 +603,16 @@ i
 13
 45
 10
-22
+23
 20
 0
 20
 1
 49
-12
+14
 0
 49
-17
+18
 2
 20
 1
@@ -626,23 +626,23 @@ i
 0
 47
 49
-18
+19
 3
 15
 8
 183
 45
 10
-23
+24
 20
 0
 20
 1
 49
-12
+14
 0
 49
-17
+18
 2
 20
 1
@@ -668,7 +668,7 @@ I
 2
 n
 p
-24
+25
 x
 15
 numerator_units
@@ -701,16 +701,18 @@ x
 4
 Math
 n
-x
-5
-value
 n
 x
 2
 PI
 x
+5
+value
+x
 1
 *
+I
+168
 x
 1
 /
@@ -726,7 +728,7 @@ n
 n
 n
 p
-11
+9
 I
 -1
 I
@@ -744,14 +746,10 @@ I
 I
 18
 I
-b7
-I
-0
-I
 b8
 x
-77
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/functions/trig.rb
+75
+/Users/chris/Projects/compass/lib/compass/sass_extensions/functions/trig.rb
 p
 2
 x
@@ -789,8 +787,8 @@ I
 I
 4c
 x
-77
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/functions/trig.rb
+75
+/Users/chris/Projects/compass/lib/compass/sass_extensions/functions/trig.rb
 p
 0
 x
@@ -805,7 +803,7 @@ I
 I
 22
 x
-77
-/Users/crispee/Projects/compass/lib/compass/sass_extensions/functions/trig.rb
+75
+/Users/chris/Projects/compass/lib/compass/sass_extensions/functions/trig.rb
 p
 0

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

@@ -1,112 +1,203 @@
 module Compass::SassExtensions::Functions::Urls
 
-  def stylesheet_url(path, only_path = Sass::Script::Bool.new(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?
-      compute_relative_path(Compass.configuration.css_path)
-    elsif Compass.configuration.http_stylesheets_path
-      Compass.configuration.http_stylesheets_path
-    else
-      Compass.configuration.http_root_relative(Compass.configuration.css_dir)
-    end
 
-    path = "#{http_stylesheets_path}/#{path.value}"
-    if only_path.to_bool
-      Sass::Script::String.new(clean_path(path))
-    else
-      clean_url(path)
-    end
+  def self.has?(base, instance_method)
+    Sass::Util.has?(:instance_method, base, instance_method)
   end
-  Sass::Script::Functions.declare :stylesheet_url, [:path]
-  Sass::Script::Functions.declare :stylesheet_url, [:path, :only_path]
 
-  def font_url(path, only_path = Sass::Script::Bool.new(false))
-    path = path.value # get to the string value of the literal.
+  def self.included(base)
+    base.send(:include, StylesheetUrl) unless has?(base, :stylesheet_url)
+    base.send(:include, FontUrl) unless has?(base, :font_url)
+    base.send(:include, ImageUrl) unless has?(base, :image_url)
+    base.send(:include, GeneratedImageUrl) unless has?(base, :generated_image_url)
+  end
 
-    # Short curcuit if they have provided an absolute url.
-    if absolute_path?(path)
-      return Sass::Script::String.new("url(#{path})")
+  module StylesheetUrl
+    def self.included(base)
+      if base.respond_to?(:declare)
+        base.declare :stylesheet_url, [:path]
+        base.declare :stylesheet_url, [:path, :only_path]
+      end
     end
+    def stylesheet_url(path, only_path = Sass::Script::Bool.new(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?
+        compute_relative_path(Compass.configuration.css_path)
+      elsif Compass.configuration.http_stylesheets_path
+        Compass.configuration.http_stylesheets_path
+      else
+        Compass.configuration.http_root_relative(Compass.configuration.css_dir)
+      end
 
-    # Compute the path to the font file, either root relative or stylesheet relative
-    # or nil if the http_fonts_path cannot be determined from the configuration.
-    http_fonts_path = if relative?
-                        compute_relative_path(Compass.configuration.fonts_path)
-                      else
-                        Compass.configuration.http_fonts_path
-                      end
-
-    path = "#{http_fonts_path}/#{path}"
-
-    if only_path.to_bool
-      Sass::Script::String.new(clean_path(path))
-    else
-      clean_url(path)
+      path = "#{http_stylesheets_path}/#{path.value}"
+      if only_path.to_bool
+        Sass::Script::String.new(clean_path(path))
+      else
+        clean_url(path)
+      end
     end
   end
-  Sass::Script::Functions.declare :font_url, [:path]
-  Sass::Script::Functions.declare :font_url, [:path, :only_path]
 
-  def image_url(path, only_path = Sass::Script::Bool.new(false), cache_buster = Sass::Script::Bool.new(true))
-    path = path.value # get to the string value of the literal.
+  module FontUrl
+    def self.included(base)
+      if base.respond_to?(:declare)
+        base.declare :font_url,       [:path]
+        base.declare :font_url,       [:path, :only_path]
+      end
+    end
+    def font_url(path, only_path = Sass::Script::Bool.new(false))
+      path = path.value # get to the string value of the literal.
 
-    if path =~ %r{^#{Regexp.escape(Compass.configuration.http_images_path)}/(.*)}
-      # Treat root relative urls (without a protocol) like normal if they start with
-      # the images path.
-      path = $1
-    elsif absolute_path?(path)
       # Short curcuit if they have provided an absolute url.
-      return Sass::Script::String.new("url(#{path})")
-    end
+      if absolute_path?(path)
+        return Sass::Script::String.new("url(#{path})")
+      end
 
-    # Compute the path to the image, either root relative or stylesheet relative
-    # or nil if the http_images_path is not set in the configuration.
-    http_images_path = if relative?
-      compute_relative_path(Compass.configuration.images_path)
-    elsif Compass.configuration.http_images_path
-      Compass.configuration.http_images_path
-    else
-      Compass.configuration.http_root_relative(Compass.configuration.images_dir)
+      # Compute the path to the font file, either root relative or stylesheet relative
+      # or nil if the http_fonts_path cannot be determined from the configuration.
+      http_fonts_path = if relative?
+                          compute_relative_path(Compass.configuration.fonts_path)
+                        else
+                          Compass.configuration.http_fonts_path
+                        end
+
+      path = "#{http_fonts_path}/#{path}"
+
+      if only_path.to_bool
+        Sass::Script::String.new(clean_path(path))
+      else
+        clean_url(path)
+      end
     end
+  end
 
-    # Compute the real path to the image on the file stystem if the images_dir is set.
-    real_path = if Compass.configuration.images_dir
-      File.join(Compass.configuration.project_path, Compass.configuration.images_dir, path)
+  module ImageUrl
+    def self.included(base)
+      if base.respond_to?(:declare)
+        base.declare :image_url,      [:path]
+        base.declare :image_url,      [:path, :only_path]
+        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))
+      path = path.value # get to the string value of the literal.
+
+      if path =~ %r{^#{Regexp.escape(Compass.configuration.http_images_path)}/(.*)}
+        # Treat root relative urls (without a protocol) like normal if they start with
+        # the images path.
+        path = $1
+      elsif absolute_path?(path)
+        # Short curcuit if they have provided an absolute url.
+        return Sass::Script::String.new("url(#{path})")
+      end
 
-    # prepend the path to the image if there's one
-    if http_images_path
-      http_images_path = "#{http_images_path}/" unless http_images_path[-1..-1] == "/"
-      path = "#{http_images_path}#{path}"
+      # Compute the path to the image, either root relative or stylesheet relative
+      # or nil if the http_images_path is not set in the configuration.
+      http_images_path = if relative?
+        compute_relative_path(Compass.configuration.images_path)
+      elsif Compass.configuration.http_images_path
+        Compass.configuration.http_images_path
+      else
+        Compass.configuration.http_root_relative(Compass.configuration.images_dir)
+      end
+
+      # Compute the real path to the image on the file stystem if the images_dir is set.
+      real_path = if Compass.configuration.images_dir
+        File.join(Compass.configuration.project_path, Compass.configuration.images_dir, path)
+      end
+
+      # prepend the path to the image if there's one
+      if http_images_path
+        http_images_path = "#{http_images_path}/" unless http_images_path[-1..-1] == "/"
+        path = "#{http_images_path}#{path}"
+      end
+
+      # Compute the asset host unless in relative mode.
+      asset_host = if !relative? && Compass.configuration.asset_host
+        Compass.configuration.asset_host.call(path)
+      end
+
+      # Compute and append the cache buster if there is one.
+      if cache_buster.to_bool
+        if cache_buster.is_a?(Sass::Script::String)
+          path += "?#{cache_buster.value}"
+        else
+          path = cache_busted_path(path, real_path)
+        end
+      end
+
+      # prepend the asset host if there is one.
+      path = "#{asset_host}#{'/' unless path[0..0] == "/"}#{path}" if asset_host
+
+      if only_path.to_bool
+        Sass::Script::String.new(clean_path(path))
+      else
+        clean_url(path)
+      end
     end
+  end
 
-    # Compute the asset host unless in relative mode.
-    asset_host = if !relative? && Compass.configuration.asset_host
-      Compass.configuration.asset_host.call(path)
+  module GeneratedImageUrl
+    def self.included(base)
+      if base.respond_to?(:declare)
+        base.declare :generated_image_url, [:path]
+        base.declare :generated_image_url, [:path, :cache_buster]
+      end
     end
+    def generated_image_url(path, cache_buster = Sass::Script::Bool.new(false))
+      path = path.value # get to the string value of the literal.
+
+      if path =~ %r{^#{Regexp.escape(Compass.configuration.http_generated_images_path)}/(.*)}
+        # Treat root relative urls (without a protocol) like normal if they start with
+        # the generated_images path.
+        path = $1
+      elsif absolute_path?(path)
+        # Short curcuit if they have provided an absolute url.
+        return Sass::Script::String.new("url(#{path})")
+      end
 
-    # Compute and append the cache buster if there is one.
-    if cache_buster.to_bool
-      if cache_buster.is_a?(Sass::Script::String)
-        path += "?#{cache_buster.value}"
+      # Compute the path to the image, either root relative or stylesheet relative
+      # or nil if the http_generated_images_path is not set in the configuration.
+      http_generated_images_path = if relative?
+        compute_relative_path(Compass.configuration.generated_images_path)
+      elsif Compass.configuration.http_generated_images_path
+        Compass.configuration.http_generated_images_path
       else
-        path = cache_busted_path(path, real_path)
+        Compass.configuration.http_root_relative(Compass.configuration.generated_images_dir)
       end
-    end
 
-    # prepend the asset host if there is one.
-    path = "#{asset_host}#{'/' unless path[0..0] == "/"}#{path}" if asset_host
+      # Compute the real path to the image on the file stystem if the generated_images_dir is set.
+      real_path = if Compass.configuration.generated_images_dir
+        File.join(Compass.configuration.project_path, Compass.configuration.generated_images_dir, path)
+      end
+
+      # prepend the path to the image if there's one
+      if http_generated_images_path
+        http_generated_images_path = "#{http_generated_images_path}/" unless http_generated_images_path[-1..-1] == "/"
+        path = "#{http_generated_images_path}#{path}"
+      end
+
+      # Compute the asset host unless in relative mode.
+      asset_host = if !relative? && Compass.configuration.asset_host
+        Compass.configuration.asset_host.call(path)
+      end
+
+      # Compute and append the cache buster if there is one.
+      if cache_buster.to_bool
+        if cache_buster.is_a?(Sass::Script::String)
+          path += "?#{cache_buster.value}"
+        else
+          path = cache_busted_path(path, real_path)
+        end
+      end
+
+      # prepend the asset host if there is one.
+      path = "#{asset_host}#{'/' unless path[0..0] == "/"}#{path}" if asset_host
 
-    if only_path.to_bool
-      Sass::Script::String.new(clean_path(path))
-    else
       clean_url(path)
     end
   end
-  Sass::Script::Functions.declare :image_url, [:path]
-  Sass::Script::Functions.declare :image_url, [:path, :only_path]
-  Sass::Script::Functions.declare :image_url, [:path, :only_path, :cache_buster]
 
   private