compass 0.10.0.pre1 → 0.10.0.pre2

data/CHANGELOG.markdown

@@ -1,6 +1,15 @@
 COMPASS CHANGELOG
 =================
 
+0.10.0.pre2 (November 30, 2009)
+--------------------------------
+Bug fixes:
+
+* The line-height in the compass reset should have been 1 and not 1em.
+* Fixed the reference in the rails initializer to the compass configuration file.
+* Use the correct error formatting function based on what sass version is installed.
+* Boolean properties like line_comments can now be set to false in configuration files
+
 0.10.0.pre1 (November 29, 2009)
 --------------------------------
 

data/VERSION.yml

@@ -2,4 +2,4 @@
 :patch: 0
 :major: 0
 :minor: 10
-:build: pre1
+:build: pre2

data/lib/compass/app_integration/rails/installer.rb

@@ -91,7 +91,7 @@ module Compass
         def initializer_contents
           %Q{require 'compass'
   # If you have any compass plugins, require them here.
-  Compass.configuration.parse(File.join(RAILS_ROOT, "config", "compass.config"))
+  Compass.configuration.parse(File.join(RAILS_ROOT, "config", "compass.rb"))
   Compass.configuration.environment = RAILS_ENV.to_sym
   Compass.configure_sass_plugin!
   }

data/lib/compass/compiler.rb

@@ -53,9 +53,13 @@ module Compass
         rescue Sass::SyntaxError => e
           full_exception = Compass.configuration.environment == :development
           logger.record :error, basename(sass_filename), "(Line #{e.sass_line}: #{e.message})"
-          write_file(css_filename,
-            Sass::SyntaxError.exception_to_css(e, :full_exception => full_exception),
-            options.merge(:force => true))
+          contents = if Sass::SyntaxError.respond_to?(:exception_to_css)
+                       Sass::SyntaxError.exception_to_css(e, :full_exception => full_exception)
+                     else
+                       Sass::Plugin.options[:full_exception] ||= Compass.configuration.environment == :development
+                       Sass::Plugin.send(:exception_string, e)
+                     end
+          write_file css_filename, contents, options.merge(:force => true)
         end
       end
     end

data/lib/compass/configuration.rb

@@ -29,6 +29,7 @@ module Compass
       :relative_assets,
       :additional_import_paths,
       :sass_options,
+      # Helper configuration
       :asset_host,
       :asset_cache_buster,
       :line_comments,

data/lib/compass/configuration/adapters.rb

@@ -18,7 +18,7 @@ module Compass
         end
         plugin_opts = {:template_location => locations}
         plugin_opts[:style] = output_style if output_style
-        plugin_opts[:line_comments] = line_comments if environment
+        plugin_opts[:line_comments] = line_comments
         plugin_opts.merge!(sass_options || {})
         plugin_opts
       end
@@ -41,7 +41,7 @@ module Compass
       def to_sass_engine_options
         engine_opts = {:load_paths => sass_load_paths}
         engine_opts[:style] = output_style if output_style
-        engine_opts[:line_comments] = line_comments if environment
+        engine_opts[:line_comments] = line_comments
         engine_opts.merge!(sass_options || {})
       end
 

data/lib/compass/configuration/data.rb

@@ -17,7 +17,6 @@ module Compass
     #    required.
     class Data
 
-      attr_accessor :required_libraries
       attr_reader :name
 
       include Compass::Configuration::Inheritance
@@ -25,11 +24,11 @@ module Compass
       include Compass::Configuration::Adapters
 
       inherited_accessor *ATTRIBUTES
+      inherited_accessor :required_libraries #XXX we should make this array add up cumulatively.
 
       def initialize(name, attr_hash = nil)
         raise "I need a name!" unless name
         @name = name
-        self.required_libraries = []
         set_all(attr_hash) if attr_hash
         self.top_level = self
       end
@@ -81,7 +80,7 @@ module Compass
 
       # Require a compass plugin and capture that it occured so that the configuration serialization works next time.
       def require(lib)
-        required_libraries << lib
+        (self.required_libraries ||= []) << lib
         super
       end
 

data/lib/compass/configuration/serialization.rb

@@ -37,7 +37,7 @@ module Compass
           eval(contents, bind, filename)
           ATTRIBUTES.each do |prop|
             value = eval(prop.to_s, bind) rescue nil
-            self.send("#{prop}=", value) if value
+            self.send("#{prop}=", value) unless value.nil?
           end
           if @added_import_paths
             self.additional_import_paths ||= []
@@ -48,11 +48,11 @@ module Compass
 
         def serialize
           contents = ""
-          required_libraries.each do |lib|
+          (required_libraries || []).each do |lib|
             contents << %Q{require '#{lib}'\n}
           end
           contents << "# Require any additional compass plugins here.\n"
-          contents << "\n" if required_libraries.any?
+          contents << "\n" if (required_libraries || []).any?
           ATTRIBUTES.each do |prop|
             value = send("#{prop}_without_default")
             if value.is_a?(Proc)

data/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_reset.sass

@@ -79,7 +79,7 @@
   outline: 0
  
 =reset-body
-  line-height: 1em
+  line-height: 1
   color: #000
   background: #fff
  

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

@@ -20,7 +20,7 @@ table, caption, tbody, tfoot, thead, tr, th, td {
   outline: 0; }
 
 body {
-  line-height: 1em;
+  line-height: 1;
   color: #000;
   background: #fff; }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: compass
 version: !ruby/object:Gem::Version 
-  version: 0.10.0.pre1
+  version: 0.10.0.pre2
 platform: ruby
 authors: 
 - Chris Eppstein
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-29 00:00:00 -08:00
+date: 2009-12-01 00:00:00 -08:00
 default_executable: compass
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -445,7 +445,7 @@ files:
 - test/test_case_helper.rb
 - test/test_helper.rb
 - test/test_rails_helper.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://compass-style.org
 licenses: []