compass-rails 1.0.3 → 1.1.0

data/lib/compass-rails.rb

@@ -4,6 +4,7 @@ require "compass-rails/configuration"
 
 module CompassRails
 
+    RAILS_4 = %r{^4.[0|1]}
     RAILS_32 = %r{^3.2}
     RAILS_31 = %r{^3.1}
     RAILS_23 = %r{^2.3}
@@ -12,6 +13,7 @@ module CompassRails
     extend self
 
     def load_rails
+      return true if rails_loaded?
       return if defined?(::Rails) && ::Rails.respond_to?(:application) && !::Rails.application.nil?
 
       rails_config_path = Dir.pwd
@@ -21,7 +23,7 @@ module CompassRails
       end
       #load the rails config
       require "#{rails_config_path}/config/application.rb"
-      if rails31? || rails32?
+      if rails31? || rails32? || rails4?
         require 'sass-rails'
         require 'sprockets/railtie'
         require 'rails/engine'
@@ -85,21 +87,30 @@ module CompassRails
 
     def rails3?
       return false unless defined?(::Rails)
-      rails_version =~ RAILS_3
+      version_match RAILS_3
     end
 
     def rails31?
       return false unless defined?(::Rails)
-      rails_version =~ RAILS_31
+      version_match RAILS_31
     end
 
     def rails32?
       return false unless defined?(::Rails)
-      rails_version =~ RAILS_32
+      version_match RAILS_32
     end
 
-    def rails2?
-      rails_version =~ RAILS_23
+    def rails4?
+      return false unless defined?(::Rails)
+      version_match RAILS_4
+    end
+
+    def version_match(version)
+      if (rails_version =~ version).nil?
+        return false
+      end
+
+      true
     end
 
     def booted!
@@ -111,10 +122,10 @@ module CompassRails
     end
 
     def configuration
-      load_rails unless rails2?
+      load_rails
       config = Compass::Configuration::Data.new('rails')
       config.extend(Configuration::Default)
-      if (rails31? || rails32?)
+      if (rails31? || rails32? || rails4?)
         if asset_pipeline_enabled?
           require "compass-rails/configuration/3_1"
           config.extend(Configuration::Rails3_1)
@@ -210,7 +221,11 @@ module CompassRails
   def asset_pipeline_enabled?
     return false unless rails_loaded?
     rails_config = ::Rails.application.config
-    rails_config.respond_to?(:assets) && rails_config.assets.try(:enabled)
+    unless rails4?
+      rails_config.respond_to?(:assets) && rails_config.assets.try(:enabled)
+    else
+      rails_config.respond_to?(:assets)
+    end
   end
 
   private

data/test/helpers/file_helper.rb

@@ -50,4 +50,4 @@ module CompassRails
 
     end
   end
-end
+end

data/test/helpers/rails_helper.rb

@@ -5,32 +5,32 @@ module CompassRails
       include FileHelper
       include DebugHelper
       include CommandHelper
+        RAILS_4_0   = "4.0"
         RAILS_3_2   = "3.2"
         RAILS_3_1   = "3.1"
         RAILS_3     = "3.0"
-        RAILS_2     = "2.3"
 
         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_2   => GEMFILES_DIR.join("rails2.gemfile").to_s
+          RAILS_3   => GEMFILES_DIR.join("rails3.gemfile").to_s
         }
-        
-        GENERTOR_OPTIONS = {
+
+        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_2   => ['-q']
+          RAILS_3   => ['-q', '-G', '-O', '--skip-bundle']
         }
-        
+
         GENERATOR_COMMAND = {
+          RAILS_4_0 => 'new',
           RAILS_3_2 => 'new',
           RAILS_3_1 => 'new',
-          RAILS_3   => 'new',
-          RAILS_2   => ''
+          RAILS_3   => 'new'
         }
 
     def rails_command(options, version)
@@ -42,24 +42,23 @@ module CompassRails
     # 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 += GENERTOR_OPTIONS[version]
