spritely 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1afa4634c2ebe161a2557ad31168f308f4fd4de
-  data.tar.gz: 176498f2a2579987e8c8ac4c12cc960e1ceba4b5
+  metadata.gz: ab534f8d3de68e48fe062b507a94502cc9f7ab5d
+  data.tar.gz: ff98e8e98cf0bf235bf0d2c09087d3682c54876b
 SHA512:
-  metadata.gz: 95d85bb25e1761b8223f6fc2bc2aeb50a9e3c8f7cb91e15842b5f767d7b8545fe330dfdec6f39b9919107d82b83ccae1eee973863f15a47dbad28f74aae8d78a
-  data.tar.gz: 6709371eaedb1db506fa2ab023f197e978e477f0017a1100e3f2337663b64c86c32e39250109cd3b91fedfce315259dd060b14c045202051f6245fc3cf70ecc5
+  metadata.gz: 849dcbfe7926d77b285eb087a0adabb641e423c25f1583c755a025d5d60b7a7f94337591ac119a928cfbec4ecf0d31a998f10656771c11fc18abe0b548004d33
+  data.tar.gz: 550db56989efc700924c785c6846673968e9c3b777d128c889f400a081f54af2a9838a8c6970d9a72108e8b4f2280f7b63191b3489edda126566f662046d3bbe

data/lib/spritely/sass_functions.rb

@@ -27,16 +27,24 @@ module Spritely
 
     ::Sass::Script::Functions.declare :spritely_background, [:sprite_name, :image_name]
 
-    def spritely_width(sprite_name, image_name)
-      image = find_image(sprite_name, image_name)
+    def spritely_width(sprite_name, image_name = nil)
+      image = if image_name
+        find_image(sprite_name, image_name)
+      else
+        find_sprite_map(sprite_name)
+      end
 
       Sass::Script::Number.new(image.width, ['px'])
     end
 
     ::Sass::Script::Functions.declare :spritely_width, [:sprite_name, :image_name]
 
-    def spritely_height(sprite_name, image_name)
-      image = find_image(sprite_name, image_name)
+    def spritely_height(sprite_name, image_name = nil)
+      image = if image_name
+        find_image(sprite_name, image_name)
+      else
+        find_sprite_map(sprite_name)
+      end
 
       Sass::Script::Number.new(image.height, ['px'])
     end
@@ -46,15 +54,19 @@ module Spritely
     private
 
     def find_image(sprite_name, image_name)
+      sprite_map = find_sprite_map(sprite_name)
+
+      sprite_map.find(image_name.value) || raise(Sass::SyntaxError, "No image '#{image_name.value}' found in sprite map '#{sprite_map.name}'.")
+    end
+
+    def find_sprite_map(sprite_name)
       sprockets_context.link_asset("sprites/#{sprite_name.value}.png")
 
-      sprite_map = sprite_maps.fetch(sprite_name.value) do |name|
+      sprite_maps.fetch(sprite_name.value) do |name|
         asset = sprockets_environment.find_asset("sprites/#{name}.png.sprite") || raise(Sass::SyntaxError, "No sprite map '#{name}' found.")
 
         sprite_maps[name] = SpriteMap.new(name, sprockets_environment, asset.metadata[:sprite_directives])
       end
-
-      sprite_map.find(image_name.value) || raise(Sass::SyntaxError, "No image '#{image_name.value}' found in sprite map '#{sprite_map.name}'.")
     end
 
     def sprite_maps

data/lib/spritely/version.rb

@@ -1,3 +1,3 @@
 module Spritely
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/spec/spritely/sass_functions_spec.rb

@@ -3,7 +3,7 @@ require 'sprockets'
 
 describe Spritely::SassFunctions do
   let(:asset) { double(metadata: { sprite_directives: 'directives' }) }
-  let(:sprite_map) { double(name: 'test') }
+  let(:sprite_map) { double(name: 'test', width: 100, height: 200) }
   let(:image) { double(left: 10, top: 12, width: 25, height: 50) }
 
   before do
@@ -12,7 +12,7 @@ describe Spritely::SassFunctions do
     allow(sprite_map).to receive(:find).with('bar').and_return(image)
   end
 
-  shared_examples "a sprite function that checks sprite map and image existence" do
+  shared_examples "a sprite function that checks sprite map existence" do
     context "the sprite map doesn't exist" do
       let(:asset) { nil }
 
@@ -20,6 +20,10 @@ describe Spritely::SassFunctions do
         expect { subject }.to raise_error(Sass::SyntaxError, "No sprite map 'test' found.")
       end
     end
+  end
+
+  shared_examples "a sprite function that checks sprite map and image existence" do
+    it_should_behave_like "a sprite function that checks sprite map existence"
 
     context "the image doesn't exist in the sprite map" do
       let(:image) { nil }
@@ -59,19 +63,39 @@ describe Spritely::SassFunctions do
   end
 
   describe '#spritely_width' do
-    subject { evaluate(".width { width: spritely-width('test', 'bar'); }") }
+    describe "image width" do
+      subject { evaluate(".width { width: spritely-width('test', 'bar'); }") }
 
-    it_should_behave_like "a sprite function that checks sprite map and image existence"
+      it_should_behave_like "a sprite function that checks sprite map and image existence"
+
+      it { should eq(".width {\n  width: 25px; }\n") }
+    end
+
+    describe "sprite width" do
+      subject { evaluate(".width { width: spritely-width('test'); }") }
 
-    it { should eq(".width {\n  width: 25px; }\n") }
+      it_should_behave_like "a sprite function that checks sprite map existence"
+
+      it { should eq(".width {\n  width: 100px; }\n") }
+    end
   end
 
   describe '#spritely_height' do
-    subject { evaluate(".height { height: spritely-height('test', 'bar'); }") }
+    describe "image width" do
+      subject { evaluate(".height { height: spritely-height('test', 'bar'); }") }
 
-    it_should_behave_like "a sprite function that checks sprite map and image existence"
+      it_should_behave_like "a sprite function that checks sprite map and image existence"
+
+      it { should eq(".height {\n  height: 50px; }\n") }
+    end
+
+    describe "sprite width" do
+      subject { evaluate(".height { height: spritely-height('test'); }") }
 
-    it { should eq(".height {\n  height: 50px; }\n") }
+      it_should_behave_like "a sprite function that checks sprite map existence"
+
+      it { should eq(".height {\n  height: 200px; }\n") }
+    end
   end
 
   def evaluate(value)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spritely
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Alex Robbin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-13 00:00:00.000000000 Z
+date: 2016-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chunky_png