compass 0.12.alpha.0 → 0.12.alpha.1

data/lib/compass/app_integration/rails/actionpack31/helpers.rb

@@ -3,3 +3,26 @@ module Sass::Script::Functions
     asset_url(path, Sass::Script::String.new("image"))
   end
 end
+
+
+module Compass::RailsImageFunctionPatch
+  private
+  
+  def image_path_for_size(image_file)
+    begin
+      file = ::Rails.application.assets.find_asset(image_file)
+      return file
+    rescue ::Sprockets::FileOutsidePaths
+      return super(image_file)
+    end
+  end
+end
+
+module Sass::Script::Functions
+  include Compass::RailsImageFunctionPatch
+end
+
+# Wierd that this has to be re-included to pick up sub-modules. Ruby bug?
+class Sass::Script::Functions::EvaluationContext
+  include Sass::Script::Functions
+end

data/lib/compass/app_integration/rails/actionpack31/railtie.rb

@@ -54,20 +54,18 @@ class Rails::Railtie::Configuration
         # hash or some metadata that is opaque to sprockets that could be read from the
         # asset's attributes, we could avoid cluttering the assets directory with generated
         # sprites and always just use the logical_path + data version of the api.
-        if Rails.application.config.action_controller.perform_caching
+        if Rails.application.config.assets.digests.try(:any?)
           asset         = Rails.application.assets.find_asset(filename)
           pathname      = Pathname.new(filename)
           logical_path  = filename[(Compass.configuration.generated_images_path.length+1)..-1]
           # Force the asset into the cache so find_asset will find it.
           cached_assets = Rails.application.assets.instance_variable_get("@assets")
           cached_assets[logical_path] = cached_assets[filename] = asset
-          if File.directory?(Rails.application.assets.static_root)
-            # Copy the asset into the static root so the browsers will find it.
-            asset_attributes = Rails.application.assets.attributes_for(logical_path)
-            digest_path      = asset_attributes.path_with_fingerprint(asset.digest)
-            static_path      = Rails.application.assets.static_root.join(digest_path)
-            asset.write_to(static_path)
-          end
+
+          target = Pathname.new(File.join(Rails.public_path, Rails.application.config.assets.prefix))
+          asset = Rails.application.assets.find_asset(logical_path)
+          filename = target.join(asset.digest_path)
+          asset.write_to(filename)
         end
       end
       data
@@ -78,7 +76,7 @@ end
 
 module Compass
   class Railtie < Rails::Railtie
-    initializer "compass.initialize_rails" do |app|
+    initializer "compass.initialize_rails", :group => :all do |app|
       # Configure compass for use within rails, and provide the project configuration
       # that came via the rails boot process.
       Compass::AppIntegration::Rails.check_for_double_boot!
@@ -86,4 +84,4 @@ module Compass
       Compass.configure_rails!(app)
     end
   end
-end
+end

data/lib/compass/app_integration/rails/configuration_defaults.rbc

@@ -1,5 +1,5 @@
 !RBIX
-333337424968067900
+9595534255132031488
 x
 M
 1
@@ -180,37 +180,878 @@ x
 5
 Rails
 i
