compass 1.0.3 → 1.1.0.alpha.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a27c284e7d4268de5a2538304e05954d01da116
-  data.tar.gz: 47cf37a2ea2924d909d74f5458afc9c3a120faa0
+  metadata.gz: 0b0e11394a4a7495a64db83a9afc00ce06f99ba4
+  data.tar.gz: 263711a8362fc18ef3dae40ec5d4a3b1b23dcb36
 SHA512:
-  metadata.gz: d994cc3eb0feb04ed516aed2aed413f4e07f529ea4464f6afc578b61f41ddec665bcb7e3fae7c5ea92578ef32b714753e63745dfff4439ed5143ad3ba73b93e5
-  data.tar.gz: 44bd7fe4607fe2999506e69cbccaed321f1f107f6def6e60d237a4c0d6fad9aa2677b1536ec429a2110d6a7f057009130c9b337e3637ad0c8f984513d6a7c254
+  metadata.gz: 2dbd35310a0b37c7f63328dda852aad3bd30d92a67f51359136ce2484d985b49fa31dd14a8bfd8c0e0e98ffbd55ac2a886338bbc1e6c3c812a8a61a9f318dbdf
+  data.tar.gz: 214cd21fe3ff5245f4c9cff5a48ff0bf8db05bc447efccf0d83aa9d0a45a13ceeea2f32ed6510269d4bec5d4dce2ed9e767262f95be90cd6001c1ec125f14ce5

data/lib/compass/generated_version.rb

@@ -1,4 +1,4 @@
 module Compass
-  # This file intentionall does nothing.
-  # The compass build scripts put the release VERSION constant here.
+  VERSION = "1.1.0.alpha.0"
+  VERSION_NAME = "Polaris"
 end

data/lib/compass/sass_compiler.rb

@@ -113,11 +113,10 @@ class Compass::SassCompiler
   def when_compilation_error(error, sass_file, css_file, sourcemap_file)
     @error_count += 1
     if error.respond_to?(:sass_filename)
-      error_filename = error.sass_filename || sass_file
-      if relativize(error_filename) == relativize(sass_file)
-        logger.record :error, "#{relativize(sass_file)} (Line #{error.sass_line}: #{error.message})"
+      if relativize(error.sass_filename) == relativize(sass_file)
+        logger.record :error, "#{relativize(error.sass_filename)} (Line #{error.sass_line}: #{error.message})"
       else
-        logger.record :error, "#{relativize(sass_file)} (Line #{error.sass_line} of #{relativize(error_filename)}: #{error.message})"
+        logger.record :error, "#{relativize(sass_file)} (Line #{error.sass_line} of #{relativize(error.sass_filename)}: #{error.message})"
       end
     else
       logger.record :error, "#{relativize(sass_file)} (#{error.backtrace.first}: #{error.message})"

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

@@ -1,8 +1,8 @@
-.showgrid { font-family: url('http://assets3.example.com/fonts/grid-BUSTED.ttf'); }
+.showgrid { font-family: url('http://assets2.example.com/fonts/grid-BUSTED.ttf'); }
 
 .no-buster { font-family: url('http://assets3.example.com/fonts/grid.ttf'); }
 
-.buster-by-default { font-family: url('http://assets3.example.com/fonts/grid-BUSTED.ttf'); }
+.buster-by-default { font-family: url('http://assets2.example.com/fonts/grid-BUSTED.ttf'); }
 
 .feed { font-family: url('http://assets3.example.com/fonts/feed.ttf?query_string'); }
 

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

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

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

