compass 0.12.2 → 0.13.alpha.4

data/lib/compass/commands/update_project.rb

@@ -9,7 +9,7 @@ module Compass
           Usage: compass compile [path/to/project] [path/to/project/src/file.sass ...] [options]
 
           Description:
-          compile project at the path specified or the current director if not specified.
+          compile project at the path specified or the current directory if not specified.
 
           Options:
         }.split("\n").map{|l| l.gsub(/^ */,'')}.join("\n")
@@ -48,7 +48,7 @@ module Compass
 
       def check_for_sass_files!(compiler)
         if compiler.sass_files.empty? && !dry_run?
-          message = "Nothing to compile. If you're trying to start a new project, you have left off the directory argument.\n"
+          message = "Compass can't find any Sass files to compile.\nIs your compass configuration correct?.\nIf you're trying to start a new project, you have left off the directory argument.\n"
           message << "Run \"compass -h\" to get help."
           raise Compass::Error, message
         end
@@ -129,7 +129,6 @@ module Compass
             parser.options[:project_name] = arguments.shift if File.directory?(arguments.first)
             unless arguments.empty?
               parser.options[:sass_files] = arguments.dup
-              parser.options[:force] = true
             end
           end
         end

data/lib/compass/commands/watch_project.rb

@@ -2,6 +2,7 @@ require 'fileutils'
 require 'pathname'
 require 'compass/commands/base'
 require 'compass/commands/update_project'
+require 'compass/watcher'
 require 'sass/plugin'
 
 module Compass
@@ -25,131 +26,28 @@ module Compass
 
       end
     end
-    module MemoryDebugger
-      def report_on_instances(type, options = {})
-        @@runs ||= 0
-        @@runs += 1
-        @@object_id_tracker ||= {}
-        @@object_id_tracker[type] ||= []
-        GC.start
-        sleep options.fetch(:gc_pause, 1)
-        count = ObjectSpace.each_object(type) do |obj|
-          if options.fetch(:verbose, true)
-            if @@runs > 2
-              if !@@object_id_tracker[type].include?(obj.object_id)
-                begin
-                  puts obj.inspect
-                rescue
-                end
-                puts "#{obj.class.name}:#{obj.object_id}"
-              end
-            end
-            @@object_id_tracker[type] << obj.object_id
-          end
-        end
-        puts "#{type}: #{count} instances."
-      end
-    end
+
     class WatchProject < UpdateProject
 
       register :watch
 
       attr_accessor :last_update_time, :last_sass_files
 
-      include MemoryDebugger
-
       def perform
-        Signal.trap("INT") do
-          puts ""
-          exit 0
+        # '.' assumes you are in the executing directory. so get the full path to the directory
+        if options[:project_name] == '.'
+          Compass.configuration.project_path = Dir.pwd
         end
+        
+        project_watcher = Compass::Watcher::ProjectWatcher.new(Compass.configuration.project_path, Compass.configuration.watches, options, options[:poll])
 
-        check_for_sass_files!(new_compiler_instance)
-        recompile
-
-        require 'fssm'
-
-
-        if options[:poll]
-          require "fssm/backends/polling"
-          # have to silence the ruby warning about chaning a constant.
-          stderr, $stderr = $stderr, StringIO.new
-          FSSM::Backends.const_set("Default", FSSM::Backends::Polling)
-          $stderr = stderr
-        end
-
-        action = FSSM::Backends::Default.to_s == "FSSM::Backends::Polling" ? "polling" : "watching"
-
-        puts ">>> Compass is #{action} for changes. Press Ctrl-C to Stop."
+        puts ">>> Compass is watching for changes. Press Ctrl-C to Stop."
         $stdout.flush
+        
+        project_watcher.compile
+        project_watcher.watch!
 
-        begin
-        FSSM.monitor do |monitor|
-          Compass.configuration.sass_load_paths.each do |load_path|
-            load_path = load_path.root if load_path.respond_to?(:root)
-            next unless load_path.is_a? String
-            monitor.path load_path do |path|
-              path.glob '**/*.s[ac]ss'
 