-28
+54
+5
+66
+99
+7
+0
+65
+49
+1
+2
+13
+99
+12
+7
+2
+12
+7
+3
+12
+65
+12
+49
+4
+4
+15
+49
+2
+0
+15
+99
+7
+5
+65
+49
+1
+2
+13
+99
+12
+7
+2
+12
+7
+6
+12
+65
+12
+49
+4
+4
+15
+49
+2
+0
+11
+I
+6
+I
+0
+I
+0
+I
+0
+n
+p
+7
+x
+38
+ConfigurationDefaultsWithAssetPipeline
+x
+11
+open_module
+x
+15
+__module_init__
+M
+1
+n
+n
+x
+38
+ConfigurationDefaultsWithAssetPipeline
+i
+142
+5
+66
+99
+7
+0
+7
+1
+65
+67
+49
+2
+0
+49
+3
+4
+15
+99
+7
+4
+7
+5
+65
+67
+49
+2
+0
+49
+3
+4
+15
+99
+7
+6
+7
+7
+65
+67
+49
+2
+0
+49
+3
+4
+15
+99
+7
+8
+7
+9
+65
+67
+49
+2
+0
+49
+3
+4
+15
+99
+7
+10
+7
+11
+65
+67
+49
+2
+0
+49
+3
+4
+15
+99
+7
+12
+7
+13
+65
+67
+49
+2
+0
+49
+3
+4
+15
+99
+7
+14
+7
+15
+65
+67
+49
+2
+0
+49
+3
+4
+15
+99
+7
+16
+7
+17
+65
+67
+49
+2
+0
+49
+3
+4
+15
+99
+7
+18
+7
+19
+65
+67
+49
+2
+0
+49
+3
+4
+15
+99
+7
+20
+7
+21
+65
+67
+49
+2
+0
+49
+3
+4
+11
+I
+5
+I
+0
+I
+0
+I
+0
+n
+p
+22
+x
+16
+default_sass_dir
+M
+1
+n
+n
+x
+16
+default_sass_dir
+i
+16
+45
+0
+1
+7
+2
+64
+7
+3
+64
+7
+4
+64
+49
+5
+3
+11
+I
+4
+I
+0
+I
+0
+I
+0
+n
+p
+6
+x
+4
+File
+n
+s
+3
+app
+s
+6
+assets
+s
+11
+stylesheets
+x
+4
+join
+p
+5
+I
+-1
+I
+9
+I
+0
+I
+a
+I
+10
+x
+91
+/Users/crispee/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
+p
+0
+x
+17
+method_visibility
+x
+15
+add_defn_method
+x
+18
+default_images_dir
+M
+1
+n
+n
+x
+18
+default_images_dir
+i
+16
+45
+0
+1
+7
+2
+64
+7
+3
+64
+7
+4
+64
+49
+5
+3
+11
+I
+4
+I
+0
+I
+0
+I
+0
+n
+p
+6
+x
+4
+File
+n
+s
+3
+app
+s
+6
+assets
+s
+6
+images
+x
+4
+join
+p
+5
+I
+-1
+I
+d
+I
+0
+I
+e
+I
+10
+x
+91
+/Users/crispee/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
+p
+0
+x
+17
+default_fonts_dir
+M
+1
+n
+n
+x
+17
+default_fonts_dir
+i
+16
+45
+0
+1
+7
+2
+64
+7
+3
+64
+7
+4
+64
+49
+5
+3
+11
+I
+4
+I
+0
+I
+0
+I
+0
+n
+p
+6
+x
+4
+File
+n
+s
+3
+app
+s
+6
+assets
+s
+5
+fonts
+x
+4
+join
+p
+5
+I
+-1
+I
+11
+I
+0
+I
+12
+I
+10
+x
+91
+/Users/crispee/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
+p
+0
+x
+23
+default_javascripts_dir
+M
+1
+n
+n
+x
+23
+default_javascripts_dir
+i
+16
+45
+0
+1
+7
+2
+64
+7
+3
+64
+7
+4
+64
+49
+5
+3
+11
+I
+4
+I
+0
+I
+0
+I
+0
+n
+p
+6
+x
+4
+File
+n
+s
+3
+app
+s
+6
+assets
+s
+11
+javascripts
+x
+4
+join
+p
+5
+I
+-1
+I
+15
+I
+0
+I
+16
+I
+10
+x
+91
+/Users/crispee/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
+p
+0
+x
+17
+default_http_path
+M
+1
+n
+n
+x
+17
+default_http_path
+i
+16
+44
+43
+0
+49
+1
+0
+49
+2
+0
+49
+3
+0
+49
+4
+0
+11
+I
+1
+I
+0
+I
+0
+I
+0
+n
+p
+5
+x
+5
+Rails
+x
+11
+application
+x
+6
+config
+x
+6
+assets
+x
+6
+prefix
+p
+5
+I
+-1
+I
+19
+I
+0
+I
+1a
+I
+10
+x
+91
+/Users/crispee/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
+p
+0
+x
+24
+default_http_images_path
+M
+1
+n
+n
+x
+24
+default_http_images_path
+i
+12
+5
+48
+0
+49
+1
+0
+47
+101
+2
+63
+1
+11
+I
+1
+I
+0
+I
+0
+I
+0
+n
+p
+3
+x
+9
+top_level
+x
+9
+http_path
+x
+4
+to_s
+p
+5
+I
+-1
+I
+1d
+I
+0
+I
+1e
+I
+c
+x
+91
+/Users/crispee/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
+p
+0
+x
+34
+default_http_generated_images_path
+M
+1
+n
+n
+x
+34
+default_http_generated_images_path
+i
+12
+5
+48
+0
+49
+1
+0
+47
+101
+2
+63
+1
+11
+I
+1
+I
+0
+I
+0
+I
+0
+n
+p
+3
+x
+9
+top_level
+x
+9
+http_path
+x
+4
+to_s
+p
+5
+I
+-1
+I
+21
+I
+0
+I
+22
+I
+c
+x
+91
+/Users/crispee/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
+p
+0
+x
+29
+default_http_javascripts_path
+M
+1
+n
+n
+x
+29
+default_http_javascripts_path
+i
+12
+5
+48
+0
+49
+1
+0
+47
+101
+2
+63
+1
+11
+I
+1
+I
+0
+I
+0
+I
+0
+n
+p
+3
+x
+9
+top_level
+x
+9
+http_path
+x
+4
+to_s
+p
 5
