Merge branch 'stable'

* stable:
  Fix broken test.
  tests for padding free horizontal list.
  Update tests for charset changes.
  Fix test failure in ruby 1.9.2
  fix some gem issues
  Option for horizontal-list to skip padding.
  rake examples was getting a non-existent branch. Default to master.
  update changelog
  Make it easier to disable the asset cache buster.
  Turns out that IE6 & 7 don't support this.
  Fixed typo.
  HTML5 reset includes box-model reset for newer browsers.
  Added @charset declaration to force UTF-8 encoding on systems with different default encodings
  Some doc modifications.

Conflicts:
	Gemfile
	doc-src/content/CHANGELOG.markdown
	lib/compass/app_integration/rails/installer.rb

Gemfile

@@ -4,6 +4,7 @@ gem "compass", :path => "."
 gem "cucumber"
 gem "rspec"
 gem "rails", "~>3.0.0.rc"
-gem "compass-validator"
+gem "compass-validator", "1.0.0"
 gem "css_parser"
 gem "sass", :path => "../sass"
+gem "rcov"

doc-src/content/CHANGELOG.markdown

@@ -20,6 +20,14 @@ COMPASS CHANGELOG
 * Some color defaults now use color functions instead of color arithmetic.
   This may result in different output for those who have color customizations.
 
+0.10.6 (10/11/2010)
+-------------------
+
+* HTML5 reset includes box-model reset for newer browsers.
+* Fix encoding issue for ruby 1.9 users of the font-face mixin.
+* Make it easier to disable the asset cache buster: `asset_cache_buster :none`
+* Can now set `$padding` to `false` to make the `horizontal-list` mixin skip the
+  padding properties.
 
 0.10.5 (08/29/2010)
 -------------------

doc-src/content/reference/blueprint.haml

@@ -34,10 +34,10 @@ meta_description: The Blueprint Framework -- ported to Sass.
     ### Alternate Project Layouts
 
     For any of the above commands you could have also selected
-    the `blueprint/basic` or `blueprint/semantic`. The basic
-    template assumes that you'll be starting using conventional
-    blueprint styling techniques while the semantic template
-    assumes that you'll be using mixins and inheritance to style
+    the `blueprint/basic` or `blueprint/semantic` patterns. The basic
+    pattern assumes that you'll start out using conventional class-based
+    blueprint styling techniques, while the semantic template
+    assumes that you'll be using mixins and `@extend` to style
     your site. Example:
 
         compass create my_project --using blueprint/semantic

doc-src/content/reference/compass/utilities/links/unstyled_link.haml

@@ -13,4 +13,4 @@ classnames:
 ---
 - render 'reference' do
   %p
-    Makes a link appear like regular text.
+    Makes a link appear like regular text. Not supported by IE 6 or 7.

doc-src/content/tutorials/configuration-reference.markdown

@@ -260,3 +260,7 @@ that points to the asset on disk — which may or may not exist.
         "v=#{deploy_version}"
       end
     end
+
+To disable the asset cache buster:
+
+    asset_cache_buster :none

examples/susy/bootstrap.rb

@@ -1,3 +1,3 @@
 require File.join(File.dirname(__FILE__), '..', 'downloader')
 
-install_from_github('ericam', 'compass-susy-plugin', 'susy', 'edge')
+install_from_github('ericam', 'compass-susy-plugin', 'susy')

frameworks/compass/stylesheets/compass/css3/_font-face.scss

@@ -1,3 +1,4 @@
+@charset "UTF-8";
 @import "shared";
 
 // Cross-browser support for @font-face. Supports IE, Gecko, Webkit, Opera.

frameworks/compass/stylesheets/compass/reset/_utilities.scss

@@ -102,9 +102,11 @@
 
 // Unrecognized elements are displayed inline.
 // This reset provides a basic reset for html5 elements
-// so they are rendered correctly in browsers that don't recognize them.
+// so they are rendered correctly in browsers that don't recognize them
+// and reset in browsers that have default styles for them.
 @mixin reset-html5 {
   article, aside, canvas, details, figcaption, figure, footer, header, hgroup, menu, nav, section, summary {
+    @include reset-box-model;
     display: block; } }
 
 // Resets the display of inline and block elements to their default display

frameworks/compass/stylesheets/compass/utilities/lists/_horizontal-list.scss

@@ -31,21 +31,26 @@
 //
 // :last-child is not fully supported
 // see http://www.quirksmode.org/css/contents.html#t29 for the support matrix