+      options += GENERATOR_OPTIONS[version]
       rails_command([GENERATOR_COMMAND[version], name, *options], version)
     end
 
-    def within_rails_app(named, version, &block)
+    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)
+        generate_rails_app(dir, version, asset_pipeline_enabled ? [] : ["-S"])
         cd(dir) do
-          yield RailsProject.new(File.join(WORKING_DIR, dir), version)
+          yield RailsProject.new(File.join(WORKING_DIR, dir), version, asset_pipeline_enabled)
         end
       end
       rm_rf File.join(WORKING_DIR, dir)
     end
-    
 
     end
   end
-end
+end

data/test/helpers/rails_project.rb

@@ -16,16 +16,16 @@ module CompassRails
       BOOT_FILE = 'config/boot.rb'
 
 
-      attr_reader :directory, :version
+      attr_reader :directory, :version, :asset_pipeline_enabled
 
-      def initialize(directory, version)
+      def initialize(directory, version, asset_pipeline_enabled = true)
         @directory = Pathname.new(directory)
         @version = version
-        configure_for_bundler!
+        @asset_pipeline_enabled = asset_pipeline_enabled
       end
 
       ## FILE METHODS
-        
+
       def to_s
         directory_name
       end
@@ -39,10 +39,9 @@ module CompassRails
       end
 
       def screen_file
-        case version
-        when RAILS_3_1, RAILS_3_2
+        if asset_pipeline_enabled
           return directory.join('app', 'assets', 'stylesheets', 'screen.css.scss')
-        when RAILS_2, RAILS_3
+        else
           return directory.join('app', 'assets', 'stylesheets','screen.scss')
         end
       end
@@ -65,10 +64,6 @@ module CompassRails
         directory.join(APPLICATION_FILE).exist?
       end
 
-      def rails2?
-        directory.join(BOOT_FILE).exist? && !directory.join(APPLICATION_FILE).exist?
-      end
-
       def boots?
         string = 'THIS IS MY RANDOM AWESOME TEST STRING'
         test_string = "puts \"#{string}\""
@@ -82,12 +77,7 @@ module CompassRails
       end
 
       def runner(string)
-        case version
-        when RAILS_3_1, RAILS_3, RAILS_3_2
-          rails_command(['runner', "'#{string}'"], version)
-        when RAILS_2
-          run_command("script/runner '#{string}'", GEMFILES[version])
-        end
+        rails_command(['runner', "'#{string}'"], version)
       end
 
       # COMPASS METHODS
@@ -110,57 +100,13 @@ module CompassRails
         else
           "\n    config.#{property} = '#{value}'\n"
         end
-        inject_into_file(directory.join(APPLICATION_FILE), value, :after, '# Enable the asset pipeline')
+        inject_into_file(directory.join(APPLICATION_FILE), value, :after, 'class Application < Rails::Application')
       end
 
       ## GEM METHODS
 
       def configure_for_bundler!
-        return if [RAILS_3_1, RAILS_3, RAILS_3_2].include?(version)
-        bundle = <<-BUNDLER
-        class Rails::Boot
-          def run
-            load_initializer
-
-            Rails::Initializer.class_eval do
-              def load_gems
-                @bundler_loaded ||= Bundler.require :default, Rails.env
-              end
-            end
-
-            Rails::Initializer.run(:set_load_path)
-          end
-        end
-        BUNDLER
-        inject_into_file(directory.join('config/boot.rb'), bundle, :before, 'Rails.boot!')
-
-        touch directory.join('config/preinitializer.rb')
-        preinit = <<-PREINIT
-          begin
-            require "rubygems"
-            require "bundler"
-          rescue LoadError
-            raise "Could not load the bundler gem. Install it with `gem install bundler`."
-          end
-
-          if Gem::Version.new(Bundler::VERSION) <= Gem::Version.new("0.9.24")
-            raise RuntimeError, "Your bundler version is too old for Rails 2.3." +
-             "Run `gem install bundler` to upgrade."
-          end
-
-          begin
-            # Set up load paths for all bundled gems
-            ENV["BUNDLE_GEMFILE"] = File.expand_path("../../Gemfile", __FILE__)
-            Bundler.setup
-          rescue Bundler::GemNotFound
-            raise RuntimeError, "Bundler couldn't find some gems." +
-              "Did you run `bundle install`?"
-          end
-        PREINIT
-        inject_at_bottom(directory.join('config/preinitializer.rb'), preinit)
-
-        touch directory.join('Gemfile')
-
+        Rails.logger.warn("This method is deprecated") && return
       end
 
       def bundle
