compass 0.8.17 → 0.10.0.pre1

data/lib/compass/sass_extensions.rb

@@ -1,5 +1,5 @@
 module Compass::SassExtensions
 end
 
-require File.join(File.dirname(__FILE__), 'sass_extensions', 'functions')
-require File.join(File.dirname(__FILE__), 'sass_extensions', 'monkey_patches')
+require 'compass/sass_extensions/functions'
+require 'compass/sass_extensions/monkey_patches'

data/lib/compass/sass_extensions/functions.rb

@@ -1,8 +1,8 @@
 module Compass::SassExtensions::Functions
 end
 
-['selectors', 'enumerate', 'urls', 'display', 'inline_image'].each do |func|
-  require File.join(File.dirname(__FILE__), 'functions', func)
+%w(selectors enumerate urls display inline_image color_stop font_files).each do |func|
+  require "compass/sass_extensions/functions/#{func}"
 end
 
 module Sass::Script::Functions
@@ -11,6 +11,8 @@ module Sass::Script::Functions
   include Compass::SassExtensions::Functions::Urls
   include Compass::SassExtensions::Functions::Display
   include Compass::SassExtensions::Functions::InlineImage
+  include Compass::SassExtensions::Functions::ColorStop
+  include Compass::SassExtensions::Functions::FontFiles
 end
 
 # Wierd that this has to be re-included to pick up sub-modules. Ruby bug?

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

@@ -0,0 +1,10 @@
+module Compass::SassExtensions::Functions::ColorStop
+  def color_stop(*args)
+    raise Sass::SyntaxError, "An even number of arguments must be passed to color-stop()" unless args.size % 2 == 0
+    stops = []
+    while args.size > 0
+      stops << "color-stop(#{args.shift}, #{args.shift})"
+    end
+    Sass::Script::String.new(stops.join(", "))
+  end
+end

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

@@ -0,0 +1,11 @@
+module Compass::SassExtensions::Functions::FontFiles
+  def font_files(*args)
+    raise Sass::SyntaxError, "An even number of arguments must be passed to font_files()" unless args.size % 2 == 0
+    files = []
+    while args.size > 0
+      files << "#{font_url(args.shift)} format('#{args.shift}')"
+    end
+    Sass::Script::String.new(files.join(", "))
+  end
+
+end

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

@@ -3,11 +3,24 @@ module Compass::SassExtensions::Functions::InlineImage
 
   def inline_image(path, mime_type = nil)
     path = path.value
-    real_path = File.join(Compass.configuration.project_path, Compass.configuration.images_dir, path)
+    real_path = File.join(Compass.configuration.images_path, path)
     url = "url('data:#{compute_mime_type(path,mime_type)};base64,#{data(real_path)}')"
     Sass::Script::String.new(url)
   end
 
+  def inline_font_files(*args)
+    raise Sass::SyntaxError, "An even number of arguments must be passed to font_files()" unless args.size % 2 == 0
+    path = path.value
+    files = []
+    while args.size > 0
+      path = args.shift.value
+      real_path = File.join(Compass.configuration.fonts_path, path)
+      url = "url('data:#{compute_mime_type(path,mime_type)};base64,#{data(real_path)}')"
+      files << "#{url} format('#{args.shift}')"
+    end
+    Sass::Script::String.new(files.join(", "))
+  end
+
 private
   def compute_mime_type(path, mime_type)
     return mime_type if mime_type
@@ -18,6 +31,14 @@ private
       'image/jpeg'
     when /\.gif$/i
       'image/gif'
+    when /\.otf$/i
+      'font/opentype'
+    when /\.ttf$/i
+      'font/truetype'
+    when /\.woff$/i
+      'font/woff'
+    when /\.off$/i
+      'font/openfont'
     when /\.([a-zA-Z]+)$/
       "image/#{Regexp.last_match(1).downcase}"
     else

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

@@ -33,7 +33,10 @@ module Compass::SassExtensions::Functions::Selectors
   #   #{append_selector(!selector, !to_append)}
   #     width: 2px
   def append_selector(selector, to_append)
