From 701c8d33c773352deb65e50e137591e4d552a6b3 Mon Sep 17 00:00:00 2001 From: Scott Davis <jetviper21@gmail.com> Date: Thu, 1 Dec 2011 14:54:39 -0500 Subject: [PATCH] fixed sass deprication error of Sass::Compiler#on_updating_stylesheet closes #635 --- Gemfile.lock | 81 ++++++++++++++-------------- lib/compass/configuration/helpers.rb | 5 +- 2 files changed, 44 insertions(+), 42 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7e762472..dab322c0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - compass (0.12.alpha.1.4766890) + compass (0.12.alpha.2.aab827f) chunky_png (~> 1.2) fssm (>= 0.2.7) sass (~> 3.1) @@ -10,12 +10,12 @@ GEM remote: http://rubygems.org/ specs: abstract (1.0.0) - actionmailer (3.0.10) - actionpack (= 3.0.10) + actionmailer (3.0.11) + actionpack (= 3.0.11) mail (~> 2.2.19) - actionpack (3.0.10) - activemodel (= 3.0.10) - activesupport (= 3.0.10) + actionpack (3.0.11) + activemodel (= 3.0.11) + activesupport (= 3.0.11) builder (~> 2.1.2) erubis (~> 2.6.6) i18n (~> 0.5.0) @@ -23,29 +23,29 @@ GEM rack-mount (~> 0.6.14) rack-test (~> 0.5.7) tzinfo (~> 0.3.23) - activemodel (3.0.10) - activesupport (= 3.0.10) + activemodel (3.0.11) + activesupport (= 3.0.11) builder (~> 2.1.2) i18n (~> 0.5.0) - activerecord (3.0.10) - activemodel (= 3.0.10) - activesupport (= 3.0.10) + activerecord (3.0.11) + activemodel (= 3.0.11) + activesupport (= 3.0.11) arel (~> 2.0.10) tzinfo (~> 0.3.23) - activeresource (3.0.10) - activemodel (= 3.0.10) - activesupport (= 3.0.10) - activesupport (3.0.10) + activeresource (3.0.11) + activemodel (= 3.0.11) + activesupport (= 3.0.11) + activesupport (3.0.11) addressable (2.2.6) arel (2.0.10) builder (2.1.2) chunky_png (1.2.5) compass-validator (3.0.1) css_parser (1.0.1) - cucumber (1.1.0) + cucumber (1.1.3) builder (>= 2.1.2) diff-lcs (>= 1.1.2) - gherkin (~> 2.5.0) + gherkin (~> 2.6.7) json (>= 1.4.6) term-ansicolor (>= 1.0.6) diff-lcs (1.1.3) @@ -58,44 +58,44 @@ GEM eventmachine (0.12.10) eventmachine (0.12.10-java) fssm (0.2.7) - gherkin (2.5.4) + gherkin (2.6.8) json (>= 1.4.6) - gherkin (2.5.4-java) + gherkin (2.6.8-java) json (>= 1.4.6) - haml (3.1.3) + haml (3.1.4) i18n (0.5.0) - json (1.6.1) - json (1.6.1-java) - livereload (1.6) + json (1.6.3) + json (1.6.3-java) + livereload (1.6.1) em-dir-watcher (>= 0.1) - em-websocket (>= 0.1.2) - ruby-json (>= 1.1.2) + em-websocket (>= 0.3.5) + json (>= 1.5.3) mail (2.2.19) activesupport (>= 2.3.6) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) metaclass (0.0.1) - mime-types (1.17.1) + mime-types (1.17.2) mocha (0.10.0) metaclass (~> 0.0.1) - polyglot (0.3.2) + polyglot (0.3.3) rack (1.2.4) rack-mount (0.6.14) rack (>= 1.0.0) rack-test (0.5.7) rack (>= 1.0) - rails (3.0.10) - actionmailer (= 3.0.10) - actionpack (= 3.0.10) - activerecord (= 3.0.10) - activeresource (= 3.0.10) - activesupport (= 3.0.10) + rails (3.0.11) + actionmailer (= 3.0.11) + actionpack (= 3.0.11) + activerecord (= 3.0.11) + activeresource (= 3.0.11) + activesupport (= 3.0.11) bundler (~> 1.0) - railties (= 3.0.10) - railties (3.0.10) - actionpack (= 3.0.10) - activesupport (= 3.0.10) + railties (= 3.0.11) + railties (3.0.11) + actionpack (= 3.0.11) + activesupport (= 3.0.11) rake (>= 0.8.7) rdoc (~> 3.4) thor (~> 0.14.4) @@ -113,17 +113,16 @@ GEM rspec-mocks (2.0.1) rspec-core (~> 2.0.1) rspec-expectations (~> 2.0.1) - ruby-json (1.1.2) ruby-prof (0.10.8) - rubyzip (0.9.4) - sass (3.1.10) + rubyzip (0.9.5) + sass (3.1.11) term-ansicolor (1.0.7) thor (0.14.6) timecop (0.3.5) treetop (1.4.10) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.30) + tzinfo (0.3.31) PLATFORMS java diff --git a/lib/compass/configuration/helpers.rb b/lib/compass/configuration/helpers.rb index b0bf7d45..b1bd8907 100644 --- a/lib/compass/configuration/helpers.rb +++ b/lib/compass/configuration/helpers.rb @@ -67,12 +67,15 @@ module Compass end end unless @callbacks_loaded - Sass::Plugin.on_updating_stylesheet do |sass_file, css_file| + + Sass::Plugin.on_updated_stylesheet do |sass_file, css_file| Compass.configuration.run_stylesheet_saved(css_file) end + Sass::Plugin.on_compilation_error do |e, filename, css| Compass.configuration.run_stylesheet_error(filename, e.message) end + @callbacks_loaded = true end end