compass 0.10.0.rc3 → 0.10.0.rc4

data/Rakefile

@@ -1,23 +1,7 @@
-if ENV['RUN_CODE_RUN']
-  # We need to checkout edge haml for the run>code>run test environment.
-  if File.directory?("haml")
-    Dir.chdir("haml") do
-      sh "git", "fetch"
-    end
-  else
-    sh "git", "clone", "git://github.com/nex3/haml.git"
-  end
-  Dir.chdir("haml") do
-    sh "git", "reset", "--hard", "origin/stable"
-  end
-  $LOAD_PATH.unshift "haml/lib"
-end
-
 require 'rubygems'
 require 'rake'
 $:.unshift File.join(File.dirname(__FILE__), 'lib')
 require 'compass'
-require 'rcov/rcovtask'
 
 # ----- Default: Testing ------
 
@@ -29,7 +13,6 @@ require 'fileutils'
 Rake::TestTask.new :run_tests do |t|
   t.libs << 'lib'
   t.libs << 'test'
-  t.libs << 'haml/lib' if ENV["RUN_CODE_RUN"]
   test_files = FileList['test/**/*_test.rb']
   test_files.exclude('test/rails/*', 'test/haml/*')
   t.test_files = test_files
@@ -40,65 +23,6 @@ To run with an alternate version of Rails, make test/rails a symlink to that ver
 To run with an alternate version of Haml & Sass, make test/haml a symlink to that version.
 END
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.rubyforge_project = "compass"
-    gemspec.name = "compass"
-    gemspec.summary = "A Real Stylesheet Framework"
-    gemspec.email = "chris@eppsteins.net"
-    gemspec.homepage = "http://compass-style.org"
-    gemspec.description = "Compass is a Sass-based Stylesheet Framework that streamlines the creation and maintainance of CSS."
-    gemspec.authors = ["Chris Eppstein"]
-    gemspec.has_rdoc = false
-    gemspec.add_dependency('haml', '>= 3.0.0.beta.2')
-    gemspec.files = []
-    gemspec.files << "CHANGELOG.markdown"
-    gemspec.files << "README.markdown"
-    gemspec.files << "LICENSE.markdown"
-    gemspec.files << "REVISION"
-    gemspec.files << "VERSION.yml"
-    gemspec.files << "Rakefile"
-    gemspec.files << "deps.rip"
-    gemspec.files += Dir.glob("bin/*")
-    gemspec.files += Dir.glob("examples/**/*.*")
-    gemspec.files -= Dir.glob("examples/**/*.css")
-    gemspec.files -= Dir.glob("examples/**/*.html")
-    gemspec.files -= Dir.glob("examples/*/extensions/**")
-    gemspec.files += Dir.glob("frameworks/**/*")
-    gemspec.files += Dir.glob("lib/**/*")
-    gemspec.files += Dir.glob("test/**/*.*")
-    gemspec.files -= Dir.glob("test/fixtures/stylesheets/*/saved/**/*.*")
-    gemspec.test_files = Dir.glob("test/**/*.*")
-    gemspec.test_files -= Dir.glob("test/fixtures/stylesheets/*/saved/**/*.*")
-    gemspec.test_files += Dir.glob("features/**/*.*")
-  end
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
-end
-
-desc "Record the current git revision."
-task :REVISION do
-  require 'git'
-  
-  repo = Git.open('.')
-  open("REVISION", "w") do |f|
-    f.write(repo.object("HEAD").sha)
-  end
-end
-
-desc "Commit the revision file."
-task :commit_revision => :REVISION do
-  require 'git'
-  repo = Git.open('.')  
-  repo.add("REVISION")
-  repo.commit("Record current revision for release.")
-end
-
-task :release => :commit_revision
-
-task :gem => :build
-
 desc "Compile Examples into HTML and CSS"
 task :examples do
   linked_haml = "tests/haml"
@@ -149,33 +73,37 @@ namespace :git do
   end
 end
 
-require 'cucumber/rake/task'
 
