chriseppstein-compass 0.8.5 → 0.8.6

data/CHANGELOG.markdown

@@ -1,6 +1,31 @@
 COMPASS CHANGELOG
 =================
 
+0.8.6 (July 08, 2009)
+---------------------
+
+### Rails
+
+* The rails installer now correctly references the haml 2.2 dependency.
+  [Commit](http://github.com/chriseppstein/compass/commit/85bb337f50a3a3dfaafa2820d5463f7296140c9e)
+  by [Filip Tepper][filiptepper].
+* When installing into a new rails project, set the http paths correctly for stylesheets and javascripts
+  in the configuration file.
+  [Commit](http://github.com/chriseppstein/compass/commit/94e9696b30a9a9fd750c45e6fe3c2bc93eba506a)
+* Fixed a bug in asset hosts support when compiling outside the context of a controller.
+  [Commit](http://github.com/chriseppstein/compass/commit/6b8bbd22b13ef4c329777913a633948e66e3da99)
+
+### Command Line
+
+* Fixed a bug that caused the output after installing to not display the conditional comments.
+  [Commit](http://github.com/chriseppstein/compass/commit/48a0356ad8bc7b965e64f82498a9adcc1872abad)
+
+### Compass Core
+
+* Fixed a copy & paste error in image_url() that caused the http_images_path to not get picked up unless the
+  http_stylesheets_path was also set.
+  [Commit](http://github.com/chriseppstein/compass/commit/b7a9772efb89b2b882d3fafe02813c0fc650719a)
+
 0.8.5 (July 06, 2009)
 ---------------------
 
@@ -159,7 +184,7 @@ Fixed some build issues and a bug in the rewritten --watch mode that caused chan
 ### Configuration
 
 * **Asset Hosts**. You can now configure the asset host(s) used for images via the image_url() function.
-  Asset hosts are off unless configured and also off when relative urls are enabled. 
+  Asset hosts are off unless configured and also off when relative urls are enabled.
   [Commit](http://github.com/chriseppstein/compass/commit/ef47f3dd9dbfc087de8b12a90f9a82993bbb592e).
   In your compass configuration file, you must define an asset_host algorithm to be used like so:
       # Return the same host for all images:
@@ -452,3 +477,4 @@ Almost definitely. Please let me know if you encounter any problems and I'll get
 [Chrononaut]: http://github.com/Chrononaut
 [rails_template]: http://github.com/chriseppstein/compass/raw/4e7e51e2c5491851f66c77abf3f15194f2f8fb8d/lib/compass/app_integration/rails/templates/compass-install-rails.rb
 [dturnbull]: http://github.com/dturnbull
+[filiptepper]: http://github.com/filiptepper

data/REVISION

@@ -1 +1 @@
-cf604fac4e249afcc527cef446b8438297bd8a73
+aba60c46cdfe657144cd411b7c3f4bd81826299b

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 5
 :major: 0
 :minor: 8
+:patch: 6

data/lib/compass/app_integration/rails/templates/compass-install-rails.rb

@@ -2,11 +2,11 @@
 # Compass Ruby on Rails Installer (template) v.1.0
 # written by Derek Perez (derek@derekperez.com)
 # -----------------------------------------------------------------
-# NOTE: This installer is designed to work as a Rails template, 
+# NOTE: This installer is designed to work as a Rails template,
 # and can only be used with Rails 2.3+.
 # -----------------------------------------------------------------
 # Copyright (c) 2009 Derek Perez
-# 
+#
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation
 # files (the "Software"), to deal in the Software without
@@ -15,10 +15,10 @@
 # copies of the Software, and to permit persons to whom the
 # Software is furnished to do so, subject to the following
 # conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
 # OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -46,11 +46,11 @@ css_dir = ask("Where would you like Compass to store your compiled css files? (d
 css_dir = "public/stylesheets/compiled" if css_dir.blank?
 
 # define dependencies
-gem "haml-edge", :lib => "haml"
+gem "haml", :lib => "haml", :version => ">=2.2.0"
 gem "chriseppstein-compass", :source => "http://gems.github.com/", :lib => "compass"
 
 # install and unpack
-rake "gems:install GEM=haml-edge", :sudo => true
+rake "gems:install GEM=haml", :sudo => true
 rake "gems:install GEM=chriseppstein-compass", :sudo => true
 rake "gems:unpack GEM=chriseppstein-compass"
 
@@ -69,7 +69,7 @@ compass_command << plugin_require if plugin_require
 
 # Require compass during plugin loading
 file 'vendor/plugins/compass/init.rb', <<-CODE
-# This is here to make sure that the right version of sass gets loaded (haml-edge) by the compass requires.
+# This is here to make sure that the right version of sass gets loaded (haml 2.2) by the compass requires.
 require 'compass'
 CODE
 

data/lib/compass/dependencies.rb

@@ -1,9 +1,9 @@
 unless defined?(Sass)
   require 'rubygems'
   begin
-    gem 'haml-edge','>= 2.1'
+    gem 'haml','>= 2.2.0'
   rescue Exception
-    $stderr.puts "WARNING: haml-edge gem not found. Trying to find haml on the load path."
+    $stderr.puts "WARNING: haml 2.2 gem not found. Trying to find haml on the load path."
   end
   require 'sass'
 end

data/lib/compass/installers/rails.rb

@@ -9,6 +9,8 @@ module Compass
           :css_dir => (css_dir || prompt_css_dir),
           :images_dir => default_images_dir,
           :javascripts_dir => default_javascripts_dir,
+          :http_stylesheets_path => default_http_stylesheets_path,
+          :http_javascripts_path => default_http_javascripts_path,
           :http_images_path => default_http_images_path
         }
       end
@@ -55,6 +57,14 @@ NEXTSTEPS
         "/images"
       end
 
+      def default_http_javascripts_path
+        "/javascripts"
+      end
+
+      def default_http_stylesheets_path
+        "/stylesheets"
+      end
+
       def prompt_sass_dir
         recommended_location = separate('app/stylesheets')
         default_location = separate('public/stylesheets/sass')
@@ -111,8 +121,8 @@ Compass.configure_sass_plugin!
           if stylesheet.options[:media]
             ss_line += ", :media => '#{stylesheet.options[:media]}'"
           end
-          if stylesheet.options[:ie]
-            ss_line = "  /[if IE]\n  " + ss_line
+          if stylesheet.options[:condition]
+            ss_line = "  /[if #{stylesheet.options[:condition]}]\n  " + ss_line
           end
           html << ss_line + "\n"
         end

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

@@ -18,7 +18,6 @@ module Compass::SassExtensions::Functions::Urls
     path = path.value # get to the string value of the literal.
     # Short curcuit if they have provided an absolute url.
     if absolute_path?(path)
-      puts "#{path} is absolute"
       return Sass::Script::String.new("url(#{path})")
     end
 
@@ -26,7 +25,7 @@ module Compass::SassExtensions::Functions::Urls
     # 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)
-    elsif Compass.configuration.http_stylesheets_path
+    elsif Compass.configuration.http_images_path
       Compass.configuration.http_images_path
     else
       Compass.configuration.root_relative(Compass.configuration.images_dir)
@@ -44,7 +43,9 @@ module Compass::SassExtensions::Functions::Urls
     end
 
     # Compute the asset host unless in relative mode.
-    asset_host = (compute_asset_host(path) unless relative?)
+    asset_host = if !relative? && Compass.configuration.asset_host
+      Compass.configuration.asset_host.call(path)
+    end
 
     # Compute and append the cache buster if there is one.
     if buster = compute_cache_buster(path, real_path)
@@ -101,12 +102,4 @@ module Compass::SassExtensions::Functions::Urls
     end
   end
 
-  def compute_asset_host(path)
-    if Compass.configuration.asset_host
-      Compass.configuration.asset_host.call(path)
-    else
-      nil
-    end
-  end
-
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: chriseppstein-compass
 version: !ruby/object:Gem::Version 
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors: 
 - Chris Eppstein
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-06 00:00:00 -07:00
+date: 2009-07-08 00:00:00 -07:00
 default_executable: compass
 dependencies: 
 - !ruby/object:Gem::Dependency