compass 1.0.0.alpha.21 → 1.0.0.rc.0

data/lib/compass/configuration/helpers.rb

@@ -95,9 +95,17 @@ module Compass
         end
       end
 
+      # @deprecated
       def compiler
+        Compass::Deprecation.deprecated!(:compiler_accessor,
+          "Compass.compiler is deprecated. Use Compass.sass_compiler instead.")
+        Compass::Deprecation.mark_as_issued(:compass_compiler_constructor)
         Compass::Compiler.new(*Compass.configuration.to_compiler_arguments)
       end
+
+      def sass_compiler(*args)
+        Compass::SassCompiler.new(*args)
+      end
     end
   end
 

data/lib/compass/deprecation.rb

@@ -0,0 +1,19 @@
+module Compass
+  module Deprecation
+    class << self
+      attr_accessor :issued_deprecations
+    end
+    self.issued_deprecations = {}
+
+    def self.deprecated!(identifier, message)
+      return if Deprecation.issued_deprecations[identifier]
+      Deprecation.issued_deprecations[identifier] = true
+      warn message
+      warn "Called from #{caller[1]}"
+    end
+
+    def self.mark_as_issued(identifier)
+      Deprecation.issued_deprecations[identifier] = true
+    end
+  end
+end

data/lib/compass/exec/global_options_parser.rb

@@ -45,10 +45,6 @@ module Compass::Exec::GlobalOptionsParser
       self.options[:force] = true
     end
 
-    opts.on('--dry-run', :NONE, 'Dry Run. Tells you what it plans to do.') do
-      self.options[:dry_run] = true
-    end
-
     opts.on('--boring', :NONE, 'Turn off colorized output.') do
       self.options[:color_output] = false
     end

data/lib/compass/generated_version.rb

@@ -0,0 +1,4 @@
+module Compass
+  VERSION = "1.0.0.rc.0"
+  VERSION_NAME = "Polaris"
+end

data/lib/compass/logger.rb

@@ -2,9 +2,7 @@ module Compass
 
   class Logger
 
-    DEFAULT_ACTIONS = [:directory, :exists, :remove, :create, :overwrite, :compile, :error, :identical, :warning]
-
-    COLORS = { :clear => 0, :red => 31, :green => 32, :yellow => 33 }
+    COLORS = { :clear => 0, :red => 31, :green => 32, :yellow => 33, :blue => 34 }
 
     ACTION_COLORS = {
       :error     => :red,
@@ -12,8 +10,14 @@ module Compass
       :info      => :green,
       :compile   => :green,
       :overwrite => :yellow,
+      :modified  => :yellow,
+      :clean     => :yellow,
+      :write     => :green,
       :create    => :green,
       :remove    => :yellow,
+      :delete    => :yellow,
+      :deleted   => :yellow,
+      :created   => :yellow,
       :exists    => :green,
       :directory => :green,
       :identical => :green,
@@ -21,8 +25,9 @@ module Compass
       :unchanged => :yellow
     }
 
+    DEFAULT_ACTIONS = ACTION_COLORS.keys
 
-    attr_accessor :actions, :options
+    attr_accessor :actions, :options, :time
 
     def initialize(*actions)
       self.options = actions.last.is_a?(Hash) ? actions.pop : {}
@@ -33,6 +38,9 @@ module Compass
     # Record an action that has occurred
     def record(action, *arguments)
       msg = ""
+      if time
+        msg << Time.now.strftime("%I:%M:%S.%3N %p")
+      end
       msg << color(ACTION_COLORS[action]) if Compass.configuration.color_output
       msg << "#{action_padding(action)}#{action}"
       msg << color(:clear) if Compass.configuration.color_output
@@ -40,22 +48,26 @@ module Compass
       log msg
     end
 
+    def green
+      wrap(:green) { yield }
+    end
+
     def red
-      $stderr.write(color(:red))
-      $stdout.write(color(:red))
-      yield
-    ensure
-      $stderr.write(color(:clear))
-      $stdout.write(color(:clear))
+      wrap(:red) { yield }
     end
 
     def yellow
-      $stderr.write(color(:yellow))
-      $stdout.write(color(:yellow))
+      wrap(:yellow) { yield }
+    end
+
+    def wrap(c, reset_to = :clear)
+      $stderr.write(color(c))
+      $stdout.write(color(c))
       yield
     ensure