-namespace :rcov do
-  Cucumber::Rake::Task.new(:cucumber) do |t|    
-    t.rcov = true
-    t.rcov_opts = %w{--exclude osx\/objc,gems\/,spec\/,features\/ --aggregate coverage.data}
-    t.rcov_opts << %[-o "coverage"]
-  end
-  
-  Rcov::RcovTask.new(:units) do |rcov|
-    rcov.libs << 'lib'
-    rcov.libs << 'haml/lib' if ENV["RUN_CODE_RUN"]
-    test_files = FileList['test/**/*_test.rb']
-    test_files.exclude('test/rails/*', 'test/haml/*')
-    rcov.pattern    = test_files
-    rcov.output_dir = 'coverage'
-    rcov.verbose    = true
-    rcov.rcov_opts = %w{--exclude osx\/objc,gems\/,spec\/,features\/ --aggregate coverage.data}
-    rcov.rcov_opts << %[-o "coverage" --sort coverage]
-  end
-  
-  
-  desc "Run both specs and features to generate aggregated coverage"
-  task :all do |t|
-    rm "coverage.data" if File.exist?("coverage.data")
-    Rake::Task["rcov:units"].invoke
-    Rake::Task["rcov:cucumber"].invoke
+begin
+  require 'cucumber/rake/task'
+  require 'rcov/rcovtask'
+  namespace :rcov do
+    Cucumber::Rake::Task.new(:cucumber) do |t|    
+      t.rcov = true
+      t.rcov_opts = %w{--exclude osx\/objc,gems\/,spec\/,features\/ --aggregate coverage.data}
+      t.rcov_opts << %[-o "coverage"]
+    end
+    
+    Rcov::RcovTask.new(:units) do |rcov|
+      rcov.libs << 'lib'
+      test_files = FileList['test/**/*_test.rb']
+      test_files.exclude('test/rails/*', 'test/haml/*')
+      rcov.pattern    = test_files
+      rcov.output_dir = 'coverage'
+      rcov.verbose    = true
+      rcov.rcov_opts = %w{--exclude osx\/objc,gems\/,spec\/,features\/ --aggregate coverage.data}
+      rcov.rcov_opts << %[-o "coverage" --sort coverage]
+    end
+    
+    
+    desc "Run both specs and features to generate aggregated coverage"
+    task :all do |t|
+      rm "coverage.data" if File.exist?("coverage.data")
+      Rake::Task["rcov:units"].invoke
+      Rake::Task["rcov:cucumber"].invoke
+    end
   end
+rescue LoadError => e
+  puts "WARNING: #{e}"
 end
 

data/VERSION.yml

@@ -2,4 +2,4 @@
 :patch: 0
 :major: 0
 :minor: 10
-:build: rc3
+:build: rc4

data/examples/css3/bootstrap.rb

@@ -0,0 +1,3 @@
+require File.join(File.dirname(__FILE__), '..', 'downloader')
+
+install_from_github('chriseppstein', 'compass-colors', 'compass-colors')

data/examples/css3/clean.rb

@@ -0,0 +1,2 @@
+require 'fileutils'
+FileUtils.rm_rf "#{File.dirname(__FILE__)}/extensions/compass-colors"

data/examples/downloader.rb

@@ -28,10 +28,10 @@ def install_from_github(user, project, ext_name, branch = "master", working_dire
   download_link = "http://github.com/#{user}/#{project}/zipball/#{branch}"
   extdir = File.join(working_directory,'extensions')
   
-  if !File.exists?(extdir)
+  if !File.exists?("#{extdir}/#{ext_name}")
     begin
       puts "Downloading the #{ext_name} plugin into #{extdir}."
-      FileUtils.mkdir(extdir)
+      FileUtils.mkdir_p("#{extdir}")
       zipfile = File.join(extdir, "#{ext_name}.zip")
       open(zipfile, "wb") do |tgz|
         tgz << fetch(download_link).body

data/frameworks/_compass_deprecated_imports/stylesheets/compass/_misc.sass

@@ -1,2 +1 @@
-@warn "DEPRECATED: Please change your @import of compass/misc.sass to: @import \"compass/misc\""
-@import compass/misc.scss
+@import "misc.scss"

data/frameworks/{compass → _compass_deprecated_imports}/stylesheets/compass/_misc.scss

@@ -5,6 +5,7 @@
 // Creative Commons, 171 Second Street, Suite 300, San Francisco, California, 94105, USA.
 
 @mixin unobtrusive-logo($size: 1em) {
+  @warn "DEPRECATED: unobtrusive-logo will be removed in a future release."
   font-family: Monaco, Courier, "Lucida Sans Unicode", monospace;
   font-size: $size;
   color: #888;

data/frameworks/_compass_deprecated_imports/stylesheets/compass/css3/_inline_block.sass

@@ -1,2 +1,2 @@
 @warn "DEPRECATED: Please change your @import of compass/css3/inline_block.sass to: @import \"compass/css3/inline-block\""
-@import compass/css3/inline-block.sass
+@import compass/css3/inline-block.scss

data/frameworks/blueprint/stylesheets/_blueprint.scss

@@ -35,4 +35,5 @@
   @include blueprint-grid;
   @include blueprint-debug;
   @include blueprint-interaction;
-  @include blueprint-form; }
+  @include blueprint-form;
+}

