rails-sass-images 0.2 → 0.3

data/.travis.yml

@@ -1,10 +1,7 @@
 language: ruby
 bundler_args: --without development
 rvm:
-  - 1.8.7
   - 1.9.3
   - 2.0.0
-  - jruby-18mode
   - jruby-19mode
-  - rbx-18mode
   - rbx-19mode

data/ChangeLog

@@ -1,3 +1,7 @@
+== 0.3 (Michelangelo di Lodovico Buonarroti Simoni)
+* Allow to use with Sprockets in plain Ruby application.
+* Clean up code by removing Ruby 1.8 support.
+
 == 0.2 (Raffaello Sanzio da Urbino)
 * Rename retina-image and retina-inline mixins to hidpi-image and hidpi-inline.
 

data/Gemfile

@@ -3,3 +3,7 @@ source 'https://rubygems.org'
 gemspec
 gem 'rake'
 gem 'rspec-rails'
+
+gem 'rails',           '>= 4.0.0.rc1'
+gem 'sass-rails',      '>= 4.0.0.rc1'
+gem 'sprockets-rails', '>= 2.0.0.rc4'

data/Gemfile.lock

@@ -1,82 +1,72 @@
 PATH
   remote: .
   specs:
-    rails-sass-images (0.2)
+    rails-sass-images (0.3)
       dimensions (> 0)
-      rails (>= 3.1)
-      sass-rails (> 0)
+      mime-types (> 0)
+      sass (> 0)
+      sprockets (> 0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.13)
-      actionpack (= 3.2.13)
+    actionmailer (4.0.0.rc1)
+      actionpack (= 4.0.0.rc1)
       mail (~> 2.5.3)
-    actionpack (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
+    actionpack (4.0.0.rc1)
+      activesupport (= 4.0.0.rc1)
+      builder (~> 3.1.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    builder (3.0.4)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.0.rc1)
+      activesupport (= 4.0.0.rc1)
+      builder (~> 3.1.0)
+    activerecord (4.0.0.rc1)
+      activemodel (= 4.0.0.rc1)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.0.rc1)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.2)
+    activesupport (4.0.0.rc1)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    arel (4.0.0)
+    atomic (1.1.9)
+    builder (3.1.4)
     diff-lcs (1.2.4)
     dimensions (1.2.0)
     erubis (2.7.0)
     hike (1.2.2)
-    i18n (0.6.1)
-    journey (1.0.4)
-    json (1.7.7)
+    i18n (0.6.4)
     mail (2.5.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.23)
-    multi_json (1.7.2)
+    minitest (4.7.4)
+    multi_json (1.7.3)
     polyglot (0.3.3)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.3)
-      rack
+    rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.13)
-      actionmailer (= 3.2.13)
-      actionpack (= 3.2.13)
-      activerecord (= 3.2.13)
-      activeresource (= 3.2.13)
-      activesupport (= 3.2.13)
-      bundler (~> 1.0)
-      railties (= 3.2.13)
-    railties (3.2.13)
-      actionpack (= 3.2.13)
-      activesupport (= 3.2.13)
-      rack-ssl (~> 1.3.2)
+    rails (4.0.0.rc1)
+      actionmailer (= 4.0.0.rc1)
+      actionpack (= 4.0.0.rc1)
+      activerecord (= 4.0.0.rc1)
+      activesupport (= 4.0.0.rc1)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.0.rc1)
+      sprockets-rails (~> 2.0.0.rc4)
+    railties (4.0.0.rc1)
+      actionpack (= 4.0.0.rc1)
+      activesupport (= 4.0.0.rc1)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
+      thor (>= 0.18.1, < 2.0)
     rake (10.0.4)
-    rdoc (3.12.2)
-      json (~> 1.4)
     rspec-core (2.13.1)
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
@@ -89,17 +79,24 @@ GEM
       rspec-expectations (~> 2.13.0)
       rspec-mocks (~> 2.13.0)
     sass (3.2.8)
-    sass-rails (3.2.6)
-      railties (~> 3.2.0)
+    sass-rails (4.0.0.rc1)
+      railties (>= 4.0.0.beta, < 5.0)
       sass (>= 3.1.10)
+      sprockets-rails (~> 2.0.0.rc0)
       tilt (~> 1.3)
-    sprockets (2.2.2)
+    sprockets (2.9.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.0.0.rc4)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
     thor (0.18.1)
-    tilt (1.3.7)
+    thread_safe (0.1.0)
+      atomic
+    tilt (1.4.0)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
@@ -109,6 +106,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  rails (>= 4.0.0.rc1)
   rails-sass-images!
   rake
   rspec-rails
+  sass-rails (>= 4.0.0.rc1)
+  sprockets-rails (>= 2.0.0.rc4)

data/README.md

