rails-sass-images 1.0.3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9124601cc9971cbc427489e745f7ed368415eeee
-  data.tar.gz: f02f28d79c01eec1e9aadb95abe8cfe487274260
+SHA256:
+  metadata.gz: 5597370435dfd1e26fcccced419bc5436abb93b3b31525c403bdcf2fc548dca9
+  data.tar.gz: b67958a1549ac23dc5ad9ce6ab55119f9a45246be27b2d5eb271115ef3a8e3d7
 SHA512:
-  metadata.gz: 16570e6d24c224f76c3da5203a93b842f1fff08e4363f07b6117ea81b1b133c4e476425d15d5acae4a94fc5733f0ae71aa9be3a1ab435e0dee9945c2d53911f2
-  data.tar.gz: da92c615453e9d0bee84ff2bdc332c934511248d9cdc23879ca252fb589bf312b55dd8eb019c00899ba5d521f4e6ac809204be9a784b969d3e1565bda00f3103
+  metadata.gz: bc2e83ac37d70006121281900e9d1314ba785e766952437cc797126fcd43c5387e212b910650ec0cbf57821bc351c625eeafa2f4c40951944923c8fd75973abe
+  data.tar.gz: 0ee00729e16d86f9dbc5e920681e862df5b4526d8f530ff29382d80dac0b0e0779d2d7595015b06277066effef922b7624e015ae02d482fb35462526f4faca3d

data/.travis.yml

@@ -1,8 +1,4 @@
-sudo: false
 language: ruby
 rvm:
-  - 2.0
-  - 2.1
-  - 2.2
-  - 2.3.0
-  - jruby-21mode
+  - "2.5"
+  - "2.6"

data/ChangeLog.md