-      $stderr.write(color(:clear))
-      $stdout.write(color(:clear))
+      $stderr.write(color(reset_to))
+      $stdout.write(color(reset_to))
+      $stdout.flush
     end
 
     def color(c)
@@ -70,11 +82,13 @@ module Compass
       end
     end
 
+    # Emit a log message without a trailing newline
     def emit(msg)
       print msg
+      $stdout.flush
     end
 
-    # Emit a log message
+    # Emit a log message with a trailing newline
     def log(msg)
       puts msg
       $stdout.flush
@@ -91,15 +105,14 @@ module Compass
     end
   end
 
-  class NullLogger
+  class NullLogger < Logger
     def record(*args)
     end
 
     def log(msg)
     end
 
-    def red
-      yield
+    def emit(msg)
     end
   end
 end

data/lib/compass/sass_compiler.rb

@@ -0,0 +1,134 @@
+require 'sass/plugin'
+
+class Compass::SassCompiler
+
+  include Compass::Actions
+
+  attr_writer :logger
+  attr_reader :error_count
+  attr_accessor :config
+  attr_accessor :display_compilation_times
+  attr_accessor :working_path
+  attr_accessor :only_sass_files
+
+  def initialize(options = {}, config = Compass.configuration)
+    options = options.dup
+    self.config = config
+    self.display_compilation_times = options.delete(:time)
+    self.working_path = options.delete(:working_path) || Dir.pwd
+    self.only_sass_files = options.delete(:only_sass_files) || []
+    plugin_options = config.to_sass_plugin_options.merge(options)
+    if only_sass_files.any?
+      plugin_options[:template_location] = []
+      plugin_options[:load_paths] = config.sass_load_paths
+    end
+    plugin_options[:always_update] = true if options.delete(:force)
+    @compiler = Sass::Plugin::Compiler.new(plugin_options)
+    @start_times = {}
+    @error_count = 0
+
+    public_methods(true).grep(/^when_/).each do |callback|
+      @compiler.send(callback.to_s.sub(/^when_/, 'on_')) {|*args| send(callback, *args) }
+    end
+  end
+
+  def compile!
+    @compiler.update_stylesheets(individual_files)
+  end
+
+  def watch!(options = {}, &block)
+    skip_initial_update = options.fetch(:skip_initial_update, false)
+    begin
+      @compiler.watch(individual_files, options.merge(:skip_initial_update => skip_initial_update), &block)
+    rescue Sass::SyntaxError => e
+      skip_initial_update = true
+      retry
+    end
+  end
+
+  def individual_files
+    only_sass_files.map {|sass_file| [sass_file, corresponding_css_file(sass_file)]}
+  end
+
+  def clean!
+    @compiler.clean(individual_files)
+  end
+
+  def file_list
+    @compiler.file_list(individual_files)
+  end
+
+  def when_updating_stylesheets(individual_files)
+    @start_times = {}
+    @error_count = 0
+  end
+
+  def when_compilation_starting(sass_file, css, sourcemap)
+    @start_times[sass_file] = Time.now
+  end
+
+  def when_template_created(sass_file)
+    logger.record :created, relativize(sass_file)
+  end
+
+  def when_template_deleted(sass_file)
+    logger.record :deleted, relativize(sass_file)
+  end
+
+  def when_template_modified(sass_file)
+    logger.record :modified, relativize(sass_file)
+  end
+
+  def when_updated_stylesheet(sass_file, css, sourcemap)
+    if css && display_compilation_times && @start_times[sass_file]
+      duration = ((Time.now - @start_times[sass_file]) * 1000).round / 1000.0
+      logger.record :write, "#{relativize(css)} (#{duration}s)"
+    else
+      logger.record :write, relativize(css) if css
+    end
+    config.run_stylesheet_saved(css) if css
+
+    logger.record :write, relativize(sourcemap) if sourcemap
+    config.run_sourcemap_saved(sourcemap) if sourcemap
+  end
+
+  def when_creating_directory(dirname)
+    logger.record :directory, relativize(dirname)
+  end
+
+  def when_deleting_css(filename)
+    logger.record :delete, relativize(filename)
+    config.run_stylesheet_removed(filename) if filename
+  end
+
+  def when_deleting_sourcemap(filename)
+    logger.record :delete, relativize(filename)
+    config.run_sourcemap_removed(filename) if filename
+  end
+
+  def when_compilation_error(error, sass_file, css_file, sourcemap_file)
+    @error_count += 1
+    if relativize(error.sass_filename) == relativize(sass_file)
+      logger.record :error, "#{relativize(error.sass_filename)} (Line #{error.sass_line}: #{error.message})"
+    else
+      logger.record :error, "#{relativize(sass_file)} (Line #{error.sass_line} of #{relativize(error.sass_filename)}: #{error.message})"
+    end
+    config.run_stylesheet_error(sass_file, error.message)
+  end
+
+  def logger
+    @logger ||= Compass::Logger.new
+  end
+
+  def corresponding_css_file(sass_file)
+    "#{config.css_path}/#{stylesheet_name(sass_file)}.css"
+  end
+
+  def stylesheet_name(sass_file)
+    if sass_file.index(config.sass_path) == 0
+      sass_file[(config.sass_path.length + 1)..-6].sub(/\.css$/,'')
+    else
+      raise Compass::Error, "Individual stylesheets must be in the sass directory."
+    end
+  end
+end

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

