diff -Nru ruby-sass-rails-5.0.3/debian/changelog ruby-sass-rails-5.0.4/debian/changelog --- ruby-sass-rails-5.0.3/debian/changelog 2015-08-14 12:28:58.000000000 +0000 +++ ruby-sass-rails-5.0.4/debian/changelog 2016-01-12 05:33:57.000000000 +0000 @@ -1,3 +1,10 @@ +ruby-sass-rails (5.0.4-1) unstable; urgency=medium + + * New upstream release + * Add myself to uploaders + + -- Pirate Praveen Tue, 12 Jan 2016 11:03:47 +0530 + ruby-sass-rails (5.0.3-1) unstable; urgency=medium * New upstream release diff -Nru ruby-sass-rails-5.0.3/debian/control ruby-sass-rails-5.0.4/debian/control --- ruby-sass-rails-5.0.3/debian/control 2015-08-14 12:28:58.000000000 +0000 +++ ruby-sass-rails-5.0.4/debian/control 2016-01-12 05:33:25.000000000 +0000 @@ -2,7 +2,8 @@ Section: ruby Priority: optional Maintainer: Debian Ruby Extras Maintainers -Uploaders: Antonio Terceiro +Uploaders: Antonio Terceiro , + Pirate Praveen Build-Depends: debhelper (>= 9~), gem2deb, rake, diff -Nru ruby-sass-rails-5.0.3/gemfiles/Gemfile-sprockets-3-0 ruby-sass-rails-5.0.4/gemfiles/Gemfile-sprockets-3-0 --- ruby-sass-rails-5.0.3/gemfiles/Gemfile-sprockets-3-0 2015-03-31 15:56:16.000000000 +0000 +++ ruby-sass-rails-5.0.4/gemfiles/Gemfile-sprockets-3-0 2015-09-03 19:49:16.000000000 +0000 @@ -4,4 +4,4 @@ gemspec path: ".." gem "rails" -gem "sprockets", "3.0.0.beta.10" +gem "sprockets", "~> 3.0.0" diff -Nru ruby-sass-rails-5.0.3/lib/sass/rails/railtie.rb ruby-sass-rails-5.0.4/lib/sass/rails/railtie.rb --- ruby-sass-rails-5.0.3/lib/sass/rails/railtie.rb 2015-03-31 15:56:16.000000000 +0000 +++ ruby-sass-rails-5.0.4/lib/sass/rails/railtie.rb 2015-09-03 19:49:16.000000000 +0000 @@ -67,11 +67,13 @@ end initializer :setup_compression, group: :all do |app| - unless Rails.env.development? - app.config.assets.css_compressor ||= :sass - else + if Rails.env.development? # Use expanded output instead of the sass default of :nested unless specified app.config.sass.style ||= :expanded + else + # config.assets.css_compressor may be set to nil in non-dev environments. + # otherwise, the default is sass compression. + app.config.assets.css_compressor = :sass unless app.config.assets.has_key?(:css_compressor) end end end diff -Nru ruby-sass-rails-5.0.3/lib/sass/rails/version.rb ruby-sass-rails-5.0.4/lib/sass/rails/version.rb --- ruby-sass-rails-5.0.3/lib/sass/rails/version.rb 2015-03-31 15:56:16.000000000 +0000 +++ ruby-sass-rails-5.0.4/lib/sass/rails/version.rb 2015-09-03 19:49:16.000000000 +0000 @@ -1,5 +1,5 @@ module Sass module Rails - VERSION = "5.0.3" + VERSION = "5.0.4" end end diff -Nru ruby-sass-rails-5.0.3/README.md ruby-sass-rails-5.0.4/README.md --- ruby-sass-rails-5.0.3/README.md 2015-03-31 15:56:16.000000000 +0000 +++ ruby-sass-rails-5.0.4/README.md 2015-09-03 19:49:16.000000000 +0000 @@ -68,24 +68,24 @@ #### `asset-path($relative-asset-path)` Returns a string to the asset. -* `asset-path("rails.png")` becomes `"/assets/rails.png"` +* `asset-path("rails.png")` returns `"/assets/rails.png"` #### `asset-url($relative-asset-path)` Returns a url reference to the asset. -* `asset-url("rails.png")` becomes `url(/assets/rails.png)` +* `asset-url("rails.png")` returns `url(/assets/rails.png)` As a convenience, for each of the following asset classes there are corresponding `-path` and `-url` helpers: image, font, video, audio, javascript, stylesheet. -* `image-path("rails.png")` becomes `"/assets/rails.png"` -* `image-url("rails.png")` becomes `url(/assets/rails.png)` +* `image-path("rails.png")` returns `"/assets/rails.png"` +* `image-url("rails.png")` returns `url(/assets/rails.png)` #### `asset-data-url($relative-asset-path)` Returns a url reference to the Base64-encoded asset at the specified path. -* `asset-data-url("rails.png")` becomes `url(data:image/png;base64,iVBORw0K...)` +* `asset-data-url("rails.png")` returns `url(data:image/png;base64,iVBORw0K...)` ## Running Tests diff -Nru ruby-sass-rails-5.0.3/sass-rails.gemspec ruby-sass-rails-5.0.4/sass-rails.gemspec --- ruby-sass-rails-5.0.3/sass-rails.gemspec 2015-03-31 15:56:16.000000000 +0000 +++ ruby-sass-rails-5.0.4/sass-rails.gemspec 2015-09-03 19:49:16.000000000 +0000 @@ -17,7 +17,7 @@ s.add_dependency 'sass', '~> 3.1' s.add_dependency 'sprockets-rails', '>= 2.0', '< 4.0' s.add_dependency 'sprockets', '>= 2.8', '< 4.0' - s.add_dependency 'tilt', '~> 1.1' + s.add_dependency 'tilt', '>= 1.1', '< 3' s.add_development_dependency 'sqlite3' diff -Nru ruby-sass-rails-5.0.3/test/fixtures/alternate_config_project/config/environments/test.rb ruby-sass-rails-5.0.4/test/fixtures/alternate_config_project/config/environments/test.rb --- ruby-sass-rails-5.0.3/test/fixtures/alternate_config_project/config/environments/test.rb 2015-03-31 15:56:16.000000000 +0000 +++ ruby-sass-rails-5.0.4/test/fixtures/alternate_config_project/config/environments/test.rb 2015-09-03 19:49:16.000000000 +0000 @@ -39,4 +39,7 @@ # Print deprecation notices to the stderr config.active_support.deprecation = :stderr + + # Decide not to use sass compression + config.assets.css_compressor = nil end diff -Nru ruby-sass-rails-5.0.3/test/sass_rails_test.rb ruby-sass-rails-5.0.4/test/sass_rails_test.rb --- ruby-sass-rails-5.0.3/test/sass_rails_test.rb 2015-03-31 15:56:16.000000000 +0000 +++ ruby-sass-rails-5.0.4/test/sass_rails_test.rb 2015-09-03 19:49:16.000000000 +0000 @@ -76,6 +76,16 @@ end end + test 'sass allows compressor override in test mode' do + within_rails_app 'alternate_config_project' do + runner 'test' do + "puts Rails.application.config.assets.css_compressor.nil?" + end + + assert_equal 'true', $last_output.chomp + end + end + test 'sass defines compressor by default in production mode' do within_rails_app 'scss_project' do runner 'production' do diff -Nru ruby-sass-rails-5.0.3/.travis.yml ruby-sass-rails-5.0.4/.travis.yml --- ruby-sass-rails-5.0.3/.travis.yml 2015-03-31 15:56:16.000000000 +0000 +++ ruby-sass-rails-5.0.4/.travis.yml 2015-09-03 19:49:16.000000000 +0000 @@ -33,7 +33,7 @@ - rvm: rbx-2 include: - gemfile: Gemfile - rvm: 2.2.1 + rvm: 2.2.2 notifications: email: false