-    Sass::Script::String.new(selector.value.split(COMMA_SEPARATOR).map{|s| "#{s}#{to_append}"}.join(", "))
+    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)
   end
 
 end

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

@@ -8,14 +8,34 @@ module Compass::SassExtensions::Functions::Urls
     elsif Compass.configuration.http_stylesheets_path
       Compass.configuration.http_stylesheets_path
     else
-      Compass.configuration.root_relative(Compass.configuration.css_dir)
+      Compass.configuration.http_root_relative(Compass.configuration.css_dir)
     end
 
     url("#{http_stylesheets_path}/#{path}")
   end
 
+  def font_url(path)
+    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})")
+    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_dir)
+                      else
+                        Compass.configuration.http_fonts_path
+                      end
+
+    url("#{http_fonts_path}/#{path}")
+  end
+
   def image_url(path)
     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})")
@@ -28,7 +48,7 @@ module Compass::SassExtensions::Functions::Urls
     elsif Compass.configuration.http_images_path
       Compass.configuration.http_images_path
     else
-      Compass.configuration.root_relative(Compass.configuration.images_dir)
+      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.

data/lib/compass/sass_extensions/monkey_patches.rb

@@ -1,3 +1,3 @@
-['stylesheet_updating'].each do |patch|
-  require File.join(File.dirname(__FILE__), 'monkey_patches', patch)
-end
+%w(stylesheet_updating traversal).each do |patch|
+  require "compass/sass_extensions/monkey_patches/#{patch}"
+end

data/lib/compass/sass_extensions/monkey_patches/traversal.rb

@@ -0,0 +1,23 @@
+module Sass
+  module Tree
+    class Node
+      unless method_defined?(:visit_depth_first)
+        def visit_depth_first(visitor)
+          visitor.visit(self)
+          visitor.down(self) if children.any? and visitor.respond_to?(:down)
+          if is_a?(ImportNode) && visitor.import?(self)
+            root = Sass::Files.tree_for(import, @options)
+            imported_children = root.children
+          end
+
+          (imported_children || children).each do |child|
+            break if visitor.respond_to?(:stop?) && visitor.stop?
+            child.visit_depth_first(visitor)
+          end
+          visitor.up(self) if children.any?
+        end
+      end
+    end
+  end
+end
+

data/lib/compass/stats.rb

@@ -0,0 +1,92 @@
+module Compass
+  module Stats
+    class StatsVisitor
+      attr_accessor :rule_count, :prop_count, :mixin_def_count, :mixin_count
+      def initialize
+        self.rule_count = 0
+        self.prop_count = 0
+        self.mixin_def_count = 0
+        self.mixin_count = 0
+      end
+      def visit(node)
+        self.prop_count += 1 if node.is_a?(Sass::Tree::PropNode) && !node.children.any?
+        if node.is_a?(Sass::Tree::RuleNode)
+          self.rule_count += node.rules.map{|r| r.split(/,/)}.flatten.compact.size
+        end
+        self.mixin_def_count += 1 if node.is_a?(Sass::Tree::MixinDefNode)
+        self.mixin_count += 1 if node.is_a?(Sass::Tree::MixinNode)
+      end
+      def up(node)
+      end
+      def down(node)
+      end
+      def import?(node)
+        return false
+        full_filename = node.send(:import)
+        full_filename != Compass.deprojectize(full_filename)
+      end
+    end
+    class CssFile
+      attr_accessor :path, :css
+      attr_accessor :selector_count, :prop_count
+      def initialize(path)
+        require 'css_parser'
+        self.path = path
+        self.css = CssParser::Parser.new
+        self.css.add_block!(contents)
+        self.selector_count = 0
+        self.prop_count = 0
+      end
+      def contents
+        @contents ||= File.read(path)
+      end
+      def lines
+        contents.inject(0){|m,c| m + 1 }
+      end
+      def analyze!
+        css.each_selector do |selector, declarations, specificity|
+          sels = selector.split(/,/).size
+          props = declarations.split(/;/).size
+          self.selector_count += sels
+          self.prop_count += props
+        end
+      end
+    end
+    class SassFile
+      attr_accessor :path
+      attr_reader :visitor
+      def initialize(path)
+        self.path = path
+      end
+      def contents
+        @contents ||= File.read(path)
+      end
+      def tree
+        @tree = Sass::Engine.new(contents, Compass.configuration.to_sass_engine_options).to_tree
+      end
+      def visit_tree!
+        @visitor = StatsVisitor.new
+        tree.visit_depth_first(@visitor)
+        @visitor
+      end
+      def analyze!
+        visit_tree!
+      end
+      def lines
+        contents.inject(0){|m,c| m + 1 }
+      end
+      def rule_count
+        visitor.rule_count
+      end
+      def prop_count
+        visitor.prop_count
+      end
+      def mixin_def_count
+        visitor.mixin_def_count
+      end
+      def mixin_count
+        visitor.mixin_count
+      end
+    end
+  end
+end

