chriseppstein-compass 0.6.2 → 0.6.3

data/CHANGELOG.markdown

@@ -1,6 +1,51 @@
 COMPASS CHANGELOG
 =================
 
+0.6.3
+-----
+
+### Rails
+
+Bug fix: The http_images_path configuration default should be "/images" instead of "/public/images".
+
+### Command Line
+
+These changes, coupled with upcoming changes to Sass result in significantly reduced time spent on compilation for large projects.
+
+* The compass command line will no longer recompile sass files that haven't changed (taking import dependencies into account).
+* The compass command line will now respect the -q (quiet) option during compilation. Additionally, the quiet option will be set by default when watching a project for changes.
+
+0.6.2
+-----
+
+### Blueprint
+
+Split the push and pull mixins into sub-mixins that separate the common styles from the ones that vary. The generated css when using presentational class names will be smaller as a result. The existing <code>+push</code> and <code>+pull</code> mixins continue to work as expected. The following mixins were added:
+
+    +push-base
+    +push-margins
+    +pull-base
+    +pull-margins
+
+Additonally, the liquid plugin was updated to have a span mixin that matches elsewhere.
+
+### YUI
+
+Added Yahoo's version of the css reset. To use it, mix into the top level of your project:
+
+    @import yui/modules/reset.sass
+    +reset
+
+### Rails
+
+* Conditionally defining #blank? on String/NilClass (Erik Bryn <erik.bryn@gmail.com>)
+* Set compass environment in plugin based on RAILS_ENV (Lee Nussbaum <wln@scrunch.org>)
+
+0.6.1
+-----
+
+Maintenance release that fixes several bugs in the handling of configuration files.
+
 0.6.0
 -----
 

data/VERSION

@@ -1 +1 @@
-0.6.2
+0.6.3

data/compass.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name = %q{compass}
-  s.version = "0.6.2"
+  s.version = "0.6.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chris Eppstein"]
-  s.date = %q{2009-04-19}
+  s.date = %q{2009-04-22}
   s.default_executable = %q{compass}
   s.description = %q{Sass-Based CSS Meta-Framework. Semantic, Maintainable CSS.}
   s.email = %q{chris@eppsteins.net}

data/lib/compass/actions.rb

@@ -18,7 +18,7 @@ module Compass
     def directory(dir, options = nil)
       options ||= self.options if self.respond_to?(:options)
       if File.exists?(dir) && File.directory?(dir)
-          logger.record :exists, basename(dir)
+          logger.record :exists, basename(dir) unless options[:quiet]
       elsif File.exists?(dir)
         msg = "#{basename(dir)} already exists and is not a directory."
         raise Compass::FilesystemConflict.new(msg)
@@ -46,22 +46,30 @@ module Compass
       else
         logger.record :create, basename(file_name)
       end
-      open(file_name,'w') do |file|
-        file.write(contents)
-      end unless skip_write
+      if skip_write
+        FileUtils.touch file_name
+      else
+        open(file_name,'w') do |file|
+          file.write(contents)
+        end
+      end
     end
 
     # Compile one Sass file
     def compile(sass_filename, css_filename, options)
-      logger.record :compile, basename(sass_filename)
-      engine = ::Sass::Engine.new(open(sass_filename).read,
-                                  :filename => sass_filename,
-                                  :line_comments => options[:line_comments],
-                                  :style => options[:style],
-                                  :css_filename => css_filename,
-                                  :load_paths => options[:load_paths])
-      css_content = engine.render
-      write_file(css_filename, css_content, options.merge(:force => true))
+      if Sass::Plugin.exact_stylesheet_needs_update?(css_filename, sass_filename)
+        logger.record :compile, basename(sass_filename) unless options[:quiet]
+        engine = ::Sass::Engine.new(open(sass_filename).read,
+                                    :filename => sass_filename,
+                                    :line_comments => options[:line_comments],
+                                    :style => options[:style],
+                                    :css_filename => css_filename,
+                                    :load_paths => options[:load_paths])
+        css_content = engine.render
+        write_file(css_filename, css_content, options.merge(:force => true))
+      else
+        logger.record :unchanged, basename(sass_filename) unless options[:quiet]
+      end
     end
 
     def basename(file)

data/lib/compass/commands/update_project.rb

@@ -14,7 +14,7 @@ module Compass
         Compass::Compiler.new(working_path,
                               projectize(Compass.configuration.sass_dir),
                               projectize(Compass.configuration.css_dir),
-                              Compass.sass_engine_options).run
+                              Compass.sass_engine_options.merge(:quiet => options[:quiet])).run
       end
 
     end

data/lib/compass/compiler.rb

@@ -29,6 +29,7 @@ module Compass
     end
 
     def run
+      Compass.configure_sass_plugin!
       target_directories.each do |dir|
         directory dir
       end

data/lib/compass/exec.rb

@@ -98,6 +98,7 @@ END
 
         opts.on('-w', '--watch', :NONE, 'Monitor the current project for changes and update') do
           self.options[:command] = :watch_project
+          self.options[:quiet] = true
         end
 
         opts.on('--sass-dir SRC_DIR', "The source directory where you keep your sass stylesheets.") do |sass_dir|

data/lib/compass/installers/rails.rb

@@ -8,7 +8,8 @@ module Compass
           :sass_dir => (sass_dir || prompt_sass_dir),
           :css_dir => (css_dir || prompt_css_dir),
           :images_dir => default_images_dir,
-          :javascripts_dir => default_javascripts_dir
+          :javascripts_dir => default_javascripts_dir,
+          :http_images_path => default_http_images_path
         }
       end
 
@@ -49,6 +50,10 @@ NEXTSTEPS
         separate("public/javascripts")
       end
 
+      def default_http_images_path
+        "/images"
+      end
+
       def prompt_sass_dir
         recommended_location = separate('app/stylesheets')
         default_location = separate('public/stylesheets/sass')

data/lib/sass_extensions.rb

@@ -1,4 +1,5 @@
 require 'sass'
+require 'sass/plugin'
 
 module Sass::Script::Functions
   COMMA_SEPARATOR = /\s*,\s*/
@@ -34,4 +35,26 @@ module Sass::Script::Functions
     end
     Sass::Script::String.new("url(#{path})")
   end
+end
+
+# XXX: We can remove this check and monkeypatch once Sass 2.2 is released.
+module Sass::Plugin
+  class << self
+    unless method_defined?(:exact_stylesheet_needs_update?)
+      def stylesheet_needs_update?(name, template_path, css_path)
+        css_file = css_filename(name, css_path)
+        template_file = template_filename(name, template_path)
+        exact_stylesheet_needs_update?(css_file, template_file)
+      end
+      def exact_stylesheet_needs_update?(css_file, template_file)
+        if !File.exists?(css_file)
+          return true
+        else
+          css_mtime = File.mtime(css_file)
+          File.mtime(template_file) > css_mtime ||
+            dependencies(template_file).any?(&dependency_updated?(css_mtime))
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: chriseppstein-compass
 version: !ruby/object:Gem::Version 
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors: 
 - Chris Eppstein
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-19 00:00:00 -07:00
+date: 2009-04-22 00:00:00 -07:00
 default_executable: compass
 dependencies: 
 - !ruby/object:Gem::Dependency