rails-sass-images 0.5 → 0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a313b8d58d03d3b7bc2820f00b72a769c19f839
-  data.tar.gz: c7930af69f98b6526ef628164fab6ec83c25f7b3
+  metadata.gz: cba13d7d4f12aca10edb470201f8801acbed6889
+  data.tar.gz: 8b10d42d9c70286c922ce0457ce2299cb9b04f1d
 SHA512:
-  metadata.gz: 7a41f969226d64fa32f8939bba614e242c004f10083f757287ea40267f5a66fb5c622e0f9251838da531eff741afbed5f8282caedb8c4ff579efbf27e9d5ae31
-  data.tar.gz: 23a160ecca764803a1e26a70376ab36438cc73f509806d00d690008c0131e6165b3908357d359dca959ebd2a7c981a6830f79d5d6eec15918c353c4b8e424e8e
+  metadata.gz: 026022539d5c88d4ee96af176a84fe2c9c4f780f4989b057cebed86954b19753ebc7c60b7e6f466992b1ab31816914283571198d21ddd6ad0f9fea810f1ec31b
+  data.tar.gz: a79fd8c213914725da089c339e2e9b24f467e90f2bf652137e02d4e5f46ab0424764062098b962ebdc1a2b6b8b86536a297e6887bdb6c4ff10d831f6135eb567

data/.travis.yml

@@ -1,7 +1,7 @@
+sudo: false
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
-  - jruby-19mode
-  - rbx-2
+  - 2.0
+  - 2.1
+  - 2.2
+  - jruby-21mode

data/ChangeLog.md

@@ -1,3 +1,7 @@
+### 1.0 “Correggio”
+* Better encoding for SVG (by Alexey Plutalov).
+* Remove official Ruby 1.9 support.
+
 ### 0.5 “Gentile Bellini”
 * Allow to use gem without Sprockets.
 * Add `hidpi-background` mixin for repeated backgrounds.

data/Gemfile

@@ -6,7 +6,3 @@ gem 'rspec-rails'
 
 gem 'rails',      '>= 4'
 gem 'sass-rails', '>= 4'
-
-gem 'racc',             platforms: 'rbx'
-gem 'rubysl',           platforms: 'rbx'
-gem 'rubysl-test-unit', platforms: 'rbx'

data/README.md

@@ -1,4 +1,4 @@
-# Rails Sass Images
+# Rails Sass Images [![Build Status](https://travis-ci.org/ai/rails-sass-images.svg)](https://travis-ci.org/ai/rails-sass-images)
 
 Sass functions and mixins to inline images and get images size:
 
