spritely 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 721132518267e110bd80c304728233e7205ee17b
-  data.tar.gz: 409be4e94f2e8c211e2c2ec409f0bb4d54f2f37b
+  metadata.gz: 1aeabc56574aebd3b05f381fe8ae100158ab1fa7
+  data.tar.gz: 6248f29cfd68142d27dc5037669ad7720d043996
 SHA512:
-  metadata.gz: 5140489bc42620192ebe3ca36fe6311baee5aece73a290d3a928345805b62745d93ed9bc8d667f135cda859502a9d143780771d453ce9dfa2713a905f0d883aa
-  data.tar.gz: 3eba0c2c8d580440ead81d95d9b0f893cf3f52247e2de139924b96dfddd405fa1759e0565ea6ed3bcac84f3b0d0d4640e90fb91cef485734fc8ea4711dd47249
+  metadata.gz: 99d976b70aea6b8d0d16bc8e08d0e0184dbc0d7581efe79825894d1b4490fc56b68c4a42fd08c80eccf0fb07bff30c095a6b919edda7246e0f4d1b2fb948db7a
+  data.tar.gz: c3019d1f01e9b4ff07a3780b211d6cbbd5fdaddcc63d2c36b6daa33a7bb6b952c12e31fb888e135f9eaa37c8d732786913802611ed401fbe667ab1df22f5aa79

data/lib/spritely/sprockets/manifest.rb

@@ -1,17 +1,20 @@
 require 'sprockets/manifest'
-require 'active_support/core_ext/module/aliasing'
 
-module Sprockets
+module Spritely
   # In order to hook into Sprockets' asset compilation appropriately, we must
   # chain our own implementation of `compile`. Our extension calls up to the
   # original, and then performs the same action on the generated sprite images,
   # forcing the sprites to be part of the compiled asset manifest.
-  class Manifest
-    def compile_with_sprites(*args)
-      compile_without_sprites(*args)
-      compile_without_sprites(*Dir.glob(Spritely.directory.join('*.png')))
+  module Sprockets
+    module Manifest
+      def compile(*args)
+        super
+        super(*Dir.glob(Spritely.directory.join('*.png')))
+      end
     end
 
-    alias_method_chain :compile, :sprites
+    # TODO: Once we drop support for Ruby 2.0, stop using `send`.
+    # `Module#prepend` was made public in Ruby 2.1.
+    ::Sprockets::Manifest.send(:prepend, Manifest)
   end
 end

data/lib/spritely/version.rb

@@ -1,3 +1,3 @@
 module Spritely
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/spritely.rb

@@ -1,4 +1,6 @@
 require 'sass'
+require 'sprockets/rails/version'
+require 'sprockets/railtie'
 require 'sprockets/version'
 require 'spritely/sass_functions'
 require 'spritely/sprockets/manifest'
@@ -7,7 +9,11 @@ require 'spritely/adapters/sprockets_3'
 
 module Spritely
   def self.environment
-    ::Rails.application.assets
+    if sprockets_rails_version == 3
+      ::Rails.application.assets || ::Sprockets::Railtie.build_environment(::Rails.application)
+    else
+      ::Rails.application.assets
+    end
   end
 
   def self.directory
@@ -19,7 +25,11 @@ module Spritely
   end
 
   def self.sprockets_version
-    Gem::Version.new(Sprockets::VERSION).segments.first
+    Gem::Version.new(::Sprockets::VERSION).segments.first
+  end
+
+  def self.sprockets_rails_version
+    Gem::Version.new(::Sprockets::Rails::VERSION).segments.first
   end
 
   def self.sprockets_adapter

data/spec/spritely_spec.rb

@@ -2,9 +2,25 @@ require 'spec_helper'
 
 describe Spritely do
   describe '.environment' do
-    before { stub_const('::Rails', double(application: double(assets: 'assets environment'))) }
+    let(:application) { double(assets: 'assets environment') }
+
+    before { stub_const('::Rails', double(application: application)) }
 
     its(:environment) { should eq('assets environment') }
+
+    context 'sprockets-rails version 3' do
+      before { stub_const('Sprockets::Rails::VERSION', '3.0.0') }
+
+      its(:environment) { should eq('assets environment') }
+
+      context 'the Rails application assets environment is nil' do
+        let(:application) { double(assets: nil) }
+
+        before { allow(::Sprockets::Railtie).to receive(:build_environment).with(application).and_return('new assets environment') }
+
+        its(:environment) { should eq('new assets environment') }
+      end
+    end
   end
 
   describe '.directory' do

data/spec/support/rails_app_helpers.rb

@@ -17,6 +17,7 @@ module RailsAppHelpers
           Bundler.with_clean_env do
             File.open('Gemfile', 'a') do |f|
               f.write("gem 'spritely', path: '#{__dir__}/../../'\n")
+              f.write("gem 'sprockets-rails', '#{Sprockets::Rails::VERSION}'\n")
               f.write("gem 'sprockets', '#{Sprockets::VERSION}'")
             end
             %x(bundle install)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spritely
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Alex Robbin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-17 00:00:00.000000000 Z
+date: 2015-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chunky_png
@@ -219,7 +219,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -227,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Hooks into the Rails asset pipeline to allow you to easily generate sprite