-              path.update &method(:recompile)
-              path.delete {|base, relative| remove_obsolete_css(base,relative); recompile(base, relative)}
-              path.create &method(:recompile)
-            end
-          end
-          Compass.configuration.watches.each do |glob, callback|
-            monitor.path Compass.configuration.project_path do |path|
-              path.glob glob
-              path.update do |base, relative|
-                puts ">>> Change detected to: #{relative}"
-                $stdout.flush
-                callback.call(base, relative)
-              end
-              path.create do |base, relative|
-                puts ">>> New file detected: #{relative}"
-                $stdout.flush
-                callback.call(base, relative)
-              end
-              path.delete do |base, relative|
-                puts ">>> File Removed: #{relative}"
-                $stdout.flush
-                callback.call(base, relative)
-              end
-            end
-          end
-
-        end
-      rescue FSSM::CallbackError => e
-        # FSSM catches exit? WTF.
-        if e.message =~ /exit/
-          exit
-        end
-      end
-      end
-
-      def remove_obsolete_css(base = nil, relative = nil)
-        compiler = new_compiler_instance(:quiet => true)
-        sass_files = compiler.sass_files
-        deleted_sass_files = (last_sass_files || []) - sass_files
-        deleted_sass_files.each do |deleted_sass_file|
-          css_file = compiler.corresponding_css_file(deleted_sass_file)
-          remove(css_file) if File.exists?(css_file)
-        end
-        self.last_sass_files = sass_files
-      end
-
-      def recompile(base = nil, relative = nil)
-        @memory_cache.reset! if @memory_cache
-        compiler = new_compiler_instance(:quiet => true, :loud => [:identical, :overwrite, :create])
-        if file = compiler.out_of_date?
-          begin
-            puts ">>> Change detected at "+Time.now.strftime("%T")+" to: #{relative || compiler.relative_stylesheet_name(file)}"
-            $stdout.flush
-            compiler.run
-            GC.start
-          rescue StandardError => e
-            ::Compass::Exec::Helpers.report_error(e, options)
-          end
-        end
       end
 
       class << self

data/lib/compass/commands.rb

@@ -3,7 +3,7 @@ end
 
 require 'compass/commands/registry'
 
