compass-edge 0.9.5.0 → 0.10.0.pre

data/lib/compass/sass_extensions/functions.rb

@@ -1,7 +1,7 @@
 module Compass::SassExtensions::Functions
 end
 
-%w(selectors enumerate urls display inline_image color_stop font_files).each do |func|
+%w(selectors enumerate urls display inline_image).each do |func|
   require "compass/sass_extensions/functions/#{func}"
 end
 
@@ -11,8 +11,6 @@ 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/enumerate.rb

@@ -1,6 +1,6 @@
 module Compass::SassExtensions::Functions::Enumerate
-  def enumerate(prefix, from, through, separator = "-")
-    selectors = (from.value..through.value).map{|i| "#{prefix.value}#{separator}#{i}"}.join(", ")
+  def enumerate(prefix, from, through)
+    selectors = (from.value..through.value).map{|i| "#{prefix.value}-#{i}"}.join(", ")
     Sass::Script::String.new(selectors)
   end
 end

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

@@ -3,24 +3,11 @@ module Compass::SassExtensions::Functions::InlineImage
 
   def inline_image(path, mime_type = nil)
     path = path.value
-    real_path = File.join(Compass.configuration.images_path, path)
+    real_path = File.join(Compass.configuration.project_path, Compass.configuration.images_dir, 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
@@ -31,14 +18,6 @@ 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/urls.rb

@@ -14,28 +14,8 @@ module Compass::SassExtensions::Functions::Urls
     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})")

data/lib/compass/sass_extensions/monkey_patches.rb

@@ -1,3 +1,3 @@
-%w(stylesheet_updating traversal).each do |patch|
+%w(stylesheet_updating).each do |patch|
   require "compass/sass_extensions/monkey_patches/#{patch}"
-end
+end

data/lib/compass/validator.rb

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

data/lib/vendor/fssm.rb

@@ -1,41 +1,28 @@
-dir = File.dirname(__FILE__)
-$LOAD_PATH.unshift dir unless $LOAD_PATH.include?(dir)
-
 module FSSM
   FileNotFoundError = Class.new(StandardError)
   CallbackError = Class.new(StandardError)
   
   class << self
-    def dbg(msg=nil)
-      STDERR.puts(msg)
-    end
-
-    def monitor(*args, &block)      
+    def monitor(*args, &block)
       monitor = FSSM::Monitor.new
       context = args.empty? ? monitor : monitor.path(*args)
-
-      if block_given?
-        if block.arity == 1
-          block.call(context)
-        else
-          context.instance_eval(&block)
-        end
+      if block && block.arity == 0
+        context.instance_eval(&block)
+      elsif block && block.arity == 1
+        block.call(context)
       end
-
       monitor.run
     end
   end
 end
 
-require 'thread'
 require 'pathname'
-
 require 'fssm/ext'
 require 'fssm/support'
-require 'fssm/tree'
 require 'fssm/path'
 require 'fssm/state'
 require 'fssm/monitor'
 
 require "fssm/backends/#{FSSM::Support.backend.downcase}"
 FSSM::Backends::Default = FSSM::Backends.const_get(FSSM::Support.backend)
+

data/lib/vendor/fssm/backends/fsevents.rb

@@ -1,37 +1,78 @@
-require 'fssm/fsevents'
-
 module FSSM::Backends
-  class FSEvents
-    def initialize
-      @handlers = {}
-      @fsevents = []
+  class FSEvents    
+    def initialize(options={})
+      @streams   = []
+      @handlers  = {}
+      @allocator = options[:allocator] || OSX::KCFAllocatorDefault
+      @context   = options[:context]   || nil
+      @since     = options[:since]     || OSX::KFSEventStreamEventIdSinceNow
+      @latency   = options[:latency]   || 0.0
+      @flags     = options[:flags]     || 0
     end
     
     def add_path(path, preload=true)