data/frameworks/blueprint/stylesheets/blueprint/_buttons.scss

@@ -5,65 +5,75 @@
 $blueprint_button_font_family: unquote('"Lucida Grande", Tahoma, Arial, Verdana, sans-serif') !default;
 
 // Default Button Colors
-$blueprint_button_border_color: #dedede !default;
-
+$blueprint_button_border_color:     #dedede !default;
 $blueprint_button_background_color: #f5f5f5 !default;
-
-$blueprint_button_font_color: #565656 !default;
+$blueprint_button_font_color:       #565656 !default;
 
 // Default Button Hover Colors
-$blueprint_button_hover_border_color: #c2e1ef !default;
-
+$blueprint_button_hover_border_color:     #c2e1ef !default;
 $blueprint_button_hover_background_color: #dff4ff !default;
-
-$blueprint_button_hover_font_color: #336699 !default;
+$blueprint_button_hover_font_color:       #336699 !default;
 
 // Default Button Active Colors
-$blueprint_button_active_border_color: #6299c5 !default;
-
+$blueprint_button_active_border_color:     #6299c5 !default;
 $blueprint_button_active_background_color: #6299c5 !default;
-
-$blueprint_button_active_font_color: white !default;
+$blueprint_button_active_font_color:       white !default;
 
 //**
 // Sets the colors for a button
 // @param border_highlight_color
 //   The highlight color defaults to whatever is the value of the border_color but it's one shade lighter.
-@mixin button-colors($font_color: $blueprint_button_font_color, $bg_color: $blueprint_button_background_color, $border_color: $blueprint_button_border_color, $border_highlight_color: $border_color + #101010) {
+@mixin button-colors
+(
+  $font_color: $blueprint_button_font_color,
+  $bg_color: $blueprint_button_background_color,
+  $border_color: $blueprint_button_border_color,
+  $border_highlight_color: $border_color + #101010
+) {
   background-color: $bg_color;
   border-color: $border_highlight_color $border_color $border_color $border_highlight_color;
-  color: $font_color; }
+  color: $font_color;
+}
 
 //**
 // Sets the colors for a button in the active state
 // @param border_highlight_color
 //   The highlight color defaults to whatever is the value of the border_color but it's one shade lighter.
-@mixin button-active-colors($font_color: $blueprint_button_active_font_color, $bg_color: $blueprint_button_active_background_color, $border_color: $blueprint_button_active_border_color, $border_highlight_color: $border_color + #101010) {
+@mixin button-active-colors
+(
+  $font_color: $blueprint_button_active_font_color,
+  $bg_color: $blueprint_button_active_background_color,
+  $border_color: $blueprint_button_active_border_color,
+  $border_highlight_color: $border_color + #101010
+) {
   &:active {
-    @include button-colors($font_color, $bg_color, $border_color, $border_highlight_color); } }
+    @include button-colors($font_color, $bg_color, $border_color, $border_highlight_color);
+  }
+}
 
 //**
 // Sets the colors for a button in the hover state.
 // @param border_highlight_color
 //   The highlight color defaults to whatever is the value of the border_color but it's one shade lighter.
