compass-rails 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32048be7b100642ba51ac64ba90f5d8772db0089
-  data.tar.gz: 72b5056ea2292f497bc0bcbf2b3bdb94f9aae889
+  metadata.gz: 8b3db69cd3f6e7ae24f00b4c4a62dc0de7812ce9
+  data.tar.gz: 99d55fb02db28aaff700d3503d28b98e02fdb921
 SHA512:
-  metadata.gz: 52f299102a23a6cc39be6bb5b38fcaa9e7fa68f5988eb1f055420508729e626497f91d4540ea364e70eb4141de3f5cf1e84c135fd48438dc8d8010e87ad63453
-  data.tar.gz: cdb26631fb53897b9a4ecdb3d304fd514956f23bebfd766f4825c90711a2cbfcad708fcbaa81a24dc28c493c2e98cc72a4f575c9b05d828d5739babba8bba847
+  metadata.gz: 2b9a899fb6aa8a8f05720ddacd9f0e18df6e300ea8da15ff6b742a7d21b5cd46da36efc9d535b6c7ff06f07c6c91b2270d6fd95988bcec29e00d3edd7a06f9ec
+  data.tar.gz: 53baf588260989ae998fe741dcad4221e595314016f328a9dc74afdfaee7547ca679910829a4c47cc13599a618362a6c39694427f95132a0fc71dd5a7104a49b

data/CHANGELOG.md

