compass-rails 2.0.0 → 3.1.0

data/test/helpers/rails_helper.rb

@@ -1,59 +1,70 @@
-
 module CompassRails
   module Test
     module RailsHelpers
       include FileHelper
       include DebugHelper
       include CommandHelper
+        RAILS_5_2   = "5.2"
+        RAILS_5_1   = "5.1"
+        RAILS_5_0   = "5.0"
+        RAILS_4_2   = "4.2"
         RAILS_4_0   = "4.0"
         RAILS_3_2   = "3.2"
         RAILS_3_1   = "3.1"
 
         WORKING_DIR = File.join(ROOT_PATH, 'rails-temp')
 
+        VERSION_LOOKUP = {
+          RAILS_5_2 => %r{^5\.2\.},
+          RAILS_5_1 => %r{^5\.1\.},
+          RAILS_5_0 => %r{^5\.0\.},
+          RAILS_4_2 => %r{^4\.2\.},
+          RAILS_4_0 => %r{^4\.0\.},
+          RAILS_3_2 => %r{^3\.2\.},
+          RAILS_3_1 => %r{^3\.1\.},
+        }
+
         GEMFILES = {
+          RAILS_5_2 => GEMFILES_DIR.join("rails_edge.gemfile").to_s,
+          RAILS_5_1 => GEMFILES_DIR.join("rails51.gemfile").to_s,
+          RAILS_5_0 => GEMFILES_DIR.join("rails50.gemfile").to_s,
+          RAILS_4_2 => GEMFILES_DIR.join("rails42.gemfile").to_s,
           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
         }
 
-        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']
-        }
+        GENERATOR_OPTIONS = ['-q', '-G', '-O', '--skip-bundle']
 
-        GENERATOR_COMMAND = {
-          RAILS_4_0 => 'new',
-          RAILS_3_2 => 'new',
-          RAILS_3_1 => 'new'
-        }
+      def rails_command(options)
+        debug cmd = "rails #{options.join(' ')}"
+        run_command(cmd, GEMFILES[rails_version])
+      end
 
