compass 0.10.0.rc3 → 0.10.0.rc4

data/frameworks/compass/stylesheets/compass/utilities/text/_replacement.scss

@@ -7,7 +7,6 @@
 //   the x position of the background image.
 // @param y
 //   the y position of the background image.
-
 @mixin replace-text($img, $x: 50%, $y: 50%) {
   @include hide-text;
   background: {
@@ -15,6 +14,7 @@
     repeat: no-repeat;
     position: $x $y; }; }
 
+// Hides text in an element so you can see the background.
 @mixin hide-text {
   text-indent: -9999em;
   overflow: hidden;

data/lib/compass.rb

@@ -7,7 +7,12 @@ end
 
 module Compass
   extend Compass::Version
-  VERSION = "#{version[:major]}.#{version[:minor]}.#{version[:patch]}"
+  def self.const_missing(const)
+    # This avoid reading from disk unless the VERSION is requested.
+    if const == :VERSION
+      version[:string]
+    end
+  end
   def base_directory
     File.expand_path(File.join(File.dirname(__FILE__), '..'))
   end

data/lib/compass/commands/help.rb

@@ -58,6 +58,7 @@ To get help on a particular command please specify the command.
       class << self
         def option_parser(arguments)
           parser = Compass::Exec::CommandOptionParser.new(arguments)
+          parser.extend(Compass::Exec::GlobalOptionsParser)
           parser.extend(HelpOptionsParser)
         end
         def usage

data/lib/compass/configuration/data.rb

@@ -62,7 +62,11 @@ module Compass
         if block_given?
           @asset_host = block
         else
-          @asset_host
+          if @asset_host
+            @asset_host
+          elsif inherited_data.respond_to?(:asset_host)
+            inherited_data.asset_host
+          end
         end
       end
 
@@ -77,7 +81,11 @@ module Compass
         if block_given?
           @asset_cache_buster = block
         else
-          @asset_cache_buster
+          if @asset_cache_buster
+            @asset_cache_buster
+          elsif inherited_data.respond_to?(:asset_cache_buster)
+            inherited_data.asset_cache_buster
+          end
         end
       end
 

data/lib/compass/exec/helpers.rb

@@ -5,6 +5,9 @@ module Compass::Exec
       if Compass::Commands.command_exists? arguments.first
         SubCommandUI
       else
+        Compass::Logger.new.red do
+          Haml::Util.haml_warn "WARNING: This interface is deprecated. Please use the new subcommand interface.\nSee `compass help` for more information.\n"
+        end
         SwitchUI
       end
     end

data/lib/compass/sass_extensions/functions/selectors.rb

@@ -39,4 +39,25 @@ module Compass::SassExtensions::Functions::Selectors
     Sass::Script::String.new(nested)
   end
 
+  # Return the header selectors for the levels indicated
+  # Defaults to all headers h1 through h6
+  # For example:
+  # headers(all) => h1, h2, h3, h4, h5, h6
+  # headers(4) => h1, h2, h3, h4
+  # headers(2,4) => h2, h3, h4
+  def headers(from = nil, to = nil)
+    if from && !to
+      if from.is_a?(Sass::Script::String) && from.value == "all"
+        from = Sass::Script::Number.new(1)
+        to = Sass::Script::Number.new(6)
+      else
+        to = from
+        from = Sass::Script::Number.new(1)
+      end
+    else
+      from ||= Sass::Script::Number.new(1)
+      to ||= Sass::Script::Number.new(6)
+    end
+    Sass::Script::String.new((from.value..to.value).map{|n| "h#{n}"}.join(", "))
+  end
 end

data/lib/compass/version.rb

@@ -6,18 +6,12 @@ module Compass
     # The :rev key will have the current revision hash.
     #
     # This method swiped from Haml and then modified, some credit goes to Nathan Weizenbaum
-    attr_writer :version
     def version
-      return @version if defined?(@version)
-
-      read_version_file
-
-      if r = revision
-        @version[:rev] = r
-        @version[:string] << " [#{r[0...7]}]"
+      if defined?(@version)
+        @version
+      else
+        read_version
       end
-
-      @version
     end
 
     protected
@@ -26,22 +20,20 @@ module Compass
       File.join(File.dirname(__FILE__), '..', '..', file)
     end
 
-    def read_version_file
+    def read_version
       require 'yaml'
       @version = YAML::load(File.read(scope('VERSION.yml')))
-      @version[:string] = "#{@version[:major]}.#{@version[:minor]}.#{@version[:patch]}"
       @version[:teeny] = @version[:patch]
+      @version[:string] = "#{@version[:major]}.#{@version[:minor]}.#{@version[:patch]}"
+      @version[:string] << ".#{@version[:build]}" if @version[:build]
+      if !ENV['OFFICIAL'] && r = revision
+        @version[:string] << ".dev.#{r[0..6]}"
+      end
+      @version
     end
 
     def revision
-      revision_from_git || revision_from_file
-    end
-
-    def revision_from_file
-      if File.exists?(scope('REVISION'))
-        rev = File.read(scope('REVISION')).strip
-        rev if rev =~ /[a-f0-9]+/
-      end
+      revision_from_git
     end
 
     def revision_from_git
@@ -52,6 +44,5 @@ module Compass
         end
       end
     end
-
   end
 end

data/test/compass_test.rb

@@ -42,7 +42,7 @@ class CompassTest < Test::Unit::TestCase
       each_css_file(proj.css_path) do |css_file|
         assert_no_errors css_file, 'compass'
       end
-      assert_renders_correctly :reset, :layout, :utilities, :gradients, :image_size
+      assert_renders_correctly :reset, :layout, :utilities, :gradients, :image_size, :box
     end
   end
 

data/test/fixtures/stylesheets/blueprint/css/typography.css

@@ -1,54 +1,43 @@
 body {
   line-height: 1.5;
-  font-family: Helvetica Neue, Arial, Helvetica, sans-serif;
+  font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
   color: #333333;
   font-size: 75%; }
 
-h1 {
+h1, h2, h3, h4, h5, h6 {
   font-weight: normal;
-  color: #222222;
+  color: #222222; }
+  h1 img, h2 img, h3 img, h4 img, h5 img, h6 img {
+    margin: 0; }
+
+h1 {
   font-size: 3em;
   line-height: 1;
   margin-bottom: 0.5em; }
-  h1 img {
-    margin: 0; }
 
 h2 {
-  font-weight: normal;
-  color: #222222;
   font-size: 2em;
   margin-bottom: 0.75em; }
 
 h3 {
-  font-weight: normal;
-  color: #222222;
   font-size: 1.5em;
   line-height: 1;
   margin-bottom: 1em; }
 
 h4 {
-  font-weight: normal;
-  color: #222222;
   font-size: 1.2em;
   line-height: 1.25;
   margin-bottom: 1.25em; }
 
 h5 {
-  font-weight: normal;
-  color: #222222;
   font-size: 1em;
   font-weight: bold;
   margin-bottom: 1.5em; }
 
 h6 {
-  font-weight: normal;
-  color: #222222;
   font-size: 1em;
   font-weight: bold; }
 
-h2 img, h3 img, h4 img, h5 img, h6 img {
-  margin: 0; }
-
 p {
   margin: 0 0 1.5em; }
   p img.left {
@@ -107,7 +96,7 @@ pre {
   white-space: pre; }
 
 pre, code, tt {
-  font: 1em 'andale mono', 'lucida console', monospace;
+  font: 1em "andale mono", "lucida console", monospace;
   line-height: 1.5; }
 
 li ul, li ol {

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

@@ -0,0 +1,90 @@
+.hbox {
+  display: -moz-box;
+  display: -webkit-box;
+  display: box;
+  -moz-box-orient: horizontal;
+  -webkit-box-orient: horizontal;
+  box-orient: horizontal;
+  -moz-box-align: stretch;
+  -webkit-box-align: stretch;
+  box-align: stretch; }
+  .hbox > * {
+    -moz-box-flex: 0;
+    -webkit-box-flex: 0;
+    box-flex: 0;
+    display: block; }
+
+.vbox {
+  display: -moz-box;
+  display: -webkit-box;
+  display: box;
+  -moz-box-orient: vertical;
+  -webkit-box-orient: vertical;
+  box-orient: vertical;
+  -moz-box-align: stretch;
+  -webkit-box-align: stretch;
+  box-align: stretch; }
+  .vbox > * {
+    -moz-box-flex: 0;
+    -webkit-box-flex: 0;
+    box-flex: 0;
+    display: block; }
+
+.spacer {
+  -moz-box-flex: 1;
+  -webkit-box-flex: 1;
+  box-flex: 1;
+  display: block; }
+
+.reverse {
+  -moz-box-direction: reverse;
+  -webkit-box-direction: reverse;
+  box-direction: reverse; }
+
+.box-flex-0 {
+  -moz-box-flex: 0;
+  -webkit-box-flex: 0;
+  box-flex: 0;
+  display: block; }
+
+.box-flex-1 {
+  -moz-box-flex: 1;
+  -webkit-box-flex: 1;
+  box-flex: 1;
+  display: block; }
+
+.box-flex-2 {
+  -moz-box-flex: 2;
+  -webkit-box-flex: 2;
+  box-flex: 2;
+  display: block; }
+
+.box-flex-group-0 {
+  -moz-box-flex-group: 0;
+  -webkit-box-flex-group: 0;
+  box-flex-group: 0; }
+
+.box-flex-group-1 {
+  -moz-box-flex-group: 1;
+  -webkit-box-flex-group: 1;
+  box-flex-group: 1; }
+
+.box-flex-group-2 {
+  -moz-box-flex-group: 2;
+  -webkit-box-flex-group: 2;
+  box-flex-group: 2; }
+
+.start {
+  -moz-box-pack: start;
+  -webkit-box-pack: start;
+  box-pack: start; }
+
+.end {
+  -moz-box-pack: end;
+  -webkit-box-pack: end;
+  box-pack: end; }
+
+.center {
+  -moz-box-pack: center;
+  -webkit-box-pack: center;
+  box-pack: center; }

data/test/fixtures/stylesheets/compass/sass/box.sass

@@ -0,0 +1,50 @@
+@import compass/css3
+
+.hbox
+  +display-box
+  +box-orient
+  +box-align
+  
+  & > *
+    +box-flex
+
+.vbox
+  +display-box
+  +box-orient(vertical)
+  +box-align
+  
+  & > *
+    +box-flex
+
+.spacer
+  +box-flex(1)
+
+.reverse
+  +box-direction(reverse)
+
+.box-flex-0
+  +box-flex(0)
+
+.box-flex-1
+  +box-flex(1)
+
+.box-flex-2
+  +box-flex(2)
+
+.box-flex-group-0
+  +box-flex-group(0)
+
+.box-flex-group-1
+  +box-flex-group(1)
+
+.box-flex-group-2
+  +box-flex-group(2)
+
+.start
+  +box-pack(start)
+
+.end
+  +box-pack(end)
+
+.center
+  +box-pack(center)

data/test/sass_extensions_test.rb

@@ -2,50 +2,43 @@ require 'test_helper'
 
 class SassExtensionsTest < Test::Unit::TestCase
   def test_simple
-    assert_equal "a b", nest("a", "b")
+    assert_equal "a b", evaluate(%Q{nest("a", "b")})
   end
   def test_left_side_expansion
-    assert_equal "a c, b c", nest("a, b", "c")
+    assert_equal "a c, b c", evaluate(%Q{nest("a, b", "c")})
   end
   def test_right_side_expansion
-    assert_equal "a b, a c", nest("a", "b, c")
+    assert_equal "a b, a c", evaluate(%Q{nest("a", "b, c")})
   end
   def test_both_sides_expansion
-    assert_equal "a c, a d, b c, b d", nest("a, b", "c, d")
+    assert_equal "a c, a d, b c, b d", evaluate(%Q{nest("a, b", "c, d")})
   end
   def test_three_selectors_expansion
-    assert_equal "a b, a c, a d", nest("a", "b, c, d")
+    assert_equal "a b, a c, a d", evaluate(%Q{nest("a", "b, c, d")})
   end
   def test_third_argument_expansion
-    assert_equal "a b e, a b f, a c e, a c f, a d e, a d f", nest("a", "b, c, d", "e, f")
+    assert_equal "a b e, a b f, a c e, a c f, a d e, a d f", evaluate(%Q{nest("a", "b, c, d", "e, f")})
   end
 
   def test_enumerate
-    assert_equal ".grid-1, .grid-2, .grid-3", enumerate(".grid", 1, 3, "-")
+    assert_equal ".grid-1, .grid-2, .grid-3", evaluate(%Q{enumerate(".grid", 1, 3, "-")})
   end
   
   def test_append_selector
-    assert_equal "div.bar", append_selector("div", ".bar")
-    assert_equal ".foo1.bar1, .foo1.bar2, .foo2.bar1, .foo2.bar2", append_selector(".foo1, .foo2", ".bar1, .bar2")
+    assert_equal "div.bar", evaluate(%Q{append_selector("div", ".bar")})
+    assert_equal ".foo1.bar1, .foo1.bar2, .foo2.bar1, .foo2.bar2", evaluate(%Q{append_selector(".foo1, .foo2", ".bar1, .bar2")})
+  end
+
+  def test_headers
+    assert_equal "h1, h2, h3, h4, h5, h6", evaluate("headers()")
+    assert_equal "h1, h2, h3, h4, h5, h6", evaluate("headers(all)")
+    assert_equal "h1, h2, h3, h4", evaluate("headers(4)")
+    assert_equal "h2, h3", evaluate("headers(2,3)")
+    assert_equal "h4, h5, h6", evaluate("headers(4,6)")
   end
 
 protected
-  def evaluation_content(options)
-    Sass::Script::Functions::EvaluationContext.new(options)
-  end
-  def nest(*arguments)
-    options = arguments.last.is_a?(Hash) ? arguments.pop : Hash.new
-    evaluation_content(options).nest(*arguments.map{|a| Sass::Script::String.new(a, :string)}).to_s
-  end
-  def enumerate(prefix, from, through, separator = "-", options = {})
-    prefix = Sass::Script::String.new(prefix, :string)
-    from = Sass::Script::Number.new(from)
-    through = Sass::Script::Number.new(through)
-    separator = Sass::Script::String.new(separator, :string)
-    evaluation_content(options).enumerate(prefix, from, through, separator).to_s
-  end
-  def append_selector(*arguments)
-    options = arguments.last.is_a?(Hash) ? arguments.pop : Hash.new
-    evaluation_content(options).append_selector(*arguments.map{|a| Sass::Script::String.new(a, :string)}).to_s
+  def evaluate(value)
+    Sass::Script::Parser.parse(value, 0, 0).perform(Sass::Environment.new).to_s
   end
 end