compass 0.13.alpha.0 → 0.13.alpha.2

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

@@ -39,6 +39,7 @@ module Compass
           @kwargs = kwargs
           @kwargs['cleanup'] ||= Sass::Script::Bool.new(true)
           @kwargs['layout'] ||= Sass::Script::String.new('vertical')
+          @kwargs['sort_by'] ||= Sass::Script::String.new('none')
           @images = nil
           @width = nil
           @height = nil
@@ -47,6 +48,10 @@ module Compass
           compute_image_metadata!
         end
 
+        def sort_method
+          @kwargs['sort_by'].value
+        end
+
         def inspect
           puts 'images'
           @images.each do |img|

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

@@ -26,8 +26,12 @@ module Compass
         
         # Creates the Sprite::Image objects for each image and calculates the width
         def init_images
-          @images = image_names.collect do |relative_file|
-            Image.new(self, relative_file, kwargs)
+          @images = Images.new
+          image_names.each do |relative_file|
+            @images << Image.new(self, relative_file, kwargs)
+          end
+          unless sort_method == 'none'
+            @images.sort_by! sort_method
           end
         end
 
@@ -59,7 +63,7 @@ module Compass
         end
         
         def cleanup_old_sprites
-          Dir[File.join(Compass.configuration.images_path, "#{path}-s*.png")].each do |file|
+          Sass::Util.glob(File.join(Compass.configuration.generated_images_path, "#{path}-s*.png")).each do |file|
             log :remove, file
             FileUtils.rm file
             Compass.configuration.run_sprite_removed(file)
@@ -68,7 +72,7 @@ module Compass
         
         # Does this sprite need to be generated
         def generation_required?
-          !File.exists?(filename) || outdated? ||  options[:force]
+          !File.exists?(filename) || outdated? || options[:force]
         end
 
         # Returns the uniqueness hash for this sprite object
@@ -129,4 +133,4 @@ module Compass
       end
     end
   end
-end
+end

data/lib/compass/sprite_importer.rb

@@ -16,7 +16,7 @@ module Compass
     def self.find_all_sprite_map_files(path)
       hex = "[0-9a-f]"
       glob = "*-s#{hex*10}{#{VALID_EXTENSIONS.join(",")}}"
-      Dir.glob(File.join(path, "**", glob))
+      Sass::Util.glob(File.join(path, "**", glob))
     end
     
     def find(uri, options)
@@ -75,7 +75,7 @@ module Compass
     # Returns the Glob of image files for the uri
     def self.files(uri)
       Compass.configuration.sprite_load_path.compact.each do |folder|
-        files = Dir[File.join(folder, uri)].sort
+        files = Sass::Util.glob(File.join(folder, uri)).sort
         next if files.empty?
         return files
       end
@@ -93,7 +93,7 @@ module Compass
     
     # Returns the sass_options for this sprite
     def self.sass_options(uri, importer, options)
-      options.merge!(:filename => uri, :syntax => :scss, :importer => importer)
+      options.merge!(:filename => uri.gsub(%r{\*/},"*\\/"), :syntax => :scss, :importer => importer)
     end
     
     # Returns a Sass::Engine for this sprite object

data/lib/compass/sprite_importer/content.erb

@@ -4,6 +4,7 @@
 // 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;
 $<%= name %>-spacing           : 0 !default;
 $<%= name %>-repeat            : no-repeat !default;
@@ -11,6 +12,7 @@ $<%= name %>-prefix            : '' !default;
 $<%= name %>-clean-up          : true !default;
 $<%= name %>-layout            : vertical !default;
 $<%= name %>-inline            : false !default;
+$<%= name %>-sort-by           : 'none' !default;
 
 <% if skip_overrides %> 
   $<%= name %>-sprites: sprite-map("<%= uri %>", $layout: $<%= name %>-layout, $cleanup: $<%= name %>-clean-up, $spacing: $<%= name %>-spacing, $position : $<%= name %>-position);
@@ -32,7 +34,8 @@ $<%= name %>-inline            : false !default;
  $layout   : $<%= name %>-layout,
  $cleanup  : $<%= name %>-clean-up,
  $spacing  : $<%= name %>-spacing,
- $position : $<%= name %>-position
+ $position : $<%= name %>-position,
+ $sort-by  : $<%= name %>-sort-by
  );
 <% end %>
 
@@ -50,8 +53,7 @@ $<%= name %>-inline            : false !default;
 //sass functions to return the dimensions of a sprite image as units
 <% [:width, :height].each do |dimension| %>
   @function <%= name %>-sprite-<%= dimension %>($name) {
-    $file: sprite_file($<%= name %>-sprites, $name);
-    @return image-<%= dimension %>($file);
+    @return sprite-<%= dimension %>($<%= name %>-sprites, $name);
   }
 <% end %>
 
