compass 0.10.0.pre5 → 0.10.0.pre6

data/test/compass_test.rb

@@ -42,7 +42,7 @@ class CompassTest < Test::Unit::TestCase
       each_css_file(proj.css_path) do |css_file|
         assert_no_errors css_file, 'compass'
       end
-      assert_renders_correctly :reset, :layout, :utilities
+      assert_renders_correctly :reset, :layout, :utilities, :gradients, :image_size
     end
   end
 

data/test/configuration_test.rb

@@ -93,6 +93,36 @@ css_dir = "css"
 # 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.split("\n"), Compass.configuration.serialize.split("\n")
+  end
+
+  def test_config_with_pathname
+    contents = StringIO.new(<<-CONFIG)
+      http_path = "/"
+      project_path = Pathname.new("/home/chris/my_compass_project")
+      css_dir = "css"
+      additional_import_paths = ["../foo"]
+      add_import_path "/path/to/my/framework"
+    CONFIG
+
+    Compass.add_configuration(contents, "test_additional_import_paths")
+
+    assert Compass.configuration.to_sass_engine_options[:load_paths].include?("/home/chris/my_compass_project/../foo")
+    assert Compass.configuration.to_sass_engine_options[:load_paths].include?("/path/to/my/framework"), Compass.configuration.to_sass_engine_options[:load_paths].inspect
+    assert_equal "/home/chris/my_compass_project/css/framework", Compass.configuration.to_sass_plugin_options[:template_location]["/path/to/my/framework"]
+    assert_equal "/home/chris/my_compass_project/css/foo", Compass.configuration.to_sass_plugin_options[:template_location]["/home/chris/my_compass_project/../foo"]
+
+    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 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.split("\n"), Compass.configuration.serialize.split("\n")

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

