spritely 0.2.7 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 547b537b0bb23044c585abf41002bf689d94d3af
-  data.tar.gz: dede178e411e13338852a0e331fab4ca7da38049
+  metadata.gz: 721132518267e110bd80c304728233e7205ee17b
+  data.tar.gz: 409be4e94f2e8c211e2c2ec409f0bb4d54f2f37b
 SHA512:
-  metadata.gz: bd3f6cb6c50ef2404ac88f22ce1ac523388d0ab5a20b2d36923c3a958a44f02a6cc8ebca4b3b0d260345afe7efa999baecfa227d143fd09cbc6dd877baabc457
-  data.tar.gz: cd38facbc1ac5ce4a817300633b8a80ad8e193e08e8597ce65eb88d51894ffd51d502aa379952c1c3f795966f47bbc367a5c7bfe1013176404c7c8e3eaf104b1
+  metadata.gz: 5140489bc42620192ebe3ca36fe6311baee5aece73a290d3a928345805b62745d93ed9bc8d667f135cda859502a9d143780771d453ce9dfa2713a905f0d883aa
+  data.tar.gz: 3eba0c2c8d580440ead81d95d9b0f893cf3f52247e2de139924b96dfddd405fa1759e0565ea6ed3bcac84f3b0d0d4640e90fb91cef485734fc8ea4711dd47249

data/lib/spritely.rb

@@ -1,6 +1,9 @@
 require 'sass'
+require 'sprockets/version'
 require 'spritely/sass_functions'
 require 'spritely/sprockets/manifest'
+require 'spritely/adapters/sprockets_2'
+require 'spritely/adapters/sprockets_3'
 
 module Spritely
   def self.environment
@@ -14,4 +17,12 @@ module Spritely
   def self.relative_folder_path
     Pathname.new(File.join('app', 'assets', 'images', 'sprites'))
   end
+
+  def self.sprockets_version
+    Gem::Version.new(Sprockets::VERSION).segments.first
+  end
+
+  def self.sprockets_adapter
+    Adapters.const_get("Sprockets#{sprockets_version}").new
+  end
 end

data/lib/spritely/adapters/sprockets_2.rb

@@ -0,0 +1,13 @@
+module Spritely
+  module Adapters
+    class Sprockets2
+      def reset_cache!(environment, filename)
+        environment.instance_variable_get(:@assets).delete_if { |_, asset| asset.pathname == filename }
+        environment.send(:trail).tap do |trail|
+          trail.instance_variable_get(:@entries).delete(Spritely.directory.to_s)
+          trail.instance_variable_get(:@stats).delete(filename.to_s)
+        end
+      end
+    end
+  end
+end

data/lib/spritely/adapters/sprockets_3.rb

@@ -0,0 +1,11 @@
+module Spritely
+  module Adapters
+    class Sprockets3
+      def reset_cache!(environment, filename)
+        environment.instance_variable_get(:@uris).delete_if { |_, asset| asset.pathname == filename }
+        environment.instance_variable_get(:@entries).delete(Spritely.directory.to_s)
+        environment.instance_variable_get(:@stats).delete(filename.to_s)
+      end
+    end
+  end
+end

data/lib/spritely/sass_functions.rb

@@ -4,7 +4,7 @@ module Spritely
   module SassFunctions
     def spritely_map(glob, kwargs = {})
       SpriteMap.create(glob.value, kwargs).tap do |sprite_map|
-        reset_sprockets_caches!(sprite_map)
+        Spritely.sprockets_adapter.reset_cache!(sprockets_environment, sprite_map.filename)
         sprockets_context.depend_on(Spritely.directory)
         sprite_map.files.each do |file|
           sprockets_context.depend_on(file)
@@ -59,14 +59,6 @@ module Spritely
     def find_image(sprite_map, image_name)
       sprite_map.find(image_name.value) || raise(Sass::SyntaxError, "No image '#{image_name.value}' found in sprite map '#{sprite_map.name}'.")
     end
-
-    def reset_sprockets_caches!(sprite_map)
-      sprockets_environment.instance_variable_get(:@assets).delete_if { |_, asset| asset.pathname == sprite_map.filename }
-      sprockets_environment.send(:trail).tap do |trail|
-        trail.instance_variable_get(:@entries).delete(Spritely.directory.to_s)
-        trail.instance_variable_get(:@stats).delete(sprite_map.filename.to_s)
-      end
-    end
   end
 end
 

data/lib/spritely/version.rb

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

data/spec/fixtures/rails-app/config/initializers/assets.rb

@@ -0,0 +1,3 @@
+# Rails 4.2 turns on asset digest in development.
+# This turns them on for all Rails versions.
+Rails.application.config.assets.digest = true

