compass-edge 0.9.4 → 0.9.5.0

data/lib/vendor/fssm/state.rb

@@ -1,46 +1,54 @@
+require 'yaml'
 class FSSM::State
-  def initialize(path, preload=true)
+  def initialize(path)
     @path = path
-    @snapshot = {}
-    snapshot if preload
-  end
-  
-  def refresh
-    previous = @snapshot
-    current = snapshot
-    
-    deleted(previous, current)
-    created(previous, current)
-    modified(previous, current)    
-  end
-  
+    @cache = FSSM::Tree::Cache.new
+  end
+
+  def refresh(base=nil, skip_callbacks=false)
+    previous, current = recache(base || @path.to_pathname)
+
+    unless skip_callbacks
+      deleted(previous, current)
+      created(previous, current)
+      modified(previous, current)
+    end
+  end
+
   private
-  
+
   def created(previous, current)
     (current.keys - previous.keys).each {|created| @path.create(created)}
   end
-  
+
   def deleted(previous, current)
     (previous.keys - current.keys).each {|deleted| @path.delete(deleted)}
   end
-  
+
   def modified(previous, current)
     (current.keys & previous.keys).each do |file|
       @path.update(file) if (current[file] <=> previous[file]) != 0
     end
   end
-  
-  def snapshot
-    snap = {}
-    @path.glob.each {|glob| add_glob(snap, glob)}
-    @snapshot = snap
-  end
-  
-  def add_glob(snap, glob)
-    Pathname.glob(@path.to_pathname.join(glob)).each do |fn|
-      next unless fn.file?
-      snap["#{fn}"] = fn.mtime
+
+  def recache(base)
+    base = Pathname.for(base)
+    previous = @cache.files
+    snapshot(base)
+    current = @cache.files
+    [previous, current]
+  end
+
+  def snapshot(base)
+    base = Pathname.for(base)
+    @cache.unset(base)
+    @path.glob.each {|glob| add_glob(base, glob)}
+  end
+
+  def add_glob(base, glob)
+    Pathname.glob(base.join(glob).to_s).each do |fn|
+      @cache.set(fn)
     end
   end
-  
+
 end

data/lib/vendor/fssm/support.rb

@@ -1,17 +1,13 @@
 module FSSM::Support
   class << self
-    # def backend
-    #   (mac? && carbon_core?) ? 'FSEvents' : 'Polling'
-    # end
-    
     def backend
-      'Polling'
+      (mac? && carbon_core?) ? 'FSEvents' : 'Polling'
     end
-    
+
     def mac?
       @@mac ||= RUBY_PLATFORM =~ /darwin/i
     end
-    
+
     def carbon_core?
       @@carbon_core ||= begin
         require 'osx/foundation'

data/lib/vendor/fssm/tree.rb

@@ -0,0 +1,176 @@
+module FSSM::Tree
+  module NodeBase
+    def initialize
+      @children = {}
+    end
+    
+    protected
+    
+    def child(segment)
+      @children["#{segment}"]
+    end
+    
+    def child!(segment)
+      (@children["#{segment}"] ||= Node.new)
+    end
+    
+    def has_child?(segment)
+      @children.has_key?("#{segment}")
+    end
+    
+    def remove_child(segment)
+      @children.delete("#{segment}")
+    end
+    
+    def remove_children
+      @children.clear
+    end
+  end
+  
+  module NodeEnumerable
+    include NodeBase
+    include Enumerable
+    
+    def each(prefix=nil, &block)
+      @children.each do |segment, node|
+        cprefix = prefix ? 
+                  Pathname.for(prefix).join(segment) :
+                  Pathname.for(segment)
+        block.call(cprefix, node)
+        node.each(cprefix, &block)
+      end
+    end
+  end
+  
+  module NodeInsertion
+    include NodeBase
+    
+    def unset(path)
+      key = key_segments(path)
+      
+      if key.empty?
+        remove_children
+        return nil
+      end
+      
+      segment = key.pop
+      node = descendant(key)
+      
+      return unless node
+      
+      node.remove_child(segment)
+      
+      nil
+    end
+    
+    def set(path)
+      node = descendant!(path)
+      node.from_path(path).mtime
+    end
+    
+    protected
+    
+    def key_segments(key)
+      return key if key.is_a?(Array)
+      Pathname.for(key).segments
+    end
+    
+    def descendant(path)
+      recurse(path, false)
+    end
+    
+    def descendant!(path)
+      recurse(path, true)
+    end
+    
+    def recurse(key, create=false)
+      key = key_segments(key)
+      node = self
+      
+      until key.empty?
+        segment = key.shift
+        node = create ? node.child!(segment) : node.child(segment)
+        return nil unless node
+      end
+      
+      node
+    end
+  end
+  
+  module CacheDebug
+    def set(path)
+      FSSM.dbg("Cache#set(#{path})")
+      super
+    end
+    
+    def unset(path)
+      FSSM.dbg("Cache#unset(#{path})")
+      super
+    end
+    
+    def ftype(ft)
+      FSSM.dbg("Cache#ftype(#{ft})")
+      super
+    end
+  end
+  
+  class Node
+    include NodeBase
+    include NodeEnumerable
+    
+    attr_accessor :mtime
+    attr_accessor :ftype
+    
+    def <=>(other)
+      return unless other.is_a?(::FSSM::Tree::Node)
+      self.mtime <=> other.mtime
+    end
+    
+    def from_path(path)
+      path = Pathname.for(path)
+      @ftype = path.ftype
+      # this handles bad symlinks without failing. why handle bad symlinks at
+      # all? well, we could still be interested in their creation and deletion.
+      @mtime = path.symlink? ? Time.at(0) : path.mtime
+      self
+    end
+  end
+  
+  class Cache
+    include NodeBase
+    include NodeEnumerable
+    include NodeInsertion
+    include CacheDebug if $DEBUG
+    
+    def set(path)
+      # all paths set from this level need to be absolute
+      # realpath will fail on broken links
+      path = Pathname.for(path).expand_path      
+      super(path)
+    end
+    
+    def files
+      ftype('file')
+    end
+    
+    def directories
+      ftype('directory')
+    end
+    
+    def links
+      ftype('link')
+    end
+    alias symlinks links
+    
+    private
+    
+    def ftype(ft)
+      inject({}) do |hash, entry|
+        path, node = entry
+        hash["#{path}"] = node.mtime if node.ftype == ft
+        hash
+      end
+    end
+  end
+  
+end