-@mixin button-hover-colors($font_color: $blueprint_button_hover_font_color, $bg_color: $blueprint_button_hover_background_color, $border_color: $blueprint_button_hover_border_color, $border_highlight_color: $border_color + #101010) {
+@mixin button-hover-colors
+(
+  $font_color: $blueprint_button_hover_font_color,
+  $bg_color: $blueprint_button_hover_background_color,
+  $border_color: $blueprint_button_hover_border_color,
+  $border_highlight_color: $border_color + #101010
+) {
   &:hover {
-    @include button-colors($font_color, $bg_color, $border_color, $border_highlight_color); } }
+    @include button-colors($font_color, $bg_color, $border_color, $border_highlight_color);
+  }
+}
 
 @mixin button-base($float: false) {
-  @if $float {
-    display: block;
-    @include float($float); }
-  @else {
-    @include inline-block; }
+  @if $float { @include float($float); display: block; }
+  @else      { @include inline-block; }
   margin: 0.7em 0.5em 0.7em 0;
-  border-width: 1px;
-  border-style: solid;
-  font-family: $blueprint_button_font_family;
-  font-size: 100%;
-  line-height: 130%;
+  border-width: 1px; border-style: solid;
+  font-family: $blueprint_button_font_family; font-size: 100%; line-height: 130%; font-weight: bold;
   text-decoration: none;
-  font-weight: bold;
   cursor: pointer;
   img {
     margin: 0 3px -3px 0 !important;
@@ -71,11 +81,14 @@ $blueprint_button_active_font_color: white !default;
     border: none;
     width: 16px;
     height: 16px;
-    float: none; } }
+    float: none;
+  }
+}
 
 @mixin anchor-button($float: false) {
   @include button-base($float);
-  padding: 5px 10px 5px 7px; }
+  padding: 5px 10px 5px 7px;
+}
 
 @mixin button-button($float: false) {
   @include button-base($float);
@@ -86,4 +99,6 @@ $blueprint_button_active_font_color: white !default;
     padding: 4px 10px 4px 7px;
     line-height: 17px; }
   *:first-child+html &[type] {
-    padding: 4px 10px 3px 7px; } }
+    padding: 4px 10px 3px 7px;
+  }
+}

data/frameworks/blueprint/stylesheets/blueprint/_colors.scss

@@ -1,51 +1,31 @@
-$font_color: #333333 !default;
-
-$quiet_color: $font_color + #333333 !default;
-
-$loud_color: $font_color - #222222 !default;
-
-$header_color: $font_color - #111111 !default;
-
-$link_color: #000099 !default;
-
-$link_hover_color: black !default;
-
-$link_focus_color: $link_hover_color !default;
-
-$link_active_color: $link_color + #cc0000 !default;
-
+$font_color:     #333333 !default;
+$quiet_color:    $font_color + #333333 !default;
+$loud_color:     $font_color - #222222 !default;
+$header_color:   $font_color - #111111 !default;
+$alt_text_color: #666666 !default;
+
+$link_color:         #000099               !default;
+$link_hover_color:   black                 !default;
+$link_focus_color:   $link_hover_color     !default;
+$link_active_color:  $link_color + #cc0000 !default;
 $link_visited_color: $link_color - #333333 !default;
 
 $feedback_border_color: #dddddd !default;
-
-$success_color: #264409 !default;
-
-$success_bg_color: #e6efc2 !default;
-
-$success_border_color: #c6d880 !default;
-
-$notice_color: #514721 !default;
-
-$notice_bg_color: #fff6bf !default;
-
-$notice_border_color: #ffd324 !default;
-
-$error_color: #8a1f11 !default;
-
-$error_bg_color: #fbe3e4 !default;
-
-$error_border_color: #fbc2c4 !default;
-
-$highlight_color: yellow !default;
-
-$added_color: white !default;
-
-$added_bg_color: #006600 !default;
-
-$removed_color: white !default;
-
-$removed_bg_color: #990000 !default;
+$success_color:         #264409 !default;
+$success_bg_color:      #e6efc2 !default;
+$success_border_color:  #c6d880 !default;
+$notice_color:          #514721 !default;
+$notice_bg_color:       #fff6bf !default;
+$notice_border_color:   #ffd324 !default;
+$error_color:           #8a1f11 !default;
+$error_bg_color:        #fbe3e4 !default;
+$error_border_color:    #fbc2c4 !default;
+
+$highlight_color:        yellow !default;
+$added_color:             white !default;
+$added_bg_color:        #006600 !default;
+$removed_color:           white !default;
+$removed_bg_color:      #990000 !default;
 
 $blueprint_table_header_color: #c3d9ff !default;
-
 $blueprint_table_stripe_color: #e5ecf9 !default;

data/frameworks/blueprint/stylesheets/blueprint/_debug.scss

