compass-rails 1.1.2 → 1.1.3

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MmUwYjg0NjMwMzRhNjQ3NGUzYTQ5OThkY2VhMTU4MTc3ZjY4ODdhMg==
+  data.tar.gz: !binary |-
+    ODQ0YzAyNDIyNmI3NDU2OTJlZGJlMzg4MDdlODYyMzFkNmU4M2UzZQ==
+SHA512:
+  metadata.gz: !binary |-
+    NGQ0YjRlYTM1NTBiMWUzYzEyZGQwNmU4OThkNGJhMjc3NTRkYzgyY2JlYmI2
+    NjMyOWFiMjJmZGRiZjVhM2EyZjExNDUxMmMwZjM2ZmIwNTQxMDU0OTM2ZDg5
+    MzlmYjFhNTdiNmI1YmMwNjY0OWI3MDUyMWJkYWMxMWQyMmFkYjA=
+  data.tar.gz: !binary |-
+    YmNlMGQ2NTU2OWU3ZWYxN2FhN2M3NzNjYzAzNzEzZTkzN2Q4NmQxOTZlMTkz
+    Mjc4YWRhMGFiNzk3ODNlNTQwZmZhMzYwMjA5MDgxNWYxNmZlOWUxMDYyOGY1
+    MTUwZjQ2ZWJlMjVkNDYxMzdiN2FhZTA4YTk2ODM4MGY5ZTdhMjU=

data/README.md