data/spec/integration/stylesheet_spec.rb

@@ -2,12 +2,14 @@ require 'spec_helper'
 require 'active_support/core_ext/string/strip'
 
 describe 'Stylesheet generation', :integration do
-  subject(:stylesheet) { render_asset('sprites.css') }
+  subject!(:stylesheet) { render_asset('sprites.css') }
+
+  let!(:background_image_url) { spite_image_path("application") }
 
   describe 'body CSS with repetition' do
     it { should include(<<-CSS.strip_heredoc
       body {
-        background-image: url(/assets/sprites/application.png);
+        background-image: url(#{background_image_url});
         background-position: 0 0;
       }
     CSS
@@ -17,7 +19,7 @@ describe 'Stylesheet generation', :integration do
   describe '#mario CSS with no repetition' do
     it { should include(<<-CSS.strip_heredoc
       #mario {
-        background-image: url(/assets/sprites/application.png);
+        background-image: url(#{background_image_url});
         background-position: -150px -806px;
         width: 200px;
         height: 214px;

data/spec/spec_helper.rb

@@ -12,6 +12,8 @@ RSpec.configure do |config|
     c.syntax = :expect
   end
 
+  config.include "Sprockets#{Spritely.sprockets_version}SassFunctionsHelpers".constantize, :sass_functions
+
   config.include RailsAppHelpers, :integration
   config.include GeneratorSpec::GeneratorExampleGroup, :generator
   config.around(:each, :integration) { |example| within_rails_app(&example) }

data/spec/spritely/sass_functions_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'sprockets'
 require 'ostruct'
 
-describe Spritely::SassFunctions do
+describe Spritely::SassFunctions, :sass_functions do
   class SpriteMapDouble < Sass::Script::Literal
     def name; 'test'; end
     def filename; 'test.png'; end
@@ -15,6 +15,7 @@ describe Spritely::SassFunctions do
 
   before do
     allow(Spritely).to receive(:directory).and_return(directory)
+    allow(Spritely).to receive_message_chain(:sprockets_adapter, :reset_cache!)
     allow(Spritely::SpriteMap).to receive(:create).and_return(sprite_map)
     allow(sprite_map).to receive(:find).with('bar').and_return(image)
   end
@@ -28,11 +29,10 @@ describe Spritely::SassFunctions do
   end
 
   shared_examples "a sprite function that resets the sprockets directory caches" do
-    it 'should clear out the trail caches' do
+    it 'should clear the Sprockets cache' do
       subject
-      expect(environment.instance_variable_get(:@assets).length).to eq(0)
-      expect(environment.send(:trail).instance_variable_get(:@entries)).to_not have_key(directory)
-      expect(environment.send(:trail).instance_variable_get(:@stats)).to_not have_key('test.png')
+
+      expect(Spritely.sprockets_adapter).to have_received(:reset_cache!).with(sprockets_environment, 'test.png')
     end
   end
 
@@ -85,21 +85,4 @@ describe Spritely::SassFunctions do
 
     it { should eq(".height {\n  height: 50px; }\n") }
   end
-
-  def evaluate(value)
-    Sprockets::ScssTemplate.new { value }.evaluate(environment.context_class.new(environment, nil, nil), nil)
-  end
-
-  def environment
-    @environment ||= Sprockets::Environment.new.tap do |environment|
-      environment.instance_variable_set(:@assets, {'test' => OpenStruct.new(pathname: 'test.png')})
-      environment.send(:trail).instance_variable_set(:@entries, {'spritely-directory' => 'blah'})
-      environment.send(:trail).instance_variable_set(:@stats, {'test.png' => 'blah'})
-      environment.context_class.class_eval do
-        def asset_path(path, options = {})
-          path
-        end
-      end
-    end
-  end
 end

data/spec/spritely_spec.rb

@@ -16,4 +16,10 @@ describe Spritely do
   describe '.relative_folder_path' do
     its(:relative_folder_path) { should eq(Pathname.new('app/assets/images/sprites')) }
   end
+
+  describe '.sprockets_version' do
+    before { stub_const('Sprockets::VERSION', '1.0') }
+
+    its(:sprockets_version) { should eq(1) }
+  end
 end

data/spec/support/rails_app_helpers.rb

@@ -3,7 +3,8 @@ module RailsAppHelpers
     '--skip-active-record',
     '--skip-test-unit',
     '--skip-javascript',
-    '--skip-spring'
+    '--skip-spring',
+    '--skip-bundle'
   ]
 
   def within_rails_app(&block)
@@ -16,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', '#{Sprockets::VERSION}'")
             end
             %x(bundle install)
             %x(rails generate spritely:install)
@@ -31,6 +33,12 @@ module RailsAppHelpers
     runner "puts Rails.application.assets[#{filename.inspect}]"
   end
 
+  def spite_image_path(sprite_name)
+    # TODO: When Sprockets 2.0 support is dropped (probably when Sprockets 4.0 is released), swap `digest` for `hexdigest`
+    fingerprint = runner(%~puts Rails.application.assets["sprites/#{sprite_name}.png"].digest~)
+    "/assets/sprites/application-#{fingerprint.strip}.png"
+  end
+
   def compile_assets
     %x(RAILS_ENV=production rake assets:precompile)
   end

data/spec/support/shared_examples/sprockets_2_sass_functions_helpers.rb

@@ -0,0 +1,13 @@
+module Sprockets2SassFunctionsHelpers
+  def evaluate(value)
+    Sprockets::ScssTemplate.new { value }.evaluate(sprockets_environment.context_class.new(sprockets_environment, nil, nil), nil)
+  end
+
+  def sprockets_environment
+    @sprockets_environment ||= Sprockets::Environment.new.tap do |sprockets_environment|
+      sprockets_environment.context_class.class_eval do
+        def asset_path(path, options = {}); path; end
+      end
+    end
+  end
+end

data/spec/support/shared_examples/sprockets_3_sass_functions_helpers.rb

@@ -0,0 +1,15 @@
+module Sprockets3SassFunctionsHelpers
+  def evaluate(value)
+    Sprockets::ScssProcessor.call(environment: sprockets_environment, data: value, filename: "test.scss", metadata: {}, cache: Sprockets::Cache.new)[:data]
+  end
+
+  def sprockets_environment
+    @sprockets_environment ||= Sprockets::CachedEnvironment.new(Sprockets::Environment.new).tap do |sprockets_environment|
+      sprockets_environment.context_class.class_eval do
+        def depend_on(path); end
+        def depend_on_asset(path); end
+        def asset_path(path, options = {}); path; end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spritely
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.3.0
 platform: ruby
 authors:
 - Alex Robbin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-26 00:00:00.000000000 Z
+date: 2015-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chunky_png
@@ -30,7 +30,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
@@ -40,7 +40,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
@@ -62,14 +62,14 @@ dependencies:
   name: sprockets-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
@@ -165,6 +165,8 @@ extra_rdoc_files: []
 files:
 - lib/generators/spritely/install_generator.rb
 - lib/spritely.rb
+- lib/spritely/adapters/sprockets_2.rb
+- lib/spritely/adapters/sprockets_3.rb
 - lib/spritely/cache.rb
 - lib/spritely/collection.rb
 - lib/spritely/generators/base.rb
@@ -186,6 +188,7 @@ files:
 - spec/fixtures/rails-app/app/assets/images/foo/fool.png
 - spec/fixtures/rails-app/app/assets/stylesheets/sprites.css.scss
 - spec/fixtures/rails-app/app/assets/stylesheets/sprites_2.css.scss
+- spec/fixtures/rails-app/config/initializers/assets.rb
 - spec/fixtures/test/foo.png
 - spec/generators/spritely/install_generator_spec.rb
 - spec/integration/precompilation_spec.rb
@@ -202,6 +205,8 @@ files:
 - spec/spritely_spec.rb
 - spec/support/rails_app_helpers.rb
 - spec/support/shared_examples.rb
+- spec/support/shared_examples/sprockets_2_sass_functions_helpers.rb
+- spec/support/shared_examples/sprockets_3_sass_functions_helpers.rb
 homepage: https://github.com/agrobbin/spritely
 licenses:
 - MIT
@@ -222,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Hooks into the Rails asset pipeline to allow you to easily generate sprite
@@ -236,6 +241,7 @@ test_files:
 - spec/fixtures/rails-app/app/assets/images/foo/fool.png
 - spec/fixtures/rails-app/app/assets/stylesheets/sprites.css.scss
 - spec/fixtures/rails-app/app/assets/stylesheets/sprites_2.css.scss
+- spec/fixtures/rails-app/config/initializers/assets.rb
 - spec/fixtures/rails-app-changes/app/assets/images/application/dropdown-arrow.png
 - spec/fixtures/rails-app-changes/app/assets/stylesheets/sprites.css.scss
 - spec/fixtures/test/foo.png
@@ -253,4 +259,6 @@ test_files:
 - spec/spritely/sprite_map_spec.rb
 - spec/spritely_spec.rb
 - spec/support/rails_app_helpers.rb
+- spec/support/shared_examples/sprockets_2_sass_functions_helpers.rb
+- spec/support/shared_examples/sprockets_3_sass_functions_helpers.rb
 - spec/support/shared_examples.rb