-
+//
+// Setting `$padding` to `false` disables the padding between list elements
 @mixin horizontal-list-item($padding: 4px, $direction: left) {
   @include no-bullet;
   white-space: nowrap;
   @include float($direction);
-  padding: {
-    left: $padding;
-    right: $padding;
-  };
-  &:first-child, &.first { padding-#{$direction}: 0px; }
-  &:last-child, &.last   { padding-#{opposite-position($direction)}: 0px; }
+  @if $padding {
+    padding: {
+      left: $padding;
+      right: $padding;
+    }
+    &:first-child, &.first { padding-#{$direction}: 0; }
+    &:last-child, &.last   { padding-#{opposite-position($direction)}: 0; }
+  }
 }
 
 // A list(ol,ul) that is layed out such that the elements are floated left and won't wrap.
 // This is not an inline list.
+//
+// Setting `$padding` to `false` disables the padding between list elements
 @mixin horizontal-list($padding: 4px, $direction: left) {
   @include horizontal-list-container;
   li {

lib/compass/app_integration/rails/installer.rb

@@ -41,7 +41,7 @@ def gem_config_instructions
           if rails3?
             %Q{Add the following to your Gemfile:\n\n    gem "compass", ">= #{Compass::VERSION}"}
           else
-            %Q{Add the following to your evironment.rb:\n\n    config.gem "compass", :version => ">= #{Compass::VERSION}"}
+            %Q{Add the following to your environment.rb:\n\n    config.gem "compass", :version => ">= #{Compass::VERSION}"}
           end
         end
 

lib/compass/configuration/data.rb

@@ -77,9 +77,19 @@ def asset_host(&block)
       # If the block accepts two arguments, it will also be passed a File object
       # that points to the asset on disk -- which may or may not exist.
       # When called without a block, returns the block that was previously set.
-      def asset_cache_buster(&block)
+      #
+      # To disable the asset cache buster:
+      #
+      #     asset_cache_buster :none
+      def asset_cache_buster(simple = nil, &block)
         if block_given?
           @asset_cache_buster = block
+        elsif !simple.nil?
+          if simple == :none
+            @asset_cache_buster = Proc.new {|_,_| nil}
+          else
+            raise ArgumentError, "Unexpected argument: #{simple.inspect}"
+          end
         else
           if @asset_cache_buster
             @asset_cache_buster

test/fixtures/stylesheets/compass/css/box.css

@@ -1,3 +1,4 @@
+@charset "UTF-8";
 .hbox {
   display: -moz-box;
   display: -webkit-box;

test/fixtures/stylesheets/compass/css/fonts.css

@@ -1,3 +1,4 @@
+@charset "UTF-8";
 @font-face {
   font-family: "font1";
   src: local("☺"), url('/tmp/fonts/font1.woff') format('woff'); }

test/fixtures/stylesheets/compass/css/gradients.css

@@ -1,3 +1,4 @@
+@charset "UTF-8";
 .linear-1 {
   background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(0%, #dddddd), color-stop(100%, #aaaaaa));
   background-image: -moz-linear-gradient(top, #dddddd 0%, #aaaaaa 100%);

test/fixtures/stylesheets/compass/css/lists.css

@@ -15,9 +15,9 @@ ul.horizontal {
     padding-left: 4px;
     padding-right: 4px; }
     ul.horizontal li:first-child, ul.horizontal li.first {
-      padding-left: 0px; }
+      padding-left: 0; }
     ul.horizontal li:last-child, ul.horizontal li.last {
-      padding-right: 0px; }
+      padding-right: 0; }
 
 ul.wide-horizontal {
   margin: 0;
@@ -36,9 +36,9 @@ ul.wide-horizontal {
     padding-left: 10px;
     padding-right: 10px; }
     ul.wide-horizontal li:first-child, ul.wide-horizontal li.first {
-      padding-left: 0px; }
+      padding-left: 0; }
     ul.wide-horizontal li:last-child, ul.wide-horizontal li.last {
-      padding-right: 0px; }
+      padding-right: 0; }
 
 ul.right-horizontal {
   margin: 0;
@@ -57,9 +57,24 @@ ul.right-horizontal {
     padding-left: 4px;
     padding-right: 4px; }
     ul.right-horizontal li:first-child, ul.right-horizontal li.first {
-      padding-right: 0px; }
+      padding-right: 0; }
     ul.right-horizontal li:last-child, ul.right-horizontal li.last {
-      padding-left: 0px; }
+      padding-left: 0; }
+
+ul.no-padding {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  outline: 0;
+  overflow: hidden;
+  *zoom: 1; }
+  ul.no-padding li {
+    list-style-image: none;
+    list-style-type: none;
+    margin-left: 0px;
+    white-space: nowrap;
+    display: inline;
+    float: left; }
 
 ul.inline-block {
   margin: 0;

test/fixtures/stylesheets/compass/sass/lists.scss

@@ -3,6 +3,7 @@
 ul.horizontal        { @include horizontal-list;             }
 ul.wide-horizontal   { @include horizontal-list(10px);       }
 ul.right-horizontal  { @include horizontal-list(4px, right); }
+ul.no-padding        { @include horizontal-list(false);      }
 ul.inline-block      { @include inline-block-list;           }
 ul.wide-inline-block { @include inline-block-list(10px);     }
 ul.inline            { @include inline-list;                 }

test/fixtures/stylesheets/image_urls/config.rb

@@ -7,11 +7,13 @@
 # To enable relative image paths using the images_url() function:
 # http_images_path = :relative
 http_images_path = "/images"
+line_comments = false
 
 asset_cache_buster do |path, file|
   "busted=true"
 end
 
+
 asset_host do |path|
-  "http://assets%d.example.com" % (path.hash % 4)
+  "http://assets%d.example.com" % (path.size % 4)
 end

test/fixtures/stylesheets/image_urls/css/screen.css

@@ -1,3 +1,3 @@
-.showgrid { background-image: url('http://assets2.example.com/images/grid.png?busted=true'); }
+.showgrid { background-image: url('http://assets0.example.com/images/grid.png?busted=true'); }
 
 .inlinegrid { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAUEAYAAACv1qP4AAAABmJLR0T///////8JWPfcAAAACXBIWXMAAABIAAAASABGyWs+AAAAZ0lEQVRYw+3QwQ2AIBAFUTEUwI3+uzN7gDscsIgxEuO8An52J11X73OudfxMraXkzHfO3Y98nQEhA0IGhAwIGRAyIGRAyICQASEDQgaEDAgZEDIgZEDIgJABoZzSGK3tPuN9ERFP7Nw4fg+c5g8V1wAAAABJRU5ErkJggg=='); }