-%w(base generate_grid_background default help list_frameworks project_base
+%w(base project_base default help list_frameworks 
    update_project watch_project create_project clean_project extension_command
    imports installer_command print_version project_stats stamp_pattern
    sprite validate_project write_configuration interactive unpack_extension

data/lib/compass/compiler.rb

@@ -19,6 +19,12 @@ module Compass
       self.sass_options[:compass] ||= {}
       self.sass_options[:compass][:logger] = self.logger
       self.sass_options[:compass][:environment] = Compass.configuration.environment
+      reset_staleness_checker!
+    end
+
+    def reset_staleness_checker!
+      self.staleness_checker = nil
+      #Sass::Plugin::StalenessChecker.dependencies_cache = {}
       self.staleness_checker = Sass::Plugin::StalenessChecker.new(sass_options)
     end
 

data/lib/compass/configuration/data.rb

@@ -142,7 +142,7 @@ module Compass
 
       def watch(glob, &block)
         @watches ||= []
-        @watches << [glob, block]
+        @watches << Watcher::Watch.new(glob, &block)
       end
       
       def watches

data/lib/compass/configuration/helpers.rb

@@ -33,6 +33,8 @@ module Compass
           nil
         elsif config.is_a?(Compass::Configuration::Data)
           config
+        elsif config.instance_of?(Hash)
+          Compass::Configuration::Data.new(filename, config)
         elsif config.respond_to?(:read)
           filename ||= config.to_s if config.is_a?(Pathname)
           Compass::Configuration::FileData.new_from_string(config.read, filename, defaults)

data/lib/compass/exec/global_options_parser.rb

@@ -26,7 +26,7 @@ module Compass::Exec::GlobalOptionsParser
         ::Compass.configuration.discover Pathname.new(frameworks_dir).realpath
       end
 
-    opts.on('-I IMPORT_PATH',
+    opts.on('-I IMPORT_PATH', '--import-path IMPORT_PATH',
             "Makes files under the IMPORT_PATH folder findable by Sass's @import directive."
       ) do |import_path|
         require 'pathname'

data/lib/compass/exec/project_options_parser.rb

@@ -20,6 +20,10 @@ module Compass::Exec::ProjectOptionsParser
       self.options[:project_type] = project_type.to_sym
     end
 
+    opts.on('--app-dir PATH', 'The base directory for your application.') do |project_path|
+      self.options[:project_path] = project_path
+    end
+
     opts.on('--sass-dir SRC_DIR', "The source directory where you keep your sass stylesheets.") do |sass_dir|
       set_dir_or_path(:sass, sass_dir)
     end
@@ -35,7 +39,7 @@ module Compass::Exec::ProjectOptionsParser
     opts.on('--javascripts-dir JS_DIR', "The directory where you keep your javascripts.") do |javascripts_dir|
       set_dir_or_path(:javascripts, javascripts_dir)
     end
-    
+
     opts.on('--fonts-dir FONTS_DIR', "The directory where you keep your fonts.") do |fonts_dir|
       set_dir_or_path(:fonts, fonts_dir)
     end
@@ -57,6 +61,14 @@ module Compass::Exec::ProjectOptionsParser
     opts.on('--no-line-comments', :NONE, 'Disable line comments.') do
       self.options[:line_comments] = false
     end
+
+    opts.on('--http-path HTTP_PATH', 'Set this to the root of your project when deployed') do |http_path|
+      self.options[:http_path] = http_path
+    end
+
+    opts.on('--generated-images-path GENERATED_IMAGES_PATH', 'The path where you generate your images') do |generated_images_path|
+      self.options[:generated_images_path] = generated_images_path
+    end
   end
 
 end

data/lib/compass/logger.rb

@@ -9,6 +9,7 @@ module Compass
     ACTION_COLORS = {
       :error     => :red,
       :warning   => :yellow,
+      :info      => :green,
       :compile   => :green,
       :overwrite => :yellow,
       :create    => :green,
@@ -76,6 +77,7 @@ module Compass
     # Emit a log message
     def log(msg)
       puts msg
+      $stdout.flush
     end
 
     # add padding to the left of an action that was performed.

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

@@ -33,7 +33,7 @@ module Compass::SassExtensions::Functions::CrossBrowserSupport
     Sass::Script::Bool.new(needed)
   end
 
-  %w(webkit moz o ms svg pie css2 owg).each do |prefix|
+  %w(webkit moz o ms svg pie css2).each do |prefix|
     class_eval <<-RUBY, __FILE__, __LINE__ + 1
       # Syntactic sugar to apply the given prefix
       # -moz($arg) is the same as calling prefix(-moz, $arg)

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

@@ -1,5 +1,23 @@
 module Compass::SassExtensions::Functions::Env
+
   def compass_env
     Sass::Script::String.new((options[:compass][:environment] || "development").to_s)
   end
+
+  def current_time(format)
+    time = Time.now.strftime(format.to_s)
+
+    Sass::Script::String.new(time.to_s)
+  end
+
+  alias :current_date :current_time
+
+  def current_source_file
+    Sass::Script::String.new(options[:filename].to_s)
+  end
+
+  def current_output_file
+    Sass::Script::String.new(options[:css_filename].to_s)
+  end
+
 end

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

@@ -10,6 +10,7 @@ module Compass::SassExtensions::Functions::GradientSupport
     def initialize(color, stop = nil)
       unless Sass::Script::Color === color ||
              Sass::Script::Funcall === color ||
+             (Sass::Script::String === color && color.value == "currentColor")||
              (Sass::Script::String === color && color.value == "transparent")
         raise Sass::SyntaxError, "Expected a color. Got: #{color}"
       end
@@ -21,6 +22,31 @@ module Compass::SassExtensions::Functions::GradientSupport
     def inspect
       to_s
     end
+
+    def self.color_to_svg_s(c)
+      # svg doesn't support the "transparent" keyword; we need to manually
+      # refactor it into "transparent black"
+      if c.is_a?(Sass::Script::String) && c.value == "transparent"
+        "black"
+      elsif c.is_a?(Sass::Script::String)
+        c.value.dup
+      else
+        self.color_to_s(c.with(:alpha => 1))
+      end
+    end
+
+    def self.color_to_svg_alpha(c)
+      # svg doesn't support the "transparent" keyword; we need to manually
+      # refactor it into "transparent black"
+      if c.is_a?(Sass::Script::String) && c.value == "transparent"
+        0
+      elsif c.is_a?(Sass::Script::String) && c.value == "currentColor"
+        1
+      else
+        c.alpha
+      end
+    end
+
     def self.color_to_s(c)
       if c.is_a?(Sass::Script::String)
         c.value.dup
@@ -53,7 +79,7 @@ module Compass::SassExtensions::Functions::GradientSupport
       def standardized_prefix(prefix)
         class_eval %Q{
           def to_#{prefix}(options = self.options)
-            Sass::Script::String.new("-#{prefix}-\#{to_s(options)}")
+            Sass::Script::String.new("-#{prefix}-\#{to_s_prefixed(options)}")
           end
         }
       end
@@ -108,22 +134,14 @@ module Compass::SassExtensions::Functions::GradientSupport
       s << color_stops.to_s(options)
       s << ")"
     end
+
+    def to_s_prefixed(options = self.options)
+      to_s(options)
+    end
     
     standardized_prefix :webkit
     standardized_prefix :moz
     standardized_prefix :o
-    
-    def to_owg(options = self.options)
-      args = [
-        grad_point(position || _center_position),
-        Sass::Script::String.new("0"),
-        grad_point(position || _center_position),
-        grad_end_position(color_stops, Sass::Script::Bool.new(true)),
-        grad_color_stops(color_stops)
-      ]
-      args.each {|a| a.options = options}
-      Sass::Script::String.new("-webkit-gradient(radial, #{args.join(', ')})")
-    end
 
     def to_svg(options = self.options)
       # XXX Add shape support if possible
@@ -143,23 +161,48 @@ module Compass::SassExtensions::Functions::GradientSupport
   class LinearGradient < Sass::Script::Literal
     include Gradient
 
-    attr_accessor :color_stops, :position_or_angle
+    attr_accessor :color_stops, :position_or_angle, :legacy
 
     def children
       [color_stops, position_or_angle].compact
     end
 
-    def initialize(position_or_angle, color_stops)
+    def initialize(position_or_angle, color_stops, legacy=false)
       unless color_stops.value.size >= 2
         raise Sass::SyntaxError, "At least two color stops are required for a linear-gradient"
       end
       self.position_or_angle = position_or_angle
       self.color_stops = color_stops
+      self.legacy = legacy
     end
 
-    def to_s(options = self.options)
+    def to_s_prefixed(options = self.options)
       s = "linear-gradient("
-      s << position_or_angle.to_s(options) << ", " if position_or_angle
+      if legacy
+        s << position_or_angle.to_s(options) << ", " if position_or_angle
+      else
+        s << convert_to_or_from_legacy(position_or_angle, options) << ", " if position_or_angle
+      end
+      s << color_stops.to_s(options)
+      s << ")"
+    end
+
+    def convert_to_or_from_legacy(position_or_angle, options = self.options)
+      input = if position_or_angle.is_a?(Sass::Script::Number)
+          position_or_angle
+        else
+          Sass::Script::List.new(position_or_angle.to_s.split(' ').map {|s| Sass::Script::String.new(s) }, :space)
+        end
+      return convert_angle_from_offical(input).to_s(options)
+    end
+
+    def to_s(options = self.options)
+      s = 'linear-gradient('
+      if legacy
+        s << convert_to_or_from_legacy(position_or_angle, options) << ", " if position_or_angle
+      else
+        s << position_or_angle.to_s(options) << ", " if position_or_angle
+      end
       s << color_stops.to_s(options)
       s << ")"
     end
@@ -177,16 +220,6 @@ module Compass::SassExtensions::Functions::GradientSupport
       end
     end
 
-    # Output the original webkit gradient syntax
-    def to_owg(options = self.options)
-      args = []
-      args << grad_point(position_or_angle || Sass::Script::String.new("top"))
-      args << linear_end_position(position_or_angle, color_stops)
-      args << grad_color_stops(color_stops)
-      args.each{|a| a.options = options}
-      Sass::Script::String.new("-webkit-gradient(linear, #{args.join(', ')})")
-    end
-
     def to_svg(options = self.options)
       linear_svg_gradient(color_stops, position_or_angle || Sass::Script::String.new("top"))
     end
@@ -203,6 +236,29 @@ module Compass::SassExtensions::Functions::GradientSupport
   end
 
   module Functions
+
+    def convert_angle_from_offical(deg)
+      if deg.is_a?(Sass::Script::Number)
+        return Sass::Script::Number.new((deg.value.to_f - 450).abs % 360, ['deg'])
+      else
+        args = deg.value
+        direction = []
+        if args[0] == Sass::Script::String.new('to')
+          if args.size < 2
+            direction = args
+          else
+            direction << opposite_position(args[1])
+          end
+        else
+          direction << Sass::Script::String.new('to')
+          args.each do |pos|
+            direction << opposite_position(pos)
+          end
+        end
+        return Sass::Script::String.new(direction.join(' '))
+      end
+    end
+
     # given a position list, return a corresponding position in percents
     # otherwise, returns the original argument
     def grad_point(position)
@@ -252,6 +308,8 @@ module Compass::SassExtensions::Functions::GradientSupport
           ColorStop.new(*arg.value)
         elsif Sass::Script::String === arg && arg.value == "transparent"
           ColorStop.new(arg)
+        elsif Sass::Script::String === arg && arg.value == "currentColor"
+          ColorStop.new(arg)
         else
           raise Sass::SyntaxError, "Not a valid color stop: #{arg.class.name}: #{arg}"
         end
@@ -286,7 +344,7 @@ module Compass::SassExtensions::Functions::GradientSupport
       RadialGradient.new(position_or_angle, shape_and_size, send(:color_stops, *color_stops))
     end
 
-    def linear_gradient(position_or_angle, *color_stops)
+    def _build_linear_gradient(position_or_angle, *color_stops)
       if color_stop?(position_or_angle)
         color_stops.unshift(position_or_angle)
         position_or_angle = nil
@@ -300,9 +358,19 @@ module Compass::SassExtensions::Functions::GradientSupport
       if color_stops.size == 1 && (stops = list_of_color_stops?(color_stops.first))
         color_stops = stops
       end
+      return [position_or_angle, color_stops]
+    end
+
+    def _linear_gradient(position_or_angle, *color_stops)
+      position_or_angle, color_stops = _build_linear_gradient(position_or_angle, *color_stops)
       LinearGradient.new(position_or_angle, send(:color_stops, *color_stops))
     end
 
+    def _linear_gradient_legacy(position_or_angle, *color_stops)
+      position_or_angle, color_stops = _build_linear_gradient(position_or_angle, *color_stops)
+      LinearGradient.new(position_or_angle, send(:color_stops, *color_stops), true)
+    end
+
     # returns color-stop() calls for use in webkit.
     def grad_color_stops(color_list)
       stops = color_stops_in_percentages(color_list).map do |stop, color|
@@ -495,7 +563,11 @@ module Compass::SassExtensions::Functions::GradientSupport
     # color_stops = array of: [stop, color]
     def color_stops_svg(color_stops)
       color_stops.each.map{ |stop, color|
-          %{<stop offset="#{stop.to_s}" stop-color="#{color.inspect}"/>}
+        s = %{<stop offset="#{stop.to_s}"}
+        s << %{ stop-color="#{ColorStop.color_to_svg_s(color)}"}
+        alpha = ColorStop.color_to_svg_alpha(color)
+        s << %{ stop-opacity="#{alpha}"} if alpha != 1
+        s << "/>"
       }.join
     end
 

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

@@ -45,9 +45,10 @@ module Compass::SassExtensions::Functions::ImageSize
 private
 
   def image_dimensions(image_file)
+    image_file = image_file.respond_to?(:value) ? image_file.value : image_file
     options[:compass] ||= {}
     options[:compass][:image_dimensions] ||= {}
-    options[:compass][:image_dimensions][image_file.value] = ImageProperties.new(image_path_for_size(image_file.value)).size
+    options[:compass][:image_dimensions][image_file] = ImageProperties.new(image_path_for_size(image_file)).size
   end
   
   def image_path_for_size(image_file)

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

@@ -5,6 +5,18 @@ module Compass::SassExtensions::Functions::Math
   end
   Sass::Script::Functions.declare :pi, []
 
+  def random(*args)
+    value = if args.length == 1
+      rand(args.pop.value)
+    else
+      range = (args.first.value..args.last.value).to_a
+      range[rand(range.length)]
+    end
+    Sass::Script::Number.new(value)
+  end
+  Sass::Script::Functions.declare :random, [:limit]
+  Sass::Script::Functions.declare :random, [:start, :limit]
+
   def sin(number)
     trig(:sin, number)
   end
@@ -20,10 +32,10 @@ module Compass::SassExtensions::Functions::Math
   end
   Sass::Script::Functions.declare :tan, [:number]
 
-  def e()
+  def e
     Sass::Script::Number.new(Math::E)
   end
-  Sass::Script::Functions.declare :pi, []
+  Sass::Script::Functions.declare :e, []
 
   def logarithm(number, base = e )
     assert_type number, :Number