compass 0.11.beta.2 → 0.11.beta.3

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

@@ -40,7 +40,7 @@ module Compass::SassExtensions::Functions::Colors
     alphastr = alpha.to_s(16).rjust(2, '0')
     Sass::Script::String.new("##{alphastr}#{color.send(:hex_str)[1..-1]}".upcase)
   end
-
+  
   private
   def scale_color_value(value, amount)
     if amount > 0

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

@@ -2,7 +2,7 @@ require 'digest/md5'
 
 module Compass::SassExtensions::Functions::Sprites
   ZERO = Sass::Script::Number::new(0)
-  
+
   # Provides a consistent interface for getting a variable in ruby
   # from a keyword argument hash that accounts for underscores/dash equivalence
   # and allows the caller to pass a symbol instead of a string.
@@ -123,7 +123,9 @@ module Compass::SassExtensions::Functions::Sprites
     # Generate a sprite image if necessary
     def generate
       if generation_required?
-        save!(construct_sprite)
+        sprite_data = construct_sprite
+        save!(sprite_data)
+        Compass.configuration.run_callback(:sprite_generated, sprite_data)
       end
     end
 
@@ -155,7 +157,7 @@ module Compass::SassExtensions::Functions::Sprites
           end
         end
       end
-      output_png 
+      output_png
     end
 
     # The on-the-disk filename of the sprite
@@ -180,7 +182,9 @@ module Compass::SassExtensions::Functions::Sprites
 
     # saves the sprite for later retrieval
     def save!(output_png)
-      output_png.save filename
+      saved = output_png.save filename
+      Compass.configuration.run_callback(:sprite_saved, filename)
+      saved
     end
 
     # All the full-path filenames involved in this sprite
@@ -285,7 +289,7 @@ module Compass::SassExtensions::Functions::Sprites
     end
   end
   Sass::Script::Functions.declare :sprite_file, [:map, :sprite]
-    
+
   # Returns a url to the sprite image.
   def sprite_url(map)
     unless map.is_a?(SpriteMap)

data/test/compass_test.rb

@@ -20,6 +20,29 @@ class CompassTest < Test::Unit::TestCase
     end
   end
 
+  def test_on_stylesheet_saved_callback
+    saved = false
+    path = nil
+    config = nil
+    before_compile = Proc.new do |config|
+      config.on_stylesheet_saved {|filepath| path = filepath; saved = true }
+    end
+    within_project(:blueprint, before_compile)
+    assert saved, "Stylesheet callback didn't get called"
+    assert path.is_a?(String), "Path is not a string. Got: #{path.class.name}"
+  end
+
+  # no project with errors exists to test aginst - leep of FAITH!
+  # *chriseppstein flogs himself*
+  # def test_on_stylesheet_error_callback
+  #     error = false
+  #     file = nil
+  #     Compass.configuration.on_stylesheet_error {|filename, message| file = filename; error = true }
+  #     within_project(:error) { } #requires a block but we don't need to pass anything - sdavis
+  #     assert error, "Project did not throw a compile error"
+  #     assert file.is_a?(String), "Filename was not a string"
+  #   end
+
   def test_empty_project
     # With no sass files, we should have no css files.
     within_project(:empty) do |proj|
@@ -102,22 +125,27 @@ private
     end
   end
 
-  def within_project(project_name)
+  def within_project(project_name, config_block = nil)
     @current_project = project_name
     Compass.add_configuration(configuration_file(project_name)) if File.exists?(configuration_file(project_name))
     Compass.configuration.project_path = project_path(project_name)
     Compass.configuration.environment = :production
     args = Compass.configuration.to_compiler_arguments(:logger => Compass::NullLogger.new)
+
+    if config_block
+      config_block.call(Compass.configuration)
+    end
+
     if Compass.configuration.sass_path && File.exists?(Compass.configuration.sass_path)
       compiler = Compass::Compiler.new *args
       compiler.run
     end
-    yield Compass.configuration
+    yield Compass.configuration if block_given?
   rescue