@@ -183,4 +129,4 @@ module CompassRails
       end
     end
   end
-end
+end

data/test/integrations/rails3_test.rb

@@ -4,13 +4,13 @@ class Rails3Test < Test::Unit::TestCase
   RAILS_VERSION = RAILS_3
 
   def test_rails_app_created
-    within_rails_app('test_railtie', RAILS_VERSION) do |project|
+    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) do |project|
+    within_rails_app('test_railtie', RAILS_VERSION, false) do |project|
       project.run_compass('init')
       assert project.has_config?
       assert project.has_screen_file?
@@ -19,7 +19,7 @@ class Rails3Test < Test::Unit::TestCase
   end
 
   def test_compass_compile
-    within_rails_app('test_railtie', RAILS_VERSION) do |project|
+    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?
@@ -27,7 +27,7 @@ class Rails3Test < Test::Unit::TestCase
   end
 
   def test_install_blueprint
-    within_rails_app('test_railtie', RAILS_VERSION) do |project|
+    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?

data/test/integrations/rails_32_without_pipeline_test.rb

@@ -0,0 +1,37 @@
+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

data/test/integrations/{rails_23_test.rb → rails_40_test.rb}

@@ -1,7 +1,7 @@
 require 'test_helper'
-class Rails23Test < Test::Unit::TestCase
+class Rails40Test < Test::Unit::TestCase
   include CompassRails::Test::RailsHelpers
-  RAILS_VERSION = RAILS_2
+  RAILS_VERSION = RAILS_4_0
 
   def test_rails_app_created
     within_rails_app('test_railtie', RAILS_VERSION) do |project|
@@ -9,6 +9,7 @@ class Rails23Test < Test::Unit::TestCase
     end
   end
 
+
   def test_installs_compass
     within_rails_app('test_railtie', RAILS_VERSION) do |project|
       project.run_compass('init')
@@ -18,11 +19,28 @@ class Rails23Test < Test::Unit::TestCase
     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
 
-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

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: compass-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.3
   prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - Scott Davis
@@ -10,12 +10,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-26 00:00:00.000000000 Z
+date: 2013-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: compass
-  requirement: &70221156370480 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -23,13 +21,24 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: '0.14'
+    none: false
+  name: compass
   type: :runtime
   prerelease: false
-  version_requirements: *70221156370480
-description: Integrate Compass into Rails 2.3 and up.
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.12.2
+    - - <
+      - !ruby/object:Gem::Version
+        version: '0.14'
+    none: false
+description: Integrate Compass into Rails 3.0 and up.
 email:
 - jetviper21@gmail.com
 - chris@eppsteins.net
+- craig.mcnamara@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -42,15 +51,12 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- changelog.markdown
 - compass-rails.gemspec
-- gemfiles/rails2.gemfile
-- gemfiles/rails2.gemfile.lock
 - gemfiles/rails3.gemfile
-- gemfiles/rails3.gemfile.lock
 - gemfiles/rails31.gemfile
-- gemfiles/rails31.gemfile.lock
 - gemfiles/rails32.gemfile
-- gemfiles/rails32.gemfile.lock
+- gemfiles/rails40.gemfile
 - lib/compass-rails.rb
 - lib/compass-rails/configuration.rb
 - lib/compass-rails/configuration/3_1.rb