@@ -120,9 +120,9 @@ module Compass::SassExtensions::Functions::Sprites
     verify_map(map, "sprite")
     verify_sprite(sprite)
     if image = map.image_for(sprite.value)
-      image_path = Pathname.new(File.expand_path(image.file, Compass.configuration.images_path))
-      generated_images_path = Pathname.new(File.expand_path(Compass.configuration.generated_images_path))
-      quoted_string(image_path.relative_path_from(generated_images_path).to_s)
+      image_path = Pathname.new(File.expand_path(image.file))
+      images_path = Pathname.new(File.expand_path(Compass.configuration.images_path))
+      quoted_string(image_path.relative_path_from(images_path).to_s)
     else
       missing_image!(map, sprite)
     end

data/lib/compass/sprite_importer.rb

@@ -52,7 +52,7 @@ module Compass
       [self.class.name + ":sprite:" + File.dirname(File.expand_path(uri)), File.basename(uri)]
     end
 
-    def public_url
+    def public_url(*args)
       nil
     end
 

data/lib/compass/version.rb

@@ -1,44 +1,42 @@
+require 'compass/generated_version'
 module Compass
   module Version
-    # Returns a hash representing the semantic version of the current compass release.
-    # See http://semver.org/ for more details.
-    #
-    # The :major, :minor, and :patch keys have their respective release numbers.
-    # The :string key contains a human-readable string representation of the version.
-    # The :prerelease key will have the current pre-release state
-    # The :build key will have the current pre-release build
-    def version
-      @version ||= read_version
-    end
-
-    protected
-
     def scope(file) # :nodoc:
       File.join(File.dirname(__FILE__), '..', '..', file)
     end
 
-    def read_version
-      version_file = File.exist?(scope("RELEASE_VERSION")) ? scope("RELEASE_VERSION") : scope("VERSION")
-      v = File.read(version_file).strip
-      segments = v.split(".")
-      version_hash = {:string => v}
-      version_hash[:major] = segments.shift
-      version_hash[:minor] = segments.shift
-      version_hash[:patch] = segments.shift
-      version_hash[:prerelease] = segments.shift
-      version_hash[:build] = segments.shift
-      version_hash
+    def parse_version(version, name)
+      nil_or_int = lambda{|i| i.nil? ? nil : i.to_i}
+      segments = version.split(".")
+      {
+        :string => version,
+        :name => name,
+        :major => nil_or_int.call(segments.shift),
+        :minor => nil_or_int.call(segments.shift),
+        :patch => nil_or_int.call(segments.shift),
+        :state => segments.shift,
+        :iteration => nil_or_int.call(segments.shift)
+      }
+    end
+
+    # Returns a hash representing the version.
+    # The :major, :minor, and :teeny keys have their respective numbers.
+    # The :string key contains a human-readable string representation of the version.
+    # The :rev key will have the current revision hash.
+    #
+    # This method swiped from Haml and then modified, some credit goes to Nathan Weizenbaum
+    def version
+      Compass::VERSION_DETAILS
     end
   end
 
   extend Compass::Version
 