-      handler = FSSM::State.new(path)
-      @handlers["#{path}"] = handler
+      @handlers["#{path}"] = FSSM::State.new(path, preload)
       
-      fsevent = Rucola::FSEvents.new("#{path}", {:latency => 0.5}) do |events|
-        events.each do |event|
-          handler.refresh(event.path)
-        end
+      cb = lambda do |stream, context, number, paths, flags, ids|
+        paths.regard_as('*')
+        watched = OSX.FSEventStreamCopyPathsBeingWatched(stream).first
+        @handlers["#{watched}"].refresh
+        # TODO: support this level of granularity
+        # number.times do |n|
+        #   @handlers["#{watched}"].refresh_path(paths[n])
+        # end
       end
       
-      fsevent.create_stream
-      handler.refresh(path.to_pathname, true) if preload
-      fsevent.start
-      @fsevents << fsevent
+      @streams << create_stream(cb, "#{path}")
     end
     
     def run
+      @streams.each do |stream|
+        schedule_stream(stream)
+        start_stream(stream)
+      end
+      
       begin
         OSX.CFRunLoopRun
       rescue Interrupt
-        @fsevents.each do |fsev|
-          fsev.stop
+        @streams.each do |stream|
+          stop_stream(stream)
+          invalidate_stream(stream)
+          release_stream(stream)
         end
       end
+      
+    end
+    
+    private
+    
+    def create_stream(callback, paths)
+      paths = [paths] unless paths.is_a?(Array)
+      OSX.FSEventStreamCreate(@allocator, callback, @context, paths, @since, @latency, @flags)
+    end
+    
+    def schedule_stream(stream, options={})
+      run_loop  = options[:run_loop]  || OSX.CFRunLoopGetCurrent
+      loop_mode = options[:loop_mode] || OSX::KCFRunLoopDefaultMode
+      
+      OSX.FSEventStreamScheduleWithRunLoop(stream, run_loop, loop_mode)
     end
-
+    
+    def start_stream(stream)
+      OSX.FSEventStreamStart(stream)
+    end
+    
+    def stop_stream(stream)
+      OSX.FSEventStreamStop(stream)
+    end
+    
+    def invalidate_stream(stream)
+      OSX.FSEventStreamInvalidate(stream)
+    end
+    
+    def release_stream(stream)
+      OSX.FSEventStreamRelease(stream)
+    end
+    
   end
 end

data/lib/vendor/fssm/backends/polling.rb

@@ -1,26 +1,24 @@
 module FSSM::Backends
   class Polling
-    def initialize(options={})
-      @handlers  = []
-      @latency   = options[:latency]   || 1
-    end
-
-    def add_path(path, preload=true)
-      handler = FSSM::State.new(path)
-      handler.refresh(path.to_pathname, true) if preload
-      @handlers << handler
-    end
-
-    def run
-      begin
-        loop do
-          start = Time.now.to_f
-          @handlers.each {|handler| handler.refresh}
-          nap_time = @latency - (Time.now.to_f - start)
-          sleep nap_time if nap_time > 0
-        end
-      rescue Interrupt
+  def initialize(options={})
+    @handlers  = []
+    @latency   = options[:latency]   || 1
+  end
+  
+  def add_path(path, preload=true)
+    @handlers << FSSM::State.new(path, preload)
+  end
+  
+  def run
+    begin
+      loop do
+        start = Time.now.to_f
+        @handlers.each {|handler| handler.refresh}
+        nap_time = @latency - (Time.now.to_f - start)
+        sleep nap_time if nap_time > 0
       end
+    rescue Interrupt
     end
   end
 end
+end

data/lib/vendor/fssm/ext.rb

@@ -4,34 +4,4 @@ class Pathname
       path.is_a?(Pathname) ? path : new(path)
     end
   end