@@ -5,4 +5,4 @@
   background-image: url('/images/4x6.png?busted=true'); }
 
 .absolute {
-  background-image: url(http://example.com/images/4x6.png); }
+  background-image: url('http://example.com/images/4x6.png'); }

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

@@ -17,3 +17,10 @@ end
 asset_host do |path|
   "http://assets%d.example.com" % (path.size % 4)
 end
+
+add_asset_collection(
+  :root_dir => "other/asset_collection",
+  :http_dir => "ext-assets",
+  :images_dir => "img",
+  :sass_dir => "scss"
+)

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

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

data/test/fixtures/stylesheets/image_urls/other/asset_collection/scss/_ac-stylesheet.scss

@@ -0,0 +1 @@
+.imported-from-asset-collection { color: red; }

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

@@ -1,3 +1,5 @@
+@import "ac-stylesheet"
+
 .showgrid
   background-image: image-url(unquote("grid.png"))
 

data/test/units/configuration_test.rb

@@ -206,24 +206,30 @@ class ConfigurationTest < Test::Unit::TestCase
   end
 
   def test_cache_buster_file_not_passed_when_the_file_does_not_exist
-    config = Compass::Configuration::Data.new("test_cache_buster_file_not_passed_when_the_file_does_not_exist")
-    the_file = nil
-    was_called = nil
-    config.asset_cache_buster do |path, file|
-      was_called = true
-      the_file = file
-      "busted=true"
-    end
+    FileUtils.mkdir_p("images")
+    begin
+      config = Compass::Configuration::Data.new("test_cache_buster_file_not_passed_when_the_file_does_not_exist")
+      open("images/asdf.gif", "w") {|f| }
+      the_file = nil
+      was_called = nil
+      config.asset_cache_buster do |path, file|
+        was_called = true
+        the_file = file
+        "busted=true"
+      end
 
-    Compass.add_configuration(config)
+      Compass.add_configuration(config)
 
 
-    sass = Sass::Engine.new(<<-SCSS, Compass.configuration.to_sass_engine_options.merge(:syntax => :scss))
-      .foo { background: image-url("asdf.gif") }
-    SCSS
-    sass.render
-    assert was_called
-    assert_nil the_file
+      sass = Sass::Engine.new(<<-SCSS, Compass.configuration.to_sass_engine_options.merge(:syntax => :scss))
+        .foo { background: image-url("asdf.gif") }
+      SCSS
+      sass.render
+      assert was_called
+      assert the_file.closed?
+    ensure
+      FileUtils.rm_r("images")
+    end
   end
 
   def test_cache_buster_file_is_closed

data/test/units/sass_extensions_test.rb

@@ -136,18 +136,18 @@ WARNING
 
   def test_font_files
     assert_equal '', evaluate('font_files()')
-    assert_equal "url(/font/name.woff) format('woff'), url(/font/name.woff2) format('woff2'), url(/fonts/name.ttf) format('truetype'), url(/fonts/name.svg#fontpath) format('svg')", evaluate("font-files('/font/name.woff', woff, '/font/name.woff2', woff2, '/fonts/name.ttf', truetype, '/fonts/name.svg#fontpath', svg)")
+    assert_equal "url('/font/name.woff') format('woff'), url('/font/name.woff2') format('woff2'), url('/fonts/name.ttf') format('truetype'), url('/fonts/name.svg#fontpath') format('svg')", evaluate("font-files('/font/name.woff', woff, '/font/name.woff2', woff2, '/fonts/name.ttf', truetype, '/fonts/name.svg#fontpath', svg)")
 
-    assert_equal "url(/font/with/right_ext.woff) format('woff')", evaluate("font_files('/font/with/right_ext.woff')")
-    assert_equal "url(/font/with/wrong_ext.woff) format('svg')", evaluate("font_files('/font/with/wrong_ext.woff', 'svg')")
-    assert_equal "url(/font/with/no_ext) format('opentype')", evaluate("font_files('/font/with/no_ext', 'otf')")
-    assert_equal "url(/font/with/weird.ext) format('truetype')", evaluate("font_files('/font/with/weird.ext', 'ttf')")
+    assert_equal "url('/font/with/right_ext.woff') format('woff')", evaluate("font_files('/font/with/right_ext.woff')")
+    assert_equal "url('/font/with/wrong_ext.woff') format('svg')", evaluate("font_files('/font/with/wrong_ext.woff', 'svg')")
+    assert_equal "url('/font/with/no_ext') format('opentype')", evaluate("font_files('/font/with/no_ext', 'otf')")
+    assert_equal "url('/font/with/weird.ext') format('truetype')", evaluate("font_files('/font/with/weird.ext', 'ttf')")
 
     # unquoted path strings used to break because of a regex test
-    assert_equal "url(/font/with/right_ext.woff) format('woff')", evaluate("font_files(unquote('/font/with/right_ext.woff'))")
+    assert_equal "url('/font/with/right_ext.woff') format('woff')", evaluate("font_files(unquote('/font/with/right_ext.woff'))")
 
-    assert_equal "url(/font/with/right_ext.woff) format('woff'), url(/font/with/right_ext_also.otf) format('opentype')", evaluate("font_files('/font/with/right_ext.woff', '/font/with/right_ext_also.otf')")
-    assert_equal "url(/font/with/wrong_ext.woff) format('truetype'), url(/font/with/right_ext.otf) format('opentype')", evaluate("font_files('/font/with/wrong_ext.woff', 'ttf', '/font/with/right_ext.otf')")
+    assert_equal "url('/font/with/right_ext.woff') format('woff'), url('/font/with/right_ext_also.otf') format('opentype')", evaluate("font_files('/font/with/right_ext.woff', '/font/with/right_ext_also.otf')")
+    assert_equal "url('/font/with/wrong_ext.woff') format('truetype'), url('/font/with/right_ext.otf') format('opentype')", evaluate("font_files('/font/with/wrong_ext.woff', 'ttf', '/font/with/right_ext.otf')")
 
     assert_nothing_raised Sass::SyntaxError do
       evaluate("font-files('/font/name.woff')")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: compass
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0.alpha.0
 platform: ruby
 authors:
 - Chris Eppstein
@@ -12,96 +12,96 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-15 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.3.13
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '3.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.3.13
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '3.5'
 - !ruby/object:Gem::Dependency
   name: compass-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.1.0.alpha.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.1.0.alpha.0
 - !ruby/object:Gem::Dependency
   name: compass-import-once
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: chunky_png
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.3
 - !ruby/object:Gem::Dependency
   name: rb-inotify
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.9'
 description: Compass is a Sass-based Stylesheet Framework that streamlines the creation
@@ -114,20 +114,12 @@ extra_rdoc_files: []
 files:
 - LICENSE.markdown
 - Rakefile
-- VERSION
-- VERSION_NAME
 - bin/compass
-- features/command_line.feature
-- features/extensions.feature
-- features/step_definitions/command_line_steps.rb
-- features/step_definitions/extension_steps.rb
-- lib/compass.rb
 - lib/compass/actions.rb
-- lib/compass/app_integration.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
-- lib/compass/commands.rb
+- lib/compass/app_integration/stand_alone.rb
+- lib/compass/app_integration.rb
 - lib/compass/commands/base.rb
 - lib/compass/commands/clean_project.rb
 - lib/compass/commands/create_project.rb
@@ -150,6 +142,7 @@ files:
 - lib/compass/commands/validate_project.rb
 - lib/compass/commands/watch_project.rb
 - lib/compass/commands/write_configuration.rb
+- lib/compass/commands.rb
 - lib/compass/compiler.rb
 - lib/compass/configuration/comments.rb
 - lib/compass/configuration/file_data.rb
@@ -158,49 +151,50 @@ files:
 - lib/compass/dependencies.rb
 - lib/compass/deprecation.rb
 - lib/compass/errors.rb
-- lib/compass/exec.rb
 - lib/compass/exec/command_option_parser.rb
 - lib/compass/exec/global_options_parser.rb
 - lib/compass/exec/helpers.rb
 - lib/compass/exec/project_options_parser.rb
 - lib/compass/exec/sub_command_ui.rb
+- lib/compass/exec.rb
 - lib/compass/generated_version.rb
-- lib/compass/installers.rb
 - lib/compass/installers/bare_installer.rb
 - lib/compass/installers/base.rb
 - lib/compass/installers/manifest.rb
 - lib/compass/installers/manifest_installer.rb
 - lib/compass/installers/template_context.rb
+- lib/compass/installers.rb
 - lib/compass/logger.rb
 - lib/compass/quick_cache.rb
 - lib/compass/rails.rb
 - lib/compass/sass_compiler.rb
-- lib/compass/sass_extensions.rb
-- lib/compass/sass_extensions/functions.rb
 - lib/compass/sass_extensions/functions/sprites.rb
-- lib/compass/sass_extensions/sprites.rb
-- lib/compass/sass_extensions/sprites/engines.rb
+- lib/compass/sass_extensions/functions.rb
 - lib/compass/sass_extensions/sprites/engines/chunky_png_engine.rb
+- lib/compass/sass_extensions/sprites/engines.rb
 - lib/compass/sass_extensions/sprites/image.rb
 - lib/compass/sass_extensions/sprites/image_methods.rb
 - lib/compass/sass_extensions/sprites/image_row.rb
 - lib/compass/sass_extensions/sprites/images.rb
-- lib/compass/sass_extensions/sprites/layout.rb
 - lib/compass/sass_extensions/sprites/layout/diagonal.rb
 - lib/compass/sass_extensions/sprites/layout/horizontal.rb
 - lib/compass/sass_extensions/sprites/layout/smart.rb
 - lib/compass/sass_extensions/sprites/layout/vertical.rb
+- lib/compass/sass_extensions/sprites/layout.rb
 - lib/compass/sass_extensions/sprites/layout_methods.rb
 - lib/compass/sass_extensions/sprites/row_fitter.rb
 - lib/compass/sass_extensions/sprites/sprite_map.rb
 - lib/compass/sass_extensions/sprites/sprite_methods.rb
-- lib/compass/sprite_importer.rb
+- lib/compass/sass_extensions/sprites.rb
+- lib/compass/sass_extensions.rb
 - lib/compass/sprite_importer/binding.rb
 - lib/compass/sprite_importer/content.erb
+- lib/compass/sprite_importer.rb
 - lib/compass/stats.rb
 - lib/compass/test_case.rb
 - lib/compass/validator.rb
 - lib/compass/version.rb
+- lib/compass.rb
 - test/fixtures/extensions/only_stylesheets/compass_init.rb
 - test/fixtures/extensions/only_stylesheets/scss/only_stylesheets/foo.scss
 - test/fixtures/fonts/bgrove.base64.txt
@@ -298,12 +292,13 @@ files:
 - test/fixtures/stylesheets/compass/css/vertical_rhythm_with_ems.css
 - test/fixtures/stylesheets/compass/css/vertical_rhythm_with_px.css
 - test/fixtures/stylesheets/compass/css/vertical_rhythm_with_rems.css
+- test/fixtures/stylesheets/compass/fonts/font1.eot
+- test/fixtures/stylesheets/compass/fonts/font1.woff
 - 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/images/4x6.png
-- test/fixtures/stylesheets/compass/images/flag-s5b4f509715.png
 - test/fixtures/stylesheets/compass/images/flag/ad.png
 - test/fixtures/stylesheets/compass/images/flag/ae.png
 - test/fixtures/stylesheets/compass/images/flag/af.png
@@ -551,12 +546,13 @@ files:
 - test/fixtures/stylesheets/compass/images/flag/za.png
 - test/fixtures/stylesheets/compass/images/flag/zm.png
 - test/fixtures/stylesheets/compass/images/flag/zw.png
-- test/fixtures/stylesheets/compass/images/flag_states-sc42d7bf926.png
+- test/fixtures/stylesheets/compass/images/flag-s5b4f509715.png
 - test/fixtures/stylesheets/compass/images/flag_states/foo.png
 - test/fixtures/stylesheets/compass/images/flag_states/foo_active.png
 - test/fixtures/stylesheets/compass/images/flag_states/foo_focus.png
 - test/fixtures/stylesheets/compass/images/flag_states/foo_hover.png
 - test/fixtures/stylesheets/compass/images/flag_states/foo_target.png
+- test/fixtures/stylesheets/compass/images/flag_states-sc42d7bf926.png
 - test/fixtures/stylesheets/compass/sass/animation-with-legacy-ie.scss
 - test/fixtures/stylesheets/compass/sass/animation.scss
 - test/fixtures/stylesheets/compass/sass/appearance.scss
@@ -611,6 +607,8 @@ files:
 - test/fixtures/stylesheets/image_urls/config.rb
 - test/fixtures/stylesheets/image_urls/css/screen.css
 - test/fixtures/stylesheets/image_urls/images/grid.png
+- test/fixtures/stylesheets/image_urls/other/asset_collection/img/ac-img-1.jpg
+- test/fixtures/stylesheets/image_urls/other/asset_collection/scss/_ac-stylesheet.scss
 - test/fixtures/stylesheets/image_urls/sass/screen.sass
 - test/fixtures/stylesheets/relative/assets/images/testing.png
 - test/fixtures/stylesheets/relative/config.rb
@@ -672,6 +670,10 @@ files:
 - test/units/sprites/row_fitter_test.rb
 - test/units/sprites/sprite_command_test.rb
 - test/units/sprites/sprite_map_test.rb
+- features/command_line.feature
+- features/extensions.feature
+- features/step_definitions/command_line_steps.rb
+- features/step_definitions/extension_steps.rb
 homepage: http://compass-style.org
 licenses: []
 metadata: {}
@@ -682,17 +684,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: A Real Stylesheet Framework
@@ -794,6 +796,8 @@ test_files:
 - test/fixtures/stylesheets/compass/css/vertical_rhythm_with_ems.css
 - test/fixtures/stylesheets/compass/css/vertical_rhythm_with_px.css
 - test/fixtures/stylesheets/compass/css/vertical_rhythm_with_rems.css
+- test/fixtures/stylesheets/compass/fonts/font1.eot
+- test/fixtures/stylesheets/compass/fonts/font1.woff
 - test/fixtures/stylesheets/compass/images/100x150.gif
 - test/fixtures/stylesheets/compass/images/100x150.jpeg
 - test/fixtures/stylesheets/compass/images/100x150.jpg
@@ -1107,6 +1111,8 @@ test_files:
 - test/fixtures/stylesheets/image_urls/config.rb
 - test/fixtures/stylesheets/image_urls/css/screen.css
 - test/fixtures/stylesheets/image_urls/images/grid.png
+- test/fixtures/stylesheets/image_urls/other/asset_collection/img/ac-img-1.jpg
+- test/fixtures/stylesheets/image_urls/other/asset_collection/scss/_ac-stylesheet.scss
 - test/fixtures/stylesheets/image_urls/sass/screen.sass
 - test/fixtures/stylesheets/relative/assets/images/testing.png
 - test/fixtures/stylesheets/relative/config.rb

data/VERSION

@@ -1 +0,0 @@
-1.0.3

data/VERSION_NAME

@@ -1 +0,0 @@
-Polaris