-    save_output(project_name)    
+    save_output(project_name)
     raise
   end
-  
+
   def each_css_file(dir, &block)
     Dir.glob("#{dir}/**/*.css").each(&block)
   end
@@ -145,15 +173,15 @@ private
   def tempfile_path(project_name)
     File.join(project_path(project_name), "tmp")
   end
-  
+
   def template_path(project_name)
     File.join(project_path(project_name), "sass")
   end
-  
+
   def result_path(project_name)
     File.join(project_path(project_name), "css")
   end
-  
+
   def save_path(project_name)
     File.join(project_path(project_name), "saved")
   end

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

@@ -1,33 +1,32 @@
 html, body, div, span, applet, object, iframe,
 h1, h2, h3, h4, h5, h6, p, blockquote, pre,
 a, abbr, acronym, address, big, cite, code,
-del, dfn, em, font, img, ins, kbd, q, s, samp,
+del, dfn, em, img, ins, kbd, q, s, samp,
 small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
 dl, dt, dd, ol, ul, li,
 fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td {
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
   margin: 0;
   padding: 0;
   border: 0;
-  outline: 0;
-  font-weight: inherit;
-  font-style: inherit;
   font-size: 100%;
-  font-family: inherit;
+  font: inherit;
   vertical-align: baseline; }
 
 body {
-  line-height: 1;
-  color: black;
-  background: white; }
+  line-height: 1; }
 
 ol, ul {
   list-style: none; }
 
 table {
-  border-collapse: separate;
-  border-spacing: 0;
-  vertical-align: middle; }
+  border-collapse: collapse;
+  border-spacing: 0; }
 
 caption, th, td {
   text-align: left;
@@ -35,13 +34,18 @@ caption, th, td {
   vertical-align: middle; }
 
 q, blockquote {
-  quotes: "" ""; }
+  quotes: none; }
   q:before, q:after, blockquote:before, blockquote:after {
-    content: ""; }
+    content: "";
+    content: none; }
 
 a img {
   border: none; }
 
+article, aside, details, figcaption, figure,
+footer, header, hgroup, menu, nav, section {
+  display: block; }
+
 body {
   line-height: 1.5;
   font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;

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

@@ -1,9 +1,5 @@
 @charset "UTF-8";
 @font-face {
   font-family: "font1";
-  src: local("☺"), url('/tmp/fonts/font1.woff') format('woff'); }
-
-@media screen and (max-device-width: 480px) {
-  @font-face {
-    font-family: "font1";
-    src: url('/tmp/fonts/font1.woff') format('woff'); } }
+  src: url('/tmp/fonts/font1.eot');
+  src: url('/tmp/fonts/font1.eot?iefix') format('eot'), url('/tmp/fonts/font1.woff') format('woff'); }

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