@@ -1,6 +1,7 @@
 # CompassRails
 
 [![Build Status](https://travis-ci.org/Compass/compass-rails.png?branch=stable)](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
 Framework](http://compass-style.org) for [Ruby on Rails](http://rubyonrails.org/).
@@ -8,8 +9,7 @@ Framework](http://compass-style.org) for [Ruby on Rails](http://rubyonrails.org/
 Since Compass v0.12, this adapter is the only way to install compass
 into your rails application.
 
-This adapter supports rails versions 3.0 and greater. Rails 3.0 users
-please read the caveats below.
+This adapter supports Rails 3.x, 4.x releases.
 
 ## Installation
 
@@ -29,19 +29,6 @@ And then execute:
 
     $ bundle
 
-## Optional
-
-To set up your project with starter stylesheets and a configuration
-file:
-
-    $ bundle exec compass init
-
-If using a compass-based framework (like [susy](http://susy.oddbird.net/) or [blueprint](http://compass-style.org/reference/blueprint/)) then you can use the `--using` option to set this:
-
-    $ bundle exec compass init --using blueprint
-
-Note that the `compass init` step is optional if you have a project running Rails 3.0 or greater.
-
 ## Usage
 
 Change your `application.css` to `application.css.scss` or `application.css.sass` and use `@import` to your hearts content. Ex:
@@ -63,6 +50,19 @@ Use `application.css` to require files that use compass features. Ex:
 
 *Don't* use `*= require something` within your SCSS or SASS files. You're gonna have a bad time.
 
+## Optional
+
+To set up your project with starter stylesheets and a configuration
+file:
+
+    $ bundle exec compass init
+
+If using a compass-based framework (like [susy](http://susy.oddbird.net/) or [blueprint](http://compass-style.org/reference/blueprint/)) then you can use the `--using` option to set this:
+
+    $ bundle exec compass init --using blueprint
+
+Note that the `compass init` step is optional if you have a project running Rails 3.0 or greater.
+
 ### Configuration
 
 If you have a compass configuration file (recommended) then you can

data/lib/compass-rails.rb

@@ -7,7 +7,6 @@ module CompassRails
     RAILS_4 = %r{^4.[0|1]}
     RAILS_32 = %r{^3.2}
     RAILS_31 = %r{^3.1}
-    RAILS_23 = %r{^2.3}
     RAILS_3 = %r{^3.0}
 
     extend self
@@ -125,11 +124,9 @@ module CompassRails
       load_rails
       config = Compass::Configuration::Data.new('rails')
       config.extend(Configuration::Default)
-      if (rails31? || rails32? || rails4?)
-        if asset_pipeline_enabled?
-          require "compass-rails/configuration/3_1"
-          config.extend(Configuration::Rails3_1)
-        end
+      if asset_pipeline_enabled?
+        require "compass-rails/configuration/asset_pipeline"
+        config.extend(Configuration::AssetPipeline)
       end
       config
     end
@@ -176,7 +173,7 @@ module CompassRails
       end
     end
 
-    # Rails 2.x projects use this in their compass initializer.
+    # 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)
@@ -221,10 +218,10 @@ module CompassRails
   def asset_pipeline_enabled?
     return false unless rails_loaded?
     rails_config = ::Rails.application.config
-    unless rails4?
-      rails_config.respond_to?(:assets) && rails_config.assets.try(:enabled)
+    if rails_config.respond_to?(:assets)
+      rails_config.assets.enabled != false
     else
-      rails_config.respond_to?(:assets)
+      false
     end
   end
 

data/lib/compass-rails/configuration/{3_1.rb → asset_pipeline.rb}

@@ -1,6 +1,6 @@
 module CompassRails
   module Configuration
-    module Rails3_1
+    module AssetPipeline
 
       def default_images_dir
         File.join("app", "assets", "images")

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

@@ -1,30 +1,12 @@
+require 'compass-rails/patches/compass'
 require 'compass-rails/patches/static_compiler'
 
 module Sass::Script::Functions
   def generated_image_url(path, only_path = nil)
-    path = if Compass.configuration.generated_images_dir
-             full_path = File.join(Compass.configuration.generated_images_dir, path.value)
-             Sass::Script::String.new full_path.sub(File.join('app', 'assets', 'images'), "")[1..-1]
-           end
-
     asset_url(path, Sass::Script::String.new("image"))
   end
 end
 
-
-module Compass::RailsImageFunctionPatch
-  private
-
-  def image_path_for_size(image_file)
-    begin
-      file = ::Rails.application.assets.find_asset(image_file)
-      return file
-    rescue ::Sprockets::FileOutsidePaths
-      return super(image_file)
-    end
-  end
-end
-
 module Sass::Script::Functions
   include Compass::RailsImageFunctionPatch
 end

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

@@ -1,3 +1,4 @@
+require 'compass-rails/patches/compass'
 require 'compass-rails/patches/sass_importer'
 require 'compass-rails/patches/sprite_importer'
 
@@ -14,20 +15,6 @@ module Sass::Script::Functions
   end
 end
 
-
-module Compass::RailsImageFunctionPatch
-  private
-  
-  def image_path_for_size(image_file)
-    begin
-      file = ::Rails.application.assets.find_asset(image_file)
-      return file
-    rescue ::Sprockets::FileOutsidePaths
-      return super(image_file)
-    end
-  end
-end
-
 module Sass::Script::Functions
   include Compass::RailsImageFunctionPatch
 end

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

@@ -0,0 +1,12 @@
+module Compass::RailsImageFunctionPatch
+  private
+
+  def image_path_for_size(image_file)
+    begin
+      file = ::Rails.application.assets.find_asset(image_file)
+      return file
+    rescue ::Sprockets::FileOutsidePaths
+      return super(image_file)
+    end
+  end
+end

data/lib/compass-rails/version.rb

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

data/test/helpers/rails_project.rb

@@ -103,16 +103,6 @@ module CompassRails
         inject_into_file(directory.join(APPLICATION_FILE), value, :after, 'class Application < Rails::Application')
       end
 
-      ## GEM METHODS
-
-      def configure_for_bundler!
-        Rails.logger.warn("This method is deprecated") && return
-      end
-
-      def bundle
-        raise "NO BUNDLE FOR U"
-      end
-
     private
 
       ## GEM METHODS

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: compass-rails
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Scott Davis
@@ -11,24 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-06 00:00:00.000000000 Z
+date: 2013-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.12.2
-    none: false
-  name: compass
-  type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.12.2
-    none: false
+  name: compass
+  type: :runtime
 description: Integrate Compass into Rails 3.0 and up.
 email:
 - jetviper21@gmail.com
@@ -54,18 +51,18 @@ files:
 - gemfiles/rails40.gemfile
 - lib/compass-rails.rb
 - lib/compass-rails/configuration.rb
-- lib/compass-rails/configuration/3_1.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
 - lib/compass-rails/patches/4_0.rb
+- lib/compass-rails/patches/compass.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
@@ -87,6 +84,7 @@ files:
 homepage: https://github.com/Compass/compass-rails
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -96,18 +94,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Integrate Compass into Rails 3.0 and up.
 test_files:
 - test/fixtures/.gitkeep

data/lib/compass-rails/railties/2_3.rb

@@ -1,56 +0,0 @@
-#rails 2.x doesn't have railties so gona do this the long way
-require "sass/plugin/rack" #unless defined?(Sass::Plugin::Rack)
-
-module ActionController
-  class Base
-    def process_with_compass(*args)
-      Sass::Plugin.rails_controller = self
-      begin
-        process_without_compass(*args)
-      ensure
-        Sass::Plugin.rails_controller = nil
-      end
-    end
-    alias_method_chain :process, :compass
-  end
-end
-
-
-module Sass::Plugin
-  class << self
-    attr_accessor :rails_controller
-  end
-end
-
-module Compass::SassExtensions::Functions::Urls::ImageUrl
-  def image_url_with_rails_integration(path, only_path = Sass::Script::Bool.new(false), cache_buster = Sass::Script::Bool.new(true))
-    if (@controller = Sass::Plugin.rails_controller) && @controller.respond_to?(:request) && @controller.request
-      begin
-        if only_path.to_bool
-          Sass::Script::String.new image_path(path.value)
-        else
-          Sass::Script::String.new "url(#{image_path(path.value)})"
-        end
-      ensure
-        @controller = nil
-      end
-    else
-      image_url_without_rails_integration(path, only_path, cache_buster)
-    end
-  end
-  alias_method_chain :image_url, :rails_integration
-end
-
-
-class Sass::Script::Functions::EvaluationContext
-  include Sass::Script::Functions
-  private
-  include ActionView::Helpers::AssetTagHelper
-end
-
-unless Compass.detect_configuration_file.nil?
-  Compass.add_configuration(CompassRails.configuration)
-  CompassRails.initialize!
-else
-  CompassRails.initialize!(CompassRails.configuration)
-end