compass 0.10.2 → 0.10.3.pre.1

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

@@ -19,19 +19,16 @@ module Compass
 
         def write_configuration_files(config_file = nil)
           config_file ||= targetize('config/compass.rb')
-          directory File.dirname(config_file)
-          write_file config_file, config_contents
+          unless File.exists?(config_file)
+            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
         end
 
-        def config_files_exist?
-          File.exists?(targetize('config/compass.rb')) &&
-          File.exists?(targetize('config/initializers/compass.rb'))
-        end
-
         def prepare
-          write_configuration_files unless config_files_exist?
+          write_configuration_files
         end
 
         def finalize(options = {})
@@ -55,10 +52,12 @@ Sass will automatically compile your stylesheets during the next
 page request and keep them up to date when they change.
 NEXTSTEPS
           end
-          if manifest.has_stylesheet?
-            puts "\nNext add these lines to the head of your layouts:\n\n"
-            puts stylesheet_links
-            puts "\n(You are using haml, aren't you?)"
+          unless options[:prepare]
+            if manifest.has_stylesheet?
+              puts "\nNext add these lines to the head of your layouts:\n\n"
+              puts stylesheet_links
+              puts "\n(You are using haml, aren't you?)"
+            end
           end
         end
 
@@ -105,10 +104,8 @@ NEXTSTEPS
 
         def initializer_contents
           %Q{require 'compass'
-            |rails_root = (defined?(Rails) ? Rails.root : RAILS_ROOT).to_s
-            |Compass.add_project_configuration(File.join(rails_root, "config", "compass.rb"))
-            |Compass.configure_sass_plugin!
-            |Compass.handle_configuration_change!
+            |require 'compass/app_integration/rails'
+            |Compass::AppIntegration::Rails.initialize!
             |}.gsub(/^\s+\|/,'')
         end
 

data/lib/compass/commands/create_project.rb

@@ -43,7 +43,12 @@ module Compass
           self.options[:preferred_syntax] = syntax
         end
 
+        opts.on("--prepare", "Prepare the project by only creating configuration files.") do
+          self.options[:prepare] = true
+        end
+
         super
+
       end
     end
 

data/lib/compass/commands/project_stats.rb

@@ -33,13 +33,14 @@ module Compass
         require 'compass/stats'
         compiler = new_compiler_instance
         sass_files = sorted_sass_files(compiler)
+        total_label = "Total (#{sass_files.size} files):"
         rows       = [[           :-,           :-,           :-,            :-,            :-,            :-,               :- ],
                       [   'Filename',      'Rules', 'Properties', 'Mixins Defs', 'Mixins Used',   'CSS Rules', 'CSS Properties' ],
                       [           :-,           :-,           :-,            :-,            :-,            :-,               :- ]]
-        maximums   =  [            8,            5,           10,            14,            11,             9,               14 ]
+        maximums   =  [ total_label.length,      5,           10,            14,            11,             9,               14 ]
         alignments =  [        :left,       :right,       :right,        :right,        :right,        :right,           :right ]
         delimiters =  [ ['| ', ' |'],  [' ', ' |'],  [' ', ' |'],   [' ', ' |'],   [' ', ' |'],   [' ', ' |'],      [' ', ' |'] ]
-        totals     =  [ "Total (#{sass_files.size} files):", 0, 0,            0,             0,             0,                0 ]
+        totals     =  [ total_label,             0,            0,             0,             0,             0,                0 ]
 
         sass_files.each do |sass_file|
           css_file = compiler.corresponding_css_file(sass_file) unless sass_file[0..0] == '_'

data/lib/compass/commands/stamp_pattern.rb

@@ -74,7 +74,7 @@ Options:
         installer.init
         installer.run(:skip_finalization => true)
         UpdateProject.new(working_path, options).perform if installer.compilation_required?
-        installer.finalize(:create => is_project_creation?)
+        installer.finalize(options.merge(:create => is_project_creation?))
       end
 
       def is_project_creation?

data/lib/compass/exec/project_options_parser.rb

@@ -13,19 +13,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
+      self.options[:sass_dir] = sass_dir.tr('\\','/')
     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
