compass 0.13.alpha.4 → 0.13.alpha.5

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

@@ -5,6 +5,7 @@ module Compass
         ACTIVE = %r{[_-]active$}
         TARGET = %r{[_-]target$}
         HOVER = %r{[_-]hover$}
+        FOCUS = %r{[_-]focus$}
         PARENT = %r{(.+)[-_](.+)$}
 
         REPEAT_X = 'repeat-x'
@@ -114,7 +115,7 @@ module Compass
         
         # Hover selector Image object if exsists
         def hover
-          base.image_for("#{name}_hover")
+          base.get_magic_selector_image(name, 'hover')
         end
         
         # Is target selector
@@ -124,7 +125,7 @@ module Compass
         
         # Target selector Image object if exsists
         def target
-          base.image_for("#{name}_target")
+          base.get_magic_selector_image(name, 'target')
         end
         
         # Is active selector
@@ -134,12 +135,21 @@ module Compass
         
         # Active selector Image object if exsists
         def active
-          base.image_for("#{name}_active")
+          base.get_magic_selector_image(name, 'active')
+        end
+
+        # Is active selector
+        def focus?
+          name =~ FOCUS
         end
         
+        # Active selector Image object if exsists
+        def focus
+          base.get_magic_selector_image(name, 'focus')
+        end
         
         def parent
-          if [hover?, target?, active?].any?
+          if [hover?, target?, active?, focus?].any?
             PARENT.match name
             base.image_for($1)
           end

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

@@ -13,19 +13,35 @@ module Compass
 
          # Returns true if the image name has a hover selector image
          def has_hover?(name)
-           !image_for("#{name}_hover").nil?
+           !get_magic_selector_image(name, 'hover').nil?
          end
 
          # Returns true if the image name has a target selector image
          def has_target?(name)
-           !image_for("#{name}_target").nil?
+           !get_magic_selector_image(name, 'target').nil?
+         end
+
+         # Returns true if the image name has a focus selector image
+         def has_focus?(name)
+           !get_magic_selector_image(name, 'focus').nil?
          end
 
          # Returns true if the image name has an active selector image
          def has_active?(name)
-           !image_for("#{name}_active").nil?
+           !get_magic_selector_image(name, 'active').nil?
          end
 
+         SEPERATORS = ['_', '-']
+
+         def get_magic_selector_image(name, selector)
+          SEPERATORS.each do |seperator|
+            file = image_for("#{name}#{seperator}#{selector}")
+            return file if !file.nil?
+          end
+
+          nil
+        end
+
          # Return and array of image names that make up this sprite
          def sprite_names
            image_names.map { |f| File.basename(f, '.png') }

data/lib/compass/sprite_importer/content.erb

@@ -2,7 +2,6 @@
 
 // General Sprite Defaults
 // You can override them before you import this file.
-$<%= name %>-sprite-base-class : ".<%= name %>-sprite" !default;
 $<%= name %>-sprite-dimensions : false !default;
 $<%= name %>-use-percentages   : false !default;
 $<%= name %>-position          : 0% !default;
@@ -13,6 +12,8 @@ $<%= name %>-clean-up          : true !default;
 $<%= name %>-layout            : vertical !default;
 $<%= name %>-inline            : false !default;
 $<%= name %>-sort-by           : 'none' !default;
+$<%= name %>-class-separator   : $default-sprite-separator !default;
+$<%= name %>-sprite-base-class : ".<%= name %>#{$<%= name %>-class-separator}sprite" !default;
 
 <% if skip_overrides %> 
   $<%= name %>-sprites: sprite-map("<%= uri %>", $layout: $<%= name %>-layout, $cleanup: $<%= name %>-clean-up, $spacing: $<%= name %>-spacing, $position : $<%= name %>-position);
@@ -71,16 +72,16 @@ $<%= name %>-sort-by           : 'none' !default;
 
 // Extends the sprite base class and set the background position for the desired sprite.
 // It will also apply the image dimensions if $dimensions is true.