@@ -1,3 +1,7 @@
+## 2.0.0
+* Add sprockets 4 support ([#9](https://github.com/ai/rails-sass-images/pull/9))
+* Drop sprockets 3 support ([#9](https://github.com/ai/rails-sass-images/pull/9))
+
 ## 1.0.3
 * Fix Sprockets 3 support.
 * Better error message for wrong `load_from`.

data/Gemfile

@@ -4,5 +4,5 @@ gemspec
 gem 'rake'
 gem 'rspec-rails'
 
-gem 'rails',      '>= 4'
-gem 'sass-rails', '>= 4'
+gem 'rails',      '>= 5'
+gem 'sassc-rails'

data/lib/rails-sass-images.rb

@@ -13,7 +13,7 @@ module RailsSassImages
     elsif sprockets? @load_from
       asset = @load_from[path]
       raise "Can't find asset #{path}" unless asset
-      asset = asset.pathname
+      asset = Pathname.new(asset.filename)
     else
       raise "Unknown type of RailsSassImages.load_from"
     end
@@ -43,7 +43,7 @@ private
   # Safe detect is `var` is a Sprockets environment
   def self.sprockets?(var)
     return false unless defined? Sprockets
-    var.is_a? Sprockets::Environment or var.is_a? Sprockets::Index
+    var.is_a? Sprockets::Environment or var.is_a? Sprockets::CachedEnvironment
   end
 end
 

data/lib/rails-sass-images/sass.rb

@@ -1,8 +1,18 @@
-require 'sass'
+require 'sassc'
 
 dir = Pathname(__FILE__).dirname.join('sass')
 Dir.glob(dir.join('*.rb').to_s) { |ext| require ext }
 
-module Sass::Script::Functions
+module SassC::Script::Functions
   include RailsSassImages::Sass
 end
+
+if defined? Sprockets
+  module Sprockets
+    class SasscProcessor
+      module Functions
+        include RailsSassImages::Sass
+      end
+    end
+  end
+end

data/lib/rails-sass-images/sass/inline.rb

@@ -27,6 +27,6 @@ module RailsSassImages::Sass
       encoding = 'base64'
     end
 
-    Sass::Script::String.new("url('data:#{mime};#{encoding},#{file}')")
+    SassC::Script::Value::String.new("url('data:#{mime};#{encoding},#{file}')")
   end
 end

data/lib/rails-sass-images/sass/size.rb

@@ -4,12 +4,12 @@ module RailsSassImages::Sass
   # Get image width
   def image_width(path)
     asset = RailsSassImages.asset(path)
-    Sass::Script::Number.new(Dimensions.width(asset), ["px"])
+    SassC::Script::Value::Number.new(Dimensions.width(asset), ["px"])
   end
 
   # Get image height
   def image_height(path)
     asset = RailsSassImages.asset(path)
-    Sass::Script::Number.new(Dimensions.height(asset), ["px"])
+    SassC::Script::Value::Number.new(Dimensions.height(asset), ["px"])
   end
 end

data/lib/rails-sass-images/version.rb

@@ -1,3 +1,3 @@
 module RailsSassImages
-  VERSION = '1.0.3'.freeze unless defined? RailsSassImages::VERSION
+  VERSION = '2.0.0'.freeze unless defined? RailsSassImages::VERSION
 end

data/rails-sass-images.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.homepage = 'https://github.com/ai/rails-sass-images'
   s.license  = 'MIT'
 
-  s.add_dependency 'sass',       ['> 0']
+  s.add_dependency 'sassc',      ['> 0']
   s.add_dependency 'dimensions', ['> 0']
   s.add_dependency 'mime-types', ['> 0']
 end

data/spec/app/app/controllers/css_controller.rb

@@ -1,6 +1,6 @@
 class CssController < ApplicationController
   def test
     file = params[:file] + '.css'
-    render text: Rails.application.assets[file]
+    render plain: Rails.application.assets[file]
   end
 end

data/spec/rails_spec.rb

@@ -7,40 +7,40 @@ describe CssController, type: :controller do
   end
 
   it "inlines assets" do
-    get :test, file: 'inline'
-    expect(response).to be_success
+    get :test, params: { file: 'inline' }
+    expect(response).to be_successful
     expect(response.body).to eq ".icon{background:#{INLINE}}\n"
   end
 
   it "raises error on unknown file" do
     expect {
-      get :test, file: 'wrong-inline'
+      get :test, params: { file: 'wrong-inline' }
     }.to raise_error(/Can't find asset no\.png/)
   end
 
   it "gets image size" do
-    get :test, file: 'size'
-    expect(response).to be_success
+    get :test, params: { file: 'size' }
+    expect(response).to be_successful
     expect(response.body).to eq ".icon{width:4px;height:6px}\n"
   end
 
   it "gets image size by mixin" do
-    get :test, file: 'image-size'
-    expect(response).to be_success
+    get :test, params: { file: 'image-size' }
+    expect(response).to be_successful
     expect(response.body).to eq ".icon{width:4px;height:6px}\n"
   end
 
   it "has hidpi-background mixin" do
-    get :test, file: 'hidpi-background'
-    expect(response).to be_success
+    get :test, params: { file: 'hidpi-background' }
+    expect(response).to be_successful
     expect(response.body).to include ".icon{" +
       "background-image:url(/assets/monolith"
     expect(response.body).to include "background-size:2px 3px}"
   end
 
   it "has hidpi-image mixin" do
-    get :test, file: 'hidpi-image'
-    expect(response).to be_success
+    get :test, params: { file: 'hidpi-image' }
+    expect(response).to be_successful
     expect(response.body).to include ".icon{" +
       "width:2px;height:3px;" +
       "background-image:url(/assets/monolith"
@@ -49,8 +49,8 @@ describe CssController, type: :controller do
   end
 
   it "has hidpi-inline mixin" do
-    get :test, file: 'hidpi-inline'
-    expect(response).to be_success
+    get :test, params: { file: 'hidpi-inline' }
+    expect(response).to be_successful
     expect(response.body).to eq ".icon{" +
       "width:2px;height:3px;" +
       "background:#{INLINE} no-repeat;" +

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: rails-sass-images
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 2.0.0
 platform: ruby
 authors:
 - Andrey "A.I." Sitnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2020-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sass
+  name: sassc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">"
@@ -82,6 +82,7 @@ files:
 - lib/rails-sass-images/version.rb
 - rails-sass-images.gemspec
 - spec/app/.gitignore
+- spec/app/app/assets/config/manifest.js
 - spec/app/app/assets/images/monolith.png
 - spec/app/app/assets/images/square.svg
 - spec/app/app/assets/stylesheets/hidpi-background.sass
@@ -123,8 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Sass functions and mixins to inline images and get images size