spritely 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 667e7648ac4d154e6ec6f9a98b08f1f50a2aae93
-  data.tar.gz: 8ce617668fea3fc218ac4bff2aad24988ba9bdc1
+  metadata.gz: 41e28bf3c683cf51ded0b5bf335e09274ba130c0
+  data.tar.gz: 0f2b23688154ab07300b3d14d7184d84af3d2eec
 SHA512:
-  metadata.gz: 0b8fb5a5c96ebb17a0c3aefca9a4081f4036c259b182b82cbcfb37085b64da7f10cea73aa1c9b10bd74a0afc4a24ede9ca431ac8db8853559024236ef46aea82
-  data.tar.gz: ac6fc8c395a4a934217090846e458347cc6d150c09dca1ff87000dd6df91191662e0dca3eba6861da2356f5b2ce8a885224c024d9e9f1479df6ceeb9fe156c3c
+  metadata.gz: 95f01f44df4c8d559fa3f2fbffa5cd5d972354d3471b025507747d99fc2d2e09cf9774062665e22586417c032f1763754779f4bfca9c1a3662b1cf1621166211
+  data.tar.gz: a23a5f9d76f0a8c34d127c2963ce740174c54b8efff1c633c3693c1b17e6b3d184404feb03b6f0de0c181a9e5c4c89d05d1ead3b049f9af3c949bc3bd8a813f0

data/lib/spritely/sass_functions.rb

@@ -4,6 +4,7 @@ module Spritely
   module SassFunctions
     def spritely_map(glob, kwargs = {})
       SpriteMap.create(glob.value, kwargs).tap do |sprite_map|
+        reset_sprockets_directory_cache!
         sprite_map.files.each do |file|
           sprockets_context.depend_on(file)
           sprockets_context.depend_on_asset(file)
@@ -57,6 +58,10 @@ 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_directory_cache!
+      sprockets_context.environment.send(:trail).instance_variable_get(:@entries).delete(Spritely.directory.to_s)
+    end
   end
 end
 

data/lib/spritely/version.rb

@@ -1,3 +1,3 @@
 module Spritely
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/fixtures/rails-app/app/assets/stylesheets/sprites_2.css.scss

@@ -0,0 +1,8 @@
+$foo-sprite: spritely-map("foo/*.png", $spacing: 5px);
+
+#foo {
+  background-image: spritely-url($foo-sprite);
+  background-position: spritely-position($foo-sprite, "fool");
+  width: spritely-width($foo-sprite, "fool");
+  height: spritely-height($foo-sprite, "fool");
+}

data/spec/integration/stylesheet_spec.rb

@@ -25,4 +25,14 @@ describe 'Stylesheet generation', :integration do
     CSS
     ) }
   end
+
+  describe 'multiple sprite maps across files' do
+    it 'should produce the correct asset URL for both sprites' do
+      compile_assets
+      compiled_css = File.read(Dir.glob(File.join('public', 'assets', 'application-*.css')).first)
+      expect(compiled_css).to include('url(/assets/sprites/application')
+      expect(compiled_css).to include('url(/assets/sprites/foo')
+      expect(compiled_css).to_not include('url(/sprites/')
+    end
+  end
 end

data/spec/spritely/sass_functions_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'sprockets'
 
 describe Spritely::SassFunctions do
   class SpriteMapDouble < Sass::Script::Literal
@@ -6,23 +7,15 @@ describe Spritely::SassFunctions do
     def files; []; end
   end
 
-  module AssetUrlModule
-    def asset_url(path)
-      Sass::Script::String.new("url(#{path})")
-    end
-  end
-
   let(:sprite_map) { SpriteMapDouble.new }
   let(:image) { double(left: 10, top: 12, width: 25, height: 50) }
 
   before do
+    allow(Spritely).to receive(:directory).and_return('spritely-directory')
     allow(Spritely::SpriteMap).to receive(:create).and_return(sprite_map)
     allow(sprite_map).to receive(:find).with('bar').and_return(image)
   end
 
-  before(:all) { ::Sass::Script::Functions.send(:include, AssetUrlModule) }
-  after(:all) { ::Sass::Script::Functions.send(:undef_method, :asset_url) }
-
   shared_examples "a sprite function that checks image existence" do
     let(:image) { nil }
 
@@ -31,51 +24,75 @@ describe Spritely::SassFunctions do
     end
   end
 