-@mixin <%= name %>-sprite($name, $dimensions: $<%= name %>-sprite-dimensions, $offset-x: 0, $offset-y: 0, $use-percentages: $<%= name %>-use-percentages) {
+@mixin <%= name %>-sprite($name, $dimensions: $<%= name %>-sprite-dimensions, $offset-x: 0, $offset-y: 0, $use-percentages: $<%= name %>-use-percentages, $separator: $<%= name %>-class-separator) {
   @extend #{$<%= name %>-sprite-base-class};
-  @include sprite($<%= name %>-sprites, $name, $dimensions, $offset-x, $offset-y, $use-percentages);
+  @include sprite($<%= name %>-sprites, $name, $dimensions, $offset-x, $offset-y, $use-percentages, $separator: $separator);
 }
 
-@mixin <%= name %>-sprites($sprite-names, $dimensions: $<%= name %>-sprite-dimensions, $prefix: sprite-map-name($<%= name %>-sprites), $offset-x: 0, $offset-y: 0, $use-percentages: $<%= name %>-use-percentages) {
-  @include sprites($<%= name %>-sprites, $sprite-names, $<%= name %>-sprite-base-class, $dimensions, $prefix, $offset-x, $offset-y, $use-percentages)
+@mixin <%= name %>-sprites($sprite-names, $dimensions: $<%= name %>-sprite-dimensions, $prefix: sprite-map-name($<%= name %>-sprites), $offset-x: 0, $offset-y: 0, $use-percentages: $<%= name %>-use-percentages, $separator: $<%= name %>-class-separator) {
+  @include sprites($<%= name %>-sprites, $sprite-names, $<%= name %>-sprite-base-class, $dimensions, $prefix, $offset-x, $offset-y, $use-percentages, $separator: $separator)
 }
 
 // Generates a class for each sprited image.
-@mixin all-<%= name %>-sprites($dimensions: $<%= name %>-sprite-dimensions, $prefix: sprite-map-name($<%= name %>-sprites), $offset-x: 0, $offset-y: 0, $use-percentages: $<%= name %>-use-percentages) {
-  @include <%= name %>-sprites(<%= sprite_names.join(" ") %>, $dimensions, $prefix, $offset-x, $offset-y, $use-percentages);
+@mixin all-<%= name %>-sprites($dimensions: $<%= name %>-sprite-dimensions, $prefix: sprite-map-name($<%= name %>-sprites), $offset-x: 0, $offset-y: 0, $use-percentages: $<%= name %>-use-percentages, $separator: $<%= name %>-class-separator) {
+  @include <%= name %>-sprites(<%= sprite_names.join(" ") %>, $dimensions, $prefix, $offset-x, $offset-y, $use-percentages, $separator: $separator);
 }

data/lib/compass/watcher/project_watcher.rb

@@ -8,7 +8,7 @@ module Compass
       ALL_CHILDREN_SASS_FILTER = File.join('**', SASS_FILTER)
       POLLING_MESSAGE = 'Compass is polling for changes'
 
-      attr_reader :options, :project_path, :watcher_compiler, :listener, :poll, :css_dir, :sass_watchers
+      attr_reader :options, :project_path, :watcher_compiler, :listener, :poll, :css_dir, :watchers
 
       alias :working_path :project_path
 
@@ -22,83 +22,86 @@ module Compass
         @options          = options
         @project_path     = project_path
         @css_dir          = Compass.configuration.css_dir
-        @sass_watchers    = create_sass_watchers + watches
+        @watchers         = [SassWatch.new(&method(:sass_callback))] + watches
         @watcher_compiler = Compass::Watcher::Compiler.new(project_path, options)
         setup_listener
       end
 
       def watch!
-        listener.start
+        listener.start!
       rescue Interrupt
-        log_action(:info, "Good bye!", options)
+        logger.log "\nHappy Styling!"
         listener.stop
       end
 
     private #============================================================================>
 
       def setup_listener
-        @listener = Listen.to(@project_path, :relative_paths => true)
-        if poll
-          @listener = listener.force_polling(true)
-        end
+        @listener = Listen::Listener.new(directories_to_watch,
+                                         :relative_paths => false)
+        @listener = listener.force_polling(true) if poll
         @listener = listener.polling_fallback_message(POLLING_MESSAGE)
         @listener = listener.ignore(/\.css$/)
         @listener = listener.change(&method(:listen_callback))
       end
 
-      def create_sass_watchers
-        watches = []
-        Compass.configuration.sass_load_paths.map do |load_path|
-          load_path = load_path.root if load_path.respond_to?(:root)
-          next unless load_path.is_a? String
-          next unless load_path.include? project_path
-          load_path = Pathname.new(load_path).relative_path_from(Pathname.new(project_path))
-          filter = File.join(load_path, SASS_FILTER)
-          children = File.join(load_path, ALL_CHILDREN_SASS_FILTER)
-          if filter.match(%r{^./})
-            watches << Watcher::Watch.new(SASS_FILTER, &method(:sass_callback))
+      def directories_to_watch
+        [Compass.configuration.sass_path] + Compass.configuration.sass_load_paths.map{|p| p.respond_to?(:root) ? p.root : nil}.compact
+      end
+
+      def listen_callback(modified_files, added_files, removed_files)
+        #log_action(:info, ">>> Listen Callback fired added: #{added_files}, mod: #{modified_files}, rem: #{removed_files}", {})
+        files = {:modified => modified_files,
+                 :added    => added_files,
+                 :removed  => removed_files}
+
+        run_once, run_each = watchers.partition {|w| w.run_once_per_changeset?}
+
+        run_once.each do |watcher|
+          if file = files.values.flatten.detect{|f| watcher.match?(f) }
+            action = files.keys.detect{|k| files[k].include?(file) }
+            watcher.run_callback(project_path, relative_to(file, project_path), action)
           end
-          watches << Watcher::Watch.new(filter, &method(:sass_callback))
-          watches << Watcher::Watch.new(children, &method(:sass_callback))
         end
-        watches.compact
-      end
 
-      def listen_callback(modified_file, added_file, removed_file)
-        #log_action(:info, ">>> Listen Callback fired added: #{added_file}, mod: #{modified_file}, rem: #{removed_file}", {})
-        action = nil
-        action ||= :modified unless modified_file.empty?
-        action ||= :added unless added_file.empty?
-        action ||= :removed unless removed_file.empty?
-
-        files = modified_file + added_file + removed_file
-        # run watchers
-        sass_watchers.each do |watcher|
-          files.each do |file|
-            watcher.run_callback(project_path, file, action) if watcher.match?(file)
+        run_each.each do |watcher|
+          files.each do |action, list|
+            list.each do |file|
+              if watcher.match?(file)
+                watcher.run_callback(project_path, relative_to(file, project_path), action)
+              end
+            end
           end
         end
       end
 
       def sass_callback(base, file, action)
         #log_action(:info, ">>> Sass Callback fired #{action}, #{file}", {})
-        sass_modified(file) if action == :modified
-        sass_added(file) if action == :added
-        sass_removed(file) if action == :removed
+        full_filename = File.expand_path(File.join(base,file))
+        case action
+        when :modified
+          sass_modified(full_filename)
+        when :added
+          sass_added(full_filename)
+        when :removed
+          sass_removed(full_filename)
+        else
+          raise ArgumentError, "Illegal Action: #{action.inspect}"
+        end
       end
 
       def sass_modified(file)
-        log_action(:info, "#{file} was modified", options)
+        log_action(:info, "#{filename_for_display(file)} was modified", options)
         compile
       end
 
       def sass_added(file)
-        log_action(:info, "#{file} was added", options)
+        log_action(:info, "#{filename_for_display(file)} was added", options)
         compile
       end
 
       def sass_removed(file)
-        log_action(:info, "#{file} was removed", options)
+        log_action(:info, "#{filename_for_display(file)} was removed", options)
         css_file = compiler.corresponding_css_file(File.join(project_path, file))
         compile
         if File.exists?(css_file)
@@ -106,6 +109,36 @@ module Compass
         end
       end
 
+      def local_development_locations
+        @local_development_locations ||= begin
+                                          r = [Compass.configuration.sass_path] + Array(Compass.configuration.additional_import_paths)
+                                          r.map!{|l| File.expand_path(l) }
+                                         end
+      end
+
+      def filename_for_display(f)
+        if local_development_locations.detect{|d| in_directory?(d, f) }
+          relative_to_working_directory(f)
+        elsif framework = Frameworks::ALL.detect {|framework| in_directory?(framework.stylesheets_directory, f) }
+          "(#{framework.name}) #{relative_to(f, framework.stylesheets_directory)}"
+        else
+          f
+        end
+      end
+
+      def in_directory?(dir, f)
+        dir && (f[0...(dir.size)] == dir)
+      end
+
+      def relative_to_working_directory(f)
+        relative_to(f, Dir.pwd)
+      end
+
+      def relative_to(f, dir)
+        Pathname.new(f).relative_path_from(Pathname.new(dir))
+      rescue ArgumentError # does not share a common path.
+        f
+      end
     end
   end
-end
+end

data/lib/compass/watcher/watch.rb

@@ -1,33 +1,51 @@
 module Compass
   module Watcher
-    class Watch
-      attr_reader :callback, :glob
+    class BasicWatch
+      attr_reader :callback
 
-      def initialize(glob, &block)
+      def initialize(&block)
+        unless block
+          raise NoCallbackError, "A Block must be supplied in order to be watched"
+        end
         @callback = block
-        @glob     = glob
-        verify!
-      end
-
-      def match?(changed_path)
-        File.fnmatch(glob, changed_path)
       end
 
       def run_callback(base, relative, action)
         callback.call(base, relative, action)
       end
 
-    private
+      def run_once_per_changeset?
+        false
+      end
 
-      def verify!
-        if Pathname.new(glob).absolute?
-          raise AbsolutePathError, "Only paths relative to the project can be watched"
-        end
-        if callback.nil?
-          raise NoCallbackError, "A Block must be supplied in order to be watched"
+      def match?(path)
+        Sass::Util.abstract(self)
+      end
+    end
+
+    class Watch < BasicWatch
+      attr_reader :glob
+
+      def initialize(glob, &block)
+        super(&block)
+        unless glob
+          raise WatcherException, "A glob must be supplied in order to be watched"
         end
+        @glob = glob
       end
 
+      def match?(changed_path)
+        File.fnmatch(glob, changed_path)
+      end
+    end
+
+    class SassWatch < BasicWatch
+      def match?(path)
+        path =~ /s[ac]ss$/
+      end
+      def run_once_per_changeset?
+        true
+      end
     end
   end
-end
+end

data/test/fixtures/stylesheets/compass/config.rb

@@ -1,4 +1,5 @@
 # Require any additional compass plugins here.
+require 'true'
 project_type = :stand_alone
 css_dir = "tmp"
 sass_dir = "sass"

data/test/fixtures/stylesheets/compass/css/animation-with-legacy-ie.css

@@ -12,13 +12,6 @@
   50% {
     opacity: 0; } }
 
-@-o-keyframes test {
-  0%, 100% {
-    opacity: 1; }
-
-  50% {
-    opacity: 0; } }
-
 @keyframes test {
   0%, 100% {
     opacity: 1; }
@@ -27,7 +20,6 @@
     opacity: 0; } }
 
 .animation {
-  -webkit-animation: test;
   -moz-animation: test;
-  -o-animation: test;
+  -webkit-animation: test;
   animation: test; }

data/test/fixtures/stylesheets/compass/css/animation.css

@@ -12,13 +12,6 @@
   50% {
     background-color: blue; } }
 
-@-o-keyframes test {
-  0%, 100% {
-    background-color: red; }
-
-  50% {
-    background-color: blue; } }
-
 @keyframes test {
   0%, 100% {
     background-color: red; }
@@ -27,7 +20,6 @@
     background-color: blue; } }
 
 .animation {
-  -webkit-animation: test;
   -moz-animation: test;
-  -o-animation: test;
+  -webkit-animation: test;
   animation: test; }

data/test/fixtures/stylesheets/compass/css/appearance.css

@@ -0,0 +1,3 @@
+.searchfield {
+  -moz-appearance: searchfield;
+  -webkit-appearance: searchfield; }

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

@@ -1,15 +1,11 @@
 .background-clip {
-  -webkit-background-clip: border;
   -moz-background-clip: border;
+  -o-background-clip: border-box;
+  -webkit-background-clip: border;
   background-clip: border-box; }
 
 .background-clip-multiple {
-  -webkit-background-clip: border, padding, content;
   -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; }
-
-.background-clip-khtml {
-  -webkit-background-clip: border;
-  -moz-background-clip: border;
-  -khtml-background-clip: border-box;
-  background-clip: border-box; }