@@ -58,13 +64,16 @@ files:
 - lib/compass-rails/installer.rb
 - lib/compass-rails/patches.rb
 - lib/compass-rails/patches/3_1.rb
+- lib/compass-rails/patches/4_0.rb
 - lib/compass-rails/patches/importer.rb
+- lib/compass-rails/patches/sass_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
 - lib/compass-rails/railties/3_1.rb
+- lib/compass-rails/railties/4_0.rb
 - lib/compass-rails/version.rb
 - test/fixtures/.gitkeep
 - test/helpers/command_helper.rb
@@ -74,9 +83,10 @@ files:
 - test/helpers/rails_project.rb
 - test/integrations/.gitkeep
 - test/integrations/rails3_test.rb
-- test/integrations/rails_23_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
 homepage: https://github.com/Compass/compass-rails
@@ -86,29 +96,23 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4153052124869045784
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4153052124869045784
+  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Integrate Compass into Rails 2.3 and up.
+summary: Integrate Compass into Rails 3.0 and up.
 test_files:
 - test/fixtures/.gitkeep
 - test/helpers/command_helper.rb
@@ -118,8 +122,10 @@ test_files:
 - test/helpers/rails_project.rb
 - test/integrations/.gitkeep
 - test/integrations/rails3_test.rb
-- test/integrations/rails_23_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/rails2.gemfile.lock

@@ -1,81 +0,0 @@
-GIT
-  remote: git://github.com/scottdavis/appraisal.git
-  revision: b39ce49f69e330ccd5a1cb48e690f00e800a45d3
-  specs:
-    appraisal (0.4.0)
-      bundler
-      rake
-
-PATH
-  remote: /Users/sdavis/Work/compass-rails
-  specs:
-    compass-rails (1.0.2)
-      compass (>= 0.12.2, < 0.14)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (2.3.14)
-      actionpack (= 2.3.14)
-    actionpack (2.3.14)
-      activesupport (= 2.3.14)
-      rack (~> 1.1.0)
-    activerecord (2.3.14)
-      activesupport (= 2.3.14)
-    activeresource (2.3.14)
-      activesupport (= 2.3.14)
-    activesupport (2.3.14)
-    chunky_png (1.2.5)
-    compass (0.12.2)
-      chunky_png (~> 1.2)
-      fssm (>= 0.2.7)
-      sass (~> 3.1)
-    ffi (1.0.11)
-    fssm (0.2.9)
-    guard (1.2.1)
-      listen (>= 0.4.2)
-      thor (>= 0.14.6)
-    guard-test (0.5.0)
-      guard (>= 1.1.0)
-      test-unit (~> 2.2)
-    listen (0.4.6)
-      rb-fchange (~> 0.0.5)
-      rb-fsevent (~> 0.9.1)
-      rb-inotify (~> 0.8.8)
-    metaclass (0.0.1)
-    mocha (0.11.4)
-      metaclass (~> 0.0.1)
-    rack (1.1.3)
-    rails (2.3.14)
-      actionmailer (= 2.3.14)
-      actionpack (= 2.3.14)
-      activerecord (= 2.3.14)
-      activeresource (= 2.3.14)
-      activesupport (= 2.3.14)
-      rake (>= 0.8.3)
-    rainbow (1.1.4)
-    rake (0.9.2.2)
-    rb-fchange (0.0.5)
-      ffi
-    rb-fsevent (0.9.1)
-    rb-inotify (0.8.8)
-      ffi (>= 0.5.0)
-    ruby_gntp (0.3.4)
-    sass (3.1.19)
-    test-unit (2.5.0)
-    thor (0.15.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal!
-  compass
-  compass-rails!
-  guard
-  guard-test
-  mocha
-  rails (= 2.3.14)
-  rainbow
-  rb-fsevent
-  ruby_gntp