@@ -62,22 +64,22 @@ $<%= name %>-inline            : false !default;
 }
 
 // Move the background position to display the sprite.
-@mixin <%= name %>-sprite-position($name, $offset-x: 0, $offset-y: 0) {
-  @include sprite-background-position($<%= name %>-sprites, $name, $offset-x, $offset-y)
+@mixin <%= name %>-sprite-position($name, $offset-x: 0, $offset-y: 0, $use-percentages: $<%= name %>-use-percentages) {
+  @include sprite-background-position($<%= name %>-sprites, $name, $offset-x, $offset-y, $use-percentages)
 }
 
 // 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) {
+@mixin <%= name %>-sprite($name, $dimensions: $<%= name %>-sprite-dimensions, $offset-x: 0, $offset-y: 0, $use-percentages: $<%= name %>-use-percentages) {
   @extend #{$<%= name %>-sprite-base-class};
-  @include sprite($<%= name %>-sprites, $name, $dimensions, $offset-x, $offset-y)
+  @include sprite($<%= name %>-sprites, $name, $dimensions, $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) {
-  @include sprites($<%= name %>-sprites, $sprite-names, $<%= name %>-sprite-base-class, $dimensions, $prefix, $offset-x, $offset-y)
+@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)
 }
 
 // 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) {
-  @include <%= name %>-sprites(<%= sprite_names.join(" ") %>, $dimensions, $prefix, $offset-x, $offset-y);
-}
+@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);
+}

data/lib/compass/version.rb

@@ -26,8 +26,9 @@ module Compass
       @version[:teeny]  = @version[:patch]
       @version[:string] = "#{@version[:major]}.#{@version[:minor]}"
       @version[:string] << ".#{@version[:patch]}" if @version[:patch]
-      @version[:string] << ".#{@version[:state]}" if @version[:state]
       @version[:string] << ".#{@version[:build]}" if @version[:build]
+      @version[:string] << ".#{@version[:state]}" if @version[:state]
+      @version[:string] << ".#{@version[:iteration]}" if @version[:iteration]
       if !ENV['OFFICIAL'] && r = revision
         @version[:string] << ".#{r[0..6]}"
       end

data/lib/compass/watcher.rb

@@ -0,0 +1,11 @@
+require 'compass/watcher/watch'
+require 'compass/watcher/compiler'
+require 'compass/watcher/project_watcher'
+
+module Compass
+  module Watcher
+    class WatcherException < Compass::Error; end
+    class NoCallbackError < WatcherException; end
+    class AbsolutePathError < WatcherException; end
+  end
+end

data/lib/compass/watcher/compiler.rb

@@ -0,0 +1,59 @@
+module Compass
+  module Watcher
+   class Compiler
+      include Compass::Actions
+      attr_reader :working_path, :memory_store, :backing_store, :cache_store, :compiler_options, :compiler
+
+      def initialize(working_path, additional_options={})
+        @working_path       = working_path
+        @compiler_options   = create_compiler_options(additional_options)
+        @memory_store     ||= Sass::CacheStores::Memory.new
+        @backing_store    ||= compiler_options[:cache_store]
+        @backing_store    ||= Sass::CacheStores::Filesystem.new(determine_cache_location)
+        @cache_store      ||= Sass::CacheStores::Chain.new(@memory_store, @backing_store)
+        @compiler         ||= create_compiler
+      end
+
+      def compile
+        @memory_cache.reset! if @memory_cache
+        compiler.reset_staleness_checker!
+        if file = compiler.out_of_date?
+          begin
+            time = Time.now.strftime("%T")
+            log_action(:info, "Change detected at #{time} to: #{compiler.relative_stylesheet_name(file)}", compiler_options)
+            compiler.run
+            GC.start
+          rescue StandardError => e
+            ::Compass::Exec::Helpers.report_error(e, compiler_options)
+          end
+        end
+      end
+
+    private #=========================================================================================>
+
+      def create_compiler_options(additional_options)
+        compiler_opts = {:sass => Compass.sass_engine_options, :cache_store => @cache_store, :quiet => true, :loud => [:identical, :overwrite, :create]}.merge(additional_options)
+        compiler_opts[:cache_location] ||= determine_cache_location
+        if compiler_opts.include?(:debug_info)
+          compiler_opts[:sass][:debug_info] = compiler_opts.delete(:debug_info)
+        end
+        
+        compiler_opts
+      end
+
+      def create_compiler
+        @memory_store.reset!
+        Compass::Compiler.new(
+          working_path,
+          Compass.configuration.sass_path,
+          Compass.configuration.css_path,
+          compiler_options.dup
+        )
+      end
+
+      def determine_cache_location
+        Compass.configuration.cache_path || Sass::Plugin.options[:cache_location] || File.join(working_path, ".sass-cache")
+      end
+    end
+  end
+end

