compass 1.0.0.alpha.16 → 1.0.0.alpha.17

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0845623a8ac0adce18252bd110196bd20d6abd59
+  data.tar.gz: 1ae42262d1befe79e77b487c610e27ad2b787a81
+SHA512:
+  metadata.gz: c93fc5e873127d50e553d11dfbf82732ed29bd08cdf4a3160c192914390c176c230a533d3eae6e7231710420f88c9129b486de39d5752b58790a22693de678c0
+  data.tar.gz: 63d030bac6ec9659f04ea52d70e974c70cfcf38e819aa4c55b6564b0a05cd4b107a935ec62cef8c9c22077ebabfebf69160c0ff0dba5f50fb2e0a8dd6af1388f

data/RELEASE_VERSION

@@ -1 +1 @@
-1.0.0.alpha.16
+1.0.0.alpha.17

data/VERSION

@@ -1 +1 @@
-1.0.0.alpha.15
+1.0.0.alpha.16

data/lib/compass/compiler.rb

@@ -66,7 +66,7 @@ module Compass
     end
 
     def corresponding_sourcemap_file(sass_file)
-      "#{to}/#{stylesheet_name(sass_file)}.map"
+      "#{to}/#{stylesheet_name(sass_file)}.css.map"
     end
 
     def target_directories
@@ -148,12 +148,13 @@ module Compass
       end
     end
 
-    def timed
+    def timed(timed_thing = lambda {|res| res})
       start_time = Time.now
       res = yield
       end_time = Time.now
-      res.instance_variable_set("@__duration", end_time - start_time)
-      def res.__duration
+      has_duration = timed_thing.call(res)
+      has_duration.instance_variable_set("@__duration", end_time - start_time)
+      def has_duration.__duration
         @__duration
       end
       res
@@ -161,9 +162,8 @@ module Compass
 
     # Compile one Sass file
     def compile(sass_filename, css_filename, sourcemap_filename = nil)
-      start_time = end_time = nil
       css_content, sourcemap = logger.red do
-        timed do
+        timed(lambda {|r| r[0]}) do
           engine = engine(sass_filename, css_filename)
           if sourcemap_filename && options[:sourcemap]
             engine.render_with_sourcemap(relative_path(css_filename, sourcemap_filename))

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

@@ -0,0 +1,10 @@
+# Require any additional compass plugins here.
+css_dir = "tmp"
+sass_dir = "sass"
+images_dir = "assets/images"
+javascripts_dir = "assets/javascripts"
+# Set this to the root of your project when deployed:
+http_path = "/"
+# To enable relative paths to assets via compass helper functions. Uncomment:
+relative_assets = true
+sourcemap = true

data/test/fixtures/stylesheets/sourcemaps/css/another_simple.css

@@ -0,0 +1 @@
+.another-simple-class{color:blue}

data/test/fixtures/stylesheets/sourcemaps/css/another_simple.css.map

@@ -0,0 +1,6 @@
+{
+"version": 3,
+"mappings": ";AAAA,qBAAsB;EACpB,KAAK,EAAE,IAAI",
+"sources": ["../sass/another_simple.scss"],
+"file": "another_simple.css"
+}

data/test/fixtures/stylesheets/sourcemaps/css/simple.css

@@ -0,0 +1 @@
+div{color:red}

data/test/fixtures/stylesheets/sourcemaps/css/simple.css.map

@@ -0,0 +1,6 @@
+{
+"version": 3,
+"mappings": ";AAAA,GAAG;EACD,KAAK,EAAE,GAAG",
+"sources": ["../sass/simple.sass"],
+"file": "simple.css"
+}

data/test/fixtures/stylesheets/sourcemaps/css/with_libraries.css

@@ -0,0 +1 @@
+*{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}

data/test/fixtures/stylesheets/sourcemaps/css/with_libraries.css.map

@@ -0,0 +1,6 @@
+{
+"version": 3,
+"mappings": ";AAEA,CAAE;ECqVA,eAAwC,ECrU5B,UAAmB;EDqU/B,kBAAwC,ECrU5B,UAAmB;EDqU/B,UAAwC,ECrU5B,UAAmB",
+"sources": ["../sass/with_libraries.scss","../../../../../../core/stylesheets/compass/_support.scss","../../../../../../core/stylesheets/compass/css3/_box-sizing.scss"],
+"file": "with_libraries.css"
+}

data/test/fixtures/stylesheets/sourcemaps/sass/another_simple.scss

@@ -0,0 +1,3 @@
+.another-simple-class {
+  color: blue;
+}

data/test/fixtures/stylesheets/sourcemaps/sass/simple.sass

@@ -0,0 +1,2 @@
+div
+  color: red