-  def self.const_missing(const)
-    # This avoid reading from disk unless the VERSION is requested.
-    if const == :VERSION
-      version[:string]
-    else
-      super
-    end
+  unless defined?(VERSION)
+    VERSION = File.read(scope("VERSION")).strip 
+    VERSION_NAME = File.read(scope("VERSION_NAME")).strip
   end
+
+  VERSION_DETAILS = parse_version(VERSION, VERSION_NAME)
+
 end

data/test/fixtures/stylesheets/compass/css/background-clip.css

@@ -1,9 +1,11 @@
 .background-clip {
   -moz-background-clip: border;
+  -o-background-clip: border-box;
   -webkit-background-clip: border;
   background-clip: border-box; }
 
 .background-clip-multiple {
   -moz-background-clip: border, padding, content;
+  -o-background-clip: border-box, padding-box, content-box;
   -webkit-background-clip: border, padding, content;
   background-clip: border-box, padding-box, content-box; }

data/test/fixtures/stylesheets/compass/css/background-origin.css

@@ -1,9 +1,11 @@
 .background-origin {
   -moz-background-origin: border;
+  -o-background-origin: border-box;
   -webkit-background-origin: border;
   background-origin: border-box; }
 
 .background-origin-multiple {
   -moz-background-origin: border, padding, content;
+  -o-background-origin: border-box, padding-box, content-box;
   -webkit-background-origin: border, padding, content;
   background-origin: border-box, padding-box, content-box; }

data/test/fixtures/stylesheets/compass/css/background-size.css

@@ -1,14 +1,17 @@
 .background-size-default {
   -moz-background-size: 100% auto;
+  -o-background-size: 100% auto;
   -webkit-background-size: 100% auto;
   background-size: 100% auto; }
 
 .background-size-single {
   -moz-background-size: 50% 25%;
+  -o-background-size: 50% 25%;
   -webkit-background-size: 50% 25%;
   background-size: 50% 25%; }
 
 .background-size-multiple {
   -moz-background-size: 4em 3em, 100% auto, 50%;
+  -o-background-size: 4em 3em, 100% auto, 50%;
   -webkit-background-size: 4em 3em, 100% auto, 50%;
   background-size: 4em 3em, 100% auto, 50%; }

data/test/fixtures/stylesheets/compass/css/browser-support.css

@@ -7,6 +7,7 @@
   border-radius: -webkit;
   border-radius-unprefixed-at: "2.2";
   css-animation: -webkit;
+  css-appearance: -webkit;
   css-boxshadow: -webkit;
   css-boxshadow-unprefixed-at: "4";
   css-canvas: -webkit;