@@ -0,0 +1,64 @@
+# Change log
+
+## 2.0.0 - 2014-07-10
+### Added
+- Support for Rails 4.2
+- Allow newer sass-rails with Sass 3.3 support (see #160).
+
+### Removed
+- Rails 3.0 support.
+
+### Fixed
+- Properly bust the cache on image sprites within a sub-directory that
+are imported with a wildcard (see #166).
+
+## 1.1.7 - 2014-03-18
+### Fixed
+- Locked Sprockets version to 2.11.0 (see #146).
+
+## 1.1.6 - 2014-03-11
+### Fixed
+- Leave bundle selection to rails environment.
+
+## 1.1.5 - 2014-03-11
+### Added
+- Support for Ruby 2.1.0.
+
+### Fixed
+- Fixed `rails_loaded?` for when Rails is defined but no application is actually loaded.
+
+## 1.1.4 - 2014-03-18
+### Changed
+- Simplified README.
+
+## 1.1.3 - 2013-12-27
+### Fixed
+- No longer assuming asset pipeline is running when generating sprites.
+
+## 1.1.2 - 2013-12-06
+### Fixed
+- Reverted fix for `generated_image_url` introduced in 1.1.0.
+
+## 1.1.1 - 2013-12-05
+### Added
+- Support for Compass versions greater than 0.12.2.
+
+## 1.1.0 - 2013-12-05
+### Added
+- Rails 4 support.
+- Ruby 2.0 support.
+
+### Fixed
+- Allow compass-rails without asset pipeline on Rails 3.2.
+- Fix `generated_image_url` when `generated_images_dir` is set.
+
+### Removed
+- Support for Ruby 1.8.7 and 1.9.2.
+- Support for Rails 2.3.
+
+## 1.0.3 - 2012-06-26
+### Added
+- Bumped Compass version to 0.12.2.
+
+### Fixed
+- `FixedStaticCompiler` hack so sprite source files dont show up in manifest.

data/Gemfile

@@ -4,14 +4,13 @@ source 'https://rubygems.org'
 gemspec
 
 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 "appraisal"
   gem 'rainbow'
 end
 

data/README.md

@@ -4,6 +4,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)
 
 Compass rails is an adapter for the [Compass Stylesheet Authoring
 Framework](http://compass-style.org) for [Ruby on Rails](http://rubyonrails.org/).
@@ -54,7 +55,7 @@ Use `application.css` to require files that use compass features. Ex:
 
 If you have a compass configuration file (recommended) then you can
 use the [Compass configuration 
-reference](http://compass-style.org/help/tutorials/configuration-reference/)
+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`

data/Rakefile

@@ -10,7 +10,7 @@ require 'compass'
 
 # ----- Default: Testing ------
 
-task :default => [:test, :features]
+task :default => [:test]
 
 require 'rake/testtask'
 require 'fileutils'

data/compass-rails.gemspec

@@ -16,6 +16,6 @@ Gem::Specification.new do |gem|
   gem.version       = CompassRails::VERSION
   gem.license       = "MIT"
 
-  gem.add_dependency 'compass', '>= 0.12.2'
+  gem.add_dependency 'compass', '~> 1.0.0'
 
 end

data/gemfiles/rails31.gemfile

@@ -10,7 +10,6 @@ gem "rails", "3.1.3"
 gem "sass-rails"
 
 group :assets do
-  gem "compass", "~> 0.13.alpha.0"
   gem "compass-rails", :path=>".."
   gem "compass-blueprint"
 end

data/gemfiles/rails32.gemfile

@@ -10,7 +10,6 @@ gem "rails", "~> 3.2"
 gem "sass-rails"
 
 group :assets do
-  gem "compass", "~> 0.13.alpha.0"
   gem "compass-rails", :path=>".."
   gem "compass-blueprint"
 end

data/gemfiles/rails40.gemfile

@@ -10,7 +10,6 @@ gem "rails", "~> 4.0.0"
 gem "sass-rails"
 
 group :assets do
-  gem "compass", "~> 0.13.alpha.0"
   gem "compass-rails", :path=>".."
   gem "compass-blueprint"
 end

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

@@ -1,17 +1,8 @@
 require 'compass-rails/patches/compass'
 require 'compass-rails/patches/static_compiler'
 
-module Sass::Script::Functions
+Compass::Core::SassExtensions::Functions::Urls::GeneratedImageUrl.module_eval do
   def generated_image_url(path, only_path = nil)
     asset_url(path, Sass::Script::String.new("image"))
   end
 end
-
-module Sass::Script::Functions
-  include Compass::RailsImageFunctionPatch
-end
-
-# Wierd that this has to be re-included to pick up sub-modules. Ruby bug?
-class Sass::Script::Functions::EvaluationContext
-  include Sass::Script::Functions
-end

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

@@ -2,7 +2,7 @@ require 'compass-rails/patches/compass'
 require 'compass-rails/patches/sass_importer'
 require 'compass-rails/patches/sprite_importer'
 
-module Sass::Script::Functions
+Compass::Core::SassExtensions::Functions::Urls::GeneratedImageUrl.module_eval do
   def generated_image_url(path, only_path = nil)
     pathobject = Pathname.new(path.to_s)
     subdirectory = pathobject.dirname.to_s
@@ -13,10 +13,10 @@ module Sass::Script::Functions
 
   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
+    if subdirectory.nil?
+      bust_cache_path = generated_images_path
     else
-        bust_cache_path = generated_images_path + "/" + subdirectory
+      bust_cache_path = generated_images_path + "/" + subdirectory
     end
     bust_image_stat_path = generated_images_path + "/" + image_path.to_s
 
@@ -24,22 +24,13 @@ module Sass::Script::Functions
 
     # 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) 
+      # 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 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) 
+      # 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
-
-module Sass::Script::Functions
-  include Compass::RailsImageFunctionPatch
-end
-
-# Wierd that this has to be re-included to pick up sub-modules. Ruby bug?
-class Sass::Script::Functions::EvaluationContext
-  include Sass::Script::Functions
-end

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

@@ -1,4 +1,4 @@
-module Compass::RailsImageFunctionPatch
+Compass::Core::SassExtensions::Functions::ImageSize.class_eval do
   private
 
   def image_path_for_size(image_file)

data/lib/compass-rails/version.rb

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

data/lib/compass-rails.rb

@@ -14,17 +14,20 @@ module CompassRails
       return true if rails_loaded?
       return if defined?(::Rails) && ::Rails.respond_to?(:application) && !::Rails.application.nil?
 
-      rails_config_path = Dir.pwd
-      until File.exists?(File.join(rails_config_path, 'config', 'application.rb')) do
+      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
-      #load the rails config
-      require "#{rails_config_path}/config/application.rb"
-      require 'sass-rails'
-      require 'sprockets/railtie'
-      require 'rails/engine'
-      @app ||= ::Rails.application.initialize!
+
+      false
     end
 
 
@@ -226,11 +229,12 @@ module CompassRails
 
 end
 
-Compass::AppIntegration.register(:rails, "::CompassRails")
-Compass.add_configuration(CompassRails.boot_config)
-
-require "compass-rails/patches"
-require "compass-rails/railties"
-require "compass-rails/installer"
+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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: compass-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Scott Davis
@@ -10,22 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-10 00:00:00.000000000 Z
+date: 2014-10-06 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
 description: Integrate Compass into Rails 3.0 and up.
 email:
 - jetviper21@gmail.com
@@ -38,12 +38,12 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - Appraisals
+- CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENSE
 - README.md
 - Rakefile
-- changelog.markdown
 - compass-rails.gemspec
 - gemfiles/rails31.gemfile
 - gemfiles/rails32.gemfile
@@ -113,4 +113,3 @@ test_files:
 - 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