compass-rails 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35b96ecdbcc4b8f31aa688118b7bd77d6d5db397
-  data.tar.gz: f3df7f5b7e2b6cece063d59ca2514c07bd09e138
+  metadata.gz: 9d3ea3227955811ea299dc8f915573ae37ee90f5
+  data.tar.gz: 24816da0d21eeef9ba77e4ddeb9e5d5deeda2f4a
 SHA512:
-  metadata.gz: 9add8d36252e6f429c3585f2710bcdd69147bd373d3b97fb0988980e154137a3e3ef8545d4f0221580f7564183a8d209bdd7aa37e688e82f5550ff8ce627fb59
-  data.tar.gz: 88057fec2aeeeb78d17f516645c6c608d590226e1901344637391f734c5eeec0c63ad47ec2f1eae6ac1a61aab567ab3029a53c953a9add9770ee75cf41a14bb9
+  metadata.gz: 5a20909a5341932b4e5b88067d3dcbba5eaec2e7e9ed5b4c166fc55772b73e377e5363e8e6f80fcfe25b1e9bd6a7613deb12973b5200b197a31ac072a11bd387
+  data.tar.gz: f85fc30a47c2a9f77774ecdab8bfab905acb73366d0f9e58f1485b8de03b7c488031bab426c08067795e358eeff5ddd163de6e4bff61029996693659ef541645

data/.travis.yml

@@ -1,14 +1,19 @@
 language: ruby
+
+sudo: false
+
 rvm:
   - 1.9.3
   - 2.0
   - 2.1
   - 2.2
   - jruby-head
+  - rbx-2.4.1
 
 matrix:
   allow_failures:
     - rvm: jruby-head
+    - rvm: rbx-2.4.1
 
 gemfile:
   - gemfiles/rails31.gemfile

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change log
 
+## 2.0.2 - 2015-01-03
+
+- Fixed test suite to test against Rails 3.1, 3.2, 4.0, 4.2 on Ruby 1.9.3, 2.0.0, 2.1.0, 2.2.0 and jruby-head. Issue #206
+- Support up to sass-rails 5.0.1. Issue #198
+- Fix sass_importer patches having incorrect method signatures. Issue #195
+- Fixed incorrect path generation for sprites in Rails 4. Issue #190
+
 ## 2.0.0 - 2014-07-10
 ### Added
 - Support for Rails 4.2

data/Gemfile

@@ -3,13 +3,10 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in compass-rails.gemspec
 gemspec
 
-group :assets do
-  gem 'compass-blueprint'
-end
-
 group :test do
   gem 'mocha'
-  gem "appraisal"
+  gem 'appraisal'
+  gem 'minitest'
 end
 
 unless ENV["CI"]

data/README.md