data/lib/compass/validator.rb

@@ -2,9 +2,8 @@ begin
   require 'rubygems'
   require 'compass-validator'
 rescue LoadError
-  puts %Q{The Compass CSS Validator could not be loaded. Please install it:
+  raise Compass::MissingDependency, %Q{The Compass CSS Validator could not be loaded. Please install it:
 
 sudo gem install chriseppstein-compass-validator --source http://gems.github.com/
 }
-  exit(1)
-end
+end

data/lib/vendor/fssm/state.rb

@@ -46,7 +46,7 @@ class FSSM::State
   end
 
   def add_glob(base, glob)
-    Pathname.glob(base.join(glob)).each do |fn|
+    Pathname.glob(base.join(glob).to_s).each do |fn|
       @cache.set(fn)
     end
   end

data/test/command_line_helper.rb

@@ -1,3 +1,5 @@
+require 'timeout'
+
 module Compass::CommandLineHelper
   def compass(*arguments)
     options = arguments.last.is_a?(Hash) ? arguments.pop : {}
@@ -17,30 +19,38 @@ module Compass::CommandLineHelper
             else
               eof_at = nil
               timeout(1) do
-                output << io.readpartial(1024)
+                partial_output = io.readpartial(1024)
+                # puts "))))#{partial_output}((((("
+                output << partial_output
               end
-              prompt = output.split("\n").last
+              prompt = output.split("\n").last.strip
               if response = responder.response_for(prompt)
                 io.puts response
               end
             end
           end
           responder.assert_required_responses!
-          @last_result = output
+          @last_result = decolorize(output)
         else
           #child process
           execute *arguments
         end
       end
     else
-      @last_result = capture_output do
-        execute *arguments
+      @last_error = capture_warning do
+        @last_result = decolorize(capture_output do
+          @last_exit_code = execute *arguments
+        end)
       end
     end
   rescue Timeout::Error
     fail "Read from child process timed out"
   end
 
+  def decolorize(str)
+    str.gsub(/\e\[\d+m/,'')
+  end
+
   class Responder
     Response = Struct.new(:prompt, :text, :required, :responded)
     def initialize
@@ -73,7 +83,7 @@ module Compass::CommandLineHelper
       actions_found << line.first if line.last == path
     end
     message = "Action #{action.inspect} was not performed on: #{path}."
-    message += "The following actions were performed: #{actions_found.join(", ")}" if actions_found.any?
+    message += "The following actions were performed: #{actions_found.map{|a|a.inspect}.join(", ")}" if actions_found.any?
     puts @last_result
     fail message
   end
@@ -88,15 +98,8 @@ module Compass::CommandLineHelper
     FileUtils.rm_rf(d)
   end
 
-  def capture_output
-    real_stdout, $stdout = $stdout, StringIO.new
-    yield
-    $stdout.string
-  ensure
-    $stdout = real_stdout
-  end
-
   def execute(*arguments)
-    Compass::Exec::Compass.new(arguments).run!
+    command_line_class = Compass::Exec::Helpers.select_appropriate_command_line_ui(arguments)
+    command_line_class.new(arguments).run!
   end
-end
+end

data/test/command_line_test.rb

@@ -1,4 +1,4 @@
-require  File.dirname(__FILE__)+'/test_helper'
+require 'test_helper'
 require 'fileutils'
 require 'compass'
 require 'compass/exec'
@@ -7,9 +7,10 @@ require 'timeout'
 class CommandLineTest < Test::Unit::TestCase
   include Compass::TestCaseHelper
   include Compass::CommandLineHelper
+  include Compass::IoHelper
 
   def teardown
-    Compass.configuration.reset!
+    Compass.reset_configuration!
   end
 
   def test_print_version
@@ -19,7 +20,7 @@ class CommandLineTest < Test::Unit::TestCase
 
   def test_list_frameworks
     compass "--list-frameworks"
-    assert_equal(%w(blueprint compass yui), @last_result.split.sort)
+    assert_equal(%w(blueprint compass), @last_result.split.sort)
   end
 
   def test_basic_install
@@ -63,4 +64,4 @@ class CommandLineTest < Test::Unit::TestCase
     end
   end
 
-end
+end

data/test/compass_test.rb

@@ -1,15 +1,15 @@
-require  File.dirname(__FILE__)+'/test_helper'
+require 'test_helper'
 require 'fileutils'
 require 'compass'
 
 class CompassTest < Test::Unit::TestCase
   include Compass::TestCaseHelper
   def setup
-    Compass.configuration.reset!
+    Compass.reset_configuration!
   end
 
   def teardown
-    teardown_fixtures :blueprint, :yui, :empty, :compass, :image_urls
+    teardown_fixtures :blueprint, :empty, :compass, :image_urls, :relative
   end
 
   def teardown_fixtures(*project_names)
@@ -37,15 +37,6 @@ class CompassTest < Test::Unit::TestCase
     end
   end
 
-  def test_yui
-    within_project('yui') do |proj|
-      each_css_file(proj.css_path) do |css_file|
-        assert_no_errors css_file, 'yui'
-      end
-      assert_renders_correctly :mixins
-    end
-  end
-
   def test_compass
     within_project('compass') do |proj|
       each_css_file(proj.css_path) do |css_file|
@@ -64,6 +55,15 @@ class CompassTest < Test::Unit::TestCase
     end
   end
 
+  def test_image_urls
+    within_project('relative') do |proj|
+      each_css_file(proj.css_path) do |css_file|
+        assert_no_errors css_file, 'relative'
+      end
+      assert_renders_correctly :screen
+    end
+  end
+
 private
   def assert_no_errors(css_file, project_name)
     file = css_file[(tempfile_path(project_name).size+1)..-1]
@@ -77,7 +77,7 @@ private
       actual_result_file = "#{tempfile_path(@current_project)}/#{name}.css"
       expected_result_file = "#{result_path(@current_project)}/#{name}.css"
       actual_lines = File.read(actual_result_file).split("\n")
-      expected_lines = File.read(expected_result_file).split("\n")
+      expected_lines = ERB.new(File.read(expected_result_file)).result(binding).split("\n")
       expected_lines.zip(actual_lines).each_with_index do |pair, line|
         message = "template: #{name}\nline:     #{line + 1}"
         assert_equal(pair.first, pair.last, message)
@@ -90,8 +90,9 @@ private
 
   def within_project(project_name)
     @current_project = project_name
-    Compass.configuration.parse(configuration_file(project_name)) if File.exists?(configuration_file(project_name))
+    Compass.add_configuration(configuration_file(project_name)) if File.exists?(configuration_file(project_name))
     Compass.configuration.project_path = project_path(project_name)
+    Compass.configuration.environment = :production
     args = Compass.configuration.to_compiler_arguments(:logger => Compass::NullLogger.new)
     if Compass.configuration.sass_path && File.exists?(Compass.configuration.sass_path)
       compiler = Compass::Compiler.new *args
@@ -138,4 +139,4 @@ private
     File.join(project_path(project_name), "saved")
   end
 
-end
+end