data/test/fixtures/stylesheets/sourcemaps/sass/with_libraries.scss

@@ -0,0 +1,5 @@
+@import "compass/css3/box-sizing";
+
+* {
+  @include box-sizing;
+}

data/test/fixtures/stylesheets/valid/css/another_simple.css

@@ -0,0 +1,4 @@
+/* line 1, ../sass/another_simple.scss */
+.another-simple-class {
+  color: blue;
+}

data/test/fixtures/stylesheets/valid/css/simple.css

@@ -0,0 +1,4 @@
+/* line 1, ../sass/simple.sass */
+div {
+  color: red;
+}

data/test/helpers/command_line.rb

@@ -92,7 +92,7 @@ module Compass::CommandLineHelper
     end
     message = "Action #{action.inspect} was not performed on: #{path}."
     message += "The following actions were performed: #{actions_found.map{|a|a.inspect}.join(", ")}" if actions_found.any?
-    puts @last_result
+    # puts @last_result
     fail message
   end
 

data/test/integrations/compass_test.rb

@@ -11,8 +11,10 @@ class CompassTest < Test::Unit::TestCase
   end
 
   def teardown
-    [:empty, :compass, :image_urls, :relative].each do |project_name|
+    Dir.glob(absolutize("fixtures/stylesheets/*")).each do |dir|
+      project_name = File.basename(dir)
       ::FileUtils.rm_rf tempfile_path(project_name)
+      ::FileUtils.rm_rf File.join(project_path(project_name), ".sass-cache")
     end
   end
 
@@ -36,7 +38,7 @@ class CompassTest < Test::Unit::TestCase
       before_compile = Proc.new do |config|
         config.on_stylesheet_error {|filename, message| file = filename; error = true }
       end
-      within_project(:error, before_compile) rescue nil;
+      within_project(:error, before_compile) rescue nil
       assert error, "Project did not throw a compile error"
       assert file.is_a?(String), "Filename was not a string"
     end
@@ -62,6 +64,17 @@ class CompassTest < Test::Unit::TestCase
     end
   end
 
+  def test_sourcemaps
+    within_project('sourcemaps') do |proj|
+      each_css_file(proj.css_path) do |css_file|
+        assert_no_errors css_file, 'sourcemaps'
+      end
+      each_sass_file do |sass_file|
+        assert_renders_correctly sass_file, :ignore_charset => true
+      end
+    end
+  end
+
   def test_env_in_development
     within_project('envtest', lambda {|c| c.environment = :development }) do |proj|
       each_css_file(proj.css_path) do |css_file|

metadata

@@ -1,17 +1,9 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: compass
-version: !ruby/object:Gem::Version 
-  hash: 915323291
-  prerelease: 6
-  segments: 
-  - 1
-  - 0
-  - 0
-  - alpha
-  - 16
-  version: 1.0.0.alpha.16
+version: !ruby/object:Gem::Version
+  version: 1.0.0.alpha.17
 platform: ruby
-authors: 
+authors:
 - Chris Eppstein
 - Scott Davis
 - Eric A. Meyer
@@ -20,115 +12,100 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-12-11 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+date: 2013-12-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: sass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: -2745595092
-        segments: 
-        - 3
-        - 3
-        - 0
-        - rc
-        - 1
+      - !ruby/object:Gem::Version
         version: 3.3.0.rc.1
-  name: sass
-  prerelease: false
   type: :runtime
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 915323291
-        segments: 
-        - 1
-        - 0
-        - 0
-        - alpha
-        - 16
-        version: 1.0.0.alpha.16
+      - !ruby/object:Gem::Version
+        version: 3.3.0.rc.1
+- !ruby/object:Gem::Dependency
   name: compass-core
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0.alpha.16
   type: :runtime
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 1
-        - 0
-        - 1
-        version: 1.0.1
+      - !ruby/object:Gem::Version
+        version: 1.0.0.alpha.16
+- !ruby/object:Gem::Dependency
   name: compass-import-once
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.1
   type: :runtime
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 2
-        version: "1.2"
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+- !ruby/object:Gem::Dependency
   name: chunky_png
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
   type: :runtime
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
-        version: 1.1.0
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
   name: listen
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
   type: :runtime
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: json
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: *id006
-description: Compass is a Sass-based Stylesheet Framework that streamlines the creation and maintenance of CSS.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Compass is a Sass-based Stylesheet Framework that streamlines the creation
+  and maintenance of CSS.
 email: chris@eppsteins.net
-executables: 
+executables:
 - compass
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - LICENSE.markdown
 - VERSION
 - Rakefile