@@ -2,7 +2,6 @@ ul.horizontal {
   margin: 0;
   padding: 0;
   border: 0;
-  outline: 0;
   overflow: hidden;
   *zoom: 1; }
   ul.horizontal li {
@@ -25,7 +24,6 @@ ul.wide-horizontal {
   margin: 0;
   padding: 0;
   border: 0;
-  outline: 0;
   overflow: hidden;
   *zoom: 1; }
   ul.wide-horizontal li {
@@ -48,7 +46,6 @@ ul.right-horizontal {
   margin: 0;
   padding: 0;
   border: 0;
-  outline: 0;
   overflow: hidden;
   *zoom: 1; }
   ul.right-horizontal li {
@@ -71,7 +68,6 @@ ul.no-padding {
   margin: 0;
   padding: 0;
   border: 0;
-  outline: 0;
   overflow: hidden;
   *zoom: 1; }
   ul.no-padding li {
@@ -86,7 +82,6 @@ ul.inline-block {
   margin: 0;
   padding: 0;
   border: 0;
-  outline: 0;
   overflow: hidden;
   *zoom: 1; }
   ul.inline-block li {
@@ -106,7 +101,6 @@ ul.wide-inline-block {
   margin: 0;
   padding: 0;
   border: 0;
-  outline: 0;
   overflow: hidden;
   *zoom: 1; }
   ul.wide-inline-block li {

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

@@ -1,33 +1,32 @@
 html, body, div, span, applet, object, iframe,
 h1, h2, h3, h4, h5, h6, p, blockquote, pre,
 a, abbr, acronym, address, big, cite, code,
-del, dfn, em, font, img, ins, kbd, q, s, samp,
+del, dfn, em, img, ins, kbd, q, s, samp,
 small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
 dl, dt, dd, ol, ul, li,
 fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td {
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
   margin: 0;
   padding: 0;
   border: 0;
-  outline: 0;
-  font-weight: inherit;
-  font-style: inherit;
   font-size: 100%;
-  font-family: inherit;
+  font: inherit;
   vertical-align: baseline; }
 
 body {
-  line-height: 1;
-  color: black;
-  background: white; }
+  line-height: 1; }
 
 ol, ul {
   list-style: none; }
 
 table {
-  border-collapse: separate;
-  border-spacing: 0;
-  vertical-align: middle; }
+  border-collapse: collapse;
+  border-spacing: 0; }
 
 caption, th, td {
   text-align: left;
@@ -35,13 +34,18 @@ caption, th, td {
   vertical-align: middle; }
 
 q, blockquote {
-  quotes: "" ""; }
+  quotes: none; }
   q:before, q:after, blockquote:before, blockquote:after {
-    content: ""; }
+    content: "";
+    content: none; }
 
 a img {
   border: none; }
 
+article, aside, details, figcaption, figure,
+footer, header, hgroup, menu, nav, section {
+  display: block; }
+
 .unregistered-only, .registered-only {
   display: none; }
 

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

@@ -11,3 +11,16 @@
     clear: both;
     overflow: hidden;
     visibility: hidden; }
+
+p.light {
+  background-color: #b0201e;
+  color: black; }
+p.dark {
+  background-color: #5f1210;
+  color: white; }
+p.light-with-args {
+  background-color: #b0201e;
+  color: green; }
+p.dark-with-args {
+  background-color: #5f1210;
+  color: blue; }

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

@@ -0,0 +1,42 @@
+body {
+  font-size: 87.5%;
+  line-height: 1.143em; }
+
+html > body {
+  font-size: 14px; }
+
+.small {
+  font-size: 0.857em;
+  line-height: 1.333em; }
+
+.padded {
+  margin-top: 1.143em;
+  padding-top: 1.143em;
+  padding-bottom: 1.143em;
+  margin-bottom: 1.143em; }
+
+.small-padded {
+  font-size: 0.857em;
+  line-height: 1.333em;
+  margin-top: 1.333em;
+  padding-top: 1.333em;
+  padding-bottom: 1.333em;
+  margin-bottom: 1.333em; }
+
+.borders {
+  border-top-style: solid;
+  border-top-width: 0.071em;
+  padding-top: 1.071em;
+  border-bottom-style: solid;
+  border-bottom-width: 0.071em;
+  padding-bottom: 1.071em; }
+
+.large-borders {
+  font-size: 1.714em;
+  line-height: 2em;
+  border-top-style: solid;
+  border-top-width: 0.25em;
+  padding-top: 0.417em;
+  border-bottom-style: solid;
+  border-bottom-width: 0.25em;
+  padding-bottom: 0.417em; }

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

@@ -1,3 +1,3 @@
 @import compass/css3/font-face
 
-+font-face("font1", font-files("font1.woff", woff))
++font-face("font1", font-files("font1.woff", woff), "font1.eot")

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

@@ -1,4 +1,4 @@
-@import "compass/utilities/lists";
+@import "compass/typography/lists";
 
 ul.horizontal        { @include horizontal-list;             }
 ul.wide-horizontal   { @include horizontal-list(10px);       }
@@ -7,6 +7,6 @@ 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;                 }
-ul.comma             { @include comma-delimited-list;        }
+ul.comma             { @include delimited-list;              }
 ul.no-bullets        { @include no-bullets;                  }
 ul.pretty            { @include pretty-bullets("4x6.png");   }

data/test/fixtures/stylesheets/compass/sass/utilities.scss

@@ -7,3 +7,8 @@
 .pie-clearfix {
     @include pie-clearfix;
 }
+
+p.light { @include contrasted(#B0201E); }
+p.dark  { @include contrasted(#5F1210); }
+p.light-with-args { @include contrasted(#B0201E, green, blue); }
+p.dark-with-args  { @include contrasted(#5F1210, green, blue); }

data/test/fixtures/stylesheets/compass/sass/vertical_rhythm.scss

@@ -0,0 +1,14 @@
+@import "compass/typography/vertical_rhythm";
+
+$base-font-size: 14px;
+$base-line-height: 16px;
+
+@include establish-baseline;
+
+.small { @include adjust-font-size-to(12px,1); }
+
+.padded { @include rhythm(1,1,1,1); }
+.small-padded { @include adjust-font-size-to(12px,1); @include rhythm(1,1,1,1,12px); }
+
+.borders { @include h-borders(1px,1); }
+.large-borders { @include adjust-font-size-to(24px,3); @include h-borders(6px,1,24px); }

metadata

@@ -1,14 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: compass
 version: !ruby/object:Gem::Version 
-  hash: 62196239
-  prerelease: true
-  segments: 
-  - 0
-  - 11
-  - beta
-  - 2
-  version: 0.11.beta.2
+  prerelease: 5
+  version: 0.11.beta.3
 platform: ruby
 authors: 
 - Chris Eppstein
@@ -19,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-01 00:00:00 -08:00
+date: 2011-03-15 00:00:00 -07:00
 default_executable: compass
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,14 +24,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: -3702664552
-        segments: 
-        - 3
-        - 1
-        - 0
-        - alpha
-        - 218
-        version: 3.1.0.alpha.218
+        version: 3.1.0.alpha.249
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -48,11 +35,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 0
-        - 12
-        - 0
         version: 0.12.0
   type: :runtime
   version_requirements: *id002
@@ -512,9 +494,12 @@ files:
 - frameworks/compass/stylesheets/_lemonade.scss
 - frameworks/compass/stylesheets/compass/_css3.scss
 - frameworks/compass/stylesheets/compass/_layout.scss
+- frameworks/compass/stylesheets/compass/_reset-legacy.scss
 - frameworks/compass/stylesheets/compass/_reset.scss
 - frameworks/compass/stylesheets/compass/_support.scss
+- frameworks/compass/stylesheets/compass/_typography.scss
 - frameworks/compass/stylesheets/compass/_utilities.scss
+- frameworks/compass/stylesheets/compass/css3/_appearance.scss
 - frameworks/compass/stylesheets/compass/css3/_background-clip.scss
 - frameworks/compass/stylesheets/compass/css3/_background-origin.scss
 - frameworks/compass/stylesheets/compass/css3/_background-size.scss
@@ -536,7 +521,23 @@ files:
 - frameworks/compass/stylesheets/compass/css3/_transition.scss
 - frameworks/compass/stylesheets/compass/layout/_sticky-footer.scss
 - frameworks/compass/stylesheets/compass/layout/_stretching.scss
+- frameworks/compass/stylesheets/compass/reset/_utilities-legacy.scss
 - frameworks/compass/stylesheets/compass/reset/_utilities.scss
+- frameworks/compass/stylesheets/compass/typography/_links.scss
+- frameworks/compass/stylesheets/compass/typography/_lists.scss
+- frameworks/compass/stylesheets/compass/typography/_text.scss
+- frameworks/compass/stylesheets/compass/typography/_vertical_rhythm.scss
+- frameworks/compass/stylesheets/compass/typography/links/_hover-link.scss
+- frameworks/compass/stylesheets/compass/typography/links/_link-colors.scss
+- frameworks/compass/stylesheets/compass/typography/links/_unstyled-link.scss
+- frameworks/compass/stylesheets/compass/typography/lists/_bullets.scss
+- frameworks/compass/stylesheets/compass/typography/lists/_horizontal-list.scss
+- frameworks/compass/stylesheets/compass/typography/lists/_inline-block-list.scss
+- frameworks/compass/stylesheets/compass/typography/lists/_inline-list.scss
+- frameworks/compass/stylesheets/compass/typography/text/_ellipsis.scss
+- frameworks/compass/stylesheets/compass/typography/text/_nowrap.scss
+- frameworks/compass/stylesheets/compass/typography/text/_replacement.scss
+- frameworks/compass/stylesheets/compass/utilities/_color.scss
 - frameworks/compass/stylesheets/compass/utilities/_general.scss
 - frameworks/compass/stylesheets/compass/utilities/_links.scss
 - frameworks/compass/stylesheets/compass/utilities/_lists.scss
@@ -544,6 +545,7 @@ files:
 - frameworks/compass/stylesheets/compass/utilities/_sprites.scss
 - frameworks/compass/stylesheets/compass/utilities/_tables.scss
 - frameworks/compass/stylesheets/compass/utilities/_text.scss
+- frameworks/compass/stylesheets/compass/utilities/color/_contrast.scss
 - frameworks/compass/stylesheets/compass/utilities/general/_clearfix.scss
 - frameworks/compass/stylesheets/compass/utilities/general/_float.scss
 - frameworks/compass/stylesheets/compass/utilities/general/_hacks.scss
@@ -627,6 +629,7 @@ files:
 - lib/compass/configuration/comments.rb
 - lib/compass/configuration/data.rb
 - lib/compass/configuration/defaults.rb
+- lib/compass/configuration/file_data.rb
 - lib/compass/configuration/helpers.rb
 - lib/compass/configuration/inheritance.rb
 - lib/compass/configuration/paths.rb
@@ -767,6 +770,7 @@ files:
 - test/fixtures/stylesheets/compass/css/text_shadow.css
 - test/fixtures/stylesheets/compass/css/transform.css
 - test/fixtures/stylesheets/compass/css/utilities.css
+- test/fixtures/stylesheets/compass/css/vertical_rhythm.css
 - test/fixtures/stylesheets/compass/images/100x150.gif
 - test/fixtures/stylesheets/compass/images/100x150.jpeg
 - test/fixtures/stylesheets/compass/images/100x150.jpg
@@ -791,6 +795,7 @@ files:
 - test/fixtures/stylesheets/compass/sass/text_shadow.scss
 - test/fixtures/stylesheets/compass/sass/transform.scss
 - test/fixtures/stylesheets/compass/sass/utilities.scss
+- test/fixtures/stylesheets/compass/sass/vertical_rhythm.scss
 - test/fixtures/stylesheets/image_urls/config.rb
 - test/fixtures/stylesheets/image_urls/css/screen.css
 - test/fixtures/stylesheets/image_urls/images/grid.png
@@ -831,25 +836,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
       version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A Real Stylesheet Framework
@@ -930,6 +927,7 @@ test_files:
 - test/fixtures/stylesheets/compass/css/text_shadow.css
 - test/fixtures/stylesheets/compass/css/transform.css
 - test/fixtures/stylesheets/compass/css/utilities.css
+- test/fixtures/stylesheets/compass/css/vertical_rhythm.css
 - test/fixtures/stylesheets/compass/images/100x150.gif
 - test/fixtures/stylesheets/compass/images/100x150.jpeg
 - test/fixtures/stylesheets/compass/images/100x150.jpg
@@ -954,6 +952,7 @@ test_files:
 - test/fixtures/stylesheets/compass/sass/text_shadow.scss
 - test/fixtures/stylesheets/compass/sass/transform.scss
 - test/fixtures/stylesheets/compass/sass/utilities.scss
+- test/fixtures/stylesheets/compass/sass/vertical_rhythm.scss
 - test/fixtures/stylesheets/image_urls/config.rb
 - test/fixtures/stylesheets/image_urls/css/screen.css
 - test/fixtures/stylesheets/image_urls/images/grid.png