-66
-99
-7
+I
+-1
+I
+25
+I
 0
-65
-49
+I
+26
+I
+c
+x
+91
+/Users/crispee/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
+p
+0
+x
+23
+default_http_fonts_path
+M
 1
-2
-13
-99
+n
+n
+x
+23
+default_http_fonts_path
+i
 12
-7
+5
+48
+0
+49
+1
+0
+47
+101
 2
-12
-7
+63
+1
+11
+I
+1
+I
+0
+I
+0
+I
+0
+n
+p
 3
-12
-65
-12
-49
-4
+x
+9
+top_level
+x
+9
+http_path
+x
 4
-15
+to_s
+p
+5
+I
+-1
+I
+29
+I
+0
+I
+2a
+I
+c
+x
+91
+/Users/crispee/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
+p
+0
+x
+29
+default_http_stylesheets_path
+M
+1
+n
+n
+x
+29
+default_http_stylesheets_path
+i
+12
+5
+48
+0
 49
-2
+1
 0
+47
+101
+2
+63
+1
 11
 I
-6
+1
 I
 0
 I
@@ -219,16 +1060,88 @@ I
 0
 n
 p
+3
+x
+9
+top_level
+x
+9
+http_path
+x
+4
+to_s
+p
 5
+I
+-1
+I
+2d
+I
+0
+I
+2e
+I
+c
 x
+91
+/Users/crispee/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
+p
+0
+p
 21
-ConfigurationDefaults
-x
+I
+2
+I
+9
+I
+10
+I
+d
+I
+1e
+I
 11
-open_module
-x
+I
+2c
+I
 15
-__module_init__
+I
+3a
+I
+19
+I
+48
+I
+1d
+I
+56
+I
+21
+I
+64
+I
+25
+I
+72
+I
+29
+I
+80
+I
+2d
+I
+8e
+x
+91
+/Users/crispee/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
+p
+0
+x
+13
+attach_method
+x
+21
+ConfigurationDefaults
 M
 1
 n
@@ -495,16 +1408,16 @@ p
 I
 -1
 I
-6
+34
 I
 0
 I
-7
+35
 I
 3
 x
-89
-/Users/chris/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
+91
+/Users/crispee/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
 p
 0
 x
@@ -524,74 +1437,31 @@ x
 16
 default_sass_dir
 i
-43
+13
 45
 0
 1
-43
-2
-7
-3
-64
-49
-4
-1
-9
-30
-45
-5
-6
-7
-7
-64
 7
-8
+2
 64
 7
-9
-64
-49
-10
 3
-8
-42
-45
-5
-11
-7
-7
-64
-7
-9
 64
 49
-10
+4
 2
 11
 I
-4
-I
-0
-I
-0
+3
 I
 0
