compass-rails 1.1.7 → 2.0.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OGJhZGJjYmQ4NzYxODExMDQ5MTllYzM2ZmM1MGQ0YWZlODAzZmZmMw==
-  data.tar.gz: !binary |-
-    YTRiYTc0M2VhZjkyOGJkNzVmNWYxMDJmOTE0OTA2ZGY3MzBiZjEzMA==
+SHA1:
+  metadata.gz: 32048be7b100642ba51ac64ba90f5d8772db0089
+  data.tar.gz: 72b5056ea2292f497bc0bcbf2b3bdb94f9aae889
 SHA512:
-  metadata.gz: !binary |-
-    YTJiYWRmMGMzNzJiNWUyZmVkNDVhOTMzN2E1ZDBkYzBkMTU2OWU2NzBkNWEw
-    NjdhMTkxZjYyMmI0ZjViODhhMWIyMmRiMjVjZDlhMjEyNzUyNTVjY2I5Njc5
-    MTk1YjQ5YWVhMmNmN2NmMzVmNDQxMWFhM2Y0MDU2OGNiNWI3ZmI=
-  data.tar.gz: !binary |-
-    N2Q2ZmE3OTYxNzM5MDJiMzFiMTQ0YzQ5ZWU0YzFjZDNiZDFlODFmMzMxZmM3
-    NjFiMTRhZDk0ZmY0ODdhOTcwYjM1NGI4MzM0ZDk0NTVmNGU1OWI0ZTMxNjVj
-    ZmNlMjI4NTk5Y2EyZjFiOWJhMTY1YTU0YThmZWZlM2VkN2JmZjk=
+  metadata.gz: 52f299102a23a6cc39be6bb5b38fcaa9e7fa68f5988eb1f055420508729e626497f91d4540ea364e70eb4141de3f5cf1e84c135fd48438dc8d8010e87ad63453
+  data.tar.gz: cdb26631fb53897b9a4ecdb3d304fd514956f23bebfd766f4825c90711a2cbfcad708fcbaa81a24dc28c493c2e98cc72a4f575c9b05d828d5739babba8bba847

data/Appraisals

@@ -1,7 +1,3 @@
-appraise "rails3" do
-  gem "rails", "3.0.11"
-end
-
 appraise "rails31" do
   gem "rails", "3.1.3"
   gem "sass-rails"

data/README.md

@@ -2,7 +2,7 @@
 
 **We Take Pull Requests!**
 
