chriseppstein-compass 0.8.2 → 0.8.3

data/CHANGELOG.markdown

@@ -1,6 +1,50 @@
 COMPASS CHANGELOG
 =================
 
+0.8.3 (July 06, 2009)
+---------------------
+
+Note: Compass now depends on the stable release of haml with version 2.2.0 or greater.
+
+### Compass Core
+
+* A new helper function `stylesheet_url(path)` can now be used to refer to assets that are relative to the css directory.
+  [Commit](http://github.com/chriseppstein/compass/commit/ff5c8500144272ee2b94271b06cce1690cbbc000).
+* Cross browser ellipsis mixin is now available. Use `compass -p ellipsis` to install it into your project since it
+  requires some additional assets.
+  [Commit](http://github.com/chriseppstein/compass/commit/3d909ceda997bdcde2aec09bd72e646098389e7d).
+
+### Blueprint
+
+* The +colruler mixin now accepts an argument for the color.
+  [Commit](http://github.com/chriseppstein/compass/commit/a5393bbb7cd0941ab8add5be188aea1d6f9d4b00)
+  by [Thomas Reynolds][tdreyno].
+
+### Extensions
+
+* A bug was fixed related to how javascript installation as part of an extension manifest.
+  [Commit](http://github.com/chriseppstein/compass/commit/a5393bbb7cd0941ab8add5be188aea1d6f9d4b00)
+  by [dturnbull][dturnbull].
+* When installing a file, the :like option can now be set to have it installed into the
+  same location as what it is like. E.g. `file 'foo.xml', :like => :css` will install
+  the foo.xml file into the top level of the project's css directory.
+  [Commit](http://github.com/chriseppstein/compass/commit/21cfce33db81e185ce5517818844a9849b5a836e).
+
+### Configuration
+* Setting `http_images_path` to `:relative` is now **deprecated**. Instead, please set `relative_assets` to
+  `true`.
+  [Commit](http://github.com/chriseppstein/compass/commit/956c437fe9ffaad08b6b34d91b6cfb80d6121a2f).
+* New configuration option `http_path` can be used to set the project's path relative to the server's root.
+  Defaults to "/". The http paths to images, stylesheets, and javascripts are now assumed to be relative to that
+  path but can be overridden using the `http_images_path`, `http_css_path`, `http_javascripts_path`.
+  [Commit](http://github.com/chriseppstein/compass/commit/6555ab3952ae37d736d54f43ee7053c2a88f4a69).
+
+### Command Line
+
+* A new command line option `--relative-assets` can be used to cause links to assets generated
+  via compass helper functions to be relative to the target css file.
+  [Commit](http://github.com/chriseppstein/compass/commit/956c437fe9ffaad08b6b34d91b6cfb80d6121a2f).
+
 0.8.2 (July 04, 2009)
 ---------------------
 
@@ -396,3 +440,4 @@ Almost definitely. Please let me know if you encounter any problems and I'll get
 [perezd]: http://github.com/perezd
 [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

data/REVISION

@@ -1 +1 @@
-1de07d81dc07bca446b9f911aff76243c1e515a2
+51743bdb5b4d9835f3bde134219fab68bfaafc5f

data/Rakefile

@@ -45,7 +45,7 @@ begin
     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-edge', '>= 2.1.12')
+    gemspec.add_dependency('haml', '>= 2.2.0')
     gemspec.files = []
     gemspec.files << "CHANGELOG.markdown"
     gemspec.files << "README.markdown"

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 2
 :major: 0
 :minor: 8
+:patch: 3

data/examples/blueprint_default/config.rb

@@ -4,5 +4,4 @@ css_dir = "stylesheets"
 sass_dir = "src"
 images_dir = "images"
 output_style = :compact
-# To enable relative image paths using the images_url() function:
-http_images_path = :relative
+relative_assets = true

data/examples/blueprint_plugins/config.rb

@@ -4,6 +4,5 @@ css_dir = "stylesheets"
 sass_dir = "src"
 images_dir = "images"
 output_style = :compact
-# To enable relative image paths using the images_url() function:
-# http_images_path = :relative
-http_images_path = :relative
+relative_assets = true
+

data/examples/blueprint_semantic/config.rb

@@ -4,5 +4,4 @@ css_dir = "stylesheets"
 sass_dir = "src"
 images_dir = "images"
 output_style = :compact
-# To enable relative image paths using the images_url() function:
-http_images_path = :relative
+relative_assets = true

data/examples/compass/config.rb

@@ -4,5 +4,4 @@ css_dir = "stylesheets"
 sass_dir = "src"
 images_dir = "images"
 output_style = :compact
-# To enable relative image paths using the images_url() function:
-http_images_path = :relative
+relative_assets = true

data/examples/compass/src/utilities.sass

@@ -3,6 +3,7 @@
 @import yui/modules/base.sass
 @import blueprint/modules/grid.sass
 @import blueprint/modules/scaffolding.sass
+@import compass/utilities/text/ellipsis.sass
 
 html
   +yui-base
@@ -67,6 +68,12 @@ h2
     +outer-table-borders(2px, #151A99)
     +inner-table-borders(1px, #151A99)
 
+#ellipsis
+  +column(8, true)
+  td
+    width: 50%
+    +ellipsis
+
 #floats
   +column(16)
   .clearfix-example

data/examples/compass/utilities.html.haml

@@ -139,6 +139,10 @@
                 %td.numeric.even 15.5
                 %td.numeric.odd  16.0
                 %td.numeric.even 17.5
+      #ellipsis
+        .example
+          %h2 Ellipsis
+          %p This long text is truncated at the end of the first line. Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
       #floats
         .example
           %h2 Floats

data/frameworks/blueprint/stylesheets/blueprint/modules/_grid.sass

@@ -151,9 +151,9 @@
   :border-right #{!border_width} solid #{!border_color}
 
 // Mixin this to an hr to make a horizontal ruler across a column.
-=colruler
-  :background #ddd
-  :color #ddd
+=colruler(!border_color = #ddd)
+  :background= !border_color
+  :color= !border_color
   :clear both
   :float none
   :width 100%

data/frameworks/compass/stylesheets/compass/utilities/text/_ellipsis.sass

@@ -0,0 +1,13 @@
+//
+  This technique, by [Justin Maxwell](http://code404.com/), was originally
+  published at http://mattsnider.com/css/css-string-truncation-with-ellipsis/
+  Firefox implementation by [Rikkert Koppes](http://www.rikkertkoppes.com/thoughts/2008/6/)
+
+=ellipsis(!no_wrap = true)
+  @if !no_wrap
+    white-space: nowrap
+  overflow: hidden
+  text-overflow: ellipsis
+  -o-text-overflow: ellipsis
+  -ms-text-overflow: ellipsis
+  -moz-binding= stylesheet_url("xml/ellipsis.xml#ellipsis")

data/frameworks/compass/templates/ellipsis/ellipsis.sass

@@ -0,0 +1,6 @@
+@import compass/utilities/text/ellipsis.sass
+
+// You can delete this sass file if you want, it's just an example of how to use the ellipsis mixin.
+// By default, ellipsis text is no-wrap. Pass false as the first argument if you don't want that.
+.ellipsis
+  +ellipsis

data/frameworks/compass/templates/ellipsis/manifest.rb

@@ -0,0 +1,2 @@
+file 'xml/ellipsis.xml', :like => :css
+stylesheet 'ellipsis.sass'

data/frameworks/compass/templates/ellipsis/xml/ellipsis.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<bindings
+  xmlns="http://www.mozilla.org/xbl"
+  xmlns:xbl="http://www.mozilla.org/xbl"
+  xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+>
+	<binding id="ellipsis">
+		<content>
+			<xul:window>
+				<xul:description crop="end" xbl:inherits="value=xbl:text"><children/></xul:description>
+			</xul:window>
+		</content>
+	</binding>
+</bindings>

data/lib/compass/configuration.rb

@@ -7,13 +7,17 @@ module Compass
     ATTRIBUTES = [
       :project_type,
       :project_path,
+      :http_path,
       :css_dir,
       :sass_dir,
       :images_dir,
       :javascripts_dir,
       :output_style,
       :environment,
+      :relative_assets,
       :http_images_path,
+      :http_stylesheets_path,
+      :http_javascripts_path,
       :additional_import_paths,
       :sass_options
     ]
@@ -44,6 +48,7 @@ module Compass
         self.additional_import_paths ||= []
         self.additional_import_paths += @added_import_paths
       end
+      issue_deprecation_warnings
     end
 
     def set_all(options)
@@ -91,12 +96,27 @@ module Compass
       "images"
     end
 
-    def default_http_images_path
-      "/#{images_dir}"
+    def default_http_path
+      "/"
     end
 
-    def comment_for_http_images_path
-      "# To enable relative image paths using the images_url() function:\n# http_images_path = :relative\n"
+    def comment_for_http_path
+      "# Set this to the root of your project when deployed:\n"
+    end
+
+    def relative_assets?
+      # the http_images_path is deprecated, but here for backwards compatibility.
+      relative_assets || http_images_path == :relative
+    end
+
+    def comment_for_relative_assets
+      unless relative_assets
+        %q{# To enable relative paths to assets via compass helper functions. Uncomment:
+# relative_assets = true
+}
+      else
+        ""
+      end
     end
 
     def default_output_style
@@ -123,6 +143,12 @@ module Compass
       end
     end
 
+    def root_relative(path)
+      hp = http_path || default_http_path
+      hp = hp[0..-2] if hp[-1..-1] == "/"
+      "#{hp}/#{path}"
+    end
+
     def add_import_path(*paths)
       # The @added_import_paths variable works around an issue where
       # the additional_import_paths gets overwritten during parse
@@ -249,6 +275,12 @@ module Compass
       self.required_libraries = []
     end
 
+    def issue_deprecation_warnings
+      if http_images_path == :relative
+        puts "DEPRECATION WARNING: Please set relative_assets = true to enable relative paths."
+      end
+    end
+
     def require(lib)
       required_libraries << lib
       super

data/lib/compass/exec.rb

@@ -184,6 +184,10 @@ END
           self.options[:output_style] = style
         end
 
+        opts.on('--relative-assets', :NONE, 'Make compass asset helpers generate relative urls to assets.') do
+          self.options[:relative_assets] = true
+        end
+
         opts.separator ''
         opts.separator 'General Options:'
 

data/lib/compass/installers/base.rb

@@ -31,7 +31,7 @@ module Compass
       # Initializes the project to work with compass
       def init
         dirs = manifest.map do |entry|
-          File.dirname(send("install_location_for_#{entry.type}", entry.to))
+          File.dirname(send("install_location_for_#{entry.type}", entry.to, entry.options))
         end
 
         if manifest.has_stylesheet?
@@ -90,9 +90,16 @@ module Compass
       def self.installer(type, &locator)
         locator ||= lambda{|to| to}
         loc_method = "install_location_for_#{type}".to_sym
-        define_method loc_method, locator
+        define_method("simple_#{loc_method}", locator)
+        define_method(loc_method) do |to, options|
+          if options[:like] && options[:like] != type
+            send("install_location_for_#{options[:like]}", to, options)
+          else
+            send("simple_#{loc_method}", to)
+          end
+        end
         define_method "install_#{type}" do |from, to, options|
-          copy templatize(from), targetize(send(loc_method, to))
+          copy templatize(from), targetize(send(loc_method, to, options))
         end
       end
 
@@ -100,11 +107,15 @@ module Compass
         "#{sass_dir}/#{pattern_name_as_dir}#{to}"
       end
 
+      installer :css do |to|
+        "#{css_dir}/#{to}"
+      end
+
       installer :image do |to|
         "#{images_dir}/#{to}"
       end
 
-      installer :script do |to|
+      installer :javascript do |to|
         "#{javascripts_dir}/#{to}"
       end
 

data/lib/compass/sass_extensions/functions/{image_url.rb → urls.rb}

@@ -1,4 +1,19 @@
-module Compass::SassExtensions::Functions::ImageUrl
+module Compass::SassExtensions::Functions::Urls
+
+  def stylesheet_url(path)
+    # 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)
+    elsif Compass.configuration.http_stylesheets_path
+      Compass.configuration.http_stylesheets_path
+    else
+      Compass.configuration.root_relative(Compass.configuration.css_dir)
+    end
+
+    url("#{http_stylesheets_path}/#{path}")
+  end
+
   def image_url(path)
     path = path.value # get to the string value of the literal.
     # Short curcuit if they have provided an absolute url.
@@ -10,9 +25,11 @@ module Compass::SassExtensions::Functions::ImageUrl
     # 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
-    else
+      compute_relative_path(Compass.configuration.images_dir)
+    elsif Compass.configuration.http_stylesheets_path
       Compass.configuration.http_images_path
+    else
+      Compass.configuration.root_relative(Compass.configuration.images_dir)
     end
 
     # Compute the real path to the image on the file stystem if the images_dir is set.
@@ -37,23 +54,30 @@ module Compass::SassExtensions::Functions::ImageUrl
     # prepend the asset host if there is one.
     path = "#{asset_host}#{'/' unless path[0..0] == "/"}#{path}" if asset_host
 
-    Sass::Script::String.new("url(#{path})")
+    url(path)
+  end
+
+  # Emits a url, taking off any leading "./"
+  def url(url)
+    url = url.to_s
+    url = url[0..1] == "./" ? url[2..-1] : url
+    Sass::Script::String.new("url('#{url}')")
   end
 
   private
 
   def relative?
-    Compass.configuration.http_images_path == :relative
+    Compass.configuration.relative_assets?
   end
 
   def absolute_path?(path)
     path[0..0] == "/" || path[0..3] == "http"
   end
 
-  def compute_relative_path
+  def compute_relative_path(dir)
     if (target_css_file = options[:css_filename])
-      images_path = File.join(Compass.configuration.project_path, Compass.configuration.images_dir)
-      Pathname.new(images_path).relative_path_from(Pathname.new(File.dirname(target_css_file))).to_s
+      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/lib/compass/sass_extensions/functions.rb

@@ -1,14 +1,14 @@
 module Compass::SassExtensions::Functions
 end
 
-['selectors', 'enumerate', 'image_url', 'display', 'inline_image'].each do |func|
+['selectors', 'enumerate', 'urls', 'display', 'inline_image'].each do |func|
   require File.join(File.dirname(__FILE__), 'functions', func)
 end
 
 module Sass::Script::Functions
   include Compass::SassExtensions::Functions::Selectors
   include Compass::SassExtensions::Functions::Enumerate
-  include Compass::SassExtensions::Functions::ImageUrl
+  include Compass::SassExtensions::Functions::Urls
   include Compass::SassExtensions::Functions::Display
   include Compass::SassExtensions::Functions::InlineImage
 end

data/test/configuration_test.rb

@@ -13,14 +13,15 @@ class ConfigurationTest < Test::Unit::TestCase
       # Require any additional compass plugins here.
 
       project_type = :stand_alone
+      # Set this to the root of your project when deployed:
+      http_path = "/"
       css_dir = "css"
       sass_dir = "sass"
       images_dir = "img"
       javascripts_dir = "js"
       output_style = :nested
-      # To enable relative image paths using the images_url() function:
-      # http_images_path = :relative
-      http_images_path = "/images"
+      # To enable relative paths to assets via compass helper functions. Uncomment:
+      # relative_assets = true
     CONFIG
 
     Compass.configuration.parse_string(contents, "test_parse")
@@ -65,6 +66,7 @@ class ConfigurationTest < Test::Unit::TestCase
 
   def test_additional_import_paths
     contents = <<-CONFIG
+      http_path = "/"
       project_path = "/home/chris/my_compass_project"
       css_dir = "css"
       additional_import_paths = ["../foo"]
@@ -81,11 +83,14 @@ class ConfigurationTest < Test::Unit::TestCase
     expected_serialization = <<EXPECTED
 # Require any additional compass plugins here.
 project_path = "/home/chris/my_compass_project"
+# Set this to the root of your project when deployed:
+http_path = "/"
 css_dir = "css"
-# To enable relative image paths using the images_url() function:
-# http_images_path = :relative
+# To enable relative paths to assets via compass helper functions. Uncomment:
+# relative_assets = true
 additional_import_paths = ["../foo", "/path/to/my/framework"]
 EXPECTED
+    assert_equal "/", Compass.configuration.http_path
     assert_equal expected_serialization, Compass.configuration.serialize
   end
 
@@ -101,10 +106,12 @@ EXPECTED
 
       expected_serialization = <<EXPECTED
 # Require any additional compass plugins here.
-# To enable relative image paths using the images_url() function:
-# http_images_path = :relative
+# Set this to the root of your project when deployed:
+# To enable relative paths to assets via compass helper functions. Uncomment:
+# relative_assets = true
 sass_options = {:foo=>"bar"}
 EXPECTED
+
       assert_equal expected_serialization, Compass.configuration.serialize
     end
 

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

@@ -1,3 +1,3 @@
-.showgrid { background-image: url(http://assets2.example.com/images/grid.png?busted=true); }
+.showgrid { background-image: url('http://assets2.example.com/images/grid.png?busted=true'); }
 
 .inlinegrid { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAUEAYAAACv1qP4AAAABmJLR0T///////8JWPfcAAAACXBIWXMAAABIAAAASABGyWs+AAAAZ0lEQVRYw+3QwQ2AIBAFUTEUwI3+uzN7gDscsIgxEuO8An52J11X73OudfxMraXkzHfO3Y98nQEhA0IGhAwIGRAyIGRAyICQASEDQgaEDAgZEDIgZEDIgJABoZzSGK3tPuN9ERFP7Nw4fg+c5g8V1wAAAABJRU5ErkJggg=='); }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: chriseppstein-compass
 version: !ruby/object:Gem::Version 
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors: 
 - Chris Eppstein
@@ -9,18 +9,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-04 00:00:00 -07:00
+date: 2009-07-06 00:00:00 -07:00
 default_executable: compass
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: haml-edge
+  name: haml
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.1.12
+        version: 2.2.0
     version: 
 description: Compass is a Sass-based Stylesheet Framework that streamlines the creation and maintainance of CSS.
 email: chris@eppsteins.net
@@ -194,8 +194,12 @@ files:
 - frameworks/compass/stylesheets/compass/utilities/tables/_alternating_rows_and_columns.sass
 - frameworks/compass/stylesheets/compass/utilities/tables/_borders.sass
 - frameworks/compass/stylesheets/compass/utilities/tables/_scaffolding.sass
+- frameworks/compass/stylesheets/compass/utilities/text/_ellipsis.sass
 - frameworks/compass/stylesheets/compass/utilities/text/_nowrap.sass
 - frameworks/compass/stylesheets/compass/utilities/text/_replacement.sass
+- frameworks/compass/templates/ellipsis/ellipsis.sass
+- frameworks/compass/templates/ellipsis/manifest.rb
+- frameworks/compass/templates/ellipsis/xml/ellipsis.xml
 - frameworks/compass/templates/project/ie.sass
 - frameworks/compass/templates/project/manifest.rb
 - frameworks/compass/templates/project/print.sass
@@ -247,9 +251,9 @@ files:
 - lib/compass/sass_extensions/functions.rb
 - lib/compass/sass_extensions/functions/display.rb
 - lib/compass/sass_extensions/functions/enumerate.rb
-- lib/compass/sass_extensions/functions/image_url.rb
 - lib/compass/sass_extensions/functions/inline_image.rb
 - lib/compass/sass_extensions/functions/selectors.rb
+- lib/compass/sass_extensions/functions/urls.rb
 - lib/compass/sass_extensions/monkey_patches.rb
 - lib/compass/sass_extensions/monkey_patches/stylesheet_updating.rb
 - lib/compass/test_case.rb