@@ -0,0 +1,71 @@
+.linear-1 {
+  background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(0%, #dddddd), color-stop(100%, #aaaaaa));
+  background-image: -moz-linear-gradient(top, #dddddd 0%, #aaaaaa 100%); }
+
+.linear-2 {
+  background-image: -webkit-gradient(linear, 0% 0%, 100% 0%, color-stop(0%, #dddddd), color-stop(100%, #aaaaaa));
+  background-image: -moz-linear-gradient(left, #dddddd 0%, #aaaaaa 100%); }
+
+.linear-3 {
+  background-image: -webkit-gradient(linear, 0% 0%, 100% 100%, color-stop(0%, #dddddd), color-stop(100%, #aaaaaa));
+  background-image: -moz-linear-gradient(top left, #dddddd 0%, #aaaaaa 100%); }
+
+.linear-4 {
+  background-image: -webkit-gradient(linear, 100% 0%, 0% 100%, color-stop(0%, #dddddd), color-stop(100%, #aaaaaa));
+  background-image: -moz-linear-gradient(top right, #dddddd 0%, #aaaaaa 100%); }
+
+.linear-5 {
+  background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(0%, #dddddd), color-stop(50%, #cccccc), color-stop(100%, #aaaaaa));
+  background-image: -moz-linear-gradient(top, #dddddd 0%, #cccccc 50%, #aaaaaa 100%); }
+
+.linear-6 {
+  background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(0%, #dddddd), color-stop(20%, #cccccc), color-stop(100%, #aaaaaa));
+  background-image: -moz-linear-gradient(top, #dddddd 0%, #cccccc 20%, #aaaaaa 100%); }
+
+.linear-7 {
+  background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(0%, #dddddd), color-stop(20%, #cccccc), color-stop(50.1%, #eeeeee), color-stop(100%, #aaaaaa));
+  background-image: -moz-linear-gradient(top, #dddddd 0%, #cccccc 20%, #eeeeee 50.1%, #aaaaaa 100%); }
+
+.linear-8 {
+  background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(80%, #dddddd), color-stop(100%, #aaaaaa));
+  background-image: -moz-linear-gradient(top, #dddddd 80%, #aaaaaa 100%); }
+
+.linear-9 {
+  background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(0%, #dddddd), color-stop(100%, #aaaaaa));
+  background-image: -moz-linear-gradient(top, #dddddd 0%, #aaaaaa 20%); }
+
+.linear-10 {
+  background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(80%, #dddddd), color-stop(100%, #aaaaaa));
+  background-image: -moz-linear-gradient(top, #dddddd 40%, #aaaaaa 50%); }
+
+.linear-11 {
+  background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(80%, #dddddd), color-stop(90%, black), color-stop(100%, #aaaaaa));
+  background-image: -moz-linear-gradient(top, #dddddd 40%, black 45%, #aaaaaa 50%); }
+
+.radial-1 {
+  background-image: -webkit-gradient(radial, 50% 50%, 0, 50% 50%, 100, color-stop(0%, #dddddd), color-stop(100%, #aaaaaa));
+  background-image: -moz-radial-gradient(center center, circle, #dddddd 0%, #aaaaaa 100%); }
+
+.radial-2 {
+  background-image: -webkit-gradient(radial, 50% 50%, 0, 50% 50%, 100, color-stop(0%, #dddddd), color-stop(100%, #aaaaaa));
+  background-image: -moz-radial-gradient(center center, circle, #dddddd 0%, #aaaaaa 100%); }
+
+.radial-3 {
+  background-image: -webkit-gradient(radial, 50% 0%, 0, 50% 0%, 100, color-stop(0%, #dddddd), color-stop(100%, #aaaaaa));
+  background-image: -moz-radial-gradient(top center, circle, #dddddd 0%, #aaaaaa 100%); }
+
+.radial-4 {
+  background-image: -webkit-gradient(radial, 50% 50%, 0, 50% 50%, 100, color-stop(0%, #dddddd), color-stop(100%, #aaaaaa));
+  background-image: -moz-radial-gradient(center center, circle, #dddddd 0%, #aaaaaa 100%); }
+
+.radial-5 {
+  background-image: -webkit-gradient(radial, 50% 0%, 0, 50% 0%, 100, color-stop(0%, #dddddd), color-stop(100%, #aaaaaa));
+  background-image: -moz-radial-gradient(top center, circle, #dddddd 0%, #aaaaaa 100%); }
+
+.radial-6 {
+  background-image: -webkit-gradient(radial, 50% 50%, 0, 50% 50%, 50, color-stop(40%, #dddddd), color-stop(100%, #aaaaaa));
+  background-image: -moz-radial-gradient(center center, circle, #dddddd 20px, #aaaaaa 50px); }
+
+.radial-7 {
+  background-image: -webkit-gradient(radial, 50% 50%, 0, 50% 50%, 50, color-stop(20%, #dddddd), color-stop(100%, #aaaaaa));
+  background-image: -moz-radial-gradient(center center, circle, #dddddd 20%, #aaaaaa 50px); }

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

@@ -0,0 +1,15 @@
+.png {
+  width: 100px;
+  height: 150px; }
+
+.jpg {
+  width: 100px;
+  height: 150px; }
+
+.jpeg {
+  width: 100px;
+  height: 150px; }
+
+.gif {
+  width: 100px;
+  height: 150px; }

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

@@ -2,6 +2,7 @@ html, body {
   height: 100%; }
 
 #layout {
+  clear: both;
   min-height: 100%;
   height: auto !important;
   height: 100%;

data/test/fixtures/stylesheets/compass/sass/gradients.sass

@@ -0,0 +1,48 @@
+@import compass/css3.sass
+
+.linear-1
+  +linear-gradient(color_stops(#ddd, #aaa))
+.linear-2
+  +linear-gradient(color_stops(#ddd, #aaa), "left")
+.linear-3
+  +linear-gradient(color_stops(#ddd, #aaa), "top left")
+.linear-4
+  +linear-gradient(color_stops(#ddd, #aaa), "top right")
+.linear-5
+  +linear-gradient(color_stops(#ddd, #ccc, #aaa))
+.linear-6
+  +linear-gradient(color_stops(#ddd, #ccc 20%, #aaa))
+.linear-7
+  +linear-gradient(color_stops(#ddd, #ccc 20%, #eee, #aaa))
+.linear-8
+  +linear-gradient(color_stops(#ddd 80%, #aaa))
+.linear-9
+  +linear-gradient(color_stops(#ddd, #aaa 20%))
+.linear-10
+  +linear-gradient(color_stops(#ddd 40%, #aaa 50%))
+.linear-11
+  +linear-gradient(color_stops(#ddd 40%, #000, #aaa 50%))
+.radial-1
+  // A default radial gradient:
+  // A centered gradient having the shape of the container (aka ellipse)
+  +radial-gradient(color_stops(#ddd, #aaa))
+.radial-2
+  // A centered gradient having the shape of the container (aka ellipse)
+  +radial-gradient(color_stops(#ddd, #aaa))
+.radial-3
+  // A centered gradient at the top having the shape of the container (aka ellipse)
+  +radial-gradient(color_stops(#ddd, #aaa), "top center")
+.radial-4
+  // A centered gradient having a circular shape
+  +radial-gradient(color_stops(#ddd, #aaa))
+.radial-5
+  // A centered gradient at the top having a circular shape
+  +radial-gradient(color_stops(#ddd, #aaa), "top center")
+.radial-6
+  // A centered circular gradient with color stops
+  // The color stops must be absolute units
+  +radial-gradient(color_stops(#ddd 20px, #aaa 50px))
+.radial-7
+  // A centered elliptical gradient with color stops
+  // The color stops must be relative units
+  +radial-gradient(color_stops(#ddd 20%, #aaa 50px))

data/test/fixtures/stylesheets/compass/sass/image_size.sass

@@ -0,0 +1,12 @@
+.png
+  width= image_width("100x150.png")
+  height= image_height("100x150.png")
+.jpg
+  width= image_width("100x150.jpg")
+  height= image_height("100x150.jpg")
+.jpeg
+  width= image_width("100x150.jpeg")
+  height= image_height("100x150.jpeg")
+.gif
+  width= image_width("100x150.gif")
+  height= image_height("100x150.gif")

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: compass
 version: !ruby/object:Gem::Version 
-  version: 0.10.0.pre5
+  prerelease: true
+  segments: 
+  - 0
+  - 10
+  - 0
+  - pre6
+  version: 0.10.0.pre6
 platform: ruby
 authors: 
 - Chris Eppstein
@@ -9,19 +15,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-19 00:00:00 -08:00
+date: 2010-02-22 00:00:00 -08:00
 default_executable: compass
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: haml
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 2
+        - 14
         version: 2.2.14
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: Compass is a Sass-based Stylesheet Framework that streamlines the creation and maintainance of CSS.
 email: chris@eppsteins.net
 executables: 
@@ -120,15 +130,37 @@ files:
 - examples/compass/sticky_footer.html.haml
 - examples/compass/utilities.html.haml
 - examples/css3/config.rb
+- examples/css3/extensions/compass-colors/README.markdown
+- examples/css3/extensions/compass-colors/VERSION.yml
+- examples/css3/extensions/compass-colors/example/config.rb
+- examples/css3/extensions/compass-colors/example/src/_split_compliment_theme.sass
+- examples/css3/extensions/compass-colors/example/src/screen.sass
+- examples/css3/extensions/compass-colors/lib/compass-colors.rb
+- examples/css3/extensions/compass-colors/lib/compass-colors/compass_extension.rb
+- examples/css3/extensions/compass-colors/lib/compass-colors/hsl.rb
+- examples/css3/extensions/compass-colors/lib/compass-colors/sass_extensions.rb
+- examples/css3/extensions/compass-colors/spec/approximate_color_matching.rb
+- examples/css3/extensions/compass-colors/spec/sass_extensions_spec.rb
+- examples/css3/extensions/compass-colors/templates/analogous/_theme.sass
+- examples/css3/extensions/compass-colors/templates/analogous/manifest.rb
+- examples/css3/extensions/compass-colors/templates/basic/_theme.sass
+- examples/css3/extensions/compass-colors/templates/basic/manifest.rb
+- examples/css3/extensions/compass-colors/templates/complementary/_theme.sass
+- examples/css3/extensions/compass-colors/templates/complementary/manifest.rb
+- examples/css3/extensions/compass-colors/templates/split_complement/_theme.sass
+- examples/css3/extensions/compass-colors/templates/split_complement/manifest.rb
+- examples/css3/extensions/compass-colors/templates/triadic/_theme.sass
+- examples/css3/extensions/compass-colors/templates/triadic/manifest.rb
 - examples/css3/extensions/fancy-fonts/templates/project/Vtks Revolt.ttf
 - examples/css3/extensions/fancy-fonts/templates/project/angelina.ttf
 - examples/css3/extensions/fancy-fonts/templates/project/fancy-fonts.sass
 - examples/css3/extensions/fancy-fonts/templates/project/manifest.rb
+- examples/css3/gradients.html.haml
 - examples/css3/images/fresh-peas.jpg
 - examples/css3/index.html.haml
 - examples/css3/src/_base.sass
 - examples/css3/src/fancy-fonts.sass
-- examples/css3/src/gradient.sass
+- examples/css3/src/gradients.sass
 - examples/css3/src/main.sass
 - examples/css3/stylesheets/fonts/Vtks Revolt.ttf
 - examples/css3/stylesheets/fonts/angelina.ttf
@@ -355,13 +387,13 @@ files:
 - lib/compass/app_integration/merb.rb
 - lib/compass/app_integration/merb/runtime.rb
 - lib/compass/app_integration/rails.rb
-- lib/compass/app_integration/rails/action_controller.rb
+- lib/compass/app_integration/rails/actionpack2/action_controller.rb
+- lib/compass/app_integration/rails/actionpack2/sass_plugin.rb
+- lib/compass/app_integration/rails/actionpack2/urls.rb
 - lib/compass/app_integration/rails/configuration_defaults.rb
 - lib/compass/app_integration/rails/installer.rb
 - lib/compass/app_integration/rails/runtime.rb
-- lib/compass/app_integration/rails/sass_plugin.rb
 - lib/compass/app_integration/rails/templates/compass-install-rails.rb
-- lib/compass/app_integration/rails/urls.rb
 - lib/compass/app_integration/stand_alone.rb
 - lib/compass/app_integration/stand_alone/configuration_defaults.rb
 - lib/compass/app_integration/stand_alone/installer.rb
@@ -413,10 +445,11 @@ files:
 - lib/compass/logger.rb
 - lib/compass/sass_extensions.rb
 - lib/compass/sass_extensions/functions.rb
-- lib/compass/sass_extensions/functions/color_stop.rb
 - lib/compass/sass_extensions/functions/display.rb
 - lib/compass/sass_extensions/functions/enumerate.rb
 - lib/compass/sass_extensions/functions/font_files.rb
+- lib/compass/sass_extensions/functions/gradient_support.rb
+- lib/compass/sass_extensions/functions/image_size.rb
 - lib/compass/sass_extensions/functions/inline_image.rb
 - lib/compass/sass_extensions/functions/selectors.rb
 - lib/compass/sass_extensions/functions/urls.rb
@@ -451,11 +484,20 @@ files:
 - test/fixtures/stylesheets/blueprint/sass/print.sass
 - test/fixtures/stylesheets/blueprint/sass/screen.sass
 - test/fixtures/stylesheets/blueprint/sass/typography.sass
+- test/fixtures/stylesheets/compass/100x150.jpg
 - test/fixtures/stylesheets/compass/config.rb
+- test/fixtures/stylesheets/compass/css/gradients.css
+- test/fixtures/stylesheets/compass/css/image_size.css
 - test/fixtures/stylesheets/compass/css/layout.css
 - test/fixtures/stylesheets/compass/css/print.css
 - test/fixtures/stylesheets/compass/css/reset.css
 - test/fixtures/stylesheets/compass/css/utilities.css
+- test/fixtures/stylesheets/compass/images/100x150.gif
+- test/fixtures/stylesheets/compass/images/100x150.jpeg
+- test/fixtures/stylesheets/compass/images/100x150.jpg
+- test/fixtures/stylesheets/compass/images/100x150.png
+- test/fixtures/stylesheets/compass/sass/gradients.sass
+- test/fixtures/stylesheets/compass/sass/image_size.sass
 - test/fixtures/stylesheets/compass/sass/layout.sass
 - test/fixtures/stylesheets/compass/sass/print.sass
 - test/fixtures/stylesheets/compass/sass/reset.sass
@@ -479,7 +521,7 @@ files:
 - test/test_case_helper.rb
 - test/test_helper.rb
 - test/test_rails_helper.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://compass-style.org
 licenses: []
 
@@ -492,18 +534,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
-  version: 
 requirements: []
 
 rubyforge_project: compass
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A Real Stylesheet Framework
@@ -520,11 +566,20 @@ test_files:
 - test/fixtures/stylesheets/blueprint/sass/print.sass
 - test/fixtures/stylesheets/blueprint/sass/screen.sass
 - test/fixtures/stylesheets/blueprint/sass/typography.sass
+- test/fixtures/stylesheets/compass/100x150.jpg
 - test/fixtures/stylesheets/compass/config.rb
+- test/fixtures/stylesheets/compass/css/gradients.css
+- test/fixtures/stylesheets/compass/css/image_size.css
 - test/fixtures/stylesheets/compass/css/layout.css
 - test/fixtures/stylesheets/compass/css/print.css
 - test/fixtures/stylesheets/compass/css/reset.css
 - test/fixtures/stylesheets/compass/css/utilities.css
+- test/fixtures/stylesheets/compass/images/100x150.gif
+- test/fixtures/stylesheets/compass/images/100x150.jpeg
+- test/fixtures/stylesheets/compass/images/100x150.jpg
+- test/fixtures/stylesheets/compass/images/100x150.png
+- test/fixtures/stylesheets/compass/sass/gradients.sass
+- test/fixtures/stylesheets/compass/sass/image_size.sass
 - test/fixtures/stylesheets/compass/sass/layout.sass
 - test/fixtures/stylesheets/compass/sass/print.sass
 - test/fixtures/stylesheets/compass/sass/reset.sass

data/examples/css3/src/gradient.sass

@@ -1,10 +0,0 @@
-@import compass/css3/gradient.sass
-
-#gradient
-  width: 200px
-  height: 100px
-  border: 1px solid #777
-.linear
-  +v-gradient(#fff, #aaa, color_stop(50%, #ccc, 50%, #bbb))
-.radial
-  +radial-gradient("45 45, 10, 52 50, 30", "Cyan", "DodgerBlue")

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

@@ -1,10 +0,0 @@
-module Compass::SassExtensions::Functions::ColorStop
-  def color_stop(*args)
-    raise Sass::SyntaxError, "An even number of arguments must be passed to color-stop()" unless args.size % 2 == 0
-    stops = []
-    while args.size > 0
-      stops << "color-stop(#{args.shift}, #{args.shift})"
-    end
-    Sass::Script::String.new(stops.join(", "))
-  end
-end