-[![Build Status](https://travis-ci.org/Compass/compass-rails.png?branch=stable)](https://travis-ci.org/Compass/compass-rails)
+[![Build Status](https://travis-ci.org/Compass/compass-rails.png?branch=master)](https://travis-ci.org/Compass/compass-rails)
 [![Code Climate](https://codeclimate.com/github/Compass/compass-rails.png)](https://codeclimate.com/github/Compass/compass-rails)
 
 Compass rails is an adapter for the [Compass Stylesheet Authoring
@@ -10,17 +10,15 @@ Framework](http://compass-style.org) for [Ruby on Rails](http://rubyonrails.org/
 
 Since Compass v0.12.0, this is the only way to use compass with your rails application.
 
-Supports Rails 3.x, 4.x releases.
+Supports Rails 3.2, 4.x releases.
 
 ## Installation
 
-Add the `compass-rails` gem line to a group called `:assets` in your application's Gemfile (Rails 3.1+ users should already have the `:assets` group):
+Add the `compass-rails` gem line to your application's Gemfile
 
 ```ruby
-group :assets do
-  gem 'sass-rails' # if running rails 3.1 or greater
-  gem 'compass-rails'
-end
+gem 'sass-rails'
+gem 'compass-rails'
 ```
 
 If you are using any Compass extensions, add them to this group in your
@@ -32,12 +30,13 @@ And then execute:
 
 ## Usage
 
-Change your `application.css` to `application.css.scss` or `application.css.sass` and use `@import` to your hearts content. Ex:
+Change your `application.css` to `application.css.scss` or `application.css.sass` and then `@import compass` and your own stylesheets to your hearts content. E.g.:
 
 ```scss
-@import "project/mixins";
-@import "project/base";
+@import "compass";
 
+@import "your_project/mixins";
+@import "your_project/base";
 ```
 
 *or*
@@ -63,7 +62,7 @@ configuration object exposed to rails within any configuration block.
 
 ### Installing Compass extensions
 
-Step 1: Add it to your Gemfile in the `:assets` group and run the `bundle` command to install it.
+Step 1: Add it to your Gemfile and run the `bundle` command to install it.
 
 Step 2: Install the extension's assets: `bundle exec compass install 
 <extension/template>`
@@ -72,17 +71,15 @@ For example, if you want to use susy.
 
 ```ruby
 # Gemfile
-group :assets do
-  gem 'compass-rails'
-  gem 'compass-susy-plugin'
-end
+gem 'compass-rails'
+gem 'compass-susy-plugin'
 ```
 
 then run:
 
     $ bundle
     $ bundle exec compass install susy
-    
+
 if you are using the rails configuration files you should add:
 
 ```ruby

data/compass-rails.gemspec

@@ -17,6 +17,5 @@ Gem::Specification.new do |gem|
   gem.license       = "MIT"
 
   gem.add_dependency 'compass', '>= 0.12.2'
-  gem.add_dependency 'sprockets', '<= 2.11.0'
 
 end

data/lib/compass-rails.rb

@@ -4,10 +4,9 @@ require "compass-rails/configuration"
 
 module CompassRails
 
-    RAILS_4 = %r{^4.[0|1]}
+    RAILS_4 = %r{^4.[0|1|2]}
     RAILS_32 = %r{^3.2}
     RAILS_31 = %r{^3.1}
-    RAILS_3 = %r{^3.0}
 
     extend self
 
@@ -22,12 +21,10 @@ module CompassRails
       end
       #load the rails config
       require "#{rails_config_path}/config/application.rb"
-      if rails31? || rails32? || rails4?
-        require 'sass-rails'
-        require 'sprockets/railtie'
-        require 'rails/engine'
-        @app ||= ::Rails.application.initialize!
-      end
+      require 'sass-rails'
+      require 'sprockets/railtie'
+      require 'rails/engine'
+      @app ||= ::Rails.application.initialize!
     end
 
 
@@ -84,11 +81,6 @@ module CompassRails
       rails_spec.version.to_s
     end
 
-    def rails3?
-      return false unless defined?(::Rails)
-      version_match RAILS_3
-    end
-
     def rails31?
       return false unless defined?(::Rails)
       version_match RAILS_31
@@ -123,18 +115,10 @@ module CompassRails
     def configuration
       load_rails
       config = Compass::Configuration::Data.new('rails')
-      config.extend(Configuration::Default)
-      if asset_pipeline_enabled?
-        require "compass-rails/configuration/asset_pipeline"
-        config.extend(Configuration::AssetPipeline)
-      end
+      config.extend(CompassRails::Configuration)
       config
     end
 
-    def env
-      env_production? ? :production : :development
-    end
-
     def prefix
       ::Rails.application.config.assets.prefix
     end
@@ -206,13 +190,18 @@ module CompassRails
     end
 
     def boot_config
-      config = if (config_file = Compass.detect_configuration_file) && (config_data = Compass.configuration_for(config_file))
-        config_data
-      else
-        Compass::Configuration::Data.new("compass_rails_boot")
+      config = begin
+        if (config_file = Compass.detect_configuration_file) &&
+            (config_data = Compass.configuration_for(config_file))
+          config_data
+        else
+          Compass::Configuration::Data.new("compass_rails_boot")
+        end
+      end
+
+      config.tap do |c|
+        c.top_level.project_type = :rails
       end
-      config.top_level.project_type = :rails
-      config
     end
 
   def asset_pipeline_enabled?

data/lib/compass-rails/configuration.rb

@@ -1 +1,77 @@
-require "compass-rails/configuration/default"
+module CompassRails
+  module Configuration
+    def default_images_dir
+      File.join("app", "assets", "images")
+    end
+
+    def default_fonts_dir
+      File.join("app", "assets", "fonts")
+    end
+
+    def default_javascripts_dir
+      File.join("app", "assets", "javascripts")
+    end
+
+    def default_css_dir
+      File.join('public', CompassRails.prefix)
+    end
+
+    def default_http_path
+      File.join(CompassRails.prefix)
+    end
+
+    def default_http_images_path
+      "#{top_level.http_path}"
+    end
+
+    def default_http_javascripts_path
+      "#{top_level.http_path}"
+    end
+
+    def default_http_fonts_path
+      "#{top_level.http_path}"
+    end
+
+    def default_http_stylesheets_path
+      "#{top_level.http_path}"
+    end
+
+    def default_preferred_syntax
+      ::Rails.application.config.sass.preferred_syntax rescue nil
+    end
+
+    def default_sprite_load_path
+      CompassRails.sprockets.paths
+    end
+
+    def project_type_without_default
+      :rails
+    end
+
+    def default_sass_dir
+      File.join("app", "assets", "stylesheets")
+    end
+
+    def default_http_generated_images_path
+      # Relies on the fact that this will be loaded after the "normal"
+      # defaults, so that method_missing finds http_root_relative
+      http_root_relative "images"
+    end
+
+    def default_extensions_dir
+      File.join("vendor", "plugins", "compass_extensions")
+    end
+
+    def default_cache_dir
+      File.join("tmp", "sass-cache")
+    end
+
+    def default_project_path
+      Rails.root
+    end
+
+    def default_environment
+      Rails.env
+    end
+  end
+end

data/lib/compass-rails/patches/4_0.rb

@@ -4,14 +4,34 @@ require 'compass-rails/patches/sprite_importer'
 
 module Sass::Script::Functions
   def generated_image_url(path, only_path = nil)
-    cachebust_generated_images
+    pathobject = Pathname.new(path.to_s)
+    subdirectory = pathobject.dirname.to_s
+
+    cachebust_generated_images(path, subdirectory)
     asset_url(path)
   end
 
-  def cachebust_generated_images
+  def cachebust_generated_images(image_path, subdirectory = nil)
     generated_images_path = Rails.root.join(Compass.configuration.generated_images_dir).to_s
+    if subdirectory.nil? 
+        bust_cache_path = generated_images_path
+    else
+        bust_cache_path = generated_images_path + "/" + subdirectory
+    end
+    bust_image_stat_path = generated_images_path + "/" + image_path.to_s
+
     sprockets_entries = options[:sprockets][:environment].send(:trail).instance_variable_get(:@entries)
-    sprockets_entries.delete(generated_images_path) if sprockets_entries.has_key? generated_images_path
+
+    # sprockets_entries.delete(generated_images_path) if sprockets_entries.has_key? generated_images_path
+    if sprockets_entries.has_key? generated_images_path
+        # sprockets_entries.delete(generated_images_path) 
+
+        # Delete the entries (directories) which cache the files/dirs in a directory
+        options[:sprockets][:environment].send(:trail).instance_variable_get(:@entries).delete(bust_cache_path) 
+
+        # Delete the stats (file/dir info) which cache the what kind of file/dir each image is
+        options[:sprockets][:environment].send(:trail).instance_variable_get(:@stats).delete(bust_image_stat_path) 
+    end
   end
 end
 

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

@@ -1,31 +1,36 @@
-module Sprockets
-  class SassTemplate < Tilt::Template
-    def evaluate(context, locals, &block)
-      # Use custom importer that knows about Sprockets Caching
-      cache_store = SassCacheStore.new(context.environment)
-      paths  = context.environment.paths.map { |path| CompassRails::SpriteImporter.new(context, path) }
-      paths += context.environment.paths.map { |path| SassImporter.new(context, path) }
-      paths += ::Rails.application.config.sass.load_paths
+klass = if defined?(Sass::Rails::SassTemplate)
+  Sass::Rails::SassTemplate
+else
+  Sprockets::SassTemplate
+end
+
+klass.class_eval do
+  def evaluate(context, locals, &block)
+    # Use custom importer that knows about Sprockets Caching
+    cache_store = Sprockets::SassCacheStore.new(context.environment)
+    paths  = context.environment.paths.map { |path| CompassRails::SpriteImporter.new(context, path) }
+    paths += context.environment.paths.map { |path| self.class.parent::SassImporter.new(context, path) }
+    paths += ::Rails.application.config.sass.load_paths
 
 
-      options = CompassRails.sass_config.merge( {
-        :filename => eval_file,
-        :line => line,
-        :syntax => syntax,
-        :cache_store => cache_store,
-        :importer => SassImporter.new(context, context.pathname),
-        :load_paths => paths,
-        :sprockets => {
-          :context => context,
-          :environment => context.environment
-        }
-      })
+    options = CompassRails.sass_config.merge( {
+      :filename => eval_file,
+      :line => line,
+      :syntax => syntax,
+      :cache_store => cache_store,
+      :importer => self.class.parent::SassImporter.new(context, context.pathname),
+      :load_paths => paths,
+      :sprockets => {
+        :context => context,
+        :environment => context.environment
+      }
+    })
 
-      ::Sass::Engine.new(data, options).render
-    rescue ::Sass::SyntaxError => e
-      # Annotates exception message with parse line number
-      context.__LINE__ = e.sass_backtrace.first[:line]
-      raise e
-    end
+    ::Sass::Engine.new(data, options).render
+  rescue ::Sass::SyntaxError => e
+    # Annotates exception message with parse line number
+    context.__LINE__ = e.sass_backtrace.first[:line]
+    raise e
   end
-end
+end    
+

data/lib/compass-rails/railties.rb

@@ -1,8 +1,6 @@
 if defined?(::Rails)
   if CompassRails.rails31? || CompassRails.rails32?
     require "compass-rails/railties/3_1"
-  elsif CompassRails.rails3?
-    require "compass-rails/railties/3_0"
   elsif CompassRails.rails4?
     require "compass-rails/railties/4_0"
   else

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

@@ -1,93 +1,8 @@
-#3.1.3
-require 'compass'
-require 'rails/railtie'
-
-class Rails::Railtie::Configuration
-  # Adds compass configuration accessor to the application configuration.
-  #
-  # If a configuration file for compass exists, it will be read in and
-  # the project's configuration values will already be set on the config
-  # object.
-  #
-  # For example:
-  #
-  #     module MyApp
-  #       class Application < Rails::Application
-  #          config.compass.line_comments = !Rails.env.production?
-  #          config.compass.fonts_dir = "app/assets/fonts"
-  #       end
-  #     end
-  #
-  # It is suggested that you create a compass configuration file if you
-  # want a quicker boot time when using the compass command line tool.
-  #
-  # For more information on available configuration options see:
-  # http://compass-style.org/help/tutorials/configuration-reference/
-  def compass
-    @compass ||= begin
-      data = if (config_file = Compass.detect_configuration_file) && (config_data = Compass.configuration_for(config_file))
-        config_data
-      else
-        Compass::Configuration::Data.new("rails_config")
-      end
-      data.project_type = :rails # Forcing this makes sure all the rails defaults will be loaded.
-      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.
-        # At a minimum sprockets should provide this API:
-        #
-        #     #filename is a path in the asset source directory
-        #     Rails.application.assets.new_asset!(filename)
-        #
-        #     # logical_path is how devs refer to it, data is the contents of it.
-        #     Rails.application.assets.new_asset!(logical_path, data)
-        #
-        # I would also like to select one of the above calls based on whether
-        # the user is precompiling or not:
-        #
-        #     Rails.application.assets.precompiling? #=> true or false
-        #
-        # But even the above is not an ideal API. The issue is that compass sprites need to
-        # avoid generation if the sprite file is already generated (which can be quite time
-        # consuming). To do this, compass has it's own uniqueness hash based on the user's
-        # inputs instead of being based on the file contents. So if we could provide our own
-        # 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.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  = 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
-
-        end
-      end
-      data
-    end
-    @compass
-  end
-end
-
 module CompassRails
   class Railtie < Rails::Railtie
 
     initializer "compass.initialize_rails", :group => :all do |app|
+      require 'compass'
       if CompassRails.asset_pipeline_enabled?
         require 'compass-rails/patches/3_1'
         # Configure compass for use within rails, and provide the project configuration
@@ -99,5 +14,42 @@ module CompassRails
         CompassRails.initialize!(app.config.compass)
       end
     end
+
+    config.compass = begin
+      @compass ||= begin
+        data = if (config_file = Compass.detect_configuration_file) && (config_data = Compass.configuration_for(config_file))
+          config_data
+        else
+          Compass::Configuration::Data.new("rails_config")
+        end
+        data.project_type = :rails # Forcing this makes sure all the rails defaults will be loaded.
+        Compass.add_configuration(:rails)
+        Compass.add_configuration(data)
+        Compass.configuration.on_sprite_saved do |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  = 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
+
+          end
+        end
+        data
+      end
+    end
   end
 end

data/lib/compass-rails/railties/4_0.rb

@@ -1,96 +1,8 @@
-#3.1.3
-require 'compass'
-require 'rails/railtie'
-
-class Rails::Railtie::Configuration
-  # Adds compass configuration accessor to the application configuration.
-  #
-  # If a configuration file for compass exists, it will be read in and
-  # the project's configuration values will already be set on the config
-  # object.
-  #
-  # For example:
-  #
-  #     module MyApp
-  #       class Application < Rails::Application
-  #          config.compass.line_comments = !Rails.env.production?
-  #          config.compass.fonts_dir = "app/assets/fonts"
-  #       end
-  #     end
-  #
-  # It is suggested that you create a compass configuration file if you
-  # want a quicker boot time when using the compass command line tool.
-  #
-  # For more information on available configuration options see:
-  # http://compass-style.org/help/tutorials/configuration-reference/
-  def compass
-    @compass ||= begin
-      data = if (config_file = Compass.detect_configuration_file) && (config_data = Compass.configuration_for(config_file))
-        config_data
-      else
-        Compass::Configuration::Data.new("rails_config")
-      end
-      data.project_type = :rails # Forcing this makes sure all the rails defaults will be loaded.
-      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.
-        # At a minimum sprockets should provide this API:
-        #
-        #     #filename is a path in the asset source directory
-        #     Rails.application.assets.new_asset!(filename)
-        #
-        #     # logical_path is how devs refer to it, data is the contents of it.
-        #     Rails.application.assets.new_asset!(logical_path, data)
-        #
-        # I would also like to select one of the above calls based on whether
-        # the user is precompiling or not:
-        #
-        #     Rails.application.assets.precompiling? #=> true or false
-        #
-        # But even the above is not an ideal API. The issue is that compass sprites need to
-        # avoid generation if the sprite file is already generated (which can be quite time
-        # consuming). To do this, compass has it's own uniqueness hash based on the user's
-        # inputs instead of being based on the file contents. So if we could provide our own
-        # 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.digest && # if digesting is enabled
-            caller.grep(%r{/sprockets/rails/task.rb}).any? && #OMG HAX - check if we're being precompiled
-            Compass.configuration.generated_images_path[Compass.configuration.images_path.to_s] # 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  = 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.
-
-          manifest = ActionView::Base.assets_manifest
-          manifest.assets[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
-
-        end
-      end
-      data
-    end
-    @compass
-  end
-end
-
 module CompassRails
   class Railtie < Rails::Railtie
 
     initializer "compass.initialize_rails", :group => :all do |app|
+      require 'compass'
       require 'compass-rails/patches/4_0'
       # Configure compass for use within rails, and provide the project configuration
       # that came via the rails boot process.
@@ -98,5 +10,47 @@ module CompassRails
       Compass.discover_extensions!
       CompassRails.configure_rails!(app)
     end
+
+    config.compass = begin
+      @compass ||= begin
+        data = if (config_file = Compass.detect_configuration_file) && (config_data = Compass.configuration_for(config_file))
+          config_data
+        else
+          Compass::Configuration::Data.new("rails_config")
+        end
+        data.project_type = :rails # Forcing this makes sure all the rails defaults will be loaded.
+        Compass.add_configuration(:rails)
+        Compass.add_configuration(data)
+        Compass.configuration.on_sprite_saved do |filename|
+          if Rails.application.config.assets.digest && # if digesting is enabled
+              caller.grep(%r{/sprockets/rails/task.rb}).any? && #OMG HAX - check if we're being precompiled
+              Compass.configuration.generated_images_path[Compass.configuration.images_path.to_s] # 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
+            trail = Rails.application.assets.send(:trail)
+            trail.instance_variable_get(:@entries).delete(File.dirname(filename))
+            trail.instance_variable_get(:@stats).delete(filename)
+
+            pathname      = Pathname.new(filename)
+            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.
+
+            manifest = ActionView::Base.assets_manifest
+            manifest.assets[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
+
+          end
+        end
+        data
+      end
+    end
   end
 end

data/lib/compass-rails/version.rb

@@ -1,5 +1,5 @@
 module CompassRails
   unless defined?(::CompassRails::VERSION)
-    VERSION = "1.1.7"
+    VERSION = "2.0.0"
   end
 end

data/test/helpers/rails_helper.rb

@@ -8,29 +8,25 @@ module CompassRails
         RAILS_4_0   = "4.0"
         RAILS_3_2   = "3.2"
         RAILS_3_1   = "3.1"
-        RAILS_3     = "3.0"
 
         WORKING_DIR = File.join(ROOT_PATH, 'rails-temp')
 
         GEMFILES = {
           RAILS_4_0 => GEMFILES_DIR.join("rails40.gemfile").to_s,
           RAILS_3_2 => GEMFILES_DIR.join("rails32.gemfile").to_s,
-          RAILS_3_1 => GEMFILES_DIR.join("rails31.gemfile").to_s,
-          RAILS_3   => GEMFILES_DIR.join("rails3.gemfile").to_s
+          RAILS_3_1 => GEMFILES_DIR.join("rails31.gemfile").to_s
         }
 
         GENERATOR_OPTIONS = {
           RAILS_4_0 => ['-q', '-G', '-O', '--skip-bundle'],
           RAILS_3_2 => ['-q', '-G', '-O', '--skip-bundle'],
-          RAILS_3_1 => ['-q', '-G', '-O', '--skip-bundle'],
-          RAILS_3   => ['-q', '-G', '-O', '--skip-bundle']
+          RAILS_3_1 => ['-q', '-G', '-O', '--skip-bundle']
         }
 
         GENERATOR_COMMAND = {
           RAILS_4_0 => 'new',
           RAILS_3_2 => 'new',
-          RAILS_3_1 => 'new',
-          RAILS_3   => 'new'
+          RAILS_3_1 => 'new'
         }
 
     def rails_command(options, version)

data/test/integrations/rails_31_test.rb

@@ -1,4 +1,5 @@
 require 'test_helper'
+
 class Rails31Test < Test::Unit::TestCase
   include CompassRails::Test::RailsHelpers
 
@@ -35,13 +36,11 @@ class Rails31Test < Test::Unit::TestCase
     end
   end
 
-
   def test_compass_preferred_syntax
     within_rails_app('test_railtie', RAILS_VERSION) do |project|
       project.set_rails('sass.preferred_syntax', :sass)
       project.run_compass('init')
       assert project.directory.join('app/assets/stylesheets/screen.css.sass').exist?
-    end    
+    end
   end
-
-end
+end

data/test/integrations/rails_32_test.rb

@@ -1,6 +1,8 @@
 require 'test_helper'
+
 class Rails32Test < Test::Unit::TestCase
   include CompassRails::Test::RailsHelpers
+
   RAILS_VERSION = RAILS_3_2
 
   def test_rails_app_created
@@ -9,7 +11,6 @@ class Rails32Test < Test::Unit::TestCase
     end
   end
 
-
   def test_installs_compass
     within_rails_app('test_railtie', RAILS_VERSION) do |project|
       project.run_compass('init')
@@ -40,7 +41,6 @@ class Rails32Test < Test::Unit::TestCase
       project.set_rails('sass.preferred_syntax', :sass)
       project.run_compass('init')
       assert project.directory.join('app/assets/stylesheets/screen.css.sass').exist?
-    end    
+    end
   end
-
-end
+end

data/test/integrations/rails_40_test.rb

@@ -1,6 +1,8 @@
 require 'test_helper'
+
 class Rails40Test < Test::Unit::TestCase
   include CompassRails::Test::RailsHelpers
+
   RAILS_VERSION = RAILS_4_0
 
   def test_rails_app_created
@@ -9,7 +11,6 @@ class Rails40Test < Test::Unit::TestCase
     end
   end
 
-
   def test_installs_compass
     within_rails_app('test_railtie', RAILS_VERSION) do |project|
       project.run_compass('init')
@@ -42,5 +43,4 @@ class Rails40Test < Test::Unit::TestCase
       assert project.directory.join('app/assets/stylesheets/screen.css.sass').exist?
     end
   end
-
 end

data/test/test_helper.rb

@@ -1,10 +1,10 @@
 require 'test/unit'
 require 'compass-rails'
 require 'rainbow'
+
 module CompassRails
   module Test
     ROOT_PATH = File.expand_path('../../', __FILE__)
-    TESTING_VERSION = '0.12.alpha'
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: compass-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 2.0.0
 platform: ruby
 authors:
 - Scott Davis
@@ -10,36 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.12.2
-  prerelease: false
   name: compass
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.12.2
   type: :runtime
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - <=
-      - !ruby/object:Gem::Version
-        version: 2.11.0
   prerelease: false
-  name: sprockets
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <=
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.11.0
-  type: :runtime
+        version: 0.12.2
 description: Integrate Compass into Rails 3.0 and up.
 email:
 - jetviper21@gmail.com
@@ -49,8 +35,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Appraisals
 - Gemfile
 - Guardfile
@@ -59,14 +45,11 @@ files:
 - Rakefile
 - changelog.markdown
 - compass-rails.gemspec
-- gemfiles/rails3.gemfile
 - gemfiles/rails31.gemfile
 - gemfiles/rails32.gemfile
 - gemfiles/rails40.gemfile
 - lib/compass-rails.rb
 - lib/compass-rails/configuration.rb
-- lib/compass-rails/configuration/asset_pipeline.rb
-- lib/compass-rails/configuration/default.rb
 - lib/compass-rails/installer.rb
 - lib/compass-rails/patches.rb
 - lib/compass-rails/patches/3_1.rb
@@ -77,7 +60,6 @@ files:
 - lib/compass-rails/patches/sprite_importer.rb
 - lib/compass-rails/patches/static_compiler.rb
 - lib/compass-rails/railties.rb
-- lib/compass-rails/railties/3_0.rb
 - lib/compass-rails/railties/3_1.rb
 - lib/compass-rails/railties/4_0.rb
 - lib/compass-rails/version.rb
@@ -89,10 +71,8 @@ files:
 - test/helpers/rails_helper.rb
 - test/helpers/rails_project.rb
 - test/integrations/.gitkeep
-- test/integrations/rails3_test.rb
 - test/integrations/rails_31_test.rb
 - test/integrations/rails_32_test.rb
-- test/integrations/rails_32_without_pipeline_test.rb
 - test/integrations/rails_40_test.rb
 - test/test_helper.rb
 - test/units/.gitkeep
@@ -106,17 +86,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'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Integrate Compass into Rails 3.0 and up.
@@ -128,10 +108,9 @@ test_files:
 - test/helpers/rails_helper.rb
 - test/helpers/rails_project.rb
 - test/integrations/.gitkeep
-- test/integrations/rails3_test.rb
 - test/integrations/rails_31_test.rb
 - test/integrations/rails_32_test.rb
-- test/integrations/rails_32_without_pipeline_test.rb
 - test/integrations/rails_40_test.rb
 - test/test_helper.rb
 - test/units/.gitkeep
+has_rdoc: 

data/gemfiles/rails3.gemfile

@@ -1,22 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rb-fsevent", :require=>false
-gem "ruby_gntp", :require=>false
-gem "guard"
-gem "guard-test"
-gem "rails", "3.0.11"
-
-group :assets do
-  gem "compass", "~> 0.13.alpha.0"
-  gem "compass-rails", :path=>".."
-  gem "compass-blueprint"
-end
-group :test do
-  gem "mocha"
-  gem "appraisal", :git=>"https://github.com/scottdavis/appraisal.git"
-  gem "rainbow"
-end
-
-gemspec :path=>"../"

data/lib/compass-rails/configuration/asset_pipeline.rb

@@ -1,51 +0,0 @@
-module CompassRails
-  module Configuration
-    module AssetPipeline
-
-      def default_images_dir
-        File.join("app", "assets", "images")
-      end
-
-      def default_fonts_dir
-        File.join("app", "assets", "fonts")
-      end
-
-      def default_javascripts_dir
-        File.join("app", "assets", "javascripts")
-      end
-
-      def default_css_dir
-        File.join('public', CompassRails.prefix)
-      end
-
-      def default_http_path
-        File.join(CompassRails.prefix)
-      end
-
-      def default_http_images_path
-        "#{top_level.http_path}"
-      end
-
-      def default_http_javascripts_path
-        "#{top_level.http_path}"
-      end
-
-      def default_http_fonts_path
-        "#{top_level.http_path}"
-      end
-
-      def default_http_stylesheets_path
-        "#{top_level.http_path}"
-      end
-
-      def default_preferred_syntax
-        ::Rails.application.config.sass.preferred_syntax rescue nil
-      end
-
-      def default_sprite_load_path
-        CompassRails.sprockets.paths
-      end
-
-    end
-  end
-end

data/lib/compass-rails/configuration/default.rb

@@ -1,75 +0,0 @@
-module CompassRails
-  module Configuration
-    module Default
-      
-      def project_type_without_default
-        :rails
-      end
-
-      def default_sass_dir
-        File.join("app", "assets", "stylesheets")
-      end
-
-      def default_css_dir
-        File.join("public", "stylesheets")
-      end
-
-      def default_images_dir
-        File.join("public", "images")
-      end
-
-      def default_fonts_dir
-        File.join("public", "fonts")
-      end
-
-      def default_javascripts_dir
-        File.join("public", "javascripts")
-      end
-
-      def default_http_images_path
-        # Relies on the fact that this will be loaded after the "normal"
-        # defaults, so that method_missing finds http_root_relative
-        http_root_relative "images"
-      end
-
-      def default_http_generated_images_path
-        # Relies on the fact that this will be loaded after the "normal"
-        # defaults, so that method_missing finds http_root_relative
-        http_root_relative "images"
-      end
-
-      def default_http_javascripts_path
-        http_root_relative "javascripts"
-      end
-
-      def default_http_fonts_path
-        http_root_relative "fonts"
-      end
-
-      def default_http_stylesheets_path
-        http_root_relative "stylesheets"
-      end
-
-      def default_extensions_dir
-        File.join("vendor", "plugins", "compass_extensions")
-      end
-
-      def default_cache_dir
-        File.join("tmp", "sass-cache")
-      end
-
-      def default_project_path
-        project_path = CompassRails.root
-      end
-
-      def default_http_path
-        "/" # XXX Where is/was this stored in the Rails config?
-      end
-
-      def default_environment
-        CompassRails.env
-      end
-
-    end
-  end
-end

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

@@ -1,48 +0,0 @@
-#3.0.11
-require 'compass'
-require 'rails'
-
-class Rails::Railtie::Configuration
-  # Adds compass configuration accessor to the application configuration.
-  #
-  # If a configuration file for compass exists, it will be read in and
-  # the project's configuration values will already be set on the config
-  # object.
-  #
-  # For example:
-  #
-  #     module MyApp
-  #       class Application < Rails::Application
-  #          config.compass.line_comments = !Rails.env.production?
-  #          config.compass.fonts_dir = "app/assets/fonts"
-  #       end
-  #     end
-  #
-  # It is suggested that you create a compass configuration file if you
-  # want a quicker boot time when using the compass command line tool.
-  #
-  # For more information on available configuration options see:
-  # http://compass-style.org/help/tutorials/configuration-reference/
-  def compass
-    @compass ||= begin
-      data = if (config_file = Compass.detect_configuration_file) && (config_data = Compass.configuration_for(config_file))
-        config_data
-      else
-        Compass::Configuration::Data.new("project")
-      end
-      data.project_type = :rails # Forcing this makes sure all the rails defaults will be loaded.
-      data
-    end
-  end
-end
-
-module CompassRails
-  class Railtie < Rails::Railtie
-
-    initializer "compass.initialize_rails" do |app|
-      # Configure compass for use within rails, and provide the project configuration
-      # that came via the rails boot process.
-      CompassRails.initialize!(app.config.compass)
-    end
-  end
-end

data/test/integrations/rails3_test.rb

@@ -1,37 +0,0 @@
-require 'test_helper'
-class Rails3Test < Test::Unit::TestCase
-  include CompassRails::Test::RailsHelpers
-  RAILS_VERSION = RAILS_3
-
-  def test_rails_app_created
-    within_rails_app('test_railtie', RAILS_VERSION, false) do |project|
-      assert project.boots?
-    end
-  end
-
-  def test_installs_compass
-    within_rails_app('test_railtie', RAILS_VERSION, false) do |project|
-      project.run_compass('init')
-      assert project.has_config?
-      assert project.has_screen_file?
-      assert project.has_compass_import?
-    end
-  end
-
-  def test_compass_compile
-    within_rails_app('test_railtie', RAILS_VERSION, false) do |project|
-      project.run_compass('init')
-      project.run_compass('compile')
-      assert project.directory.join('public/stylesheets/screen.css').exist?
-    end
-  end
-
-  def test_install_blueprint
-    within_rails_app('test_railtie', RAILS_VERSION, false) do |project|
-      project.run_compass('init')
-      project.run_compass('install blueprint --force')
-      assert project.directory.join('app/assets/stylesheets/partials').directory?
-    end
-  end
-
-end

data/test/integrations/rails_32_without_pipeline_test.rb

@@ -1,37 +0,0 @@
-require 'test_helper'
-class Rails32WithoutPipelineTest < Test::Unit::TestCase
-  include CompassRails::Test::RailsHelpers
-  RAILS_VERSION = RAILS_3_2
-
-  def test_rails_app_created
-    within_rails_app('test_railtie', RAILS_VERSION, false) do |project|
-      assert project.boots?
-    end
-  end
-
-  def test_installs_compass
-    within_rails_app('test_railtie', RAILS_VERSION, false) do |project|
-      project.run_compass('init')
-      assert project.has_config?
-      assert project.has_screen_file?
-      assert project.has_compass_import?
-    end
-  end
-
-  def test_compass_compile
-    within_rails_app('test_railtie', RAILS_VERSION, false) do |project|
-      project.run_compass('init')
-      project.run_compass('compile')
-      assert project.directory.join('public/stylesheets/screen.css').exist?
-    end
-  end
-
-  def test_install_blueprint
-    within_rails_app('test_railtie', RAILS_VERSION, false) do |project|
-      project.run_compass('init')
-      project.run_compass('install blueprint --force')
-      assert project.directory.join('app/assets/stylesheets/partials').directory?
-    end
-  end
-
-end