compass 0.12.0 → 0.12.1

data/Rakefile

@@ -1,7 +1,16 @@
 require 'rubygems'
-require 'bundler'
-Bundler.setup
-require 'rake/dsl_definition' rescue nil
+if ENV["PKG"]
+  $: << File.expand_path(File.dirname(__FILE__))+"/lib"
+else
+  require 'bundler'
+  Bundler.setup 
+end
+
+begin
+  require 'rake/dsl_definition'
+rescue LoadError
+  #pass
+end
 require 'compass'
 
 # ----- Default: Testing ------
@@ -10,12 +19,17 @@ task :default => [:test, :features]
 
 require 'rake/testtask'
 require 'fileutils'
+
+begin
 require 'cucumber'
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new(:features) do |t|
   t.cucumber_opts = "features --format progress"
 end
+rescue LoadError
+  $stderr.puts "cannot load cucumber"
+end
 
 Rake::TestTask.new :test do |t|
   t.libs << 'lib'
@@ -124,3 +138,20 @@ rescue LoadError => e
   puts "WARNING: #{e}"
 end
 
+begin
+  require 'packager/rake_task'
+  require 'compass/version'
+  # Building a package:
+  # 1. Get packager installed and make sure your system is setup correctly according to their docs.
+  # 2. Make sure you are actually using a universal binary that has been nametooled.
+  # 3. PKG=1 OFFICIAL=1 rake packager:pkg
+  Packager::RakeTask.new(:pkg) do |t|
+    t.package_name = "Compass"
+    t.version = Compass::VERSION
+    t.domain = "compass-style.org"
+    t.bin_files = ["compass"]
+    t.resource_files = FileList["frameworks/**/*"] + ["VERSION.yml", "LICENSE.markdown"]
+  end
+rescue LoadError => e
+  puts "WARNING: #{e}"
+end

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 12
-:build: 0
+:build: 1
 :name: Alnilam

data/frameworks/compass/stylesheets/compass/typography/_vertical_rhythm.scss

@@ -1,18 +1,18 @@
 @import "compass/layout/grid-background";
 
-// The base font size
+// The base font size.
 $base-font-size: 16px !default;
 
-// The base line height is the basic unit of line hightness.
+// The base line height determines the basic unit of vertical rhythm.
 $base-line-height: 24px !default;
 
-// set the default border style for rhythm borders
+// Set the default border style for rhythm borders.
 $default-rhythm-border-style: solid !default;
 
 // The IE font ratio is a fact of life. Deal with it.
 $ie-font-ratio: 16px / 100%;
 
-// Set to false if you want to use absolute pixes in sizing your typography.
+// Set to false if you want to use absolute pixels in sizing your typography.
 $relative-font-sizing: true !default;
 
 // Allows the `adjust-font-size-to` mixin and the `lines-for-font-size` function
@@ -25,26 +25,26 @@ $round-to-nearest-half-line: false !default;
 $min-line-padding: 2px !default;
 
 // $base-font-size but in your output unit of choice.
-// Defaults to 1em when `$relative-font-sizing`
+// Defaults to 1em when `$relative-font-sizing` is true.
 $font-unit: if($relative-font-sizing, 1em, $base-font-size) !default;
 
-// The basic unit of font rhythm
+// The basic unit of font rhythm.
 $base-rhythm-unit: $base-line-height / $base-font-size * $font-unit;
 
 // The leader is the amount of whitespace in a line.
-// It might be useful in your calculations
+// It might be useful in your calculations.
 $base-leader: ($base-line-height - $base-font-size) * $font-unit / $base-font-size;
 
 // The half-leader is the amount of whitespace above and below a line.
-// It might be useful in your calculations
+// It might be useful in your calculations.
 $base-half-leader: $base-leader / 2;
 
-// True if a number has a relative unit
+// True if a number has a relative unit.
 @function relative-unit($number) {
   @return unit($number) == "%" or unit($number) == "em" or unit($number) == "rem"
 }
 
-// True if a number has an absolute unit
+// True if a number has an absolute unit.
 @function absolute-unit($number) {
   @return not (relative-unit($number) or unitless($number));
 }
@@ -53,7 +53,7 @@ $base-half-leader: $base-leader / 2;
   @warn "$relative-font-sizing is true but $font-unit is set to #{$font-unit} which is not a relative unit.";
 }
 