@@ -31,8 +32,9 @@
   user-select-none: -webkit; }
 
 .android-chrome {
-  versions: "0";
+  versions: "36";
   css-animation: -webkit;
+  css-appearance: -webkit;
   css-canvas: -webkit;
   css-filters: -webkit;
   css-masks: -webkit;
@@ -42,12 +44,12 @@
   intrinsic-width: -webkit;
   multicolumn: -webkit;
   text-stroke: -webkit;
-  transforms2d: -webkit;
   transforms3d: -webkit;
   user-select-none: -webkit; }
 
 .android-firefox {
-  versions: "0";
+  versions: "31";
+  css-appearance: -moz;
   css-hyphens: -moz;
   css-placeholder: -moz;
   css3-tabsize: -moz;
@@ -64,6 +66,7 @@
   border-image-unprefixed-at: "10";
   calc: -webkit;
   css-animation: -webkit;
+  css-appearance: -webkit;
   css-boxshadow: -webkit;
   css-boxshadow-unprefixed-at: "10";
   css-canvas: -webkit;
@@ -86,7 +89,7 @@
   user-select-none: -webkit; }
 
 .chrome {
-  versions: "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38";
+  versions: "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39";
   border-image: -webkit;
   border-image-unprefixed-at: "16";
   border-radius: -webkit;
@@ -94,6 +97,7 @@
   calc: -webkit;
   calc-unprefixed-at: "26";
   css-animation: -webkit;
+  css-appearance: -webkit;
   css-boxshadow: -webkit;
   css-boxshadow-unprefixed-at: "10";
   css-canvas: -webkit;
@@ -124,7 +128,7 @@
   user-select-none: -webkit; }
 
 .firefox {
-  versions: "2", "3", "3.5", "3.6", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33";
+  versions: "2", "3", "3.5", "3.6", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34";
   background-img-opts: -moz;
   background-img-opts-unprefixed-at: "4";
   border-image: -moz;
@@ -135,6 +139,7 @@
   calc-unprefixed-at: "16";
   css-animation: -moz;
   css-animation-unprefixed-at: "16";
+  css-appearance: -moz;
   css-boxshadow: -moz;
   css-boxshadow-unprefixed-at: "4";
   css-gradients: -moz;
@@ -152,6 +157,7 @@
   css3-boxsizing-unprefixed-at: "29";
   css3-tabsize: -moz;
   font-feature: -moz;
+  font-feature-unprefixed-at: "32";
   inline-block: prefix-no-longer-needed;
   inline-block-unprefixed-at: "3";
   intrinsic-width: -moz;
@@ -190,6 +196,7 @@
   calc: -webkit;
   calc-unprefixed-at: "7.0-7.1";
   css-animation: -webkit;
+  css-appearance: -webkit;
   css-boxshadow: -webkit;
   css-boxshadow-unprefixed-at: "5.0-5.1";
   css-canvas: -webkit;
@@ -210,7 +217,6 @@
   css3-boxsizing: -webkit;
   css3-boxsizing-unprefixed-at: "5.0-5.1";
   flexbox: -webkit;
-  font-feature: -webkit;
   intrinsic-width: -webkit;
   multicolumn: -webkit;
   text-size-adjust: -webkit;
@@ -226,6 +232,7 @@
   border-image: -webkit;
   border-image-unprefixed-at: "15";
   css-animation: -webkit;
+  css-appearance: -webkit;
   css-canvas: -webkit;
   css-filters: -webkit;
   css-gradients: -webkit;
@@ -250,7 +257,9 @@
   text-overflow-unprefixed-at: "11";
   text-stroke: -webkit;
   transforms2d: -webkit;
+  transforms2d-unprefixed-at: "23";
   transforms3d: -webkit;
+  transforms3d-unprefixed-at: "23";
   user-select-none: -webkit; }
 
 .opera-mini {
@@ -258,10 +267,11 @@
   text-overflow: -o; }
 
 .opera-mobile {
-  versions: "10", "11.5", "12", "12.1", "0";
+  versions: "10", "11.5", "12", "12.1", "22";
   border-image: -o;
-  border-image-unprefixed-at: "0";
+  border-image-unprefixed-at: "22";
   css-animation: prefix-no-longer-needed;
+  css-appearance: prefix-no-longer-needed;
   css-canvas: prefix-no-longer-needed;
   css-filters: prefix-no-longer-needed;
   css-gradients: prefix-no-longer-needed;
@@ -271,15 +281,15 @@
   css-reflections: prefix-no-longer-needed;
   css-repeating-gradients: prefix-no-longer-needed;
   css-repeating-gradients-unprefixed-at: "12.1";
-  css-transitions: prefix-no-longer-needed;
+  css-transitions: -o;
   css-transitions-unprefixed-at: "12.1";
   css3-tabsize: -o;
-  css3-tabsize-unprefixed-at: "0";
+  css3-tabsize-unprefixed-at: "22";
   font-feature: prefix-no-longer-needed;
   intrinsic-width: prefix-no-longer-needed;
   multicolumn: prefix-no-longer-needed;
   object-fit: -o;
-  object-fit-unprefixed-at: "0";
+  object-fit-unprefixed-at: "22";
   text-overflow: -o;
   text-overflow-unprefixed-at: "12.1";
   text-stroke: prefix-no-longer-needed;
@@ -296,6 +306,7 @@
   calc: -webkit;
   calc-unprefixed-at: "6.1";
   css-animation: -webkit;
+  css-appearance: -webkit;
   css-boxshadow: -webkit;
   css-boxshadow-unprefixed-at: "5.1";
   css-canvas: -webkit;