sass-rails 3.1.7 → 3.2.0

data/CHANGELOG.md

@@ -1,12 +1,6 @@
 CHANGELOG
 =========
 
-3.1.5.rc.1 (Oct 16, 2011)
----------------------
-* Several bug fixes
-* Performance and bug fixes when compressing stylesheets
-* Update dependency to latest sass stable release to fix caching issues.
-
 3.1.2 (Sept 15, 2011)
 ---------------------
 

data/Gemfile

@@ -4,7 +4,6 @@ source "http://rubygems.org"
 gemspec
 
 gem "sfl", "~> 2.0"
-gem "sprockets"
 gem "mocha"
 
 # To use debugger (ruby-debug for Ruby 1.8.7+, ruby-debug19 for Ruby 1.9.2+)

data/README.markdown

@@ -21,12 +21,13 @@ properties that will be passed to Sass.
       config.sass.syntax = :nested
     end
 
-## Important Note
+### Important Note
 
 Sprockets provides some directives that are placed inside of comments called `require`, `require_tree`, and
-`require_self`. **<span style="color:#c00">DO NOT USE THEM IN YOUR SASS/SCSS FILES.</span>** They are very 
-primitive and do not work well with Sass files. Instead, use Sass's native `@import` directive which
-`sass-rails` has customized to integrate with the conventions of your rails projects.
+`require_self`. **DO NOT USE THEM IN YOUR SASS/SCSS FILES.** They are very primitive and
+do not work well with Sass files. Instead, use Sass's native `@import`
+directive which `sass-rails` has customized to integrate with the
+conventions of your rails projects.
 
 ### Options
 
@@ -52,21 +53,19 @@ The [list of supported options](http://sass-lang.com/docs/yardoc/file.SASS_REFER
   cascade ordering for imports that contain styles using this approach.
 
 * **Asset Helpers**. When using the asset pipeline, paths to assets must be rewritten.
-  When referencing assets use the following asset helpers:
+  When referencing assets use the following asset helpers (underscored in Ruby, hyphenated
+  in Sass):
 
-  * `asset_path($relative-asset-path, $asset-class)` - Returns a string to the asset.
-    For example: `asset_path("rails.png", image)` becomes `"/assets/rails.png"`
-  * `asset_url($relative-asset-path, $asset-class)` - Returns url reference to the asset.
-    
-    For example: `asset_url("rails.png", image)` becomes `url(/assets/rails.png)`
+  * `asset-path($relative-asset-path, $asset-class)` - Returns a string to the asset.
+    For example: `asset-path("rails.png", image)` becomes `"/assets/rails.png"`
+  * `asset-url($relative-asset-path, $asset-class)` - Returns url reference to the asset.
+    For example: `asset-url("rails.png", image)` becomes `url(/assets/rails.png)`
   * As a convenience, for each of the following asset classes there are
-    corresponding `_path` and `_url` helpers:
+    corresponding `-path` and `-url` helpers:
     image, font, video, audio, javascript, stylesheet.
-    
-    For example: `image_url("rails.png")` becomes `url(/assets/rails.png)` and
-    `image_path("rails.png")` becomes `"/assets/rails.png"`.
-  
-  * `asset_data_url($relative-asset-path)` - Returns url reference to the Base64-encoded asset at the specified path.
+    For example: `image-url("rails.png")` becomes `url(/assets/rails.png)` and
+    `image-path("rails.png")` becomes `"/assets/rails.png"`.
+  * `asset-data-url($relative-asset-path)` - Returns url reference to the Base64-encoded asset at the specified path.
     For example: `asset-data-url("rails.png")` becomes `url(data:image/png;base64,iVBORw0K...)`
 
 ## Running Tests

data/lib/sass/rails.rb

@@ -1,12 +1,16 @@
 module Sass
+  autoload :Script, 'sass/rails/helpers'
+
   module Rails
+    autoload :CssCompressor, 'sass/rails/compressor'
+    autoload :Importer,      'sass/rails/importer'
+    autoload :Logger,        'sass/rails/logger'
+    autoload :Resolver,      'sass/rails/template_handlers'
+    autoload :SassTemplate,  'sass/rails/template_handlers'
+    autoload :ScssTemplate,  'sass/rails/template_handlers'
   end
 end
 
-require 'sass/rails/compressor'
-require 'sass/rails/logger'
-require 'sass/rails/railtie'
-require 'sass/rails/helpers'
-require 'sass/rails/importer'
-require 'sass/rails/template_handlers'
 require 'sass/rails/version'
+require 'sass/rails/helpers'
+require 'sass/rails/railtie'

data/lib/sass/rails/compressor.rb

@@ -4,15 +4,11 @@ module Sass
   module Rails
     class CssCompressor
       def compress(css)
-        if css.count("\n") > 2
-          Sass::Engine.new(css,
-                           :syntax => :scss,
-                           :cache => false,
-                           :read_cache => false,
-                           :style => :compressed).render
-        else
-          css
-        end
+        Sass::Engine.new(css,
+                         :syntax => :scss,
+                         :cache => false,
+                         :read_cache => false,
+                         :style => :compressed).render
       end
     end
   end

data/lib/sass/rails/railtie.rb

@@ -41,11 +41,6 @@ module Sass::Rails
       end
     end
 
-    # Remove the sass middleware if it gets inadvertently enabled by applications.
-    config.after_initialize do |app|
-      app.config.middleware.delete(Sass::Plugin::Rack) if defined?(Sass::Plugin::Rack)
-    end
-
     initializer :setup_sass, :group => :all do |app|
       # Only emit one kind of syntax because though we have registered two kinds of generators
       syntax     = app.config.sass.preferred_syntax.to_sym
@@ -71,7 +66,7 @@ module Sass::Rails
 
     initializer :setup_compression, :group => :all do |app|
       if app.config.assets.compress
-        app.config.sass.style = :compressed
+        # Use sass's css_compressor
         app.config.assets.css_compressor = CssCompressor.new
       end
     end

data/lib/sass/rails/template_handlers.rb

@@ -19,7 +19,7 @@ module Sass::Rails
       nil
     end
 
-    def public_path(path, scope = nil)
+    def public_path(path, scope)
       context.asset_paths.compute_public_path(path, ::Rails.application.config.assets.prefix)
     end
 
@@ -72,17 +72,14 @@ module Sass::Rails
       options = sass_options_from_rails(scope)
       load_paths = (options[:load_paths] || []).dup
       load_paths.unshift(importer)
-      resolver = Resolver.new(scope)
-      css_filename = File.join(::Rails.public_path, ::Rails.application.config.assets.prefix, scope.logical_path) + ".css"
       options.merge(
         :filename => eval_file,
-        :css_filename => css_filename,
         :line => line,
         :syntax => syntax,
         :importer => importer,
         :load_paths => load_paths,
         :custom => {
-          :resolver => resolver
+          :resolver => Resolver.new(scope)
         }
       )
     end

data/lib/sass/rails/version.rb

@@ -1,5 +1,5 @@
 module Sass
   module Rails
-    VERSION = "3.1.7"
+    VERSION = "3.2.0"
   end
 end

data/sass-rails.gemspec

@@ -14,10 +14,9 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "sass-rails"
 
-  s.add_runtime_dependency 'sass',       '>= 3.1.10'
-  s.add_runtime_dependency 'railties',   '~> 3.1.0'
-  s.add_runtime_dependency 'actionpack', '~> 3.1.0'
-  s.add_runtime_dependency 'tilt',       '~> 1.3.2'
+  s.add_runtime_dependency 'sass',       '~> 3.1.10'
+  s.add_runtime_dependency 'railties',   '~> 3.2.0.beta'
+  s.add_runtime_dependency 'tilt',       '~> 1.3'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/test/sass_rails_logger_test.rb

@@ -8,9 +8,11 @@ class SassRailsLoggerTest < Sass::Rails::TestCase
     end
   end
 
-  test "sending a log messages to the sass logger writes to the environment log file" do
-    within_rails_app "scss_project" do |app_root|
-      [:debug, :warn, :info, :error, :trace].each do |level|
+  [:debug, :warn, :info, :error, :trace].each do |level|
+    test "sending a #{level} message to the sass logger writes to the environment log file" do
+      within_rails_app "scss_project" do
+        app_root = runcmd 'rails runner "print Rails.root"'
+
         message = "[#{level}]: sass message"
         runcmd %{rails runner "Sass::logger.log_level = :#{level}; Sass::logger.log(:#{level}, %Q|#{message}|)"}
 

data/test/support/sass_rails_test_case.rb

@@ -59,16 +59,15 @@ class Sass::Rails::TestCase < ActiveSupport::TestCase
   #
   # Automatically changes back to the working directory
   # and removes the temp directory when done.
-  def within_rails_app(name, without_gems = [], gem_options = $gem_options)
+  def within_rails_app(name, without_gems = [], gem_locations = $gem_locations)
     sourcedir = File.expand_path("../../fixtures/#{name}", __FILE__)
     Dir.mktmpdir do |tmpdir|
       FileUtils.cp_r "#{sourcedir}/.", tmpdir
       Dir.chdir(tmpdir) do
-        gem_options.each {|name, options| modify_gem_entry name, options}
+        gem_locations.each {|name, path| modify_gem_location name, path}
         without_gems.each {|name| remove_gem name}
-        FileUtils.rm("Gemfile.lock") if File.exist?("Gemfile.lock")
         runcmd "bundle install --verbose"
-        yield tmpdir
+        yield
       end
     end
   end
@@ -82,29 +81,23 @@ class Sass::Rails::TestCase < ActiveSupport::TestCase
     end
   end
 
-  def modify_gem_entry(gemname, options, gemfile = "Gemfile")
+  def modify_gem_location(gemname, path, gemfile = "Gemfile")
     found = false
     process_gemfile(gemfile) do |line|
       if line =~ /gem *(["'])#{Regexp.escape(gemname)}\1/
         found = true
-        gem_entry(gemname, options) + "\n"
+        %Q{gem "#{gemname}", :path => #{path.inspect}\n}
       else
         line
       end
     end
     unless found
       File.open(gemfile, "a") do |f|
-        f.print("\n#{gem_entry(gemname, options)}\n")
+        f.print(%Q{\ngem "#{gemname}", :path => #{path.inspect}\n})
       end
     end
   end
 
-  def gem_entry(gemname, options)
-    entry = %Q{gem "#{gemname}", "~> #{options[:version]}"}
-    entry += ", :path => #{options[:path].inspect}" if options[:path]
-    entry
-  end
-
   def remove_gem(gemname)
     process_gemfile(gemfile) do |line|
       line unless line =~ /gem *(["'])#{Regexp.escape(gemname)}\1/

data/test/test_helper.rb

@@ -12,14 +12,14 @@ Rails.backtrace_cleaner.remove_silencers!
 
 # If developing against local dependencies, this code will ensure they get picked up
 # in the project fixtures that have their own bundle environment
-$gem_options = {}
+$gem_locations = {}
 possible_dev_dependencies = %w(sass-rails sass rails actionpack railties sprockets)
 Bundler.load.specs.each do |s|
   if possible_dev_dependencies.include?(s.name)
      gem_path = s.full_gem_path
-     gem_options = {:version => s.version}
-     gem_options[:path] = gem_path if File.exists?("#{gem_path}/#{s.name}.gemspec")
-     $gem_options[s.name] = gem_options
+     if File.exists?("#{gem_path}/#{s.name}.gemspec")
+       $gem_locations[s.name] = gem_path
+     end
   end
 end
 

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: sass-rails
 version: !ruby/object:Gem::Version
+  version: 3.2.0
   prerelease: 
-  version: 3.1.7
 platform: ruby
 authors:
 - wycats
@@ -10,72 +10,41 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-17 00:00:00.000000000 Z
+date: 2011-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  type: :runtime
-  prerelease: false
   name: sass
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.1.10
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2152738300 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.10
-- !ruby/object:Gem::Dependency
   type: :runtime
   prerelease: false
+  version_requirements: *2152738300
+- !ruby/object:Gem::Dependency
   name: railties
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &2152735040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-- !ruby/object:Gem::Dependency
+        version: 3.2.0.beta
   type: :runtime
   prerelease: false
-  name: actionpack
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.1.0
+  version_requirements: *2152735040
 - !ruby/object:Gem::Dependency
-  type: :runtime
-  prerelease: false
   name: tilt
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &2152732640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.2
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2152732640
 description: Sass adapter for the Rails asset pipeline.
 email:
 - wycats@gmail.com
@@ -265,22 +234,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 4507985399140691707
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 4507985399140691707
       version: '0'
 requirements: []
 rubyforge_project: sass-rails
-rubygems_version: 1.8.24
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Sass adapter for the Rails asset pipeline.