@@ -47,6 +47,8 @@ see [Autoprefixer](https://github.com/ai/autoprefixer).
 
 ## Usage
 
+### Ruby on Rails
+
 Add gem to your Rails `Gemfile`:
 
 ```ruby
@@ -58,3 +60,20 @@ and import mixins in your `application.sass`:
 ```sass
 @import "rails-sass-images"
 ```
+
+# Other
+
+You can use Rails Sass Images with plain Ruby application with Sprockets.
+Just install in to Sprockets environment:
+
+```ruby
+require 'rails-sass-images'
+
+RailsSassImages.install(sprockets_env)
+```
+
+and import mixins in your Sass files:
+
+```sass
+@import "rails-sass-images"
+```

data/lib/rails-sass-images.rb

@@ -17,21 +17,34 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 =end
 
 require 'pathname'
-dir = Pathname(__FILE__).dirname.join('rails-sass-images')
 
 module RailsSassImages
-  # Enable `lib/assets/`
-  class Engine < ::Rails::Engine
-  end
-
   # Return asset by file `path` from Sass parser
   def self.asset(path)
     path  = path.value
-    asset = Rails.application.assets[path]
+    asset = self.assets[path]
     raise "Can't find asset #{path}" unless asset
     asset
   end
+
+  # Set Sprockets environment and add Rails Sass Images styles paths
+  def self.install(sprockets)
+    sprockets.append_path(Pathname(__FILE__).dirname.join('assets/stylesheets'))
+    self.assets = sprockets
+  end
+
+  # Set Sprockets environment
+  def self.assets=(env = nil)
+    @assets = env
+  end
+
+  # Get Sprockets environment
+  def self.assets
+    @assets
+  end
 end
 
+dir = Pathname(__FILE__).dirname.join('rails-sass-images')
 require dir.join('version')
 require dir.join('sass')
+require dir.join('railtie') if defined?(Rails)

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

@@ -0,0 +1,30 @@
+=begin
+Copyright 2013 Andrey “A.I.” Sitnik <andrey@sitnik.ru>,
+sponsored by Evil Martians.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+=end
+
+module RailsSassImages
+  # Enable `lib/assets/`
+  class Engine < ::Rails::Engine
+  end
+
+  # Rails integration
+  class Railtie < Rails::Railtie
+    initializer 'rails-sass-images' do
+      RailsSassImages.assets = Rails.application.assets
+    end
+  end
+end

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

@@ -16,7 +16,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 =end
 
-require 'sass-rails'
+require 'sass'
 
 dir = Pathname(__FILE__).dirname.join('sass')
 Dir.glob(dir.join('*.rb').to_s) { |ext| require ext }

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

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

data/rails-sass-images.gemspec

@@ -17,7 +17,8 @@ Gem::Specification.new do |s|
   s.email    = 'andrey@sitnik.ru'
   s.homepage = 'https://github.com/ai/rails-sass-images'
 
-  s.add_dependency 'sass-rails', ['> 0']
+  s.add_dependency 'sass',       ['> 0']
+  s.add_dependency 'sprockets',  ['> 0']
   s.add_dependency 'dimensions', ['> 0']
-  s.add_dependency 'rails',      ['>= 3.1']
+  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 text: Rails.application.assets[file]
   end
 end

data/spec/app/config/application.rb

@@ -4,7 +4,7 @@ require "action_controller/railtie"
 require "sprockets/railtie"
 
 if defined?(Bundler)
-  Bundler.require(*Rails.groups(:assets => %w(development test)))
+  Bundler.require(*Rails.groups(assets: %w(development test)))
 end
 
 module App
@@ -13,6 +13,6 @@ module App
     config.assets.enabled = true
     config.assets.version = '1.0'
 
-    config.sass.style = :compressed
+    config.secret_key_base = 'foo'
   end
 end

data/spec/app/config/environments/test.rb

@@ -1,11 +1,13 @@
 App::Application.configure do
-  config.cache_classes = true
-  config.serve_static_assets = true
-  config.static_cache_control = "public, max-age=3600"
-  config.whiny_nils = true
-  config.consider_all_requests_local = true
-  config.action_controller.perform_caching = false
-  config.action_dispatch.show_exceptions = false
+  config.eager_load                                 = false
+  config.cache_classes                              = true
+  config.serve_static_assets                        = true
+  config.static_cache_control                       = "public, max-age=3600"
+  config.active_support.deprecation                 = :stderr
+  config.consider_all_requests_local                = true
+  config.action_dispatch.show_exceptions            = false
+  config.action_controller.perform_caching          = false
   config.action_controller.allow_forgery_protection = false
-  config.active_support.deprecation = :stderr
+
+  config.assets.css_compressor = :sass
 end

data/spec/app/config/routes.rb

@@ -1,3 +1,3 @@
 App::Application.routes.draw do
-  root :to => 'css#test'
+  root to: 'css#test'
 end

data/spec/plain_spec.rb

@@ -0,0 +1,56 @@
+require File.expand_path('../spec_helper', __FILE__)
+
+require 'sprockets'
+
+describe RailsSassImages do
+  before(:all) do
+    @original = RailsSassImages.assets
+
+    @assets = Sprockets::Environment.new
+    @assets.append_path(DIR.join('app/app/assets/images'))
+    @assets.append_path(DIR.join('app/app/assets/stylesheets'))
+    @assets.css_compressor = :sass
+
+    @assets.context_class.class_eval do
+      def asset_path(path, options = {})
+        "/assets/#{path}"
+      end
+    end
+
+    RailsSassImages.install(@assets)
+  end
+
+  after(:all) do
+    RailsSassImages.assets = @original
+  end
+
+  it "should inline assets" do
+    @assets['inline.css'].to_s.should == ".icon{background:#{INLINE}}\n"
+  end
+
+  it "should raise error on unknown file" do
+    proc {
+      @assets['wrong-inline.css']
+    }.should raise_error(/Can't find asset no\.png/)
+  end
+
+  it "should get image size" do
+    @assets['size.css'].to_s.should == ".icon{width:4px;height:6px}\n"
+  end
+
+  it "should get image size by mixin" do
+    @assets['image-size.css'].to_s.should == ".icon{width:4px;height:6px}\n"
+  end
+
+  it "should has hidpi-image mixin" do
+    @assets['hidpi-image.css'].to_s == ".icon{width:2px;height:3px;" +
+      "background:url(/assets/monolith.png) no-repeat;" +
+      "background-size:2px 3px}\n"
+  end
+
+  it "should has hidpi-inline mixin" do
+    @assets['hidpi-inline.css'].to_s.should == ".icon{width:2px;height:3px;" +
+      "background:#{INLINE} no-repeat;" +
+      "background-size:2px 3px}\n"
+  end
+end

data/spec/{sass_spec.rb → rails_spec.rb}

@@ -1,37 +1,37 @@
 require File.expand_path('../spec_helper', __FILE__)
 
-describe CssController, :type => :controller do
+describe CssController, type: :controller do
   after :all do
     Rails.root.join('tmp').rmtree
     Rails.root.join('log').rmtree
   end
 
   it "should inline assets" do
-    get :test, :file => 'inline'
+    get :test, file: 'inline'
     response.should be_success
     response.body.should == ".icon{background:#{INLINE}}\n"
   end
 
   it "should raise error on unknown file" do
     proc {
-      get :test, :file => 'wrong-inline'
+      get :test, file: 'wrong-inline'
     }.should raise_error(/Can't find asset no\.png/)
   end
 
   it "should get image size" do
-    get :test, :file => 'size'
+    get :test, file: 'size'
     response.should be_success
     response.body.should == ".icon{width:4px;height:6px}\n"
   end
 
   it "should get image size by mixin" do
-    get :test, :file => 'image-size'
+    get :test, file: 'image-size'
     response.should be_success
     response.body.should == ".icon{width:4px;height:6px}\n"
   end
 
   it "should has hidpi-image mixin" do
-    get :test, :file => 'hidpi-image'
+    get :test, file: 'hidpi-image'
     response.should be_success
     response.body.should == ".icon{width:2px;height:3px;" +
       "background:url(/assets/monolith.png) no-repeat;" +
@@ -39,7 +39,7 @@ describe CssController, :type => :controller do
   end
 
   it "should has hidpi-inline mixin" do
-    get :test, :file => 'hidpi-inline'
+    get :test, file: 'hidpi-inline'
     response.should be_success
     response.body.should == ".icon{width:2px;height:3px;" +
       "background:#{INLINE} no-repeat;" +

data/spec/spec_helper.rb

@@ -1,12 +1,10 @@
-# encoding: utf-8
 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 'pp'
 require 'rspec/rails'
 
-INLINE = "url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAGCAAAAADB" +
-         "UmCpAAAAC0lEQVQI12NgwAcAAB4AAW6FRzIAAAAASUVORK5CYII=')"
+INLINE = 'url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAGCAAAAADB' +
+         'UmCpAAAAC0lEQVQI12NgwAcAAB4AAW6FRzIAAAAASUVORK5CYII=")'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-sass-images
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,26 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-29 00:00:00.000000000 Z
+date: 2013-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sass-rails
+  name: sass
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sprockets
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -44,21 +60,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: mime-types
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ! '>'
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ! '>'
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0'
 description: 
 email: andrey@sitnik.ru
 executables: []
@@ -83,6 +99,7 @@ files:
 - lib/assets/stylesheets/rails-sass-images/hidpi-inline.sass
 - lib/assets/stylesheets/rails-sass-images/image-size.sass
 - lib/rails-sass-images.rb
+- lib/rails-sass-images/railtie.rb
 - lib/rails-sass-images/sass.rb
 - lib/rails-sass-images/sass/inline.rb
 - lib/rails-sass-images/sass/size.rb
@@ -104,7 +121,8 @@ files:
 - spec/app/config/environment.rb
 - spec/app/config/environments/test.rb
 - spec/app/config/routes.rb
-- spec/sass_spec.rb
+- spec/plain_spec.rb
+- spec/rails_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/ai/rails-sass-images
 licenses: []
@@ -120,7 +138,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2995797738750552235
+      hash: 3926307620625692974
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -129,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2995797738750552235
+      hash: 3926307620625692974
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23