data/lib/compass/watcher/project_watcher.rb

@@ -0,0 +1,108 @@
+require 'listen'
+require 'forwardable'
+module Compass
+  module Watcher
+    class ProjectWatcher
+      include Compass::Actions
+      SASS_FILTER = '*.s[ac]ss'
+      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
+
+      alias :working_path :project_path
+
+      extend Forwardable
+  
+      def_delegators :@watcher_compiler, :compiler, :compiler
+      def_delegators :@watcher_compiler, :compile, :compile
+
+      def initialize(project_path, watches=[], options={}, poll=false)
+        @poll             = poll
+        @options          = options
+        @project_path     = project_path
+        @css_dir          = Compass.configuration.css_dir
+        @sass_watchers    = create_sass_watchers + watches
+        @watcher_compiler = Compass::Watcher::Compiler.new(project_path, options)
+        setup_listener
+      end
+
+      def watch!
+        listener.start
+      rescue Interrupt
+        log_action(:info, "Good bye!", options)
+        listener.stop
+      end
+
+    private #============================================================================>
+
+      def setup_listener
+        @listener = Listen.to(@project_path, :relative_paths => true)
+        if poll
+          @listener = listener.force_polling(true)
+        end
+        @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)
+          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", {})
+        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)
+          end
+        end
+      end
+
+      def sass_callback(base, file, action)
+        #log_action(:info, ">>> Sass Callback fired #{action}", {})
+        sass_modified(file) if action == :modified
+        sass_added(file) if action == :added
+        sass_removed(file) if action == :removed
+      end
+
+      def sass_modified(file)
+        log_action(:info, "#{file} was modified", options)
+        compile
+      end
+
+      def sass_added(file)
+        log_action(:info, "#{file} was added", options)
+        compile
+      end
+
+      def sass_removed(file)
+        log_action(:info, "#{file} was removed", options)
+        css_file = compiler.corresponding_css_file(File.join(project_path, file))
+        compile
+        if File.exists?(css_file)
+          remove(css_file)
+        end
+      end
+
+    end
+  end
+end

data/lib/compass/watcher/watch.rb

@@ -0,0 +1,33 @@
+module Compass
+  module Watcher
+    class Watch
+      attr_reader :callback, :glob
+
+      def initialize(glob, &block)
+        @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 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"
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+# Require any additional compass plugins here.
+project_type = :stand_alone
+css_dir = "tmp"
+sass_dir = "sass"
+fonts_dir = "fonts"
+output_style = :compact
+# To enable relative image paths using the images_url() function:
+# http_images_path = :relative
+http_fonts_path = "/fonts"
+line_comments = false
+
+asset_cache_buster do |path, file|
+  pathname = Pathname.new(path)
+  dirname = pathname.dirname
+  basename = pathname.basename(pathname.extname)
+  extname = pathname.extname
+
+  case pathname.basename(pathname.extname).to_s
+  when "grid"
+    new_path = "#{dirname}/#{basename}-BUSTED#{extname}"
+    {:path => new_path, :query => nil}
+  when "feed"
+    "query_string"
+  when "dk"
+    {:query => "query_string"}
+  end
+end
+
+
+asset_host do |path|
+  "http://assets%d.example.com" % (path.size % 4)
+end

data/test/fixtures/stylesheets/busted_font_urls/css/screen.css

@@ -0,0 +1,7 @@
+.showgrid { font-family: url('http://assets3.example.com/fonts/grid-BUSTED.ttf'); }
+
+.no-buster { font-family: url('http://assets3.example.com/fonts/grid.ttf'); }
+
+.feed { font-family: url('http://assets3.example.com/fonts/feed.ttf?query_string'); }
+
+.dk { font-family: url('http://assets1.example.com/fonts/sub/dk.ttf?query_string'); }

data/test/fixtures/stylesheets/busted_font_urls/sass/screen.sass

@@ -0,0 +1,11 @@
+.showgrid
+  font-family: font-url("grid.ttf", $only-path: false, $cache-buster: true)
+
+.no-buster
+  font-family: font-url("grid.ttf")
+
+.feed
+  font-family: font-url("feed.ttf", $only-path: false, $cache-buster: true)
+
+.dk
+  font-family: font-url("sub/dk.ttf", $only-path: false, $cache-buster: true)

data/test/fixtures/stylesheets/busted_font_urls/tmp/screen.css

@@ -0,0 +1,7 @@
+.showgrid { font-family: url('http://assets3.example.com/fonts/grid-BUSTED.ttf'); }
+
+.no-buster { font-family: url('http://assets3.example.com/fonts/grid.ttf'); }
+
+.feed { font-family: url('http://assets3.example.com/fonts/feed.ttf?query_string'); }
+
+.dk { font-family: url('http://assets1.example.com/fonts/sub/dk.ttf?query_string'); }