compass 0.10.6 → 0.11.alpha.0

data/frameworks/compass/stylesheets/compass/css3/_version-1.scss

@@ -0,0 +1,16 @@
+@import "border-radius";
+@import "inline-block";
+@import "opacity";
+@import "box-shadow";
+@import "text-shadow";
+@import "columns";
+@import "box-sizing";
+@import "box";
+@import "images";
+@import "gradient";
+@import "background-clip";
+@import "background-origin";
+@import "background-size";
+@import "font-face";
+@import "transform";
+@import "transition";

data/frameworks/compass/stylesheets/compass/css3/_version-2.scss

@@ -0,0 +1,16 @@
+@import "border-radius";
+@import "inline-block";
+@import "opacity";
+@import "box-shadow-v2";
+@import "text-shadow-v2";
+@import "columns";
+@import "box-sizing";
+@import "box";
+@import "images";
+@import "gradient";
+@import "background-clip";
+@import "background-origin";
+@import "background-size";
+@import "font-face";
+@import "transform-v2";
+@import "transition";

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

@@ -0,0 +1,24 @@
+
+// stretch element height to specified top and bottom position
+
+@mixin stretch-y($offset-top:0, $offset-bottom:0) {
+  @include stretch($offset-top, false, $offset-bottom, false);
+}
+
+
+// stretch element width to specified left and right position
+
+@mixin stretch-x($offset-left:0, $offset-right:0) {
+  @include stretch(false, $offset-right, false, $offset-left);
+}
+
+
+// shorthand to stretch element height and width
+
+@mixin stretch($offset-top:0, $offset-right:0, $offset-bottom:0, $offset-left:0) {
+  position: absolute;
+  @if $offset-top { top: $offset-top; }
+  @if $offset-bottom { bottom: $offset-bottom; }
+  @if $offset-left { left: $offset-left; }
+  @if $offset-right { right: $offset-right; }
+}

data/frameworks/compass/stylesheets/compass/utilities/general/_hacks.scss

@@ -8,14 +8,14 @@ $default-has-layout-approach: zoom !default;
 // This mixin causes an element matching the selector
 // to gain the "hasLayout" property in internet explorer.
 // More information on [hasLayout](http://reference.sitepoint.com/css/haslayout).