-  
-  # before overwriting chop_basename:
-  #   %total - 29.50%
-  #   %self - 20.50%
-  # after overwriting chop_basename:
-  #   %total - 24.36%
-  #   %self - 15.47%
-  CHOP_PAT = /\A#{SEPARATOR_PAT}?\z/
-  def chop_basename(path)
-    base = File.basename(path)
-    # the original version of this method recalculates this regexp
-    # each run, despite the pattern never changing.
-    if CHOP_PAT =~ base
-      return nil
-    else
-      return path[0, path.rindex(base)], base
-    end
-  end
-  
-  def segments
-    prefix, names = split_names(@path)
-    names.unshift(prefix) unless prefix.empty?
-    names.shift if names[0] == '.'
-    names
-  end
-  
-  def names
-    prefix, names = split_names(@path)
-    names
-  end
 end

data/lib/vendor/fssm/monitor.rb

@@ -3,22 +3,18 @@ class FSSM::Monitor
     @options = options
     @backend = FSSM::Backends::Default.new
   end
-
+  
   def path(*args, &block)
     path = FSSM::Path.new(*args)
-
-    if block_given?
-      if block.arity == 1
-        block.call(path)
-      else
-        path.instance_eval(&block)
-      end
+    if block && block.arity == 0
+      path.instance_eval(&block)
+    elsif block && block.arity == 1
+      block.call(path)
     end
-
     @backend.add_path(path)
     path
   end
-
+  
   def run
     @backend.run
   end

data/lib/vendor/fssm/path.rb

@@ -3,48 +3,45 @@ class FSSM::Path
     set_path(path || '.')
     set_glob(glob || '**/*')
     init_callbacks
-
-    if block_given?
-      if block.arity == 1
-        block.call(self)
-      else
-        self.instance_eval(&block)
-      end
+    if block && block.arity == 0
+      self.instance_eval(&block)
+    elsif block && block.arity == 1
+      block.call(self)
     end
   end
-
+  
   def to_s
     @path.to_s
   end
-
+  
   def to_pathname
     @path
   end
-
+  
   def glob(value=nil)
     return @glob if value.nil?
     set_glob(value)
   end
-
+  
   def create(callback_or_path=nil, &block)
     callback_action(:create, (block_given? ? block : callback_or_path))
   end
-
+  
   def update(callback_or_path=nil, &block)
     callback_action(:update, (block_given? ? block : callback_or_path))
   end
-
+  
   def delete(callback_or_path=nil, &block)
     callback_action(:delete, (block_given? ? block : callback_or_path))
   end
-
+  
   private
-
+  
   def init_callbacks
     do_nothing = lambda {|base, relative|}
     @callbacks = Hash.new(do_nothing)
   end
-
+  
   def callback_action(type, arg=nil)
     if arg.is_a?(Proc)
       set_callback(type, arg)
@@ -54,37 +51,37 @@ class FSSM::Path
       run_callback(type, arg)
     end
   end
-
+  
   def set_callback(type, arg)
     raise ArgumentError, "Proc expected" unless arg.is_a?(Proc)
     @callbacks[type] = arg
   end
-
+  
   def get_callback(type)
     @callbacks[type]
   end
-
+  
   def run_callback(type, arg)
     base, relative = split_path(arg)
-
+    
     begin
       @callbacks[type].call(base, relative)
     rescue Exception => e
       raise FSSM::CallbackError, "#{type} - #{base.join(relative)}: #{e.message}", e.backtrace
     end
   end
-
+  
   def split_path(path)
     path = Pathname.for(path)
-    [@path, (path.relative? ? path : path.relative_path_from(@path))]
+    [@path, (path.relative? ? path : path.relative_path_from(@path))] 
   end
-
+  
   def set_path(path)
     path = Pathname.for(path)
     raise FSSM::FileNotFoundError, "#{path}" unless path.exist?
     @path = path.realpath
   end
-
+  
   def set_glob(glob)
     @glob = glob.is_a?(Array) ? glob : [glob]
   end