+      self.options[:css_dir] = css_dir.tr('\\','/')
     end
 
     opts.on('--images-dir IMAGES_DIR', "The directory where you keep your images.") do |images_dir|
-      self.options[:images_dir] = images_dir
+      self.options[:images_dir] = images_dir.tr('\\','/')
     end
 
     opts.on('--javascripts-dir JS_DIR', "The directory where you keep your javascripts.") do |javascripts_dir|
-      self.options[:javascripts_dir] = javascripts_dir
+      self.options[:javascripts_dir] = javascripts_dir.tr('\\','/')
     end
 
     opts.on('-e ENV', '--environment ENV', [:development, :production], 'Use sensible defaults for your current environment.',

data/lib/compass/installers/base.rb

@@ -28,10 +28,10 @@ module Compass
       # Runs the installer.
       # Every installer must conform to the installation strategy of prepare, install, and then finalize.
       # A default implementation is provided for each step.
-      def run(options = {})
+      def run(run_options = {})
         prepare
-        install
-        finalize(options) unless options[:skip_finalization]
+        install unless options[:prepare]
+        finalize(options.merge(run_options)) unless options[:prepare] || run_options[:skip_finalization]
       end
 
       # The default prepare method -- it is a no-op.
@@ -116,6 +116,19 @@ module Compass
         "#{pattern_name_as_dir}#{to}"
       end
 
+      def install_directory(from, to, options)
+        d = if within = options[:within]
+          if respond_to?(within)
+            targetize("#{send(within)}/#{to}")
+          else
+            raise Compass::Error, "Unrecognized location: #{within}"
+          end
+        else
+          targetize(to)
+        end
+        directory d
+      end
+
       alias install_html_without_haml install_html
       def install_html(from, to, options)
         if to =~ /\.haml$/

data/lib/compass/installers/manifest.rb

@@ -40,6 +40,7 @@ module Compass
       type :font
       type :file
       type :html
+      type :directory
 
       def help(value = nil)
         if value

data/lib/compass/installers/manifest_installer.rb

@@ -17,9 +17,11 @@ module Compass
       # Initializes the project to work with compass
       def init
         dirs = manifest.map do |entry|
-          loc = send("install_location_for_#{entry.type}", entry.to, entry.options)
-          File.dirname(loc)
-        end
+          unless entry.type == :directory
+            loc = send("install_location_for_#{entry.type}", entry.to, entry.options)
+            File.dirname(loc)
+          end
+        end.compact
 
         if manifest.has_stylesheet?
           dirs << sass_dir

data/lib/compass/sass_extensions/functions.rb

@@ -1,7 +1,11 @@
 module Compass::SassExtensions::Functions
 end
 
-%w(selectors enumerate urls display inline_image image_size gradient_support font_files).each do |func|
+%w(
+  selectors enumerate urls display
+  inline_image image_size gradient_support
+  font_files constants lists
+).each do |func|
   require "compass/sass_extensions/functions/#{func}"
 end
 
@@ -14,6 +18,8 @@ module Sass::Script::Functions
   include Compass::SassExtensions::Functions::ImageSize
   include Compass::SassExtensions::Functions::GradientSupport::Functions
   include Compass::SassExtensions::Functions::FontFiles
+  include Compass::SassExtensions::Functions::Constants
+  include Compass::SassExtensions::Functions::Lists
 end
 
 # Wierd that this has to be re-included to pick up sub-modules. Ruby bug?

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

@@ -0,0 +1,17 @@
+module Compass::SassExtensions::Functions::Constants
+  # returns the opposite position of a side or corner.
+  def opposite_position(position)
+    opposite = position.value.split(/ +/).map do |pos|
+      case pos
+      when "top" then "bottom"
+      when "bottom" then "top"
+      when "left" then "right"
+      when "right" then "left"
+      when "center" then "center"
+      else
+        raise Sass::SyntaxError, "Cannot determine the opposite of #{pos}"
+      end
+    end
+    Sass::Script::String.new(opposite.join(" "), position.type)
+  end
+end

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

@@ -36,22 +36,6 @@ module Compass::SassExtensions::Functions::GradientSupport
   end
 
   module Functions
-    # returns the opposite position of a side or corner.
-    def grad_opposite_position(position)
-      opposite = position.value.split(/ +/).map do |pos|
-        case pos
-        when "top" then "bottom"
-        when "bottom" then "top"
-        when "left" then "right"
-        when "right" then "left"
-        when "center" then "center"
-        else
-          raise Sass::SyntaxError, "Cannot determine the opposite of #{pos}"
-        end
-      end
-      Sass::Script::String.new(opposite.join(" "))
-    end
-
     # returns color-stop() calls for use in webkit.
     def grad_color_stops(color_list)
       assert_list(color_list)

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

@@ -1,4 +1,3 @@
-require 'base64'
 module Compass::SassExtensions::Functions::InlineImage
 
   def inline_image(path, mime_type = nil)
@@ -10,19 +9,18 @@ module Compass::SassExtensions::Functions::InlineImage
 
   def inline_font_files(*args)
     raise Sass::SyntaxError, "An even number of arguments must be passed to font_files()" unless args.size % 2 == 0
-    path = path.value
     files = []
     while args.size > 0
       path = args.shift.value
       real_path = File.join(Compass.configuration.fonts_path, path)
-      url = "url('data:#{compute_mime_type(path,mime_type)};base64,#{data(real_path)}')"
+      url = "url('data:#{compute_mime_type(path)};base64,#{data(real_path)}')"
       files << "#{url} format('#{args.shift}')"
     end
     Sass::Script::String.new(files.join(", "))
   end
 
 private
-  def compute_mime_type(path, mime_type)
+  def compute_mime_type(path, mime_type = nil)
     return mime_type if mime_type
     case path
     when /\.png$/i
@@ -48,7 +46,7 @@ private
 
   def data(real_path)
     if File.readable?(real_path)
-      Base64.encode64(File.read(real_path)).gsub("\n","")
+      [File.read(real_path)].pack('m').gsub("\n","")
     else
       raise Compass::Error, "File not found or cannot be read: #{real_path}"
     end

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

@@ -0,0 +1,9 @@
+module Compass::SassExtensions::Functions::Lists
+  def first_value_of(list)
+    if list.is_a?(Sass::Script::String)
+      Sass::Script::String.new(list.value.split(/\s+/).first)
+    else
+      list
+    end
+  end
+end

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

@@ -36,8 +36,12 @@ module Compass::SassExtensions::Functions::Urls
   def image_url(path)
     path = path.value # get to the string value of the literal.
 
-    # Short curcuit if they have provided an absolute url.
-    if absolute_path?(path)
+    if path =~ %r{^#{Regexp.escape(Compass.configuration.http_images_path)}/(.*)}
+      # Treat root relative urls (without a protocol) like normal if they start with
+      # the images path.
+      path = $1
+    elsif absolute_path?(path)
+      # Short curcuit if they have provided an absolute url.
       return Sass::Script::String.new("url(#{path})")
     end
 

data/test/fixtures/stylesheets/blueprint/config.rb

@@ -4,6 +4,11 @@ css_dir = "tmp"
 sass_dir = "sass"
 images_dir = "images"
 output_style = :nested
+line_comments = false
 # To enable relative image paths using the images_url() function:
 # http_images_path = :relative
 http_images_path = "/images"
+
+asset_cache_buster do |path, file|
+  "busted=true"
+end

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

@@ -669,7 +669,7 @@ input.span-24, textarea.span-24, select.span-24 {
   margin-bottom: 1.5em; }
 
 .showgrid {
-  background: url('/images/grid.png?1275242906'); }
+  background: url('/images/grid.png?busted=true'); }
 
 .error {
   padding: 0.8em;
@@ -726,7 +726,7 @@ legend {
   font-weight: bold;
   font-size: 1.2em; }
 
-input.text, input.title, input[type=text], input[type=password] {
+input.text, input.title, input[type=email], input[type=text], input[type=password] {
   margin: 0.5em 0;
   background-color: white;
   padding: 5px; }
@@ -746,14 +746,14 @@ select {
 fieldset {
   border: 1px solid #cccccc; }
 
-input.text, input.title, input[type=text], input[type=password],
+input.text, input.title, input[type=email], input[type=text], input[type=password],
 textarea, select {
   border: 1px solid #bbbbbb; }
-  input.text:focus, input.title:focus, input[type=text]:focus, input[type=password]:focus,
+  input.text:focus, input.title:focus, input[type=email]:focus, input[type=text]:focus, input[type=password]:focus,
   textarea:focus, select:focus {
     border: 1px solid #666666; }
 
-input.text, input.title, input[type=text], input[type=password] {
+input.text, input.title, input[type=email], input[type=text], input[type=password] {
   width: 300px; }
 
 textarea {

data/test/fixtures/stylesheets/blueprint/css/single-imports/buttons.css

@@ -0,0 +1,56 @@
+a {
+  display: -moz-inline-box;
+  -moz-box-orient: vertical;
+  display: inline-block;
+  vertical-align: middle;
+  *display: inline;
+  *vertical-align: auto;
+  margin: 0.7em 0.5em 0.7em 0;
+  border-width: 1px;
+  border-style: solid;
+  font-family: "Lucida Grande", Tahoma, Arial, Verdana, sans-serif;
+  font-size: 100%;
+  line-height: 130%;
+  font-weight: bold;
+  text-decoration: none;
+  cursor: pointer;
+  padding: 5px 10px 5px 7px; }
+  a img {
+    margin: 0 3px -3px 0 !important;
+    padding: 0;
+    border: none;
+    width: 16px;
+    height: 16px;
+    float: none; }
+
+button {
+  display: -moz-inline-box;
+  -moz-box-orient: vertical;
+  display: inline-block;
+  vertical-align: middle;
+  *display: inline;
+  *vertical-align: auto;
+  margin: 0.7em 0.5em 0.7em 0;
+  border-width: 1px;
+  border-style: solid;
+  font-family: "Lucida Grande", Tahoma, Arial, Verdana, sans-serif;
+  font-size: 100%;
+  line-height: 130%;
+  font-weight: bold;
+  text-decoration: none;
+  cursor: pointer;
+  width: auto;
+  overflow: visible;
+  padding: 4px 10px 3px 7px; }
+  button img {
+    margin: 0 3px -3px 0 !important;
+    padding: 0;
+    border: none;
+    width: 16px;
+    height: 16px;
+    float: none; }
+  button[type] {
+    padding: 4px 10px 4px 7px;
+    line-height: 17px; }
+  *:first-child + html button[type] {
+    padding: 4px 10px 3px 7px; }

data/test/fixtures/stylesheets/blueprint/css/single-imports/colors.css

@@ -0,0 +1,80 @@
+.font-color {
+  color: #333333; }
+
+.quiet-color {
+  color: #666666; }
+
+.loud-color {
+  color: #111111; }
+
+.header-color {
+  color: #222222; }
+
+.alt-text-color {
+  color: #666666; }
+
+.link-color {
+  color: #000099; }
+
+.link-hover-color {
+  color: black; }
+
+.link-focus-color {
+  color: black; }
+
+.link-active-color {
+  color: #cc0099; }
+
+.link-visited-color {
+  color: #000066; }
+
+.feedback-border-color {
+  color: #dddddd; }
+
+.success-color {
+  color: #264409; }
+
+.success-bg-color {
+  color: #e6efc2; }
+
+.success-border-color {
+  color: #c6d880; }
+
+.notice-color {
+  color: #514721; }
+
+.notice-bg-color {
+  color: #fff6bf; }
+
+.notice-border-color {
+  color: #ffd324; }
+
+.error-color {
+  color: #8a1f11; }
+
+.error-bg-color {
+  color: #fbe3e4; }
+
+.error-border-color {
+  color: #fbc2c4; }
+
+.highlight-color {
+  color: yellow; }
+
+.added-color {
+  color: white; }
+
+.added-bg-color {
+  color: #006600; }
+
+.removed-color {
+  color: white; }
+
+.removed-bg-color {
+  color: #990000; }
+
+.blueprint-table-header-color {
+  color: #c3d9ff; }
+
+.blueprint-table-stripe-color {
+  color: #e5ecf9; }