-@mixin has-layout($using: $default-has-layout-approach) {
+@mixin has-layout($approach: $default-has-layout-approach) {
   @if $legacy-support-for-ie {
-    @if $using == zoom {
+    @if $approach == zoom {
       @include has-layout-zoom;
-    } @else if $using == block {
+    } @else if $approach == block {
       @include has-layout-block;
     } @else {
-      @warn "Unknown has-layout approach: #{$using}";
+      @warn "Unknown has-layout approach: #{$approach}";
       @include has-layout-zoom;
     }
   }

data/frameworks/compass/stylesheets/compass/utilities/lists/_horizontal-list.scss

@@ -31,6 +31,9 @@
 //
 // :last-child is not fully supported
 // see http://www.quirksmode.org/css/contents.html#t29 for the support matrix
+// 
+// IE8 ignores rules that are included on the same line as :last-child
+// see http://www.richardscarrott.co.uk/posts/view/ie8-last-child-bug for details
 //
 // Setting `$padding` to `false` disables the padding between list elements
 @mixin horizontal-list-item($padding: 4px, $direction: left) {
@@ -43,7 +46,8 @@
       right: $padding;
     }
     &:first-child, &.first { padding-#{$direction}: 0; }
-    &:last-child, &.last   { padding-#{opposite-position($direction)}: 0; }
+    &:last-child { padding-#{opposite-position($direction)}: 0; }
+    &.last { padding-#{opposite-position($direction)}: 0; }
   }
 }
 

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

@@ -17,12 +17,18 @@
 //
 // `:last-child` is not fully supported.
 // see quirksmode for the [support matrix](http://www.quirksmode.org/css/contents.html#t29).
+//
+// IE8 ignores rules that are included on the same line as :last-child
+// see http://www.richardscarrott.co.uk/posts/view/ie8-last-child-bug for details
 
 @mixin comma-delimited-list {
   @include inline-list;
   li {
     &:after { content: ", "; }
-    &:last-child, &.last {
+    &:last-child {
+      &:after { content: ""; }
+    }
+    &.last {
       &:after { content: ""; }
     }
   }

data/frameworks/compass/stylesheets/compass/utilities/tables/_borders.scss

@@ -20,8 +20,14 @@
     &:last-child,
     &.last {
       border-right-width: 0px; } }
+
+// IE8 ignores rules that are included on the same line as :last-child
+// see http://www.richardscarrott.co.uk/posts/view/ie8-last-child-bug for details
+
   tbody, tfoot {
-    tr:last-child,
+    tr:last-child {
+      th, td {
+        border-bottom-width: 0px; } }
     tr.last {
       th, td {
         border-bottom-width: 0px; } } } }

data/lib/compass/actions.rb

@@ -18,7 +18,7 @@ module Compass
     def directory(dir, options = nil)
       options ||= self.options if self.respond_to?(:options)
       if File.exists?(dir) && File.directory?(dir)
-          logger.record :exists, basename(dir) unless options[:quiet]
+          # logger.record :exists, basename(dir) unless options[:quiet]
       elsif File.exists?(dir)
         msg = "#{basename(dir)} already exists and is not a directory."
         raise Compass::FilesystemConflict.new(msg)

data/lib/compass/app_integration/rails/actionpack3/railtie.rb

@@ -0,0 +1,18 @@
+require 'compass'
+require 'rails'
+module Compass
+  class Railtie < Rails::Railtie
+    config.to_prepare do
+      # putting this here allows compass to detect
+      # and adjust to changes to the project configuration
+      Compass.reset_configuration!
+      Compass::AppIntegration::Rails.initialize!
+    end
+
+    initializer "compass/railtie.configure_rails_initialization" do |app|
+      # XXX How do I only do this if it's not done yet?
+      # require 'sass/plugin/rack'
+      # app.middleware.use Sass::Plugin::Rack
+    end
+  end
+end

data/lib/compass/app_integration/rails/configuration_defaults.rb

@@ -7,6 +7,16 @@ module Compass
           :rails
         end
 
+        def default_sass_dir
+          # XXX Maybe this should be: app/views/stylesheets
+          # or maybe layouts should be moved up a level.
+          File.join("app", "stylesheets")
+        end
+
+        def default_css_dir
+          File.join("public", "stylesheets")
+        end
+
         def default_images_dir
           File.join("public", "images")
         end
@@ -43,6 +53,18 @@ module Compass
           File.join("tmp", "sass-cache")
         end
 
+        def default_project_path
+          project_path = Compass::AppIntegration::Rails.root
+        end
+
+        def default_http_path
+          "/" # XXX Where is/was this stored in the Rails config?
+        end
+
+        def default_environment
+          Compass::AppIntegration::Rails.env
+        end
+
       end
     end
   end

data/lib/compass/app_integration/rails/installer.rb

@@ -23,28 +23,36 @@ module Compass
             directory File.dirname(config_file)
             write_file config_file, config_contents
           end
-          directory File.dirname(targetize('config/initializers/compass.rb'))
-          write_file targetize('config/initializers/compass.rb'), initializer_contents
+          unless rails3?
+            directory File.dirname(targetize('config/initializers/compass.rb'))
+            write_file targetize('config/initializers/compass.rb'), initializer_contents
+          end
+        end
+
+        def rails3?
+          File.exists?(targetize('config/application.rb'))
         end
 
         def prepare
           write_configuration_files
         end
 
+        def gem_config_instructions
+          if rails3?
+            %Q{Add the following to your Gemfile:\n\n    gem "compass", ">= #{Compass::VERSION}"}
+          else
+            %Q{Add the following to your environment.rb:\n\n    config.gem "compass", :version => ">= #{Compass::VERSION}"}
+          end
+        end
+
         def finalize(options = {})
           if options[:create]
             puts <<-NEXTSTEPS
 
 Congratulations! Your rails project has been configured to use Compass.
-Just one more thing left to do: Register the compass gem.
-
-In Rails 2.2 & 2.3, add the following to your environment.rb:
-
-  config.gem "compass", :version => ">= #{Compass::VERSION}"
+Just a couple more things left to do.
 
-In Rails 3, add the following to your Gemfile:
-
-  gem "compass", ">= #{Compass::VERSION}"
+#{gem_config_instructions}
 
 Then, make sure you restart your server.
 
@@ -54,52 +62,61 @@ NEXTSTEPS
           end
           unless options[:prepare]
             if manifest.has_stylesheet?
-              puts "\nNext add these lines to the head of your layouts:\n\n"
+              puts "\nNow add these lines to the head of your layout(s):\n\n"
               puts stylesheet_links
-              puts "\n(You are using haml, aren't you?)"
             end
           end
         end
 
+        def hamlize?
+          # XXX Is there a better way to detect haml in a particular rails project?
+          require 'haml'
+          true
+        rescue LoadError
+          false
+        end
 
         def install_location_for_html(to, options)
           separate("public/#{pattern_name_as_dir}#{to}")
         end
 
         def prompt_sass_dir
-          recommended_location = separate('app/stylesheets')
-          default_location = separate('public/stylesheets/sass')
-          print %Q{Compass recommends that you keep your stylesheets in #{recommended_location}
+          if rails3?
+            nil
+          else
+            recommended_location = separate('app/stylesheets')
+            default_location = separate('public/stylesheets/sass')
+            print %Q{Compass recommends that you keep your stylesheets in #{recommended_location}
   instead of the Sass default location of #{default_location}.
   Is this OK? (Y/n) }
-          answer = $stdin.gets.downcase[0]
-          answer == ?n ? default_location : recommended_location
+            answer = $stdin.gets.downcase[0]
+            answer == ?n ? default_location : recommended_location
+          end
         end
 
         def prompt_css_dir
-          recommended_location = separate("public/stylesheets/compiled")
-          default_location = separate("public/stylesheets")
-          puts
-          print %Q{Compass recommends that you keep your compiled css in #{recommended_location}/
+          if rails3?
+            nil
+          else
+            recommended_location = separate("public/stylesheets/compiled")
+            default_location = separate("public/stylesheets")
+            puts
+            print %Q{Compass recommends that you keep your compiled css in #{recommended_location}/
   instead the Sass default of #{default_location}/.
   However, if you're exclusively using Sass, then #{default_location}/ is recommended.
   Emit compiled stylesheets to #{recommended_location}/? (Y/n) }
-          answer = $stdin.gets
-          answer = answer.downcase[0]
-          answer == ?n ? default_location : recommended_location
+            answer = $stdin.gets
+            answer = answer.downcase[0]
+            answer == ?n ? default_location : recommended_location
+          end
         end
 
         def config_contents
-          "# This configuration file works with both the Compass command line tool and within Rails.\n" +
-          Compass.configuration.serialize do |prop, value|
-            if prop == :project_path
-              "project_path = Compass::AppIntegration::Rails.root\n"
-            elsif prop == :environment
-              "environment = Compass::AppIntegration::Rails.env\n"
-            elsif prop == :output_style
-              ""
-            end
-          end
+          project_path, Compass.configuration.project_path = Compass.configuration.project_path, nil
+          ("# This configuration file works with both the Compass command line tool and within Rails.\n" +
+           Compass.configuration.serialize)
+        ensure
+          Compass.configuration.project_path = project_path
         end
 
         def initializer_contents
@@ -118,6 +135,14 @@ NEXTSTEPS
         end
 
         def stylesheet_links
+          if hamlize?
+            haml_stylesheet_links
+          else
+            html_stylesheet_links
+          end
+        end
+
+        def haml_stylesheet_links
           html = "%head\n"
           manifest.each_stylesheet do |stylesheet|
             # Skip partials.
@@ -133,6 +158,24 @@ NEXTSTEPS
           end
           html
         end
+        def html_stylesheet_links
+          html = "<head>\n"
+          manifest.each_stylesheet do |stylesheet|
+            # Skip partials.
+            next if File.basename(stylesheet.from)[0..0] == "_"
+            ss_line = "<%= stylesheet_link_tag '#{stylesheet_prefix}#{stylesheet.to.sub(/\.sass$/,'.css')}'"
+            if stylesheet.options[:media]
+              ss_line += ", :media => '#{stylesheet.options[:media]}'"
+            end
+            ss_line += " %>"
+            if stylesheet.options[:condition]
+              ss_line = "<!--[if #{stylesheet.options[:condition]}]>" + ss_line + "<![endif]-->"
+            end
+            html << "  #{ss_line}\n"
+          end
+          html << "</head>"
+          html
+        end
       end
     end
   end

data/lib/compass/app_integration/rails/runtime.rb

@@ -4,6 +4,9 @@ unless defined?(Compass::RAILS_LOADED)
     require 'action_pack/version'
     if ActionPack::VERSION::MAJOR >= 3
       # TODO figure something out so image_path works with rails integration
+      %w(railtie).each do |lib|
+        require "compass/app_integration/rails/actionpack3/#{lib}"
+      end
     else
       %w(action_controller sass_plugin urls).each do |lib|
         require "compass/app_integration/rails/actionpack2/#{lib}"

data/lib/compass/app_integration/stand_alone/configuration_defaults.rb

@@ -7,7 +7,7 @@ module Compass
         end
 
         def sass_dir_without_default
-          "src"
+          "sass"
         end
 
         def javascripts_dir_without_default

data/lib/compass/commands/print_version.rb

@@ -81,7 +81,7 @@ Options:
         else
           lines = []
           lines << "Compass #{::Compass.version[:string]}"
-          lines << "Copyright (c) 2008-2009 Chris Eppstein"
+          lines << "Copyright (c) 2008-#{Time.now.year} Chris Eppstein"
           lines << "Released under the MIT License."
           puts lines.join("\n")
         end

data/lib/compass/commands/update_project.rb

@@ -47,10 +47,10 @@ module Compass
 
       def new_compiler_instance(additional_options = {})
         compiler_opts = Compass.sass_engine_options
-        compiler_opts.merge!(:quiet => options[:quiet],
-                             :force => options[:force],
+        compiler_opts.merge!(:force => options[:force],
                              :sass_files => explicit_sass_files,
                              :dry_run => options[:dry_run])
+        compiler_opts[:quiet] = options[:quiet] if options[:quiet]
         compiler_opts.merge!(additional_options)
         Compass::Compiler.new(working_path,
           Compass.configuration.sass_path,

data/lib/compass/commands/write_configuration.rb

@@ -20,6 +20,9 @@ module Compass
         opts.on("--debug [PROPERTY]", "Debug your configuration by printing out details.") do |prop|
           self.options[:debug] = prop.nil? ? true : prop.to_sym
         end
+        opts.on("-p PROPERTY", "--property PROPERTY", "Print out the value of a particular configuration property") do |prop|
+          self.options[:display] = prop.to_sym
+        end
 
         super
       end
@@ -40,7 +43,13 @@ module Compass
       end
 
       def perform
-        if options[:debug]
+        if options[:display]
+          if Compass.configuration.respond_to?(options[:display])
+            puts Compass.configuration.send(options[:display])
+          else
+            raise Compass::Error, "ERROR: configuration property '#{options[:display]}' does not exist"
+          end
+        elsif options[:debug]
           puts "Configuration sources:"
           c = Compass.configuration
           while c

data/lib/compass/compiler.rb

@@ -11,6 +11,7 @@ module Compass
       self.logger = options.delete(:logger)
       self.options = options
       self.options[:cache_location] ||= determine_cache_location
+      Compass.configure_sass_plugin!
     end
 
     def determine_cache_location
@@ -40,7 +41,6 @@ module Compass
 
     # Returns the sass file that needs to be compiled, if any.
     def out_of_date?
-      Compass.configure_sass_plugin! unless Compass.sass_plugin_configured?
       sass_files.zip(css_files).each do |sass_filename, css_filename|
         return sass_filename if Sass::Plugin.send(:stylesheet_needs_update?, css_filename, sass_filename)
       end
@@ -72,9 +72,6 @@ module Compass
         options[:force] = true
       end
 
-      # We use the Sass::Plugin to check dependencies so we have configure it.
-      Compass.configure_sass_plugin! unless Compass.sass_plugin_configured?
-
       # Make sure the target directories exist
       target_directories.each {|dir| directory dir}
 
@@ -98,7 +95,6 @@ module Compass
 
     # Compile one Sass file
     def compile(sass_filename, css_filename)
-      logger.record :compile, basename(sass_filename) unless options[:quiet]
       css_content = logger.red do
         engine(sass_filename, css_filename).render
       end