@@ -260,14 +237,12 @@ files:
 - test/fixtures/stylesheets/busted_font_urls/fonts/grid.ttf
 - test/fixtures/stylesheets/busted_font_urls/fonts/sub/dk.ttf
 - test/fixtures/stylesheets/busted_font_urls/sass/screen.sass
-- test/fixtures/stylesheets/busted_font_urls/tmp/screen.css
 - test/fixtures/stylesheets/busted_image_urls/config.rb
 - test/fixtures/stylesheets/busted_image_urls/css/screen.css
 - test/fixtures/stylesheets/busted_image_urls/images/feed.png
 - test/fixtures/stylesheets/busted_image_urls/images/flags/dk.png
 - test/fixtures/stylesheets/busted_image_urls/images/grid.png
 - test/fixtures/stylesheets/busted_image_urls/sass/screen.sass
-- test/fixtures/stylesheets/busted_image_urls/tmp/screen.css
 - test/fixtures/stylesheets/compass/100x150.jpg
 - test/fixtures/stylesheets/compass/config.rb
 - test/fixtures/stylesheets/compass/css/animation-with-legacy-ie.css
@@ -626,7 +601,6 @@ files:
 - test/fixtures/stylesheets/envtest/config.rb
 - test/fixtures/stylesheets/envtest/css/env.css
 - test/fixtures/stylesheets/envtest/sass/env.scss
-- test/fixtures/stylesheets/envtest/tmp/env.css
 - test/fixtures/stylesheets/error/config.rb
 - test/fixtures/stylesheets/error/sass/screen.sass
 - test/fixtures/stylesheets/image_urls/config.rb
@@ -641,6 +615,16 @@ files:
 - test/fixtures/stylesheets/relative/sass/ie.sass
 - test/fixtures/stylesheets/relative/sass/print.sass
 - test/fixtures/stylesheets/relative/sass/screen.sass
+- test/fixtures/stylesheets/sourcemaps/config.rb
+- test/fixtures/stylesheets/sourcemaps/css/another_simple.css
+- test/fixtures/stylesheets/sourcemaps/css/another_simple.css.map
+- test/fixtures/stylesheets/sourcemaps/css/simple.css
+- test/fixtures/stylesheets/sourcemaps/css/simple.css.map
+- test/fixtures/stylesheets/sourcemaps/css/with_libraries.css
+- test/fixtures/stylesheets/sourcemaps/css/with_libraries.css.map
+- test/fixtures/stylesheets/sourcemaps/sass/another_simple.scss
+- test/fixtures/stylesheets/sourcemaps/sass/simple.sass
+- test/fixtures/stylesheets/sourcemaps/sass/with_libraries.scss
 - test/fixtures/stylesheets/uses_only_stylesheets_ext/config.rb
 - test/fixtures/stylesheets/uses_only_stylesheets_ext/sass/ie.scss
 - test/fixtures/stylesheets/uses_only_stylesheets_ext/sass/print.scss
@@ -649,6 +633,8 @@ files:
 - test/fixtures/stylesheets/uses_only_stylesheets_ext/stylesheets/print.css
 - test/fixtures/stylesheets/uses_only_stylesheets_ext/stylesheets/screen.css
 - test/fixtures/stylesheets/valid/config.rb
+- test/fixtures/stylesheets/valid/css/another_simple.css
+- test/fixtures/stylesheets/valid/css/simple.css
 - test/fixtures/stylesheets/valid/sass/another_simple.scss
 - test/fixtures/stylesheets/valid/sass/simple.sass
 - test/helpers/command_line.rb
@@ -688,40 +674,29 @@ files:
 - RELEASE_VERSION
 homepage: http://compass-style.org
 licenses: []
-
-post_install_message: "    Compass is charityware. If you love it, please donate on our behalf at http://umdf.org/compass Thanks!\n"
+metadata: {}
+post_install_message: |2
+      Compass is charityware. If you love it, please donate on our behalf at http://umdf.org/compass Thanks!
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
+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: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A Real Stylesheet Framework
-test_files: 
+test_files:
 - test/fixtures/extensions/only_stylesheets/compass_init.rb
 - test/fixtures/extensions/only_stylesheets/scss/only_stylesheets/foo.scss
 - test/fixtures/fonts/bgrove.base64.txt
@@ -765,14 +740,12 @@ test_files:
 - test/fixtures/stylesheets/busted_font_urls/fonts/grid.ttf
 - test/fixtures/stylesheets/busted_font_urls/fonts/sub/dk.ttf
 - test/fixtures/stylesheets/busted_font_urls/sass/screen.sass
