spritely 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b90bec681ab9efe494b5e246a9e7b036bd9e5998
-  data.tar.gz: 424ccf4da0ca02416f9f9f7cb9a63ec86ab1fe89
+  metadata.gz: 7abbb12ca655564072d814659941ccbeaf8693f6
+  data.tar.gz: a69e81ff56a194d7b65c1f2b21d704151435a7d1
 SHA512:
-  metadata.gz: 4e836ffa7fd997b44b44d0f81d71373a581f1dab757c9c2e3aa006d74096a524bb6853ebd3b273d44fe801153c9c0fd8fa64dd307d37261bc8cdc6304e659ea1
-  data.tar.gz: 63ffcfa28376d8bbd936dcfda0063677112e2b9b772ab56abf86600f5db41ee05ad8564f316b41a1f7e55dc38c4d749ba4f424fa3343cc29726417aeb4504411
+  metadata.gz: 33b650c6227ad170a8a6b4b97981cb74da9581c85595b8f5d3d39940505f457e3fc88218f35a01d702792d284a3ac2af136134a92ec19c6ebf76236e67fdca9a
+  data.tar.gz: 4e83cde6681229d832785381b4d86a61c9a49f7902912554238df0cfccb07d9036740b2e7af00055f1c4b91073bceec26795ad7f6c7cbf7673c323341d77a938

data/lib/spritely/image_set.rb

@@ -3,13 +3,14 @@ require 'spritely/image'
 module Spritely
   class ImageSet
     attr_accessor :top
-    attr_reader :path, :options, :data, :width, :height
+    attr_reader :path, :options, :data, :width, :height, :left
 
     def initialize(path, options)
       @path = path
       @options = options
       @data = File.read(path)
       @width, @height = data[0x10..0x18].unpack('NN')
+      @left = 0
     end
 
     def name
@@ -20,10 +21,6 @@ module Spritely
       @images ||= []
     end
 
-    def left
-      0
-    end
-
     def outer_height
       height + spacing
     end
@@ -36,13 +33,19 @@ module Spritely
       !!options[:repeat]
     end
 
+    def right?
+      options[:position] == 'right'
+    end
+
     def position_in!(collection_width)
       if repeated?
-        left = 0
-        while left < collection_width
-          add_image!(left)
-          left += width
+        left_position = 0
+        while left_position < collection_width
+          add_image!(left_position)
+          left_position += width
         end
+      elsif right?
+        add_image!(@left = collection_width - width)
       else
         add_image!(0)
       end
@@ -50,10 +53,10 @@ module Spritely
 
     private
 
-    def add_image!(left)
+    def add_image!(left_position)
       images << Image.new(data).tap do |image|
         image.top = top
-        image.left = left
+        image.left = left_position
       end
     end
   end

data/lib/spritely/options.rb

@@ -4,7 +4,7 @@ require 'active_support/core_ext/hash/slice'
 
 module Spritely
   class Options < Struct.new(:hash)
-    GLOBAL_OPTIONS = [:spacing]
+    GLOBAL_OPTIONS = [:spacing, :position]
 
     def cache_key
       stripped_hash.to_s
@@ -23,8 +23,10 @@ module Spritely
     def options
       @options ||= stripped_hash.except(*GLOBAL_OPTIONS).inject({}) do |h, (key, value)|
         split_key = key.to_s.split('_')
-        option = global_options.merge(split_key.pop.to_sym => value)
-        h.deep_merge!(split_key.join('-') => option)
+        option = {split_key.pop.to_sym => value}
+        image = split_key.join('-')
+        h[image] ||= global_options.dup
+        h.deep_merge!(image => option)
       end
     end
 

data/lib/spritely/sass_functions.rb

@@ -22,7 +22,7 @@ module Spritely
     def spritely_position(sprite_map, image_name)
       image = find_image(sprite_map, image_name)
 
-      x = Sass::Script::Number.new(image.left, image.left == 0 ? [] : ['px'])
+      x = Sass::Script::Number.new(-image.left, image.left == 0 ? [] : ['px'])
       y = Sass::Script::Number.new(-image.top, image.top == 0 ? [] : ['px'])
 
       Sass::Script::List.new([x, y], :space)

data/lib/spritely/version.rb

@@ -1,3 +1,3 @@
 module Spritely
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

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

@@ -2,6 +2,7 @@ $application-sprite: spritely-map("application/*.png",
   $background-repeat: true,
   $football-spacing: 100px,
   $mario-spacing: 10px,
+  $mario-position: right,
   $spacing: 5px
 );
 

data/spec/integration/stylesheet_spec.rb