-n
-p
-12
-x
-4
-Sass
-n
-x
-4
-Util
-s
-10
-3.1.0.beta
-x
-7
-ap_geq?
+I
+0
+I
+0
+n
+p
+5
 x
 4
 File
@@ -600,38 +1470,26 @@ s
 3
 app
 s
-6
-assets
-s
 11
 stylesheets
 x
 4
 join
-n
 p
-9
+5
 I
 -1
 I
-a
+38
 I
 0
 I
-b
+39
 I
 d
-I
-c
-I
-1e
-I
-e
-I
-2b
 x
-89
-/Users/chris/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
+91
+/Users/crispee/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
 p
 0
 x
@@ -688,16 +1546,16 @@ p
 I
 -1
 I
-12
+3c
 I
 0
 I
-13
+3d
 I
 d
 x
-89
-/Users/chris/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
+91
+/Users/crispee/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
 p
 0
 x
@@ -754,16 +1612,16 @@ p
 I
 -1
 I
-16
+40
 I
 0
 I
-17
+41
 I
 d
 x
-89
-/Users/chris/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
+91
+/Users/crispee/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
 p
 0
 x
@@ -820,16 +1678,16 @@ p
 I
 -1
 I
-1a
+44
 I
 0
 I
-1b
+45
 I
 d
 x
-89
-/Users/chris/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
+91
+/Users/crispee/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
 p
 0
 x
@@ -843,52 +1701,22 @@ x
 23
 default_javascripts_dir
 i
-43
+13
 45
 0
 1
-43
-2
-7
-3
-64
-49
-4
-1
-9
-30
-45
-5
-6
-7
 7
+2
 64
 7
-8
-64
-7
-9
-64
-49
-10
 3
-8
-42
-45
-5
-11
-7
-12
-64
-7
-9
 64
 49
-10
+4
 2
 11
 I
-4
+3
 I
 0
 I
@@ -897,63 +1725,35 @@ I
 0
 n
 p
-13
-x
-4
-Sass
-n
-x
-4
-Util
-s
-10
-3.1.0.beta
-x
-7
-ap_geq?
+5
 x
 4
 File
 n
 s
-3
-app
-s
 6
-assets
+public
 s
 11
 javascripts
 x
 4
 join
-n
-s
-6
-public
 p
-9
+5
 I
 -1
 I
-1e
+48
 I
 0
 I
-1f
+49
 I
 d
-I
-20
-I
-1e
-I
-22
-I
-2b
 x
-89
-/Users/chris/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
+91
+/Users/crispee/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
 p
 0
 x
@@ -967,20 +1767,15 @@ x
 24
 default_http_images_path
 i
-14
+9
 5
-48
+7
 0
+64
+47
 49
 1
-0
-47
-101
-2
-7
-3
-63
-2
+1
 11
 I
 2
@@ -992,34 +1787,28 @@ I
 0
 n
 p
-4
-x
-9
-top_level
-x
-9
-http_path
-x
-4
-to_s
+2
 s
 6
 images
+x
+18
+http_root_relative
 p
 5
 I
 -1
 I
-26
+4c
 I
 0
 I
-27
+4f
 I
-e
+9
 x
-89
-/Users/chris/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
+91
+/Users/crispee/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
 p
 0
 x
@@ -1033,20 +1822,15 @@ x
 29
 default_http_javascripts_path
 i
-14
+9
 5
-48
+7
 0
+64
+47
 49
 1
-0
-47
-101
-2
-7
-3
-63
-2
+1
 11
 I
 2
@@ -1058,34 +1842,28 @@ I
 0
 n
 p
-4
-x
-9
-top_level
-x
-9
-http_path
-x
-4
-to_s
+2
 s
 11
 javascripts
+x
+18
+http_root_relative
 p
 5
 I
 -1
 I
-2a
+52
 I
 0
 I
-2b
+53
 I
-e
+9
 x
-89
-/Users/chris/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
+91
+/Users/crispee/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
 p
 0
 x
@@ -1099,20 +1877,15 @@ x
 23
 default_http_fonts_path
 i
-14
+9
 5
-48
+7
 0