@@ -1,8 +1,11 @@
-@mixin showgrid($image: unquote("grid.png")) {
-  background: image_url($image); }
+@mixin showgrid($image: "grid.png") {
+  background: image_url($image);
+}
 
 @mixin blueprint-debug($grid_image: unquote("grid.png")) {
   // Use this class on any column or container to see the grid.
   // TODO: prefix this with the project path.
   .showgrid {
-    @include showgrid($grid_image); } }
+    @include showgrid($grid_image);
+  }
+}

data/frameworks/blueprint/stylesheets/blueprint/_fancy-type.scss

@@ -1,5 +1,6 @@
 @import "typography";
 
+$alternate-text-font : "Warnock Pro", "Goudy Old Style", "Palatino", "Book Antiqua", Georgia, serif !default;
 // To install the fancy type plugin:
 //   1. import the fancy_type module: @import blueprint/fancy_type
 //   2. mixin +fancy-type to your project's body or at the top level of your stylesheet:
@@ -8,30 +9,29 @@
 
 @mixin fancy-type {
   @include fancy-paragraphs;
-  .caps {
-    @include caps; }
-  .dquo {
-    @include dquo; }
-  .alt {
-    @include alt; } }
+  .caps { @include caps; }
+  .dquo { @include dquo; }
+  .alt  { @include alt;  }
+}
 
 // Indentation instead of line shifts for sibling paragraphs. Mixin to a style like p + p
 @mixin sibling-indentation {
   text-indent: 2em;
   margin-top: -1.5em;
   /* Don't want this in forms. */
-  form & {
-    text-indent: 0; } }
+  form & { text-indent: 0; }
+}
 
 // For great looking type, use this code instead of asdf: 
 // <span class="alt">asdf</span>  
 // Best used on prepositions and ampersands.
 
 @mixin alt {
-  color: #666666;
-  font-family: "Warnock Pro", "Goudy Old Style", "Palatino", "Book Antiqua", Georgia, serif;
+  color: $alt-text-color;
+  font-family: $alternate-text-font;
   font-style: italic;
-  font-weight: normal; }
+  font-weight: normal;
+}
 
 // For great looking quote marks in titles, replace "asdf" with:
 // <span class="dquo">&#8220;</span>asdf&#8221;
@@ -39,7 +39,8 @@
 // (You may have to change this value depending on your font size).
 
 @mixin dquo($offset: 0.5em) {
-  margin-left: -$offset; }
+  margin-left: -$offset;
+}
 
 // Reduced size type with incremental leading
 // (http://www.markboulton.co.uk/journal/comments/incremental_leading/)
@@ -51,14 +52,20 @@
 // every four lines of normal sized type, there is five lines of the sidenote. eg:
 //
 // Arguments:
-//   font_size - The desired font size in pixels. This will be converted to ems for you. Defaults to 10px.
-//   base_font_size - The base font size in pixels. Defaults to 12px
-//   old_line_height - The old line height. Defaults to 1.5 times the base_font_size
+//   `$font-size` - The desired font size in pixels. This will be converted to ems for you. Defaults to 10px.
+//   `$base-font-size` - The base font size in pixels. Defaults to 12px
+//   `$old-line-height` - The old line height. Defaults to 1.5 times the base-font-size
 
-@mixin incr($font_size: 10px, $base_font_size: $blueprint_font_size, $old_line_height: $base_font_size * 1.5) {
-  font-size: 1em * $font_size / $base_font_size;
-  line-height: 1em * $old_line_height / $font_size * 4 / 5;
-  margin-bottom: 1.5em; }
+@mixin incr
+(
+  $font-size: 10px,
+  $base-font-size: $blueprint-font-size,
+  $old-line-height: $base-font-size * 1.5
+) {
+  font-size: 1em * $font-size / $base-font-size;
+  line-height: 1em * $old-line-height / $font-size * 4 / 5;
+  margin-bottom: 1.5em;
+}
 
 // Surround uppercase words and abbreviations with this class.
 // Based on work by Jørgen Arnor Gårdsø Lom [http://twistedintellect.com/]
@@ -70,11 +77,11 @@
   font-size: 1.2em;
   line-height: 1%;
   font-weight: bold;
-  padding: 0 2px; }
+  padding: 0 2px;
+}
 
 @mixin fancy-paragraphs {
-  p + p {
-    @include sibling-indentation; }
+  p + p   { @include sibling-indentation; }
   p.incr,
-  .incr p {
-    @include incr; } }
+  .incr p { @include incr; }
+}