compass 0.10.4 → 0.10.5.pre.1

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 10
-:patch: 4
-#:build: pre.4
+:patch: 5
+:build: pre.1

data/examples/compass/src/bp_layout.scss

@@ -0,0 +1,18 @@
+@import "compass/layout/floated";
+
+// It's easy to build a grid with a floated layout
+$gutter: $compass-gutter-width;
+$col-width: 30px;
+$number-of-columns: 24;
+$total-width: $number-of-columns * ($col-width + $gutter) - $gutter ;
+
+@mixin span($n) {
+  width: $n * ($col-width + $gutter) - $gutter;
+}
+
+// Provides a number of base classes.
+@include act-like-blueprint;
+
+#page    { @extend .container; @include span($number-of-columns); }
+#sidebar { @extend .column;    @include span(8);                  }
+#content { @extend .column;    @include span(16); @extend .last;  }

data/frameworks/compass/stylesheets/compass/layout/_floated.scss

@@ -0,0 +1,111 @@
+@import "compass/utilities/general/float";
+@import "compass/utilities/general/clearfix";
+
+// Direction of the float
+$compass-float-direction: left !default;
+// Set to 0 to disable gutters
+$compass-gutter-width: 10px !default;
+$compass-left-gutter-width: ceil($compass-gutter-width / 2);
+$compass-right-gutter-width: floor($compass-gutter-width / 2);
+
+// A floated element is generally assigned a width to achieve table-less alignment
+@mixin floated($side : $compass-float-direction, 
+               $left-gutter : $compass-left-gutter-width,
+               $right-gutter : $compass-right-gutter-width) {
+  @include float($side);
+  @if $left-gutter > 0 {
+    margin-left: $left-gutter;
+  }
+  @if $right-gutter > 0 {
+    margin-right: $right-gutter;
+  }
+}
+
+// Remove the gutter for a particular side of a floated element
+// pass `both` to disable the gutter on both sides.
+@mixin gutterless($side) {
+  margin-#{$side}: 0;
+  @if $side == both {
+    margin-#{opposite-position($side)}: 0;
+  }
+}
+
+// provides the base structure required to make an element pushable in
+// the specified direction (which defaults to `right`).
+@mixin pushable($side: opposite-position($compass-float-direction)) {
+  @include float($side);
+  position: relative;
+}
+
+// provides the base structure required to make an element pullable in
+// the specified direction (which defaults to `left`).
+@mixin pullable($side : $compass-float-direction) {
+  @include float($side);
+  position: relative;
+}
+
+// push an element in the specified direction by the specified amount.
+@mixin pushed($side, $amount) {
+  margin-#{$side}: -$amount;
+  margin-#{opposite-position($side)}: $amount;
+}
+
+// pull an element in the specified directionn by the specified amount.
+@mixin pulled($side, $amount) {
+  margin-#{$side}: $amount;
+}
+
+// Take an element out of the float if it had been made floated already.
+// This might be applied to an element to allow it to fill the remainder
+// of a row, in which case you'll probably want to make that element also
+// a float container.
+@mixin sunken {
+  float: none;
+  width: auto;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+// make an element centered within its fixed-width parent.
+// Can be applied to a top level float container to create
+// a centered layout within the window.
+@mixin centered {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+@mixin act-like-blueprint {
+  .clearfixed { @include pie-clearfix; }
+  .column     { @include floated(left, 0, $compass-gutter-width); }
+  .last       { @include gutterless(right); }
+  .float-container { @extend .clearfixed; }
+  .container  { @extend .float-container; @include centered; }
+  .push       { @include pushable; }
+  .pull       { @include pullable; }
+}
+
+@mixin act-like-960 {
+  .clearfixed     { @include pie-clearfix; }
+  .grid           { @include floated(left, $compass-gutter-left-width, $compass-gutter-right-width); }
+  .alpha          { @include gutterless(left);  }
+  .omega          { @include gutterless(right); }
+  .container      { @extend .clearfixed;        }
+  .grid-container { @extend .container; @include centered;  }
+  .push           { @include pushable; }
+  .pull           { @include pullable; }
+}
+
+@mixin act-like-oocss {
+  .clearfixed { @include pie-clearfix; }
+  .line       { @extend .clearfixed; }
+  .unit       { @include floated(left, 0, 0); }
+  .lastUnit   { @extend .clearfixed; @include sunken; }
+  .size1of1   { @include sunken; }
+
+  @for $divisions from 2 through 5 {
+    @for $segment from 1 to $divisions {
+      .size#{$segment}of#{$divisions} { width: percentage($segment / $divisions); }
+    }
+  }
+}
+

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

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

data/frameworks/compass/stylesheets/compass/utilities/_lists.scss

@@ -1,3 +1,4 @@
 @import "lists/horizontal-list";
 @import "lists/inline-list";
+@import "lists/inline-block-list";
 @import "lists/bullets";

data/frameworks/compass/stylesheets/compass/utilities/lists/_inline-block-list.scss

@@ -0,0 +1,47 @@
+// Inline-Block list layout module.
+//
+// Easy mode using simple descendant li selectors:
+//
+//   ul.nav
+//     +inline-block-list
+//
+// Advanced mode:
+// If you need to target the list items using a different selector then use
+// +inline-block-list-container on your ul/ol and +inline-block-list-item on your li.
+// This may help when working on layouts involving nested lists. For example:
+//
+//   ul.nav
+//     +inline-block-list-container
+//     > li
+//       +inline-block-list-item
+
+@import "bullets";
+@import "horizontal-list";
+@import "compass/utilities/general/float";
+@import "compass/css3/inline-block";
+
+// Can be mixed into any selector that target a ul or ol that is meant
+// to have an inline-block layout. Used to implement +inline-block-list.
+@mixin inline-block-list-container {
+  @include horizontal-list-container; }
+
+// Can be mixed into any li selector that is meant to participate in a horizontal layout.
+// Used to implement +inline-block-list.
+
+@mixin inline-block-list-item($padding: false) {
+  @include no-bullet;
+  @include inline-block;
+  white-space: nowrap;
+  @if $padding {
+    padding: {
+      left: $padding;
+      right: $padding;
+    };    
+  }
+}
+
+// A list(ol,ul) that is layed out such that the elements are inline-block and won't wrap.
+@mixin inline-block-list($padding: false) {
+  @include inline-block-list-container;
+  li {
+    @include inline-block-list-item($padding); } }

data/lib/compass/commands/update_project.rb

@@ -53,8 +53,8 @@ module Compass
                              :dry_run => options[:dry_run])
         compiler_opts.merge!(additional_options)
         Compass::Compiler.new(working_path,
-          projectize(Compass.configuration.sass_dir),
-          projectize(Compass.configuration.css_dir),
+          Compass.configuration.sass_path,
+          Compass.configuration.css_path,
           compiler_opts)
       end
 

data/lib/compass/configuration/defaults.rb

@@ -44,43 +44,43 @@ module Compass
 
       def default_sass_path
         if (pp = top_level.project_path) && (dir = top_level.sass_dir)
-          File.join(pp, dir)
+          Compass.projectize(dir, pp)
         end
       end
 
       def default_css_path
         if (pp = top_level.project_path) && (dir = top_level.css_dir)
-          File.join(pp, dir)
+          Compass.projectize(dir, pp)
         end
       end
 
       def default_images_path
         if (pp = top_level.project_path) && (dir = top_level.images_dir)
-          File.join(pp, dir)
+          Compass.projectize(dir, pp)
         end
       end
 
       def default_javascripts_path
         if (pp = top_level.project_path) && (dir = top_level.javascripts_dir)
-          File.join(pp, dir)
+          Compass.projectize(dir, pp)
         end
       end
 
       def default_extensions_path
         if (pp = top_level.project_path) && (dir = top_level.extensions_dir)
-          File.join(pp, dir)
+          Compass.projectize(dir, pp)
         end
       end
 
       def default_fonts_path
         if (pp = top_level.project_path) && (dir = top_level.fonts_dir)
-          File.join(pp, dir)
+          Compass.projectize(dir, pp)
         end
       end
 
       def default_cache_path
         if (pp = top_level.project_path) && (dir = top_level.cache_dir)
-          File.join(pp, dir)
+          Compass.projectize(dir, pp)
         end
       end
 

data/lib/compass/exec.rb

@@ -6,6 +6,7 @@ require 'compass/actions'
 require 'compass/installers'
 require 'compass/commands'
 require 'rbconfig'
+require 'pathname'
 begin
   require 'win32console' if RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
 rescue LoadError

data/lib/compass/exec/project_options_parser.rb

@@ -3,6 +3,14 @@ module Compass::Exec::ProjectOptionsParser
     super
     set_project_options(opts)
   end
+  def set_dir_or_path(type, dir)
+    if Pathname.new(dir).absolute?
+      self.options[:"#{type}_path"] = dir.tr('\\','/')
+    else
+      self.options[:"#{type}_dir"] = dir.tr('\\','/')
+    end
+  end
+
   def set_project_options(opts)
     opts.on('-c', '--config CONFIG_FILE', 'Specify the location of the configuration file explicitly.') do |configuration_file|
       self.options[:configuration_file] = configuration_file
@@ -13,19 +21,19 @@ module Compass::Exec::ProjectOptionsParser
     end
 
     opts.on('--sass-dir SRC_DIR', "The source directory where you keep your sass stylesheets.") do |sass_dir|
-      self.options[:sass_dir] = sass_dir.tr('\\','/')
+      set_dir_or_path(:sass, sass_dir)
     end
 
     opts.on('--css-dir CSS_DIR', "The target directory where you keep your css stylesheets.") do |css_dir|
-      self.options[:css_dir] = css_dir.tr('\\','/')
+      set_dir_or_path(:css, css_dir)
     end
 
     opts.on('--images-dir IMAGES_DIR', "The directory where you keep your images.") do |images_dir|
-      self.options[:images_dir] = images_dir.tr('\\','/')
+      set_dir_or_path(:images, images_dir)
     end
 
     opts.on('--javascripts-dir JS_DIR', "The directory where you keep your javascripts.") do |javascripts_dir|
-      self.options[:javascripts_dir] = javascripts_dir.tr('\\','/')
+      set_dir_or_path(:javascripts, javascripts_dir)
     end
 
     opts.on('-e ENV', '--environment ENV', [:development, :production], 'Use sensible defaults for your current environment.',

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

@@ -46,7 +46,7 @@ private
 
   def data(real_path)
     if File.readable?(real_path)
-      [File.read(real_path)].pack('m').gsub("\n","")
+      [File.open(real_path, "rb") {|io| io.read}].pack('m').gsub("\n","")
     else
       raise Compass::Error, "File not found or cannot be read: #{real_path}"
     end

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

@@ -4,7 +4,7 @@ module Compass::SassExtensions::Functions::Urls
     # Compute the path to the stylesheet, either root relative or stylesheet relative
     # or nil if the http_images_path is not set in the configuration.
     http_stylesheets_path = if relative?
-      compute_relative_path(Compass.configuration.css_dir)
+      compute_relative_path(Compass.configuration.css_path)
     elsif Compass.configuration.http_stylesheets_path
       Compass.configuration.http_stylesheets_path
     else
@@ -30,7 +30,7 @@ module Compass::SassExtensions::Functions::Urls
     # Compute the path to the font file, either root relative or stylesheet relative
     # or nil if the http_fonts_path cannot be determined from the configuration.
     http_fonts_path = if relative?
-                        compute_relative_path(Compass.configuration.fonts_dir)
+                        compute_relative_path(Compass.configuration.fonts_path)
                       else
                         Compass.configuration.http_fonts_path
                       end
@@ -59,7 +59,7 @@ module Compass::SassExtensions::Functions::Urls
     # Compute the path to the image, either root relative or stylesheet relative
     # or nil if the http_images_path is not set in the configuration.
     http_images_path = if relative?
-      compute_relative_path(Compass.configuration.images_dir)
+      compute_relative_path(Compass.configuration.images_path)
     elsif Compass.configuration.http_images_path
       Compass.configuration.http_images_path
     else
@@ -118,9 +118,8 @@ module Compass::SassExtensions::Functions::Urls
     path[0..0] == "/" || path[0..3] == "http"
   end
 
-  def compute_relative_path(dir)
+  def compute_relative_path(path)
     if (target_css_file = options[:css_filename])
-      path = File.join(Compass.configuration.project_path, dir)
       Pathname.new(path).relative_path_from(Pathname.new(File.dirname(target_css_file))).to_s
     end
   end

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

@@ -61,6 +61,46 @@ ul.right-horizontal {
     ul.right-horizontal li:last-child, ul.right-horizontal li.last {
       padding-left: 0px; }
 
+ul.inline-block {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  outline: 0;
+  overflow: hidden;
+  *zoom: 1; }
+  ul.inline-block li {
+    list-style-image: none;
+    list-style-type: none;
+    margin-left: 0px;
+    display: -moz-inline-box;
+    -moz-box-orient: vertical;
+    display: inline-block;
+    vertical-align: middle;
+    *display: inline;
+    *vertical-align: auto;
+    white-space: nowrap; }
+
+ul.wide-inline-block {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  outline: 0;
+  overflow: hidden;
+  *zoom: 1; }
+  ul.wide-inline-block li {
+    list-style-image: none;
+    list-style-type: none;
+    margin-left: 0px;
+    display: -moz-inline-box;
+    -moz-box-orient: vertical;
+    display: inline-block;
+    vertical-align: middle;
+    *display: inline;
+    *vertical-align: auto;
+    white-space: nowrap;
+    padding-left: 10px;
+    padding-right: 10px; }
+
 ul.inline {
   list-style-type: none; }
   ul.inline, ul.inline li {

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

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

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: compass
 version: !ruby/object:Gem::Version 
-  hash: 63
-  prerelease: false
+  hash: 1923831843
+  prerelease: true
   segments: 
   - 0
   - 10
-  - 4
-  version: 0.10.4
+  - 5
+  - pre
+  - 1
+  version: 0.10.5.pre.1
 platform: ruby
 authors: 
 - Chris Eppstein
@@ -17,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-08 00:00:00 -07:00
+date: 2010-08-27 00:00:00 -07:00
 default_executable: compass
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -117,6 +119,7 @@ files:
 - examples/compass/compass.html.haml
 - examples/compass/config.rb
 - examples/compass/images/blue_arrow.gif
+- examples/compass/src/bp_layout.scss
 - examples/compass/src/compass.scss
 - examples/compass/src/images/blue_arrow.gif
 - examples/compass/src/sticky_footer.scss
@@ -318,6 +321,7 @@ files:
 - frameworks/compass/stylesheets/compass/css3/_text-shadow.scss
 - frameworks/compass/stylesheets/compass/css3/_transform.scss
 - frameworks/compass/stylesheets/compass/css3/_transition.scss
+- frameworks/compass/stylesheets/compass/layout/_floated.scss
 - frameworks/compass/stylesheets/compass/layout/_sticky-footer.scss
 - frameworks/compass/stylesheets/compass/reset/_utilities.scss
 - frameworks/compass/stylesheets/compass/utilities/_general.scss
@@ -339,6 +343,7 @@ files:
 - frameworks/compass/stylesheets/compass/utilities/links/_unstyled-link.scss
 - frameworks/compass/stylesheets/compass/utilities/lists/_bullets.scss
 - frameworks/compass/stylesheets/compass/utilities/lists/_horizontal-list.scss
+- frameworks/compass/stylesheets/compass/utilities/lists/_inline-block-list.scss
 - frameworks/compass/stylesheets/compass/utilities/lists/_inline-list.scss
 - frameworks/compass/stylesheets/compass/utilities/sprites/_sprite-img.scss
 - frameworks/compass/stylesheets/compass/utilities/tables/_alternating-rows-and-columns.scss
@@ -582,12 +587,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: