sass-rails 3.2.0 → 3.2.1

data/.travis.yml

@@ -0,0 +1,12 @@
+rvm:
+ - 1.8.7
+ - 1.9.2
+ - 1.9.3
+ - ree
+ - jruby
+ - rbx
+script: bundle exec rake test
+notifications:
+  email: false
+  campfire:
+    secure: "CGWvthGkBKNnTnk9YSmf9AXKoiRI33fCl5D3jU4nx3cOPu6kv2R9nMjt9EAo\nOuS4Q85qNSf4VNQ2cUPNiNYSWQ+XiTfivKvDUw/QW9r1FejYyeWarMsSBWA+\n0fADjF1M2dkDIVLgYPfwoXEv7l+j654F1KLKB69F0F/netwP9CQ="

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 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

@@ -3,6 +3,11 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in sass-rails.gemspec
 gemspec
 
+# Meanwhile we are depending on a non released rails version
+gem "rails", :git => 'git://github.com/rails/rails.git'
+
+gem "sqlite3"
+
 gem "sfl", "~> 2.0"
 gem "mocha"
 

data/README.markdown

@@ -21,13 +21,12 @@ 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`. **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.
+`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.
 
 ### Options
 

data/lib/sass/rails/compressor.rb

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

data/lib/sass/rails/railtie.rb

@@ -58,15 +58,18 @@ module Sass::Rails
         # Display a stack trace in the css output when in development-like environments.
         config.sass.full_exception = app.config.consider_all_requests_local
       end
-      app.assets.context_class.extend(SassContext)
-      app.assets.context_class.sass_config = app.config.sass
+
+      if app.assets
+        app.assets.context_class.extend(SassContext)
+        app.assets.context_class.sass_config = app.config.sass
+      end
 
       Sass.logger = app.config.sass.logger
     end
 
     initializer :setup_compression, :group => :all do |app|
       if app.config.assets.compress
-        # Use sass's css_compressor
+        app.config.sass.style = :compressed
         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)
+    def public_path(path, scope = nil)
       context.asset_paths.compute_public_path(path, ::Rails.application.config.assets.prefix)
     end
 
@@ -72,14 +72,17 @@ 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, resolver.public_path(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.new(scope)
+          :resolver => resolver
         }
       )
     end

data/lib/sass/rails/version.rb

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

data/sass-rails.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "sass-rails"
 
-  s.add_runtime_dependency 'sass',       '~> 3.1.10'
+  s.add_runtime_dependency 'sass',       '>= 3.1.10'
   s.add_runtime_dependency 'railties',   '~> 3.2.0.beta'
   s.add_runtime_dependency 'tilt',       '~> 1.3'
 

data/test/sass_rails_logger_test.rb

@@ -8,11 +8,9 @@ class SassRailsLoggerTest < Sass::Rails::TestCase
     end
   end
 
-  [: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"'
-
+  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|
         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,15 +59,16 @@ 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_locations = $gem_locations)
+  def within_rails_app(name, without_gems = [], gem_options = $gem_options)
     sourcedir = File.expand_path("../../fixtures/#{name}", __FILE__)
     Dir.mktmpdir do |tmpdir|
       FileUtils.cp_r "#{sourcedir}/.", tmpdir
       Dir.chdir(tmpdir) do
-        gem_locations.each {|name, path| modify_gem_location name, path}
+        gem_options.each {|name, options| modify_gem_entry name, options}
         without_gems.each {|name| remove_gem name}
+        FileUtils.rm("Gemfile.lock") if File.exist?("Gemfile.lock")
         runcmd "bundle install --verbose"
-        yield
+        yield tmpdir
       end
     end
   end
@@ -81,23 +82,29 @@ class Sass::Rails::TestCase < ActiveSupport::TestCase
     end
   end
 
-  def modify_gem_location(gemname, path, gemfile = "Gemfile")
+  def modify_gem_entry(gemname, options, gemfile = "Gemfile")
     found = false
     process_gemfile(gemfile) do |line|
       if line =~ /gem *(["'])#{Regexp.escape(gemname)}\1/
         found = true
-        %Q{gem "#{gemname}", :path => #{path.inspect}\n}
+        gem_entry(gemname, options) + "\n"
       else
         line
       end
     end
     unless found
       File.open(gemfile, "a") do |f|
-        f.print(%Q{\ngem "#{gemname}", :path => #{path.inspect}\n})
+        f.print("\n#{gem_entry(gemname, options)}\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_locations = {}
+$gem_options = {}
 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
-     if File.exists?("#{gem_path}/#{s.name}.gemspec")
-       $gem_locations[s.name] = gem_path
-     end
+     gem_options = {:version => s.version}
+     gem_options[:path] = gem_path if File.exists?("#{gem_path}/#{s.name}.gemspec")
+     $gem_options[s.name] = gem_options
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass-rails
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,22 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-17 00:00:00.000000000 Z
+date: 2011-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &2152738300 !ruby/object:Gem::Requirement
+  requirement: &2168607320 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.1.10
   type: :runtime
   prerelease: false
-  version_requirements: *2152738300
+  version_requirements: *2168607320
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &2152735040 !ruby/object:Gem::Requirement
+  requirement: &2168606380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 3.2.0.beta
   type: :runtime
   prerelease: false
-  version_requirements: *2152735040
+  version_requirements: *2168606380
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &2152732640 !ruby/object:Gem::Requirement
+  requirement: &2168605260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +44,7 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2152732640
+  version_requirements: *2168605260
 description: Sass adapter for the Rails asset pipeline.
 email:
 - wycats@gmail.com
@@ -54,6 +54,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - MIT-LICENSE