@@ -18,7 +18,7 @@ describe 'Stylesheet generation', :integration do
     it { should include(<<-CSS.strip_heredoc
       #mario {
         background-image: url(/assets/sprites/application.png);
-        background-position: 0 -728px;
+        background-position: -150px -728px;
         width: 200px;
         height: 214px;
       }

data/spec/spritely/image_set_spec.rb

@@ -3,7 +3,7 @@ require 'ostruct'
 
 describe Spritely::ImageSet do
   let(:path) { "#{__dir__}/../fixtures/test/foo.png" }
-  let(:options) { {repeat: true, spacing: 10} }
+  let(:options) { {repeat: true, spacing: 10, position: 'right'} }
 
   subject { Spritely::ImageSet.new(path, options) }
 
@@ -45,6 +45,22 @@ describe Spritely::ImageSet do
     end
   end
 
+  describe '#right?' do
+    it { should be_right }
+
+    context 'position option is passed as left' do
+      let(:options) { {position: 'left'} }
+
+      it { should_not be_right }
+    end
+
+    context 'position option is not passed' do
+      let(:options) { {} }
+
+      it { should_not be_right }
+    end
+  end
+
   describe '#position_in!' do
     class ImageDouble
       attr_accessor :top, :left
@@ -67,6 +83,36 @@ describe Spritely::ImageSet do
         expect(second_image.top).to eq(123)
         expect(second_image.left).to eq(1)
       end
+
+      context 'it is also positioned to the right' do
+        let(:options) { {position: 'right', repeat: true} }
+
+        its(:left) { should eq(0) }
+
+        it 'should ignore the position option' do
+          expect(first_image.top).to eq(123)
+          expect(first_image.left).to eq(0)
+          expect(second_image.top).to eq(123)
+          expect(second_image.left).to eq(1)
+        end
+      end
+    end
+
+    context 'the image is positioned to the right' do
+      let(:options) { {position: 'right'} }
+      let(:image) { ImageDouble.new }
+
+      before do
+        allow(Spritely::Image).to receive(:new).with(File.read(path)).and_return(image)
+        subject.position_in!(100)
+      end
+
+      its(:left) { should eq(99) }
+
+      it 'should set the position of the image' do
+        expect(image.top).to eq(123)
+        expect(image.left).to eq(99)
+      end
     end
 
     context 'the image is not repeated' do

data/spec/spritely/options_spec.rb

@@ -2,26 +2,28 @@ require 'spec_helper'
 
 describe Spritely::Options do
   let(:hash) { {
+    'some_new_image_spacing' => Sass::Script::Number.new(789),
     'some_new_image_x' => Sass::Script::Number.new(123),
     'some_new_image_y' => Sass::Script::Number.new(456),
-    'some_new_image_spacing' => Sass::Script::Number.new(789),
+    'some_new_image_position' => Sass::Script::String.new('right'),
     'another_image_repeat' => Sass::Script::Bool.new(true),
     'yet_another_image_repeat' => Sass::Script::Bool.new(false),
-    'spacing' => Sass::Script::Number.new(901)
+    'spacing' => Sass::Script::Number.new(901),
+    'position' => Sass::Script::String.new('left')
   } }
 
   subject(:options) { Spritely::Options.new(hash) }
 
-  its(:inspect) { should eq("#<Spritely::Options global_options=#{{spacing: 901}} options=#{{'some-new-image' => {spacing: 789, x: 123, y: 456}, 'another-image' => {spacing: 901, repeat: true}, 'yet-another-image' => {spacing: 901, repeat: false}}}>") }
-  its(:cache_key) { should eq({some_new_image_x: 123, some_new_image_y: 456, some_new_image_spacing: 789, another_image_repeat: true, yet_another_image_repeat: false, spacing: 901}.to_s) }
+  its(:inspect) { should eq("#<Spritely::Options global_options=#{{spacing: 901, position: 'left'}} options=#{{'some-new-image' => {spacing: 789, position: 'right', x: 123, y: 456}, 'another-image' => {spacing: 901, position: 'left', repeat: true}, 'yet-another-image' => {spacing: 901, position: 'left', repeat: false}}}>") }
+  its(:cache_key) { should eq({some_new_image_spacing: 789, some_new_image_x: 123, some_new_image_y: 456, some_new_image_position: 'right', another_image_repeat: true, yet_another_image_repeat: false, spacing: 901, position: 'left'}.to_s) }
 
-  its(['some-new-image']) { should eq({spacing: 789, x: 123, y: 456}) }
-  its(['another-image']) { should eq({spacing: 901, repeat: true}) }
-  its(['yet-another-image']) { should eq({spacing: 901, repeat: false}) }
+  its(['some-new-image']) { should eq({spacing: 789, position: 'right', x: 123, y: 456}) }
+  its(['another-image']) { should eq({spacing: 901, repeat: true, position: 'left'}) }
+  its(['yet-another-image']) { should eq({spacing: 901, repeat: false, position: 'left'}) }
 
   describe '#[]' do
     it 'should fall back to an empty hash' do
-      expect(options[:unknown]).to eq({spacing: 901})
+      expect(options[:unknown]).to eq({spacing: 901, position: 'left'})
     end
   end
 end

data/spec/spritely/sass_functions_spec.rb

@@ -42,18 +42,18 @@ describe Spritely::SassFunctions do
   end
 
   describe '#spritely_position' do
-    let(:image) { double(left: 0, top: 12) }
+    let(:image) { double(left: 10, top: 12) }
 
     subject { evaluate("spritely-position(spritely-map('test/*.png'), 'bar')") }
 
     include_examples "a sprite function that checks image existence"
 
-    it { should eq('0 -12px') }
+    it { should eq('-10px -12px') }
 
-    context 'the left is not 0' do
-      let(:image) { double(left: 10, top: 12) }
+    context 'the positions are both 0' do
+      let(:image) { double(left: 0, top: 0) }
 
-      it { should eq('10px -12px') }
+      it { should eq('0 0') }
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spritely
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Alex Robbin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-03 00:00:00.000000000 Z
+date: 2014-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chunky_png