-    def rails_command(options, version)
-      debug(Rainbow("Running Rails command with: rails #{options.join(' ')}").foreground(:cyan))
-      run_command("rails #{options.join(' ')}", GEMFILES[version])
-    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, version, options=[])
-      options += GENERATOR_OPTIONS[version]
-      rails_command([GENERATOR_COMMAND[version], name, *options], version)
-    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, version, asset_pipeline_enabled = true, &block)
-      dir = "#{named}-#{version}"
-      rm_rf File.join(WORKING_DIR, dir)
-      mkdir_p WORKING_DIR
-      cd(WORKING_DIR) do
-        generate_rails_app(dir, version, asset_pipeline_enabled ? [] : ["-S"])
-        cd(dir) do
-          yield RailsProject.new(File.join(WORKING_DIR, dir), 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,21 +7,14 @@ 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
+        disable_cookies! if version == '3.1'
       end
 
       ## FILE METHODS
@@ -34,89 +27,56 @@ module CompassRails
         File.basename(directory)
       end
 
-      def has_file?(file)
-        File.exist? directory.join(file)
+      def file(path)
+        directory.join(path)
       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
+      # RAILS METHODS
 
-      def has_screen_file?
-        screen_file.exist?
+      def boots?
+        rails_property("compass.project_type") == "rails"
       end
 
-      def has_compass_import?
-        File.read(screen_file).include?("compass/reset")
+      def precompile!
+        run_command("rake assets:precompile", GEMFILES[version])
       end
 
-      def has_config?
-        directory.join('config', 'compass.rb').exist?
+      def setup_asset_fixtures!
+        rm_rf file("app/assets")
+        cp_r CompassRails::Test.root.join('test', 'fixtures', 'assets'), file("app")
       end
 
-      # RAILS METHODS
-
-      def rails3?
-        directory.join(APPLICATION_FILE).exist?
+      def precompiled?(path)
+        !Dir[asset_path(path)].empty?
       end
 
-      def boots?
-        string = 'THIS IS MY RANDOM AWESOME TEST STRING'
-        test_string = "puts \"#{string}\""
-        matcher = %r{#{string}}
-        r = runner(test_string)
-        if r =~ matcher
-          return true
-        else
-          return false
+      def compiled_stylesheet(path, &block)
+        File.open(asset_path(path)).read.tap do |css|
+          debug(css)
+          yield css if block_given?
         end
       end
 
-      def runner(string)
-        rails_command(['runner', "'#{string}'"], version)
-      end
-
-      # COMPASS METHODS
-
-      def run_compass(command)
-        run_command("compass #{command}", GEMFILES[version])
+      def asset_path(path_pattern)
+        Dir[file(path_pattern)].first.tap do |asset|
+          raise 'Asset not found' if asset.nil?
+        end
       end
 
-      def set_compass(property, value)
-        file = directory.join(COMPASS_CONFIG)
-        unless file.exist?
-          touch file
-        end
-        inject_at_bottom(file, "#{property} = '#{value}'")
+      def rails_property(key)
+        rails_command(['runner', "'puts Rails.application.config.#{key}'"]).chomp
       end
 
       def set_rails(property, value)
-        value = if value.is_a?(Symbol)
-          "\n    config.#{property} = :#{value}\n"
-        else
-          "\n    config.#{property} = '#{value}'\n"
-        end
+        value = "\n    config.#{property} = #{value.inspect}\n"
         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(Rainbow("Adding gem #{name} to file: #{gemfile}").foreground(:green))
-        if requirements
-          gem_string = "  gem '#{name}', #{requirements}\n"
-        else
-          gem_string = "  gem '#{name}'\n"
-        end
-        inject_at_bottom(gemfile, gem_string)
+      def disable_cookies!
+        value = "\n    config.middleware.delete 'ActionDispatch::Session::CookieStore'\n"
+        inject_into_file(directory.join(APPLICATION_FILE), value, :after, 'class Application < Rails::Application')
       end
+
     end
   end
 end

data/test/test_helper.rb

@@ -1,10 +1,14 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'compass-rails'
-require 'rainbow'
+require 'active_support/all'
 
 module CompassRails
   module Test
     ROOT_PATH = File.expand_path('../../', __FILE__)
+
+    def self.root
+      Pathname.new(ROOT_PATH)
+    end
   end
 end
 
@@ -12,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.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Scott Davis
@@ -10,22 +10,50 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-10 00:00:00.000000000 Z
+date: 2018-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: compass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: sprockets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: sass-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
 description: Integrate Compass into Rails 3.0 and up.
 email:
 - jetviper21@gmail.com
@@ -38,19 +66,22 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - Appraisals
+- CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENSE
 - README.md
 - Rakefile
-- changelog.markdown
 - compass-rails.gemspec
 - gemfiles/rails31.gemfile
 - gemfiles/rails32.gemfile
 - gemfiles/rails40.gemfile
+- gemfiles/rails42.gemfile
+- gemfiles/rails50.gemfile
+- gemfiles/rails51.gemfile
+- gemfiles/rails_edge.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
@@ -64,18 +95,21 @@ 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/letters/a.png
+- test/fixtures/assets/images/letters/b.png
+- 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_31_test.rb
-- test/integrations/rails_32_test.rb
-- test/integrations/rails_40_test.rb
 - test/test_helper.rb
-- test/units/.gitkeep
 homepage: https://github.com/Compass/compass-rails
 licenses:
 - MIT
@@ -101,16 +135,18 @@ 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/letters/a.png
+- test/fixtures/assets/images/letters/b.png
+- 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_31_test.rb
-- test/integrations/rails_32_test.rb
-- test/integrations/rails_40_test.rb
 - test/test_helper.rb
-- test/units/.gitkeep
-has_rdoc: 

data/changelog.markdown

@@ -1,11 +0,0 @@
-# Compass Rails
-
-## 2.0.alpha.0
-
-* Removed rails 2.x support
-* Added Alpha support for rails 4
-
-## 1.0.3
-
-* StaticCompiler hack so sprite source files dont show up in manifest
-* Compass version bump to 0.12.2

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

data/test/integrations/rails_31_test.rb

@@ -1,46 +0,0 @@
-require 'test_helper'
-
-class Rails31Test < Test::Unit::TestCase
-  include CompassRails::Test::RailsHelpers
-
-  RAILS_VERSION = RAILS_3_1
-
-  def test_rails_app_created
-    within_rails_app('test_railtie', RAILS_VERSION) do |project|
-      assert project.boots?
-    end
-  end
-
-  def test_installs_compass
-    within_rails_app('test_railtie', RAILS_VERSION) 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) do |project|
-      project.run_compass('init')
-      project.run_compass('compile')
-      assert project.directory.join('public/assets/screen.css').exist?
-    end
-  end
-
-  def test_install_blueprint
-    within_rails_app('test_railtie', RAILS_VERSION) do |project|
-      project.run_compass('init')
-      project.run_compass('install blueprint --force')
-      assert project.directory.join('app/assets/stylesheets/partials').directory?
-    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

data/test/integrations/rails_32_test.rb

@@ -1,46 +0,0 @@
-require 'test_helper'
-
-class Rails32Test < Test::Unit::TestCase
-  include CompassRails::Test::RailsHelpers
-
-  RAILS_VERSION = RAILS_3_2
-
-  def test_rails_app_created
-    within_rails_app('test_railtie', RAILS_VERSION) do |project|
-      assert project.boots?
-    end
-  end
-
-  def test_installs_compass
-    within_rails_app('test_railtie', RAILS_VERSION) 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) do |project|
-      project.run_compass('init')
-      project.run_compass('compile')
-      assert project.directory.join('public/assets/screen.css').exist?
-    end
-  end
-
-  def test_install_blueprint
-    within_rails_app('test_railtie', RAILS_VERSION) do |project|
-      project.run_compass('init')
-      project.run_compass('install blueprint --force')
-      assert project.directory.join('app/assets/stylesheets/partials').directory?
-    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

data/test/integrations/rails_40_test.rb

@@ -1,46 +0,0 @@
-require 'test_helper'
-
-class Rails40Test < Test::Unit::TestCase
-  include CompassRails::Test::RailsHelpers
-
-  RAILS_VERSION = RAILS_4_0
-
-  def test_rails_app_created
-    within_rails_app('test_railtie', RAILS_VERSION) do |project|
-      assert project.boots?
-    end
-  end
-
-  def test_installs_compass
-    within_rails_app('test_railtie', RAILS_VERSION) 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) do |project|
-      project.run_compass('init')
-      project.run_compass('compile')
-      assert project.directory.join('public/assets/screen.css').exist?
-    end
-  end
-
-  def test_install_blueprint
-    within_rails_app('test_railtie', RAILS_VERSION) do |project|
-      project.run_compass('init')
-      project.run_compass('install blueprint --force')
-      assert project.directory.join('app/assets/stylesheets/partials').directory?
-    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