compass 0.11.beta.2 → 0.11.beta.3

data/frameworks/compass/stylesheets/compass/utilities/lists/_horizontal-list.scss

@@ -1,61 +1,3 @@
-// Horizontal list layout module.
-//
-// Easy mode using simple descendant li selectors:
-//
-//   ul.nav
-//     +horizontal-list
-//
-// Advanced mode:
-// If you need to target the list items using a different selector then use
-// +horizontal-list-container on your ul/ol and +horizontal-list-item on your li.
-// This may help when working on layouts involving nested lists. For example:
-//
-//   ul.nav
-//     +horizontal-list-container
-//     > li
-//       +horizontal-list-item
+@warn "This import is deprecated. Use 'compass/typography/lists/horizontal-list' instead.";
 
-@import "bullets";
-@import "compass/utilities/general/clearfix";
-@import "compass/utilities/general/reset";
-@import "compass/utilities/general/float";
-
-// Can be mixed into any selector that target a ul or ol that is meant
-// to have a horizontal layout. Used to implement +horizontal-list.
-@mixin horizontal-list-container {
-  @include reset-box-model;
-  @include clearfix; }
-
-// Can be mixed into any li selector that is meant to participate in a horizontal layout.
-// Used to implement +horizontal-list.
-//
-// :last-child is not fully supported
-// see http://www.quirksmode.org/css/contents.html#t29 for the support matrix
-// 
-// IE8 ignores rules that are included on the same line as :last-child
-// see http://www.richardscarrott.co.uk/posts/view/ie8-last-child-bug for details
-//
-// Setting `$padding` to `false` disables the padding between list elements
-@mixin horizontal-list-item($padding: 4px, $direction: left) {
-  @include no-bullet;
-  white-space: nowrap;
-  @include float($direction);
-  @if $padding {
-    padding: {
-      left: $padding;
-      right: $padding;
-    }
-    &:first-child, &.first { padding-#{$direction}: 0; }
-    &:last-child { padding-#{opposite-position($direction)}: 0; }
-    &.last { padding-#{opposite-position($direction)}: 0; }
-  }
-}
-
-// A list(ol,ul) that is layed out such that the elements are floated left and won't wrap.
-// This is not an inline list.
-//
-// Setting `$padding` to `false` disables the padding between list elements
-@mixin horizontal-list($padding: 4px, $direction: left) {
-  @include horizontal-list-container;
-  li {
-    @include horizontal-list-item($padding, $direction); } }
+@import "../../typography/lists/horizontal-list";

data/frameworks/compass/stylesheets/compass/utilities/lists/_inline-block-list.scss

@@ -1,47 +1,3 @@
-// Inline-Block list layout module.
-//
-// Easy mode using simple descendant li selectors:
-//
-//   ul.nav
-//     +inline-block-list
-//
-// Advanced mode:
-// If you need to target the list items using a different selector then use
-// +inline-block-list-container on your ul/ol and +inline-block-list-item on your li.
-// This may help when working on layouts involving nested lists. For example:
-//
-//   ul.nav
-//     +inline-block-list-container
-//     > li
-//       +inline-block-list-item
+@warn "This import is deprecated. Use 'compass/typography/lists/inline-block-list' instead.";
 
-@import "bullets";
-@import "horizontal-list";
-@import "compass/utilities/general/float";
-@import "compass/css3/inline-block";
-
-// Can be mixed into any selector that target a ul or ol that is meant
-// to have an inline-block layout. Used to implement +inline-block-list.
-@mixin inline-block-list-container {
-  @include horizontal-list-container; }
-
-// Can be mixed into any li selector that is meant to participate in a horizontal layout.
-// Used to implement +inline-block-list.
-
-@mixin inline-block-list-item($padding: false) {
-  @include no-bullet;
-  @include inline-block;
-  white-space: nowrap;
-  @if $padding {
-    padding: {
-      left: $padding;
-      right: $padding;
-    };    
-  }
-}
-
-// A list(ol,ul) that is layed out such that the elements are inline-block and won't wrap.
-@mixin inline-block-list($padding: false) {
-  @include inline-block-list-container;
-  li {
-    @include inline-block-list-item($padding); } }
+@import "../../typography/lists/inline-block-link";

data/frameworks/compass/stylesheets/compass/utilities/lists/_inline-list.scss

@@ -1,35 +1,3 @@
-// makes a list inline.
+@warn "This import is deprecated. Use 'compass/typography/lists/inline-list' instead.";
 
-@mixin inline-list {
-  list-style-type: none;
-  &, & li {
-    margin: 0px;
-    padding: 0px;
-    display: inline;
-  }
-}
-
-// makes an inline list that is comma delimited.
-// Please make note of the browser support issues before using this mixin.
-//
-// use of `content` and `:after` is not fully supported in all browsers.
-// See quirksmode for the [support matrix](http://www.quirksmode.org/css/contents.html#t15)
-//
-// `:last-child` is not fully supported.
-// see quirksmode for the [support matrix](http://www.quirksmode.org/css/contents.html#t29).
-//
-// IE8 ignores rules that are included on the same line as :last-child
-// see http://www.richardscarrott.co.uk/posts/view/ie8-last-child-bug for details
-
-@mixin comma-delimited-list {
-  @include inline-list;
-  li {
-    &:after { content: ", "; }
-    &:last-child {
-      &:after { content: ""; }
-    }
-    &.last {
-      &:after { content: ""; }
-    }
-  }
-}
+@import "../../typography/lists/inline-list";

data/frameworks/compass/stylesheets/compass/utilities/text/_ellipsis.scss

@@ -1,25 +1,3 @@
-@import "compass/css3/shared";
+@warn "This import is deprecated. Use 'compass/typography/text/ellipsis' instead.";
 
-// To get full firefox support, you must install the ellipsis pattern:
-//
-//     compass install compass/ellipsis
-$use-mozilla-ellipsis-binding: false !default;
-
-// This technique, by [Justin Maxwell](http://code404.com/), was originally
-// published [here](http://mattsnider.com/css/css-string-truncation-with-ellipsis/).
-// Firefox implementation by [Rikkert Koppes](http://www.rikkertkoppes.com/thoughts/2008/6/).
-@mixin ellipsis($no-wrap: true) {
-  @if $no-wrap { white-space: nowrap; }
-  overflow: hidden;
-  @include experimental(text-overflow, ellipsis,
-    not -moz,
-    not -webkit,
-    -o,
-    -ms,
-    not -khtml,
-    official
-  );
-  @if $experimental-support-for-mozilla and $use-mozilla-ellipsis-binding {
-    -moz-binding: stylesheet-url(unquote("xml/ellipsis.xml#ellipsis"));    
-  }
-}
+@import "../../typography/text/ellipsis";

data/frameworks/compass/stylesheets/compass/utilities/text/_nowrap.scss

@@ -1,2 +1,3 @@
-// When remembering whether or not there's a hyphen in white-space is too hard
-@mixin nowrap { white-space: nowrap; }
+@warn "This import is deprecated. Use 'compass/typography/text/nowrap' instead.";
+
+@import "../../typography/text/nowrap";

data/frameworks/compass/stylesheets/compass/utilities/text/_replacement.scss

@@ -1,34 +1,3 @@
-// Hides html text and replaces it with an image.
-// If you use this on an inline element, you will need to change the display to block or inline-block.
-// Also, if the size of the image differs significantly from the font size, you'll need to set the width and/or height.
-//
-// Parameters:
-//
-// * `img` -- the relative path from the project image directory to the image.
-// * `x` -- the x position of the background image.
-// * `y` -- the y position of the background image.
-@mixin replace-text($img, $x: 50%, $y: 50%) {
-  @include hide-text;
-  background: {
-    image: image-url($img);
-    repeat: no-repeat;
-    position: $x $y;
-  };
-}
+@warn "This import is deprecated. Use 'compass/typography/text/replacement' instead.";
 
-// Like the `replace-text` mixin, but also sets the width
-// and height of the element according the dimensions of the image.
-@mixin replace-text-with-dimensions($img, $x: 50%, $y: 50%) {
-  @include replace-text($img, $x, $y);
-  width: image-width($img);
-  height: image-height($img);
-}
-
-// Hides text in an element so you can see the background.
-@mixin hide-text {
-  $approximate_em_value: 12px / 1em;
-  $wider_than_any_screen: -9999em;
-  text-indent: $wider_than_any_screen * $approximate_em_value;
-  overflow: hidden;
-  text-align: left;
-}
+@import "../../typography/text/replacement";

data/frameworks/compass/templates/ellipsis/ellipsis.sass

@@ -1,7 +1,7 @@
 // Since you've installed the xml file, you should set
 // $use-mozilla-ellipsis-binding to true before importing.
 $use-mozilla-ellipsis-binding: true
-@import compass/utilities/text/ellipsis
+@import compass/typography/text/ellipsis
 
 // You can delete this sass file if you want, it's just an example of how to use the ellipsis mixin.
 // By default, ellipsis text is no-wrap. Pass false as the first argument if you don't want that.

data/frameworks/compass/templates/pie/manifest.rb

@@ -1,4 +1,4 @@
-description "Plugin for cross-browser ellipsis truncated text."
+description "Integration with http://css3pie.com/"
 
 file 'PIE.htc', :like => :css
 stylesheet 'pie.scss', :erb => true

data/lib/compass.rb

@@ -5,6 +5,8 @@ end
   require "compass/#{lib}"
 end
 
+require 'sass/callbacks'
+
 module Compass
   def base_directory
     File.expand_path(File.join(File.dirname(__FILE__), '..'))

data/lib/compass/compiler.rb

@@ -3,7 +3,7 @@ module Compass
 
     include Actions
 
-    attr_accessor :working_path, :from, :to, :options
+    attr_accessor :working_path, :from, :to, :options, :staleness_checker, :importer
 
     def initialize(working_path, from, to, options)
       self.working_path = working_path
@@ -12,6 +12,8 @@ module Compass
       self.options = options
       self.options[:cache_location] ||= determine_cache_location
       Compass.configure_sass_plugin!
+      self.importer = Sass::Importers::Filesystem.new(from)
+      self.staleness_checker = Sass::Plugin::StalenessChecker.new(options)
     end
 
     def determine_cache_location
@@ -23,6 +25,10 @@ module Compass
       @sass_files = self.options[:sass_files] || Dir.glob(separate("#{from}/**/#{'[^_]' if exclude_partials}*.s[ac]ss"))
     end
 
+    def relative_stylesheet_name(sass_file)
+      sass_file[("#{from}/".length)..-1]
+    end
+
     def stylesheet_name(sass_file)
       sass_file[("#{from}/".length)..-6]
     end
@@ -42,11 +48,15 @@ module Compass
     # Returns the sass file that needs to be compiled, if any.
     def out_of_date?
       sass_files.zip(css_files).each do |sass_filename, css_filename|
-        return sass_filename if Sass::Plugin.send(:stylesheet_needs_update?, css_filename, sass_filename)
+        return sass_filename if needs_update?(css_filename, sass_filename)
       end
       false
     end
 
+    def needs_update?(css_filename, sass_filename)
+      staleness_checker.stylesheet_needs_update?(css_filename, relative_stylesheet_name(sass_filename), importer)
+    end
+
     # Determines if the configuration file is newer than any css file
     def new_config?
       config_file = Compass.detect_configuration_file
@@ -119,10 +129,11 @@ module Compass
       end
       duration = additional_options[:time] ? "(#{(css_content.__duration * 1000).round / 1000.0}s)" : ""
       write_file(css_filename, css_content, options.merge(:force => true, :extra => duration))
+      Compass.configuration.run_callback(:stylesheet_saved, css_filename)
     end
 
     def should_compile?(sass_filename, css_filename)
-      options[:force] || Sass::Plugin.send(:stylesheet_needs_update?, css_filename, sass_filename)
+      options[:force] || needs_update?(css_filename, sass_filename)
     end
 
     # A sass engine for compiling a single file.
@@ -136,7 +147,10 @@ module Compass
     # formatted to display in the browser (in development mode)
     # if there's an error.
     def handle_exception(sass_filename, css_filename, e)
-      logger.record :error, basename(sass_filename), "(Line #{e.sass_line}: #{e.message})"
+      formatted_error = "(Line #{e.sass_line}: #{e.message})"
+      file = basename(sass_filename)
+      logger.record :error, file, formatted_error
+      Compass.configuration.run_callback(:styesheet_error, sass_filename, formatted_error)
       write_file css_filename, error_contents(e, sass_filename), options.merge(:force => true)
     end
 

data/lib/compass/configuration.rb

@@ -43,6 +43,6 @@ module Compass
   end
 end
 
-['adapters', 'comments', 'defaults', 'helpers', 'inheritance', 'serialization', 'paths', 'data'].each do |lib|
+['adapters', 'comments', 'defaults', 'helpers', 'inheritance', 'serialization', 'paths', 'data', 'file_data'].each do |lib|
   require "compass/configuration/#{lib}"
 end

data/lib/compass/configuration/data.rb

@@ -135,6 +135,16 @@ module Compass
         relative_assets || http_images_path == :relative
       end
 
+      def run_callback(event, *args)
+        begin
+          send(:"run_#{event}", *args)
+        rescue NoMethodError => e
+          unless e.message =~ /run_#{event}/
+            raise
+          end
+        end
+      end
+
       private
 
       def assert_valid_keys!(attr_hash)

data/lib/compass/configuration/file_data.rb

@@ -0,0 +1,43 @@
+module Compass
+  module Configuration
+    class FileData < Data
+      extend Sass::Callbacks
+
+      # on_sprite_generated
+      # yields the filename
+      # usage: on_sprite_save {|filename| do_somethign(filename) }
+      define_callback :sprite_saved
+
+      # on_sprite_generated
+      # yields 'ChunkyPNG::Image'
+      # usage: on_sprite_generated {|sprite_data| do_something(sprite_data) }
+      define_callback :sprite_generated
+
+      # on_stylesheet_saved
+      # yields the filename
+      # usage: on_stylesheet_saved {|filename| do_something(filename) }
+      define_callback :stylesheet_saved
+
+      # on_stylesheet_error
+      # yields the filename & message
+      # usage: on_stylesheet_error {|filename, message| do_something(filename, message) }
+      define_callback :stylesheet_error
+
+      def self.new_from_file(config_file, defaults = nil)
+        data = new(config_file)
+        data.with_defaults(defaults) do
+          data._parse(config_file)
+        end
+        data
+      end
+
+      def self.new_from_string(contents, filename, defaults = nil)
+        data = new(filename)
+        data.with_defaults(defaults) do
+          data.parse_string(contents, filename)
+        end
+        data
+      end
+    end
+  end
+end

data/lib/compass/configuration/helpers.rb

@@ -34,11 +34,11 @@ module Compass
           config
         elsif config.respond_to?(:read)
           filename ||= config.to_s if config.is_a?(Pathname)
-          Compass::Configuration::Data.new_from_string(config.read, filename, defaults)
+          Compass::Configuration::FileData.new_from_string(config.read, filename, defaults)
         elsif config.is_a?(Hash)
           Compass::Configuration::Data.new(filename, config)
         elsif config.is_a?(String)
-          Compass::Configuration::Data.new_from_file(config, defaults)
+          Compass::Configuration::FileData.new_from_file(config, defaults)
         elsif config.is_a?(Symbol)
           Compass::AppIntegration.lookup(config).configuration
         else
@@ -65,6 +65,12 @@ module Compass
             Sass::Plugin.add_template_location sass_dir, css_dir
           end
         end
+        Sass::Plugin.on_updating_stylesheet do |sass_file, css_file|
+          Compass.configuration.run_callback(:stylesheet_saved, css_file)
+        end
+        Sass::Plugin.on_compilation_error do |e, filename, css|
+          Compass.configuration.run_callback(:stylesheet_error, filename, e.message)
+        end
       end
 
       def sass_engine_options

data/lib/compass/configuration/inheritance.rb

@@ -141,9 +141,9 @@ module Compass
           end
         end
 
-        def method_missing(meth)
+        def method_missing(meth, *args, &block)
           if inherited_data
-            inherited_data.send(meth)
+            inherited_data.send(meth, *args, &block)
           else
             raise NoMethodError, meth.to_s
           end

data/lib/compass/configuration/serialization.rb

@@ -2,100 +2,75 @@ module Compass
   module Configuration
     # The serialization module manages reading and writing the configuration file(s).
     module Serialization
-      def self.included(base)
-        base.send(:include, InstanceMethods)
-        base.extend ClassMethods
+      def parse(config_file)
+        raise Compass::Error, "Compass.configuration.parse(filename) has been removed. Please call Compass.add_project_configuration(filename) instead."
       end
 
-      module ClassMethods
-        def new_from_file(config_file, defaults = nil)
-          data = Data.new(config_file)
-          data.with_defaults(defaults) do
-            data._parse(config_file)
-          end
-          data
+      # parses a configuration file which is a ruby script
+      def _parse(config_file)
+        unless File.readable?(config_file)
+          raise Compass::Error, "Configuration file, #{config_file}, not found or not readable."
         end
-
-        def new_from_string(contents, filename, defaults = nil)
-          data = Data.new(filename)
-          data.with_defaults(defaults) do
-            data.parse_string(contents, filename)
-          end
-          data
+        open(config_file) do |f|
+          parse_string(f.read, config_file)
         end
       end
 
-      module InstanceMethods
-        def parse(config_file)
-          raise Compass::Error, "Compass.configuration.parse(filename) has been removed. Please call Compass.add_project_configuration(filename) instead."
+      def parse_string(contents, filename)
+        bind = binding
+        eval(contents, bind, filename)
+        ATTRIBUTES.each do |prop|
+          value = eval(prop.to_s, bind) rescue nil
+          value = value.to_s if value.is_a?(Pathname)
+          self.send("#{prop}=", value) unless value.nil?
         end
-
-        # parses a configuration file which is a ruby script
-        def _parse(config_file)
-          unless File.readable?(config_file)
-            raise Compass::Error, "Configuration file, #{config_file}, not found or not readable."
-          end
-          open(config_file) do |f|
-            parse_string(f.read, config_file)
-          end
+        if @added_import_paths
+          self.additional_import_paths ||= []
+          self.additional_import_paths += @added_import_paths
         end
+        issue_deprecation_warnings
+      end
 
-        def parse_string(contents, filename)
-          bind = binding
-          eval(contents, bind, filename)
-          ATTRIBUTES.each do |prop|
-            value = eval(prop.to_s, bind) rescue nil
-            value = value.to_s if value.is_a?(Pathname)
-            self.send("#{prop}=", value) unless value.nil?
-          end
-          if @added_import_paths
-            self.additional_import_paths ||= []
-            self.additional_import_paths += @added_import_paths
-          end
-          issue_deprecation_warnings
+      def serialize
+        contents = ""
+        (required_libraries || []).each do |lib|
+          contents << %Q{require '#{lib}'\n}
         end
-
-        def serialize
-          contents = ""
-          (required_libraries || []).each do |lib|
-            contents << %Q{require '#{lib}'\n}
-          end
-          (loaded_frameworks || []).each do |lib|
-            contents << %Q{load '#{lib}'\n}
+        (loaded_frameworks || []).each do |lib|
+          contents << %Q{load '#{lib}'\n}
+        end
+        (framework_path || []).each do |lib|
+          contents << %Q{discover '#{lib}'\n}
+        end
+        contents << "# Require any additional compass plugins here.\n"
+        contents << "\n" if (required_libraries || []).any?
+        ATTRIBUTES.each do |prop|
+          value = send("#{prop}_without_default")
+          if value.is_a?(Proc)
+            $stderr.puts "WARNING: #{prop} is code and cannot be written to a file. You'll need to copy it yourself."
           end
-          (framework_path || []).each do |lib|
-            contents << %Q{discover '#{lib}'\n}
+          if respond_to?("comment_for_#{prop}")
+            contents << send("comment_for_#{prop}")
           end
-          contents << "# Require any additional compass plugins here.\n"
-          contents << "\n" if (required_libraries || []).any?
-          ATTRIBUTES.each do |prop|
-            value = send("#{prop}_without_default")
-            if value.is_a?(Proc)
-              $stderr.puts "WARNING: #{prop} is code and cannot be written to a file. You'll need to copy it yourself."
-            end
-            if respond_to?("comment_for_#{prop}")
-              contents << send("comment_for_#{prop}")
-            end
-            if block_given? && (to_emit = yield(prop, value))
-              contents << to_emit
-            else
-              contents << serialize_property(prop, value) unless value.nil?
-            end
+          if block_given? && (to_emit = yield(prop, value))
+            contents << to_emit
+          else
+            contents << serialize_property(prop, value) unless value.nil?
           end
-          contents
         end
+        contents
+      end
 
-        def serialize_property(prop, value)
-          %Q(#{prop} = #{value.inspect}\n)
-        end
+      def serialize_property(prop, value)
+        %Q(#{prop} = #{value.inspect}\n)
+      end
 
-        def issue_deprecation_warnings
-          if http_images_path == :relative
-            $stderr.puts "DEPRECATION WARNING: Please set relative_assets = true to enable relative paths."
-          end
+      def issue_deprecation_warnings
+        if http_images_path == :relative
+          $stderr.puts "DEPRECATION WARNING: Please set relative_assets = true to enable relative paths."
         end
-
       end
+
     end
   end
 end