-// Establishes a font baseline for the given font-size in pixels
+// Establishes a font baseline for the given font-size.
 @mixin establish-baseline($font-size: $base-font-size) {
   body {
     font-size: $font-size / $ie-font-ratio;
@@ -70,7 +70,7 @@ $base-half-leader: $base-leader / 2;
 }
 
 // Show a background image that can be used to debug your alignments.
-// include the $img argument if you would rather use your own image than the
+// Include the $img argument if you would rather use your own image than the
 // Compass default gradient image.
 @mixin debug-vertical-alignment($img: false) {
   @if $img {
@@ -80,11 +80,11 @@ $base-half-leader: $base-leader / 2;
   }
 }
 
-// Adjust a block to have a different font size and leading to maintain the rhythm.
-// $lines is a number that is how many times the baseline rhythm this
-// font size should use up. Does not have to be an integer, but it defaults
-// to the smallest integer that is large enough to fit the font.
-// Use $from_size to adjust from a non-base font-size.
+// Adjust a block to have a different font size and line height to maintain the
+// rhythm. $lines specifies how many multiples of the baseline rhythm each line
+// of this font should use up. It does not have to be an integer, but it
+// defaults to the smallest integer that is large enough to fit the font.
+// Use $from-size to adjust from a font-size other than the base font-size.
 @mixin adjust-font-size-to($to-size, $lines: lines-for-font-size($to-size), $from-size: $base-font-size) {
   @if not $relative-font-sizing and $from-size != $base-font-size {
     @warn "$relative-font-sizing is false but a relative font size was passed to adjust-font-size-to";
@@ -93,14 +93,15 @@ $base-half-leader: $base-leader / 2;
   @include adjust-leading-to($lines, if($relative-font-sizing, $to-size, $base-font-size));
 }
 
+// Adjust a block to have different line height to maintain the rhythm.
+// $lines specifies how many multiples of the baseline rhythm each line of this
+// font should use up. It does not have to be an integer, but it defaults to the
+// smallest integer that is large enough to fit the font.
 @mixin adjust-leading-to($lines, $font-size: $base-font-size) {
-  @if not $relative-font-sizing and $font-size != $base-font-size {
-    @warn "$relative-font-sizing is false but a relative font size was passed to adjust-leading-to";
-  }
-  line-height: $font-unit * $lines * $base-line-height / $font-size;
+  line-height: rhythm($lines, $font-size);
 }
 
-// Calculate rhythm units
+// Calculate rhythm units.
 @function rhythm(
   $lines: 1,
   $font-size: $base-font-size
@@ -109,9 +110,14 @@ $base-half-leader: $base-leader / 2;
     @warn "$relative-font-sizing is false but a relative font size was passed to the rhythm function";
   }
   $rhythm: $font-unit * $lines * $base-line-height / $font-size;
+  // Round the pixels down to nearest integer.
+  @if unit($rhythm) == px {
+    $rhythm: floor($rhythm);
+  }
   @return $rhythm;
 }
 
+// Calculate the minimum multiple of rhythm units needed to contain the font-size.
 @function lines-for-font-size($font-size) {
   $lines: if($round-to-nearest-half-line,
               ceil(2 * $font-size / $base-line-height) / 2,
@@ -122,46 +128,37 @@ $base-half-leader: $base-leader / 2;
   @return $lines;
 }
 
-// Apply leading whitespace
+// Apply leading whitespace. The $property can be margin or padding.
 @mixin leader($lines: 1, $font-size: $base-font-size, $property: margin) {
-  $leader: rhythm($lines, $font-size);
-  @if unit($leader) == px {
-    $leader: floor($leader)
-  }
-  #{$property}-top: $leader;
+  #{$property}-top: rhythm($lines, $font-size);
 }
 
-// Apply leading whitespace as padding
+// Apply leading whitespace as padding.
 @mixin padding-leader($lines: 1, $font-size: $base-font-size) {
-  @include leader($lines, $font-size, padding);
+  padding-top: rhythm($lines, $font-size);
 }
 
-// Apply leading whitespace as margin
+// Apply leading whitespace as margin.
 @mixin margin-leader($lines: 1, $font-size: $base-font-size) {
-  @include leader($lines, $font-size, margin);
+  margin-top: rhythm($lines, $font-size);
 }
 
-// Apply trailing whitespace
+// Apply trailing whitespace. The $property can be margin or padding.
 @mixin trailer($lines: 1, $font-size: $base-font-size, $property: margin) {
-  $leader: rhythm($lines, $font-size);
-  @if unit($leader) == px {
-    $leader: ceil($leader)
-  }
-  #{$property}-bottom: $leader;
+  #{$property}-bottom: rhythm($lines, $font-size);
 }
 
-// Apply trailing whitespace as padding
+// Apply trailing whitespace as padding.
 @mixin padding-trailer($lines: 1, $font-size: $base-font-size) {
-  @include trailer($lines, $font-size, padding);
+  padding-bottom: rhythm($lines, $font-size);
 }
 
-// Apply trailing whitespace as margin
+// Apply trailing whitespace as margin.
 @mixin margin-trailer($lines: 1, $font-size: $base-font-size) {
-  @include trailer($lines, $font-size, margin);
+  margin-bottom: rhythm($lines, $font-size);
 }
 
-// Whitespace application shortcut
-// Apply top margin/padding + bottom padding/margin
+// Shorthand mixin to apply whitespace for top and bottom margins and padding.
 @mixin rhythm($leader: 0, $padding-leader: 0, $padding-trailer: 0, $trailer: 0, $font-size: $base-font-size) {
   @include leader($leader, $font-size);
   @include padding-leader($padding-leader, $font-size);
@@ -169,8 +166,8 @@ $base-half-leader: $base-leader / 2;
   @include trailer($trailer, $font-size);
 }
 
-// Apply a border width to any side without destroying the vertical rhythm.
-// The available space ($lines) must be greater than the width of your border.
+// Apply a border and whitespace to any side without destroying the vertical
+// rhythm. The whitespace must be greater than the width of the border.
 @mixin apply-side-rhythm-border($side, $width: 1px, $lines: 1, $font-size: $base-font-size, $border-style: $default-rhythm-border-style) {
   @if not $relative-font-sizing and $font-size != $base-font-size {
     @warn "$relative-font-sizing is false but a relative font size was passed to apply-side-rhythm-border";
@@ -182,33 +179,35 @@ $base-half-leader: $base-leader / 2;
   padding-#{$side}: $font-unit / $font-size * ($lines * $base-line-height - $width);
 }
 
-// Aplly rhythm borders equally to all sides
+// Apply borders and whitespace equally to all sides.
 @mixin rhythm-borders($width: 1px, $lines: 1, $font-size: $base-font-size, $border-style: $default-rhythm-border-style) {
   @if not $relative-font-sizing and $font-size != $base-font-size {
     @warn "$relative-font-sizing is false but a relative font size was passed to rhythm-borders";
   }
   border: {
     style: $border-style;
-    width: $font-unit * $width / $font-size; };
+    width: $font-unit * $width / $font-size;
+  };
   padding: $font-unit / $font-size * ($lines * $base-line-height - $width);
 }
 
-// Apply a leading rhythm border
+// Apply a leading border.
 @mixin leading-border($width: 1px, $lines: 1, $font-size: $base-font-size, $border-style: $default-rhythm-border-style) {
   @include apply-side-rhythm-border(top, $width, $lines, $font-size, $border-style);
 }
 
-// Apply a trailing rhythm border
+// Apply a trailing border.
 @mixin trailing-border($width: 1px, $lines: 1, $font-size: $base-font-size, $border-style: $default-rhythm-border-style) {
   @include apply-side-rhythm-border(bottom, $width, $lines, $font-size, $border-style);
 }
 
-// Apply both leading and trailing rhythm borders
+// Apply both leading and trailing borders.
 @mixin horizontal-borders($width: 1px, $lines: 1, $font-size: $base-font-size, $border-style: $default-rhythm-border-style) {
   @include leading-border($width, $lines, $font-size, $border-style);
   @include trailing-border($width, $lines, $font-size, $border-style);
 }
 
+// Alias for `horizontal-borders` mixin.
 @mixin h-borders($width: 1px, $lines: 1, $font-size: $base-font-size, $border-style: $default-rhythm-border-style) {
   @include horizontal-borders($width, $lines, $font-size, $border-style);
 }

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

@@ -5,7 +5,8 @@ module Compass::SassExtensions::Functions::FontFiles
     :opentype => 'opentype',
     :ttf => 'truetype',
     :truetype => 'truetype',
-    :svg => 'svg'
+    :svg => 'svg',
+    :eot => 'embedded-opentype'
   }
 
   def font_files(*args)
@@ -24,7 +25,8 @@ module Compass::SassExtensions::Functions::FontFiles
       if FONT_TYPES.key? type
         skip_next = true
       else
-        type = arg.to_s.split('.').last.gsub('"', '').to_sym
+        # let pass url like font.type?thing#stuff
+        type = arg.to_s.split('.').last.gsub(/(\?(.*))?(#(.*))?"/, '').to_sym
       end
 
       if FONT_TYPES.key? type

data/test/units/sass_extensions_test.rb

@@ -126,6 +126,18 @@ class SassExtensionsTest < Test::Unit::TestCase
       evaluate("font-files('/font/name.woff')")
     end
 
+    assert_nothing_raised Sass::SyntaxError do
+      evaluate("font-files('/font/name.svg#fontId')")
+    end
+
+    assert_nothing_raised Sass::SyntaxError do
+      evaluate("font-files('/font/name.eot?#iefix')")
+    end
+
+    assert_nothing_raised Sass::SyntaxError do
+      evaluate("font-files('/font/name.svg?mightbedynamic=something%20+escaped#fontId')")
+    end
+
     assert_raises Sass::SyntaxError do
       evaluate("font-files('/font/name.ext')")
     end

metadata

@@ -1,25 +1,25 @@
 --- !ruby/object:Gem::Specification 
 name: compass
 version: !ruby/object:Gem::Version 
-  hash: 47
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 12
-  - 0
-  version: 0.12.0
+  - 1
+  version: 0.12.1
 platform: ruby
 authors: 
 - Chris Eppstein
+- Scott Davis
 - Eric A. Meyer
 - Brandon Mathis
+- Anthony Short
 - Nico Hagenburger
-- Scott Davis
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2012-03-12 00:00:00 -07:00
+date: 2012-03-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
         segments: 
         - 3
         - 1
@@ -45,7 +44,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 1
         - 2
@@ -60,7 +58,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
         segments: 
         - 0
         - 2
@@ -1300,7 +1297,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -1309,14 +1305,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A Real Stylesheet Framework