+  shared_examples "a sprite function that resets the sprockets directory cache" do
+    it 'should clear out the trail entries' do
+      subject
+      expect(environment.send(:trail).instance_variable_get(:@entries)).to_not have_key('spritely-directory')
+    end
+  end
+
   describe '#spritely_url' do
-    subject { evaluate("spritely-url(spritely-map('test/*.png'))") }
+    subject { evaluate(".background-image { background-image: spritely-url(spritely-map('test/*.png')); }") }
+
+    it_should_behave_like "a sprite function that resets the sprockets directory cache"
 
-    it { should eq('url(sprites/test.png)') }
+    it { should eq(".background-image {\n  background-image: url(sprites/test.png); }\n") }
   end
 
   describe '#spritely_position' do
-    subject { evaluate("spritely-position(spritely-map('test/*.png'), 'bar')") }
+    subject { evaluate(".background-position { background-position: spritely-position(spritely-map('test/*.png'), 'bar'); }") }
 
     it_should_behave_like "a sprite function that checks image existence"
+    it_should_behave_like "a sprite function that resets the sprockets directory cache"
 
-    it { should eq('-10px -12px') }
+    it { should eq(".background-position {\n  background-position: -10px -12px; }\n") }
 
     context 'the positions are both 0' do
       let(:image) { double(left: 0, top: 0) }
 
-      it { should eq('0 0') }
+      it { should eq(".background-position {\n  background-position: 0 0; }\n") }
     end
   end
 
   describe '#spritely_background' do
-    subject { evaluate("spritely-background(spritely-map('test/*.png'), 'bar')") }
+    subject { evaluate(".background { background: spritely-background(spritely-map('test/*.png'), 'bar'); }") }
 
     it_should_behave_like "a sprite function that checks image existence"
+    it_should_behave_like "a sprite function that resets the sprockets directory cache"
 
-    it { should eq('url(sprites/test.png) -10px -12px') }
+    it { should eq(".background {\n  background: url(sprites/test.png) -10px -12px; }\n") }
   end
 
   describe '#spritely_width' do
-    subject { evaluate("spritely-width(spritely-map('test/*.png'), 'bar')") }
+    subject { evaluate(".width { width: spritely-width(spritely-map('test/*.png'), 'bar'); }") }
 
     it_should_behave_like "a sprite function that checks image existence"
+    it_should_behave_like "a sprite function that resets the sprockets directory cache"
 
-    it { should eq('25px') }
+    it { should eq(".width {\n  width: 25px; }\n") }
   end
 
   describe '#spritely_height' do
-    subject { evaluate("spritely-height(spritely-map('test/*.png'), 'bar')") }
+    subject { evaluate(".height { height: spritely-height(spritely-map('test/*.png'), 'bar'); }") }
 
     it_should_behave_like "a sprite function that checks image existence"
+    it_should_behave_like "a sprite function that resets the sprockets directory cache"
 
-    it { should eq('50px') }
+    it { should eq(".height {\n  height: 50px; }\n") }
   end
 
   def evaluate(value)
-    Sass::Script::Parser.parse(value, 0, 0).perform(Sass::Environment.new).to_s
+    Sprockets::ScssTemplate.new { value }.evaluate(environment.context_class.new(environment, nil, nil), nil)
+  end
+
+  def environment
+    @environment ||= Sprockets::Environment.new.tap do |environment|
+      environment.send(:trail).instance_variable_set(:@entries, {'spritely-directory' => 'blah'})
+      environment.context_class.class_eval do
+        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.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Alex Robbin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-06 00:00:00.000000000 Z
+date: 2014-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chunky_png
@@ -166,7 +166,9 @@ files:
 - spec/fixtures/rails-app/app/assets/images/application/fool.png
 - spec/fixtures/rails-app/app/assets/images/application/football.png
 - spec/fixtures/rails-app/app/assets/images/application/mario.png
+- 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/test/foo.png
 - spec/integration/precompilation_spec.rb
 - spec/integration/stylesheet_spec.rb
@@ -213,7 +215,9 @@ test_files:
 - spec/fixtures/rails-app/app/assets/images/application/fool.png
 - spec/fixtures/rails-app/app/assets/images/application/football.png
 - spec/fixtures/rails-app/app/assets/images/application/mario.png
+- 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/test/foo.png
 - spec/integration/precompilation_spec.rb
 - spec/integration/stylesheet_spec.rb