+64
+47
 49
 1
-0
-47
-101
-2
-7
-3
-63
-2
+1
 11
 I
 2
@@ -1124,34 +1897,28 @@ I
 0
 n
 p
-4
-x
-9
-top_level
-x
-9
-http_path
-x
-4
-to_s
+2
 s
 5
 fonts
+x
+18
+http_root_relative
 p
 5
 I
 -1
 I
-2e
+56
 I
 0
 I
-2f
+57
 I
-e
+9
 x
-89
-/Users/chris/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
+91
+/Users/crispee/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
 p
 0
 x
@@ -1165,20 +1932,15 @@ x
 29
 default_http_stylesheets_path
 i
-14
+9
 5
-48
+7
 0
+64
+47
 49
 1
-0
-47
-101
-2
-7
-3
-63
-2
+1
 11
 I
 2
@@ -1190,34 +1952,28 @@ I
 0
 n
 p
-4
-x
-9
-top_level
-x
-9
-http_path
-x
-4
-to_s
+2
 s
 11
 stylesheets
+x
+18
+http_root_relative
 p
 5
 I
 -1
 I
-32
+5a
 I
 0
 I
-33
+5b
 I
-e
+9
 x
-89
-/Users/chris/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
+91
+/Users/crispee/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
 p
 0
 x
@@ -1280,16 +2036,16 @@ p
 I
 -1
 I
-36
+5e
 I
 0
 I
-37
+5f
 I
 10
 x
-89
-/Users/chris/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
+91
+/Users/crispee/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
 p
 0
 x
@@ -1346,16 +2102,16 @@ p
 I
 -1
 I
-3a
+62
 I
 0
 I
-3b
+63
 I
 d
 x
-89
-/Users/chris/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
+91
+/Users/crispee/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
 p
 0
 x
@@ -1412,16 +2168,16 @@ p
 I
 -1
 I
-3e
+66
 I
 0
 I
-3f
+67
 I
 d
 x
-89
-/Users/chris/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
+91
+/Users/crispee/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
 p
 1
 x
@@ -1462,16 +2218,16 @@ p
 I
 -1
 I
-42
+6a
 I
 0
 I
-43
+6b
 I
 4
 x
-89
-/Users/chris/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
+91
+/Users/crispee/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
 p
 0
 x
@@ -1526,16 +2282,16 @@ p
 I
 -1
 I
-46
+6e
 I
 0
 I
-47
+6f
 I
 b
 x
-89
-/Users/chris/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
+91
+/Users/crispee/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
 p
 0
 p
@@ -1543,84 +2299,85 @@ p
 I
 2
 I
-6
+34
 I
 10
 I
-a
+38
 I
 1e
 I
-12
+3c
 I
 2c
 I
-16
+40
 I
 3a
 I
-1a
+44
 I
 48
 I
-1e
+48
 I
 56
 I
-26
+4c
 I
 64
 I
-2a
+52
 I
 72
 I
-2e
+56
 I
 80
 I
-32
+5a
 I
 8e
 I
-36
+5e
 I
 9c
 I
-3a
+62
 I
 aa
 I
-3e
+66
 I
 b8
 I
-42
+6a
 I
 c6
 I
-46
+6e
 I
 d4
 x
-89
-/Users/chris/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
+91
+/Users/crispee/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
 p
 0
-x
-13
-attach_method
 p
-3
+5
 I
 2
 I
-4
+5
 I
 1c
+I
+32
+I
+36
 x
-89
-/Users/chris/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
+91
+/Users/crispee/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
 p
 0
 x
@@ -1635,8 +2392,8 @@ I
 I
 1c
 x
-89
-/Users/chris/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
+91
+/Users/crispee/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
 p
 0
 x
@@ -1651,8 +2408,8 @@ I
 I
 1c
 x
-89
-/Users/chris/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
+91
+/Users/crispee/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
 p
 0
 x
@@ -1667,7 +2424,7 @@ I
 I
 1c
 x
-89
-/Users/chris/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
+91
+/Users/crispee/Projects/compass/lib/compass/app_integration/rails/configuration_defaults.rb
 p
 0