@@ -5,6 +5,7 @@
 [![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)
 [![Gem Version](https://badge.fury.io/rb/compass-rails.svg)](http://badge.fury.io/rb/compass-rails)
+[![Coverage Status](https://coveralls.io/repos/Compass/compass-rails/badge.png)](https://coveralls.io/r/Compass/compass-rails)
 
 Compass rails is an adapter for the [Compass Stylesheet Authoring
 Framework](http://compass-style.org) for [Ruby on Rails](http://rubyonrails.org/).
@@ -53,13 +54,11 @@ Use `application.css` to require files that use compass features. Ex:
 
 ### Configuration
 
-If you have a compass configuration file (recommended) then you can
-use the [Compass configuration 
+Compass-rails is configured out of the box to work with Rails. 
+
+Advanced users can choose to add a `config/compass.rb` and take advantage of the [Compass configuration 
 reference](http://compass-style.org/help/documentation/configuration-reference/)
-as is. If you choose to configure compass from your rails configuration
-files, then you should understand that the compass configuration
-options explained there will be methods and properties on the `config.compass`
-configuration object exposed to rails within any configuration block.
+as is.
 
 ### Installing Compass extensions
 

data/Rakefile

@@ -2,7 +2,7 @@
 require 'rubygems'
 require 'bundler'
 Bundler.setup
-require 'rake/dsl_definition' rescue nil
+require 'rake/dsl_definition'
 
 require "bundler/gem_tasks"
 require 'appraisal'
@@ -18,17 +18,8 @@ require 'fileutils'
 Rake::TestTask.new :test do |t|
   t.libs << 'lib'
   t.libs << 'test'
-  test_files = FileList['test/**/*_test.rb']
+  test_files = FileList['test/**/*_{test,spec}.rb']
   test_files.exclude('test/rails/*', 'test/haml/*')
   t.test_files = test_files
   t.verbose = true
 end
-
-Rake::TestTask.new :units do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  test_files = FileList['test/units/**/*_test.rb']
-  test_files.exclude('test/rails/*', 'test/haml/*')
-  t.test_files = test_files
-  t.verbose = true
-end

data/gemfiles/rails31.gemfile

@@ -16,6 +16,7 @@ end
 group :test do
   gem "mocha"
   gem "appraisal"
+  gem "minitest"
 end
 
 gemspec :path => "../"

data/gemfiles/rails32.gemfile

@@ -16,6 +16,7 @@ end
 group :test do
   gem "mocha"
   gem "appraisal"
+  gem "minitest"
 end
 
 gemspec :path => "../"

data/gemfiles/rails40.gemfile

@@ -16,6 +16,7 @@ end
 group :test do
   gem "mocha"
   gem "appraisal"
+  gem "minitest"
 end
 
 gemspec :path => "../"

data/gemfiles/rails42.gemfile

@@ -16,6 +16,7 @@ end
 group :test do
   gem "mocha"
   gem "appraisal"
+  gem "minitest"
 end
 
 gemspec :path => "../"

data/lib/compass-rails.rb

@@ -10,27 +10,6 @@ module CompassRails
 
     extend self
 
-    def load_rails
-      return true if rails_loaded?
-      return if defined?(::Rails) && ::Rails.respond_to?(:application) && !::Rails.application.nil?
-
-      rails_path = Dir.pwd
-      if File.exists?(File.join(rails_path, 'config', 'application.rb'))
-        raise 'Rails application not found' if rails_config_path == '/'
-        rails_config_path = File.join(rails_config_path, '..')
-        #load the rails config
-        require "#{rails_config_path}/config/application.rb"
-        require 'sass-rails'
-        require 'sprockets/railtie'
-        @app ||= ::Rails.application.initialize!
-        require 'rails/engine'
-        return true
-      end
-
-      false
-    end
-
-
     def setup_fake_rails_env_paths(sprockets_env)
       return unless rails_loaded?
       keys = ['app/assets', 'lib/assets', 'vendor/assets']
@@ -46,17 +25,14 @@ module CompassRails
     end
 
     def sass_config
-      load_rails
       ::Rails.application.config.sass
     end
 
     def sprockets
-      load_rails
       @sprockets ||= ::Rails.application.assets
     end
 
     def context
-      load_rails
       @context ||= begin
         sprockets.version = ::Rails.env + "-#{sprockets.version}"
         setup_fake_rails_env_paths(sprockets)
@@ -70,10 +46,6 @@ module CompassRails
       end
     end
 
-    def installer(*args)
-      CompassRails::Installer.new(*args)
-    end
-
     def rails_loaded?
       defined?(::Rails)
     end
@@ -100,23 +72,10 @@ module CompassRails
     end
 
     def version_match(version)
-      if (rails_version =~ version).nil?
-        return false
-      end
-
-      true
-    end
-
-    def booted!
-      CompassRails.const_set(:BOOTED, true)
-    end
-
-    def booted?
-      defined?(CompassRails::BOOTED) && CompassRails::BOOTED
+      !(rails_version =~ version).nil?
     end
 
     def configuration
-      load_rails
       config = Compass::Configuration::Data.new('rails')
       config.extend(CompassRails::Configuration)
       config
@@ -126,50 +85,6 @@ module CompassRails
       ::Rails.application.config.assets.prefix
     end
 
-    def env_production?
-      if defined?(::Rails) && ::Rails.respond_to?(:env)
-        ::Rails.env.production?
-      elsif defined?(RAILS_ENV)
-        RAILS_ENV == "production"
-      end
-    end
-
-    def root
-      @root ||= begin
-        if defined?(::Rails) && ::Rails.respond_to?(:root)
-          ::Rails.root
-        elsif defined?(RAILS_ROOT)
-          Pathname.new(RAILS_ROOT)
-        else
-          Pathname.new(Dir.pwd)
-        end
-      end
-    end
-
-    def check_for_double_boot!
-      if booted?
-        Compass::Util.compass_warn("Warning: Compass was booted twice. Compass-rails has got your back; please remove your compass initializer.")
-      else
-        booted!
-      end
-    end
-
-    def sass_plugin_enabled?
-      unless rails31?
-        defined?(Sass::Plugin) && !Sass::Plugin.options[:never_update]
-      end
-    end
-
-    # Rails projects without asset pipeline use this in their compass initializer.
-    def initialize!(config = nil)
-      check_for_double_boot!
-      config ||= Compass.detect_configuration_file(root)
-      Compass.add_project_configuration(config, :project_type => :rails)
-      Compass.discover_extensions!
-      Compass.configure_sass_plugin!
-      Compass.handle_configuration_change! if sass_plugin_enabled?
-    end
-
     def configure_rails!(app)
       return unless app.config.respond_to?(:sass)
       sass_config = app.config.sass
@@ -192,31 +107,6 @@ module CompassRails
       end
     end
 
-    def boot_config
-      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
-    end
-
-  def asset_pipeline_enabled?
-    return false unless rails_loaded? && ::Rails.respond_to?(:application) && !::Rails.application.nil?
-    rails_config = ::Rails.application.config
-    if rails_config.respond_to?(:assets)
-      rails_config.assets.enabled != false
-    else
-      false
-    end
-  end
-
   private
 
     # sets the sass config value only if the corresponding compass-based setting
@@ -231,10 +121,7 @@ end
 
 if defined?(::Rails)
   Compass::AppIntegration.register(:rails, "::CompassRails")
-  Compass.add_configuration(CompassRails.boot_config)
-
   require "compass-rails/patches"
   require "compass-rails/railties"
-  require "compass-rails/installer"
 end
 

data/lib/compass-rails/patches.rb

@@ -1,6 +1,3 @@
 if CompassRails.rails31? || CompassRails.rails32?
-  CompassRails.load_rails
   require 'compass-rails/patches/importer'
-elsif CompassRails.rails4?
-  CompassRails.load_rails
 end

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

@@ -4,18 +4,16 @@ module Compass
     attr_accessor :sass_options
     STYLESHEET = /stylesheet/
     def sass_options
-      if CompassRails.asset_pipeline_enabled?
-        @sass_options[:custom] ||= {}
-        @sass_options[:custom] = {:resolver => ::Sass::Rails::Resolver.new(CompassRails.context)}
-        @sass_options[:load_paths] ||= []
-        unless @sass_options[:load_paths].any? {|k| k.is_a?(::Sass::Rails::Importer) }
-          ::Rails.application.assets.paths.each do |path|
-            next unless path.to_s =~ STYLESHEET
-            Dir["#{path}/**/*"].each do |pathname|
-              # args are: sprockets environment, the logical_path ex. 'stylesheets', and the full path name for the render
-              context = ::CompassRails.context.new(::Rails.application.assets, File.basename(path), Pathname.new(pathname))
-              @sass_options[:load_paths] << ::Sass::Rails::Importer.new(context)
-            end
+      @sass_options[:custom] ||= {}
+      @sass_options[:custom] = {:resolver => ::Sass::Rails::Resolver.new(CompassRails.context)}
+      @sass_options[:load_paths] ||= []
+      unless @sass_options[:load_paths].any? {|k| k.is_a?(::Sass::Rails::Importer) }
+        ::Rails.application.assets.paths.each do |path|
+          next unless path.to_s =~ STYLESHEET
+          Dir["#{path}/**/*"].each do |pathname|
+            # args are: sprockets environment, the logical_path ex. 'stylesheets', and the full path name for the render
+            context = ::CompassRails.context.new(::Rails.application.assets, File.basename(path), Pathname.new(pathname))
+            @sass_options[:load_paths] << ::Sass::Rails::Importer.new(context)
           end
         end
       end

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

@@ -34,7 +34,15 @@ klass.class_eval do
     engine = ::Sass::Engine.new(data, options)
 
     engine.dependencies.map do |dependency|
-      context.depend_on(dependency.options[:filename])
+      filename = dependency.options[:filename]
+      if filename.include?('*') # Handle sprite globs
+        image_path = Rails.root.join(Compass.configuration.images_dir).to_s
+        Dir[File.join(image_path, filename)].each do |f|
+          context.depend_on(f)
+        end
+      else
+        context.depend_on(filename)
+      end
     end
 
     engine.render
@@ -57,17 +65,17 @@ klass.class_eval do
       self.class.parent::SassImporter.new(path)
     else
       self.class.parent::SassImporter.new(context, path)
-    end 
+    end
   end
 
   def sprockets_cache_store
     case Rails.application.config.assets.cache_store
-      when :null_store
-        Sprockets::Cache::NullStore.new
-      when :memory_store, :mem_cache_store
-        Sprockets::Cache::MemoryStore.new
-      else
-        Sprockets::Cache::FileStore.new(Dir::tmpdir)
+    when :null_store
+      Sprockets::Cache::NullStore.new
+    when :memory_store, :mem_cache_store
+      Sprockets::Cache::MemoryStore.new
+    else
+      Sprockets::Cache::FileStore.new(Dir::tmpdir)
     end
   end
 end    

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

@@ -3,16 +3,9 @@ module CompassRails
 
     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
-        # that came via the rails boot process.
-        CompassRails.check_for_double_boot!
-        Compass.discover_extensions!
-        CompassRails.configure_rails!(app)
-      else
-        CompassRails.initialize!(app.config.compass)
-      end
+      require 'compass-rails/patches/3_1'
+      Compass.discover_extensions!
+      CompassRails.configure_rails!(app)
     end
 
     config.compass = begin

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

@@ -4,9 +4,6 @@ module CompassRails
     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.
-      CompassRails.check_for_double_boot!
       Compass.discover_extensions!
       CompassRails.configure_rails!(app)
     end
@@ -26,12 +23,6 @@ module CompassRails
               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)

data/lib/compass-rails/version.rb

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

data/test/{integrations/rails_test.rb → compass_rails_spec.rb}

@@ -1,36 +1,37 @@
 require 'test_helper'
 
-class RailsTest < Test::Unit::TestCase
+describe CompassRails do
   include CompassRails::Test::RailsHelpers
 
-  def test_rails_app_created
+  it "compiles a basic compass stylesheet" do
     within_rails_app('test_railtie') do |project|
+      project.setup_asset_fixtures!
+
       assert project.boots?
-    end
-  end
 
-  def test_rails_assets_precompile
-    within_rails_app('test_railtie') do |project|
-      rm(project.file("app/assets/javascripts/application.js"))
-      rm(project.file("app/assets/stylesheets/application.css"))
-      touch(project.file("app/assets/stylesheets/application.css.sass"))
-      assert project.precompiles?, "Missing compiled css after assets:precompile"
-    end
-  end
+      project.precompile!
 
-  def test_sass_preferred_syntax
-    within_rails_app('test_railtie') do |project|
-      assert_equal "scss", project.rails_property("sass.preferred_syntax")
-      project.set_rails('sass.preferred_syntax', :sass)
-      assert_equal "sass", project.rails_property("sass.preferred_syntax")
+      project.compiled_stylesheet 'public/assets/application*.css' do |css|
+        refute css.empty?
+        assert_match 'body container', css
+        assert_match "-webkit-linear-gradient", css
+        assert_match "-moz-border-radius", css
+        assert_match '.numbers-sprite-1', css
+        assert_match '.numbers-sprite-2', css
+      end
     end
   end
 
-  def test_compass_css_dir
+  it "supports rails config arguments" do
     within_rails_app('test_railtie') do |project|
+      assert_equal "scss", project.rails_property("sass.preferred_syntax")
       assert_equal "public/assets", project.rails_property("compass.css_dir")
+
+      project.set_rails('sass.preferred_syntax', :sass)
       project.set_rails('compass.css_dir', "public/stylesheets")
+
+      assert_equal "sass", project.rails_property("sass.preferred_syntax")
       assert_equal "public/stylesheets", project.rails_property("compass.css_dir")
     end
-  end
-end
+  end unless ENV['DEBUG_COMPILE']
+end

data/test/fixtures/assets/stylesheets/application.css.scss

@@ -0,0 +1,19 @@
+// Import Compass
+@import "compass";
+
+// Glob import SCSS partials
+@import "partials/*";
+
+// Import Sprites and Inline them to save
+$numbers-inline: true;
+@import "numbers/sprite-*.png";
+@include all-numbers-sprites;
+
+// Try out some compass stuff
+body{
+  @include background-image(linear-gradient(white, #aaaaaa));
+
+  container{
+    @include border-radius(4px, 4px);
+  }
+}

data/test/fixtures/assets/stylesheets/partials/_partial_1.scss

@@ -0,0 +1,3 @@
+.partial1 {
+  display: none;
+}

data/test/fixtures/assets/stylesheets/partials/_partial_2.scss

@@ -0,0 +1,3 @@
+.partial2{
+  display: block;
+}

data/test/helpers/command_helper.rb

@@ -75,14 +75,10 @@ class CompassRails::Test::CommandRunner
   end
 
   def run
-    announce
-    with_clean_env do
-      %x{#{@command}}
-    end
+    with_clean_env { %x{#{@command}} }
   end
 
   def exec
-    announce
     with_clean_env { Kernel.exec(@command) }
   end
 
@@ -96,15 +92,6 @@ class CompassRails::Test::CommandRunner
     restore_env
   end
 
-  def announce
-    return
-    if @gemfile
-      puts ">> BUNDLE_GEMFILE=#{@gemfile} #{@command}"
-    else
-      puts ">> #{@command}"
-    end
-  end
-
   def unset_bundler_env_vars
     BUNDLER_ENV_VARS.each do |key|
       @original_env[key] = ENV[key]

data/test/helpers/file_helper.rb

@@ -3,23 +3,7 @@ module CompassRails
     module FileHelper
       include DebugHelper
 
-      def mkdir_p(dir)
-        debug "Creating Directory: #{dir}"
-        ::FileUtils.mkdir_p dir
-        assert File.directory?(dir), "mkdir_p: #{dir} failed"
-      end
-
-      def rm(path)
-        debug "Removing: #{path}"
-        ::FileUtils.rm(path)
-        assert !File.file?(path), "rm: #{path} failed"
-      end
-
-      def rm_rf(path)
-        debug "Removing: #{path}"
-        ::FileUtils.rm_rf(path)
-        assert !File.directory?(path), "rm_rf: #{path} failed"
-      end
+      delegate :mkdir_p, :rm, :rm_rf, :cp_r, :touch, to: ::FileUtils
 
       def cd(path, &block)
         debug "Entering: #{path}"
@@ -32,11 +16,6 @@ module CompassRails
         File.open(file_name, 'w') { |file| file << content }
       end
 
-      def touch(file)
-        debug "Touching File: #{file}"
-        ::FileUtils.touch(file)
-      end
-
       def inject_into_file(file_name, replacement, position, anchor)
         case position
         when :after

data/test/helpers/rails_helper.rb

@@ -25,39 +25,37 @@ module CompassRails
           RAILS_3_1 => GEMFILES_DIR.join("rails31.gemfile").to_s
         }
 
-        GENERATOR_OPTIONS = Hash.new(['-q', '-G', '-O', '--skip-bundle'])
+        GENERATOR_OPTIONS = ['-q', '-G', '-O', '--skip-bundle']
 
-        GENERATOR_COMMAND = Hash.new("new")
-
-    def rails_command(options)
-      debug "Running Rails command with: rails #{options.join(' ')}"
-      run_command("rails #{options.join(' ')}", GEMFILES[rails_version])
-    end
+      def rails_command(options)
+        debug cmd = "rails #{options.join(' ')}"
+        run_command(cmd, GEMFILES[rails_version])
+      end
 
-    def rails_version
-      @rails_version ||= VERSION_LOOKUP.detect { |version, regex| CompassRails.version_match(regex) }.first
-    end
+      def rails_version
+        @rails_version ||= VERSION_LOOKUP.detect { |version, regex| CompassRails.version_match(regex) }.first
+      end
 
-    # Generate a rails application without polluting our current set of requires
-    # with the rails libraries. This will allow testing against multiple versions of rails
-    # by manipulating the load path.
-    def generate_rails_app(name, options=[])
-      options += GENERATOR_OPTIONS[rails_version]
-      rails_command([GENERATOR_COMMAND[rails_version], name, *options])
-    end
+      # Generate a rails application without polluting our current set of requires
+      # with the rails libraries. This will allow testing against multiple versions of rails
+      # by manipulating the load path.
+      def generate_rails_app(name, options = [])
+        options += GENERATOR_OPTIONS
+        rails_command(['new', name, *options])
+      end
 
-    def within_rails_app(named, asset_pipeline_enabled = true, &block)
-      dir = "#{named}-#{rails_version}"
-      rm_rf File.join(WORKING_DIR, dir)
-      mkdir_p WORKING_DIR
-      cd(WORKING_DIR) do
-        generate_rails_app(dir, asset_pipeline_enabled ? [] : ["-S"])
-        cd(dir) do
-          yield RailsProject.new(File.join(WORKING_DIR, dir), rails_version, asset_pipeline_enabled)
+      def within_rails_app(named, &block)
+        dir = "#{named}-#{rails_version}"
+        rm_rf File.join(WORKING_DIR, dir)
+        mkdir_p WORKING_DIR
+        cd(WORKING_DIR) do
+          generate_rails_app(dir, [])
+          cd(dir) do
+            yield RailsProject.new(File.join(WORKING_DIR, dir), rails_version)
+          end
         end
+        rm_rf File.join(WORKING_DIR, dir) unless ENV['DEBUG_COMPILE']
       end
-      rm_rf File.join(WORKING_DIR, dir)
-    end
 
     end
   end

data/test/helpers/rails_project.rb

@@ -7,20 +7,13 @@ module CompassRails
       include RailsHelpers
       include Kernal::Captures
 
-
-      GEMFILE = 'Gemfile'
-      GEMFILE_LOCK = 'Gemfile.lock'
-      ENVIRONMENT = 'config/environment.rb'
-      COMPASS_CONFIG = 'config/compass.rb'
       APPLICATION_FILE = 'config/application.rb'
-      BOOT_FILE = 'config/boot.rb'
 
-      attr_reader :directory, :version, :asset_pipeline_enabled
+      attr_reader :directory, :version
 
-      def initialize(directory, version, asset_pipeline_enabled = true)
+      def initialize(directory, version)
         @directory = Pathname.new(directory)
         @version = version
-        @asset_pipeline_enabled = asset_pipeline_enabled
       end
 
       ## FILE METHODS
@@ -37,61 +30,40 @@ module CompassRails
         directory.join(path)
       end
 
-      def has_file?(file)
-        File.exist? directory.join(file)
-      end
-
-      def screen_file
-        if asset_pipeline_enabled
-          return directory.join('app', 'assets', 'stylesheets', 'screen.css.scss')
-        else
-          return directory.join('app', 'assets', 'stylesheets','screen.scss')
-        end
-      end
-
-      def has_screen_file?
-        screen_file.exist?
-      end
-
-      def has_compass_import?
-        File.read(screen_file).include?("compass/reset")
-      end
-
-      def has_config?
-        directory.join('config', 'compass.rb').exist?
-      end
-
       # RAILS METHODS
 
-      def rails3?
-        directory.join(APPLICATION_FILE).exist?
-      end
-
       def boots?
         rails_property("compass.project_type") == "rails"
       end
 
-      def precompiles?
+      def precompile!
         run_command("rake assets:precompile", GEMFILES[version])
-        !Dir[file("public/assets/application*.css")].empty?
       end
 
-      def rails_property(key)
-        rails_command(['runner', "'puts Rails.application.config.#{key}'"]).chomp
+      def setup_asset_fixtures!
+        rm_rf file("app/assets")
+        cp_r CompassRails::Test.root.join('test', 'fixtures', 'assets'), file("app")
       end
 
-      # COMPASS METHODS
+      def precompiled?(path)
+        !Dir[asset_path(path)].empty?
+      end
 
-      def run_compass(command)
-        run_command("compass #{command}", GEMFILES[version])
+      def compiled_stylesheet(path, &block)
+        File.open(asset_path(path)).read.tap do |css|
+          debug(css)
+          yield css if block_given?
+        end
       end
 
-      def set_compass(property, value)
-        file = directory.join(COMPASS_CONFIG)
-        unless file.exist?
-          touch file
+      def asset_path(path_pattern)
+        Dir[file(path_pattern)].first.tap do |asset|
+          raise 'Asset not found' if asset.nil?
         end
-        inject_at_bottom(file, "#{property} = '#{value}'")
+      end
+
+      def rails_property(key)
+        rails_command(['runner', "'puts Rails.application.config.#{key}'"]).chomp
       end
 
       def set_rails(property, value)
@@ -99,20 +71,6 @@ module CompassRails
         inject_into_file(directory.join(APPLICATION_FILE), value, :after, 'class Application < Rails::Application')
       end
 
-    private
-
-      ## GEM METHODS
-
-      def add_to_gemfile(name, requirements)
-        gemfile = directory.join(GEMFILE)
-        debug "Adding gem #{name} to file: #{gemfile}"
-        if requirements
-          gem_string = "  gem '#{name}', #{requirements}\n"
-        else
-          gem_string = "  gem '#{name}'\n"
-        end
-        inject_at_bottom(gemfile, gem_string)
-      end
     end
   end
 end

data/test/test_helper.rb

@@ -1,9 +1,14 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'compass-rails'
+require 'active_support/all'
 
 module CompassRails
   module Test
     ROOT_PATH = File.expand_path('../../', __FILE__)
+
+    def self.root
+      Pathname.new(ROOT_PATH)
+    end
   end
 end
 
@@ -11,4 +16,5 @@ end
   require File.join(File.expand_path('../', __FILE__), 'helpers', "#{helper}_helper")
 end
 
-require File.join(File.expand_path('../', __FILE__), 'helpers', "rails_project")
+require File.join(File.expand_path('../', __FILE__), 'helpers', "rails_project")
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: compass-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Scott Davis
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-04 00:00:00.000000000 Z
+date: 2015-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: compass
@@ -79,7 +79,6 @@ files:
 - gemfiles/rails42.gemfile
 - lib/compass-rails.rb
 - lib/compass-rails/configuration.rb
-- lib/compass-rails/installer.rb
 - lib/compass-rails/patches.rb
 - lib/compass-rails/patches/3_1.rb
 - lib/compass-rails/patches/4_0.rb
@@ -93,16 +92,19 @@ files:
 - lib/compass-rails/railties/4_0.rb
 - lib/compass-rails/version.rb
 - sache.json
+- test/compass_rails_spec.rb
 - test/fixtures/.gitkeep
+- test/fixtures/assets/images/numbers/sprite-1.png
+- test/fixtures/assets/images/numbers/sprite-2.png
+- test/fixtures/assets/stylesheets/application.css.scss
+- test/fixtures/assets/stylesheets/partials/_partial_1.scss
+- test/fixtures/assets/stylesheets/partials/_partial_2.scss
 - test/helpers/command_helper.rb
 - test/helpers/debug_helper.rb
 - test/helpers/file_helper.rb
 - test/helpers/rails_helper.rb
 - test/helpers/rails_project.rb
-- test/integrations/.gitkeep
-- test/integrations/rails_test.rb
 - test/test_helper.rb
-- test/units/.gitkeep
 homepage: https://github.com/Compass/compass-rails
 licenses:
 - MIT
@@ -128,14 +130,17 @@ signing_key:
 specification_version: 4
 summary: Integrate Compass into Rails 3.0 and up.
 test_files:
+- test/compass_rails_spec.rb
 - test/fixtures/.gitkeep
+- test/fixtures/assets/images/numbers/sprite-1.png
+- test/fixtures/assets/images/numbers/sprite-2.png
+- test/fixtures/assets/stylesheets/application.css.scss
+- test/fixtures/assets/stylesheets/partials/_partial_1.scss
+- test/fixtures/assets/stylesheets/partials/_partial_2.scss
 - test/helpers/command_helper.rb
 - test/helpers/debug_helper.rb
 - test/helpers/file_helper.rb
 - test/helpers/rails_helper.rb
 - test/helpers/rails_project.rb
-- test/integrations/.gitkeep
-- test/integrations/rails_test.rb
 - test/test_helper.rb
-- test/units/.gitkeep
 has_rdoc: 

data/lib/compass-rails/installer.rb

@@ -1,30 +0,0 @@
-module CompassRails
-  class Installer < Compass::Installers::ManifestInstaller
-
-    SASS_FILE_REGEX = %r{(.*)(?:\.css)?\.(sass|scss)}
-
-    def completed_configuration
-      @completed_configuration ||= CompassRails.configuration
-    end
-
-    def install_stylesheet(from, to, options)
-      if CompassRails.rails_loaded? && CompassRails.asset_pipeline_enabled?
-        _, name, ext = SASS_FILE_REGEX.match(to).to_a
-        to = "#{name}.css.#{ext}"
-      end
-      super(from, to, options)
-    end
-
-    def write_configuration_files
-      config_file = CompassRails.root.join('config', 'compass.rb')
-      unless config_file.exist?
-        write_file config_file.to_s, CompassRails.configuration.serialize
-      end
-    end
-
-    def prepare
-      write_configuration_files
-    end
-
-  end
-end