@@ -30,7 +30,9 @@ and fonts support:
   src: inline("my.woff") format('woff')
 ```
 
-Sponsored by [Evil Martians](http://evilmartians.com/).
+<a href="https://evilmartians.com/?utm_source=rails-sass-images">
+<img src="https://evilmartians.com/badges/sponsored-by-evil-martians.svg" alt="Sponsored by Evil Martians" width="236" height="54">
+</a>
 
 ## Features
 

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

@@ -1,3 +1,4 @@
+require 'cgi'
 require 'mime-types'
 
 module RailsSassImages::Sass
@@ -14,8 +15,15 @@ module RailsSassImages::Sass
 
     mime = MIME::Types.type_for(asset.to_s).first.content_type
     file = asset.read
-    file = [file].flatten.pack('m').gsub("\n", '')
 
-    Sass::Script::String.new("url('data:#{mime};base64,#{file}')")
+    if mime == 'image/svg+xml'
+      file     = CGI::escape(file).gsub('+', '%20')
+      encoding = 'charset=utf-8'
+    else
+      file     = [file].flatten.pack('m').gsub("\n", '')
+      encoding = 'base64'
+    end
+
+    Sass::Script::String.new("url('data:#{mime};#{encoding},#{file}')")
   end
 end

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

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

data/spec/app/app/assets/images/square.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1 1"><path d="M0,0h1v1H0" fill="#ff0000"/></svg>

data/spec/app/app/assets/stylesheets/inline-svg.sass

@@ -0,0 +1,2 @@
+.icon
+  background: inline("square.svg")

data/spec/app/config/application.rb

@@ -9,10 +9,7 @@ end
 
 module App
   class Application < Rails::Application
-    config.encoding = "utf-8"
-    config.assets.enabled = true
-    config.assets.version = '1.0'
-
+    config.encoding = 'utf-8'
     config.secret_key_base = 'foo'
   end
 end

data/spec/plain_spec.rb

@@ -16,6 +16,12 @@ describe RailsSassImages do
         "/assets/#{path}"
       end
     end
+
+    @assets.context_class.instance_eval do
+      def sass_config
+        { }
+      end
+    end
   end
 
   after do
@@ -26,36 +32,36 @@ describe RailsSassImages do
 
     it "loads from dir" do
       RailsSassImages.load_from = DIR.join('app/app/assets/images')
-      @assets['size.css'].to_s.should == ".icon{width:4px;height:6px}\n"
+      expect(@assets['size.css'].to_s).to eq ".icon{width:4px;height:6px}\n"
     end
 
     it "loads by default from current dir" do
       RailsSassImages.load_from = '.'
-      @assets['relative.css'].to_s.should == ".icon{width:4px;height:6px}\n"
+      expect(@assets['relative.css'].to_s).to eq ".icon{width:4px;height:6px}\n"
     end
 
     it "loads assets from sprockets" do
       RailsSassImages.load_from = @assets
-      @assets['size.css'].to_s.should == ".icon{width:4px;height:6px}\n"
+      expect(@assets['size.css'].to_s).to eq ".icon{width:4px;height:6px}\n"
     end
 
     it "loads assets lazy" do
       RailsSassImages.load_from = proc { @assets }
-      @assets['size.css'].to_s.should == ".icon{width:4px;height:6px}\n"
+      expect(@assets['size.css'].to_s).to eq ".icon{width:4px;height:6px}\n"
     end
 
     it "raises error on unknown file in assets" do
       RailsSassImages.load_from = @assets
-      proc {
+      expect {
         @assets['wrong-inline.css']
-      }.should raise_error(/Can't find asset no\.png/)
+      }.to raise_error(/Can't find asset no\.png/)
     end
 
     it "raises error on unknown file in path" do
       RailsSassImages.load_from = '.'
-      proc {
+      expect {
         @assets['wrong-inline.css']
-      }.should raise_error(/Can't find asset no\.png in \./)
+      }.to raise_error(/Can't find asset no\.png in \./)
     end
 
   end
@@ -66,25 +72,30 @@ describe RailsSassImages do
     end
 
     it "inlines assets" do
-      @assets['inline.css'].to_s.should == ".icon{background:#{INLINE}}\n"
+      expect(@assets['inline.css'].to_s).to eq ".icon{background:#{INLINE}}\n"
+    end
+
+    it "inlines SVG" do
+      expect(@assets['inline-svg.css'].to_s).to eq ".icon{background:#{INLINE_SVG}}\n"
     end
 
     it "gets image size" do
-      @assets['size.css'].to_s.should == ".icon{width:4px;height:6px}\n"
+      expect(@assets['size.css'].to_s).to eq ".icon{width:4px;height:6px}\n"
     end
 
     it "gets image size by mixin" do
-      @assets['image-size.css'].to_s.should == ".icon{width:4px;height:6px}\n"
+      expect(@assets['image-size.css'].to_s).to eq(
+        ".icon{width:4px;height:6px}\n")
     end
 
     it "has hidpi-background mixin" do
-      @assets['hidpi-background.css'].to_s.should == (".icon{" +
+      expect(@assets['hidpi-background.css'].to_s).to eq (".icon{" +
         "background-image:url(/assets/monolith.png);" +
         "background-size:2px 3px}\n")
     end
 
     it "has hidpi-image mixin" do
-      @assets['hidpi-image.css'].to_s.should == ".icon{" +
+      expect(@assets['hidpi-image.css'].to_s).to eq ".icon{" +
         "width:2px;height:3px;" +
         "background-image:url(/assets/monolith.png);" +
         "background-size:2px 3px;" +
@@ -92,7 +103,7 @@ describe RailsSassImages do
     end
 
     it "has hidpi-inline mixin" do
-      @assets['hidpi-inline.css'].to_s.should == ".icon{" +
+      expect(@assets['hidpi-inline.css'].to_s).to eq ".icon{" +
         "width:2px;height:3px;" +
         "background:#{INLINE} no-repeat;" +
         "background-size:2px 3px}\n"

data/spec/rails_spec.rb

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

data/spec/spec_helper.rb

@@ -1,10 +1,13 @@
 ENV['RAILS_ENV'] ||= 'test'
 
-DIR = Pathname(__FILE__).dirname
-require DIR.join('app/config/environment').to_s
-require DIR.join('../lib/rails-sass-images').to_s
+require_relative 'app/config/environment'
+require_relative '../lib/rails-sass-images'
 
 require 'rspec/rails'
 
-INLINE = 'url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAGCAAAAADB' +
-         'UmCpAAAAC0lEQVQI12NgwAcAAB4AAW6FRzIAAAAASUVORK5CYII=")'
+DIR        = Pathname(__FILE__).dirname
+INLINE     = 'url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAGCAAAAADB' +
+             'UmCpAAAAC0lEQVQI12NgwAcAAB4AAW6FRzIAAAAASUVORK5CYII=")'
+INLINE_SVG = 'url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D%22http%3A%2F%2F' +
+             'www.w3.org%2F2000%2Fsvg%22%20viewBox%3D%220%200%201%201%22%3E%3Cpath' +
+             '%20d%3D%22M0%2C0h1v1H0%22%20fill%3D%22%23ff0000%22%2F%3E%3C%2Fsvg%3E%0A")'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-sass-images
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: '0.6'
 platform: ruby
 authors:
 - Andrey "A.I." Sitnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-24 00:00:00.000000000 Z
+date: 2015-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -83,10 +83,12 @@ files:
 - rails-sass-images.gemspec
 - spec/app/.gitignore
 - spec/app/app/assets/images/monolith.png
+- spec/app/app/assets/images/square.svg
 - spec/app/app/assets/stylesheets/hidpi-background.sass
 - spec/app/app/assets/stylesheets/hidpi-image.sass
 - spec/app/app/assets/stylesheets/hidpi-inline.sass
 - spec/app/app/assets/stylesheets/image-size.sass
+- spec/app/app/assets/stylesheets/inline-svg.sass
 - spec/app/app/assets/stylesheets/inline.sass
 - spec/app/app/assets/stylesheets/relative.sass
 - spec/app/app/assets/stylesheets/size.sass
@@ -122,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Sass functions and mixins to inline images and get images size