compass-rails 1.0.0.rc.3 → 1.0.0.rc.4

data/README.md

@@ -15,6 +15,7 @@ Add the `compass-rails` gem line to a group called `:assets` in your application
 
 ```ruby
 group :assets do
+  gem 'sass-rails' # if running rails 3.1 or greater
   gem 'compass-rails'
 end
 ```
@@ -46,10 +47,10 @@ older versions of rails that do not use the assets pipeline.
 If you have your stylesheets already in `app/stylesheets`, you have two choices:
 
 1. Move your stylesheets to `app/assets/stylesheets`.
-2. Configure your project to look in `app/assets/stylesheets` by setting
-   `config.compass.sass_dir = "app/stylesheets"` in your rails
-configuration or by setting `sass_dir = "app/stylesheets"` in your
-compass configuration file.
+2. Configure your project to look in the **legacy location** of
+   `app/stylesheets` by setting `config.compass.sass_dir =
+   "app/stylesheets"` in your rails configuration or by setting
+   `sass_dir = "app/stylesheets"` in your compass configuration file.
 
 ## Configuration
 
@@ -138,6 +139,11 @@ doing things like requiring. These **must not** be used with Sass files.
 Instead use the sass `@import` directive. In rails projects, the
 `@import` directive is configured to work with sprockets via `sass-rails`. For more information on importing in rails 3.1 or greater see the [Sass-Rails REAME](https://github.com/rails/sass-rails/blob/master/README.markdown)
 
+## Rails 3.1 Caveats
+
+There was a bug in rails 3.1.0 -- please make sure you are running 3.1.1
+at the earliest for this version of rails.
+
 ## Rails 3.0 Caveats
 
 If you want rails to compile your stylesheets (instead of using the

data/gemfiles/rails2.gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: ..
   specs:
-    compass-rails (1.0.0.rc.1)
+    compass-rails (1.0.0.rc.3)
       compass (~> 0.12.rc.0)
 
 GEM

data/gemfiles/rails3.gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: ..
   specs:
-    compass-rails (1.0.0.rc.1)
+    compass-rails (1.0.0.rc.3)
       compass (~> 0.12.rc.0)
 
 GEM

data/gemfiles/rails31.gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: ..
   specs:
-    compass-rails (1.0.0.rc.1)
+    compass-rails (1.0.0.rc.3)
       compass (~> 0.12.rc.0)
 
 GEM

data/gemfiles/rails32.gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: ..
   specs:
-    compass-rails (1.0.0.rc.1)
+    compass-rails (1.0.0.rc.3)
       compass (~> 0.12.rc.0)
 
 GEM

data/lib/compass-rails.rb

@@ -177,8 +177,18 @@ module CompassRails
 
     def configure_rails!(app)
       return unless app.config.respond_to?(:sass)
-      app.config.compass.to_sass_engine_options.each do |key, value|
-        app.config.sass.send(:"#{key}=", value)
+      sass_config = app.config.sass
+      compass_config = app.config.compass
+
+      sass_config.load_paths.concat(compass_config.sass_load_paths)
+
+      { :output_style => :style,
+        :line_comments => :line_comments,
+        :cache => :cache,
+        :disable_warnings => :quiet,
+        :preferred_syntax => :preferred_syntax
+      }.each do |compass_option, sass_option|
+        set_maybe sass_config, compass_config, sass_option, compass_option
       end
     end
 
@@ -198,6 +208,16 @@ module CompassRails
     rails_config.respond_to?(:assets) && rails_config.assets.try(:enabled)
   end
 
+  private
+
+    # sets the sass config value only if the corresponding compass-based setting
+    # has been explicitly set by the user.
+    def set_maybe(sass_config, compass_config, sass_option, compass_option)
+      if compass_value = compass_config.send(:"#{compass_option}_without_default")
+        sass_config.send(:"#{sass_option}=", compass_value)
+      end
+    end
+
 end
 
 Compass::AppIntegration.register(:rails, "::CompassRails")

data/lib/compass-rails/configuration/3_1.rb

@@ -26,10 +26,6 @@ module CompassRails
         "#{top_level.http_path}"
       end
 
-      def default_http_generated_images_path
-        "#{top_level.http_path}"
-      end
-
       def default_http_javascripts_path
         "#{top_level.http_path}"
       end

data/lib/compass-rails/patches/3_1.rb

@@ -1,3 +1,5 @@
+require 'compass-rails/patches/static_compiler'
+
 module Sass::Script::Functions
   def generated_image_url(path, only_path = nil)
     asset_url(path, Sass::Script::String.new("image"))
@@ -25,4 +27,4 @@ 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
+end

data/lib/compass-rails/patches/sprite_importer.rb

@@ -16,7 +16,7 @@ module Compass
           end
         end
       end
-      
+
       old
     end
 
@@ -35,4 +35,4 @@ module Compass
     end
 
   end
-end
+end

data/lib/compass-rails/patches/static_compiler.rb

@@ -0,0 +1,12 @@
+require 'sprockets/static_compiler'
+
+module Sprockets
+  class StaticCompiler
+    cattr_accessor :generated_sprites
+    self.generated_sprites = {}
+    def write_manifest_with_sprites(manifest)
+      write_manifest_without_sprites(manifest.merge(self.class.generated_sprites))
+    end
+    alias_method_chain :write_manifest, :sprites
+  end
+end

data/lib/compass-rails/railties/3_1.rb

@@ -31,8 +31,8 @@ class Rails::Railtie::Configuration
         Compass::Configuration::Data.new("rails_config")
       end
       data.project_type = :rails # Forcing this makes sure all the rails defaults will be loaded.
-      data.inherit_from!(Compass.configuration) #force this
-      Compass.add_project_configuration(data)
+      Compass.add_configuration(:rails)
+      Compass.add_configuration(data)
       Compass.configuration.on_sprite_saved do |filename|
         # This is a huge hack based on reading through the sprockets internals.
         # Sprockets needs an API for adding assets during precompilation.
@@ -56,18 +56,26 @@ 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.assets.digests.try(:any?)
-          asset         = Rails.application.assets.find_asset(filename)
+        if Rails.application.config.assets.digest && # if digesting is enabled
+            caller.grep(/static_compiler/).any? && #OMG HAX - check if we're being precompiled
+            Compass.configuration.generated_images_path[Compass.configuration.images_path] # if the generated images path is not in the assets images directory, we don't have to do these backflips
+
+          # Clear entries in Hike::Index for this sprite's directory.
+          # This makes sure the asset can be found by find_assets
+          Rails.application.assets.send(:trail).instance_variable_get(:@entries).delete(File.dirname(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
+          logical_path  = pathname.relative_path_from(Pathname.new(Compass.configuration.images_path))
+          asset         = Rails.application.assets.find_asset(logical_path)
+          target        = File.join(Rails.public_path, Rails.application.config.assets.prefix, asset.digest_path)
+
+          # Adds the asset to the manifest file.
+          Sprockets::StaticCompiler.generated_sprites[logical_path.to_s] = asset.digest_path
+
+          # Adds the fingerprinted asset to the public directory
+          FileUtils.mkdir_p File.dirname(target)
+          asset.write_to target
 
-          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
@@ -88,4 +96,4 @@ module CompassRails
       CompassRails.configure_rails!(app)
     end
   end
-end
+end

data/lib/compass-rails/version.rb

@@ -1,5 +1,5 @@
 module CompassRails
   unless defined?(::CompassRails::VERSION)
-    VERSION = "1.0.0.rc.3"
+    VERSION = "1.0.0.rc.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: compass-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.3
+  version: 1.0.0.rc.4
   prerelease: 6
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-16 00:00:00.000000000Z
+date: 2012-03-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &70279494124840 !ruby/object:Gem::Requirement
+  requirement: &70331335147980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,7 +22,7 @@ dependencies:
         version: 0.12.rc.0
   type: :runtime
   prerelease: false
-  version_requirements: *70279494124840
+  version_requirements: *70331335147980
 description: Integrate Compass into Rails 2.3 and up.
 email:
 - jetviper21@gmail.com
@@ -57,6 +57,7 @@ files:
 - lib/compass-rails/patches/3_1.rb
 - lib/compass-rails/patches/importer.rb
 - lib/compass-rails/patches/sprite_importer.rb
+- lib/compass-rails/patches/static_compiler.rb
 - lib/compass-rails/railties.rb
 - lib/compass-rails/railties/2_3.rb
 - lib/compass-rails/railties/3_0.rb