data/test/command_line_helper.rb

@@ -30,7 +30,7 @@ module Compass::CommandLineHelper
             end
           end
           responder.assert_required_responses!
-          @last_result = output
+          @last_result = decolorize(output)
         else
           #child process
           execute *arguments
@@ -38,15 +38,19 @@ module Compass::CommandLineHelper
       end
     else
       @last_error = capture_warning do
-        @last_result = capture_output do
+        @last_result = decolorize(capture_output do
           @last_exit_code = execute *arguments
-        end
+        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
@@ -79,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

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'
@@ -64,4 +64,4 @@ class CommandLineTest < Test::Unit::TestCase
     end
   end
 
-end
+end

data/test/compass_test.rb

@@ -1,4 +1,4 @@
-require  File.dirname(__FILE__)+'/test_helper'
+require 'test_helper'
 require 'fileutils'
 require 'compass'
 
@@ -9,7 +9,7 @@ class CompassTest < Test::Unit::TestCase
   end
 
   def teardown
-    teardown_fixtures :blueprint, :empty, :compass, :image_urls
+    teardown_fixtures :blueprint, :empty, :compass, :image_urls, :relative
   end
 
   def teardown_fixtures(*project_names)
@@ -55,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]
@@ -68,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)
@@ -83,6 +92,7 @@ private
     @current_project = 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
@@ -129,4 +139,4 @@ private
     File.join(project_path(project_name), "saved")
   end
 
-end
+end

data/test/configuration_test.rb

@@ -1,4 +1,4 @@
-require  File.dirname(__FILE__)+'/test_helper'
+require 'test_helper'
 require 'compass'
 require 'stringio'
 
@@ -15,12 +15,12 @@ class ConfigurationTest < Test::Unit::TestCase
       # Require any additional compass plugins here.
 
       project_type = :stand_alone
+      # Set this to the root of your project when deployed:
+      http_path = "/"
       css_dir = "css"
       sass_dir = "sass"
       images_dir = "img"
       javascripts_dir = "js"
-      # Set this to the root of your project when deployed:
-      http_path = "/"
       output_style = :nested
       # To enable relative paths to assets via compass helper functions. Uncomment:
       # relative_assets = true
@@ -87,9 +87,9 @@ class ConfigurationTest < Test::Unit::TestCase
     expected_serialization = <<EXPECTED
 # Require any additional compass plugins here.
 project_path = "/home/chris/my_compass_project"
-css_dir = "css"
 # Set this to the root of your project when deployed:
 http_path = "/"
+css_dir = "css"
 # To enable relative paths to assets via compass helper functions. Uncomment:
 # relative_assets = true
 additional_import_paths = ["../foo", "/path/to/my/framework"]
@@ -120,4 +120,4 @@ EXPECTED
       assert_equal expected_serialization, Compass.configuration.serialize
     end
 
-end
+end

data/test/fixtures/stylesheets/blueprint/css/typography.css

@@ -111,14 +111,16 @@ pre, code, tt {
   line-height: 1.5; }
 
 li ul, li ol {
-  margin: 0 1.5em; }
+  margin: 0; }
+
+ul, ol {
+  margin: 0 1.5em 1.5em 0;
+  padding-left: 3.333em; }
 
 ul {
-  margin: 0 1.5em 1.5em 1.5em;
   list-style-type: disc; }
 
 ol {
-  margin: 0 1.5em 1.5em 1.5em;
   list-style-type: decimal; }
 
 dl {

data/test/fixtures/stylesheets/blueprint/sass/screen.sass

@@ -1,4 +1,4 @@
-@import blueprint/screen
+@import blueprint.sass
 @import compass/reset
 
 +blueprint