-- test/fixtures/stylesheets/busted_font_urls/tmp/screen.css
 - test/fixtures/stylesheets/busted_image_urls/config.rb
 - test/fixtures/stylesheets/busted_image_urls/css/screen.css
 - test/fixtures/stylesheets/busted_image_urls/images/feed.png
 - test/fixtures/stylesheets/busted_image_urls/images/flags/dk.png
 - test/fixtures/stylesheets/busted_image_urls/images/grid.png
 - test/fixtures/stylesheets/busted_image_urls/sass/screen.sass
-- test/fixtures/stylesheets/busted_image_urls/tmp/screen.css
 - test/fixtures/stylesheets/compass/100x150.jpg
 - test/fixtures/stylesheets/compass/config.rb
 - test/fixtures/stylesheets/compass/css/animation-with-legacy-ie.css
@@ -1131,7 +1104,6 @@ test_files:
 - test/fixtures/stylesheets/envtest/config.rb
 - test/fixtures/stylesheets/envtest/css/env.css
 - test/fixtures/stylesheets/envtest/sass/env.scss
-- test/fixtures/stylesheets/envtest/tmp/env.css
 - test/fixtures/stylesheets/error/config.rb
 - test/fixtures/stylesheets/error/sass/screen.sass
 - test/fixtures/stylesheets/image_urls/config.rb
@@ -1146,6 +1118,16 @@ test_files:
 - test/fixtures/stylesheets/relative/sass/ie.sass
 - test/fixtures/stylesheets/relative/sass/print.sass
 - test/fixtures/stylesheets/relative/sass/screen.sass
+- test/fixtures/stylesheets/sourcemaps/config.rb
+- test/fixtures/stylesheets/sourcemaps/css/another_simple.css
+- test/fixtures/stylesheets/sourcemaps/css/another_simple.css.map
+- test/fixtures/stylesheets/sourcemaps/css/simple.css
+- test/fixtures/stylesheets/sourcemaps/css/simple.css.map
+- test/fixtures/stylesheets/sourcemaps/css/with_libraries.css
+- test/fixtures/stylesheets/sourcemaps/css/with_libraries.css.map
+- test/fixtures/stylesheets/sourcemaps/sass/another_simple.scss
+- test/fixtures/stylesheets/sourcemaps/sass/simple.sass
+- test/fixtures/stylesheets/sourcemaps/sass/with_libraries.scss
 - test/fixtures/stylesheets/uses_only_stylesheets_ext/config.rb
 - test/fixtures/stylesheets/uses_only_stylesheets_ext/sass/ie.scss
 - test/fixtures/stylesheets/uses_only_stylesheets_ext/sass/print.scss
@@ -1154,6 +1136,8 @@ test_files:
 - test/fixtures/stylesheets/uses_only_stylesheets_ext/stylesheets/print.css
 - test/fixtures/stylesheets/uses_only_stylesheets_ext/stylesheets/screen.css
 - test/fixtures/stylesheets/valid/config.rb
+- test/fixtures/stylesheets/valid/css/another_simple.css
+- test/fixtures/stylesheets/valid/css/simple.css
 - test/fixtures/stylesheets/valid/sass/another_simple.scss
 - test/fixtures/stylesheets/valid/sass/simple.sass
 - test/helpers/command_line.rb

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

@@ -1,9 +0,0 @@
-.showgrid { font-family: url('http://assets3.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'); }
-
-.feed { font-family: url('http://assets3.example.com/fonts/feed.ttf?query_string'); }
-
-.dk { font-family: url('http://assets1.example.com/fonts/sub/dk.ttf?query_string'); }

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

@@ -1,9 +0,0 @@
-.showgrid { background-image: url('http://assets0.example.com/images/grid-BUSTED.png'); }
-
-.inlinegrid { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAUEAYAAACv1qP4AAAABmJLR0T///////8JWPfcAAAACXBIWXMAAABIAAAASABGyWs+AAAAZ0lEQVRYw+3QwQ2AIBAFUTEUwI3+uzN7gDscsIgxEuO8An52J11X73OudfxMraXkzHfO3Y98nQEhA0IGhAwIGRAyIGRAyICQASEDQgaEDAgZEDIgZEDIgJABoZzSGK3tPuN9ERFP7Nw4fg+c5g8V1wAAAABJRU5ErkJggg=='); }
-
-.no-buster { background-image: url('http://assets0.example.com/images/grid.png'); }
-
-.feed { background-image: url('http://assets0.example.com/images/feed.png?query_string'); }
-
-.dk { background-image: url('http://assets0.example.com/images/flags/dk.png?query_string'); }

data/test/fixtures/stylesheets/envtest/tmp/env.css

@@ -1,14 +0,0 @@
-.env {
-  env: production; }
-
-.time {
-  time: 2013-12-10; }
-
-.date {
-  date: 2013-12-10; }
-
-.filename {
-  file: env.scss; }
-
-.output {
-  output: env.css; }