css_sprite 1.3.2 → 1.3.3

data/VERSION

@@ -1 +1 @@
-1.3.2
+1.3.3

data/css_sprite.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{css_sprite}
-  s.version = "1.3.2"
+  s.version = "1.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Richard Huang"]

data/lib/automatic.rb

@@ -8,8 +8,9 @@ class Rails
   end
 end
 
+sprite = Sprite.new
 loop do
   sleep 1
   
-  Sprite.new.check
+  sprite.check
 end

data/lib/css_sprite/sprite.rb

@@ -6,8 +6,8 @@ require 'enumerator'
 class Sprite
   
   def initialize(options={})
-    @image_path = File.join(Rails.root, 'public/images')
-    @stylesheet_path = File.join(Rails.root, 'public/stylesheets')
+    @image_path = File.expand_path(File.join(Rails.root, 'public/images'))
+    @stylesheet_path = File.expand_path(File.join(Rails.root, 'public/stylesheets'))
     @todo = {}
     
     if File.exist?(File.join(Rails.root, 'config/css_sprite.yml'))
@@ -67,13 +67,13 @@ class Sprite
     span = 5
     unless sources.empty?
       dest_image = get_image(sources.shift)
-      results << image_properties(dest_image).merge(:x => 0, :y => 0)
+      results << image_properties(dest_image, directory).merge(:x => 0, :y => 0)
       sources.each do |source|
         source_image = get_image(source)
         gravity = Magick::SouthGravity
         x = 0
         y = dest_image.rows + span
-        results << image_properties(source_image).merge(:x => x, :y => y)
+        results << image_properties(source_image, directory).merge(:x => x, :y => y)
         dest_image = composite_images(dest_image, source_image, x, y)
       end
       dest_image.image_type = Magick::PaletteMatteType
@@ -104,7 +104,7 @@ class Sprite
           f.print " \{\n  background: url('/images/#{dest_image_name}?#{Time.now.to_i}') no-repeat;\n\}\n"
         
           results.each do |result|
-            f.print ".#{result[:name]} \{"
+            f.print "#{class_name(result[:name])} \{"
             f.print " background-position: #{-result[:x]}px #{-result[:y]}px;"
             f.print " width: #{result[:width]}px;"
             f.print " height: #{result[:height]}px;"
@@ -137,7 +137,7 @@ class Sprite
           f.print " \n  background: url('/images/#{dest_image_name}?#{Time.now.to_i}') no-repeat\n"
         
           results.each do |result|
-            f.print ".#{result[:name]}\n"
+            f.print "#{class_name(result[:name])}\n"
             f.print "  background-position: #{-result[:x]}px #{-result[:y]}px\n"
             f.print "  width: #{result[:width]}px\n"
             f.print "  height: #{result[:height]}px\n"
@@ -152,11 +152,15 @@ class Sprite
     class_names = []
     results = results.select { |result| result[:name] =~ %r|#{options[:suffix]}$| } if options[:suffix]
     results.each_slice(options[:count_per_line]) do |batch_results|
-      class_names << batch_results.collect { |result| ".#{result[:name]}" }.join(', ')
+      class_names << batch_results.collect { |result| class_name(result[:name]) }.join(', ')
     end
     class_names
   end
   
+  def class_name(name)
+    ".#{name.gsub('/', ' .')}"
+  end
+  
   def all_images(directory)
     images = []
     Find.find(directory) do |path|
@@ -196,8 +200,10 @@ class Sprite
     Magick::Image::read(image_filename).first
   end
   
-  def image_properties(image)
-    {:name => File.basename(image.filename, File.extname(image.filename)), :width => image.columns, :height => image.rows}
+  def image_properties(image, directory)
+    directory_length = directory.length + 1
+    extname_length = File.extname(image.filename).length
+    {:name => image.filename.slice(directory_length...-extname_length), :width => image.columns, :height => image.rows}
   end
     
 end

data/spec/css_sprite/sprite_spec.rb

@@ -3,6 +3,7 @@ require File.dirname(__FILE__) + '/../spec_helper'
 describe Sprite do
   before(:all) do
     @sprite = Sprite.new
+    @directory_path = File.join(IMAGE_PATH, 'css_sprite')
   end
   
   describe "build" do
@@ -94,24 +95,29 @@ describe Sprite do
   
   describe "image_properties" do
     it "should get image properties" do
-      image = @sprite.get_image(File.join(IMAGE_PATH, 'css_sprite/gmail_logo.png'))
-      @sprite.image_properties(image).should == {:name => 'gmail_logo', :width => 103, :height => 36}
+      image = @sprite.get_image(File.join(@directory_path, 'gmail_logo.png'))
+      @sprite.image_properties(image, @directory_path).should == {:name => 'gmail_logo', :width => 103, :height => 36}
+    end
+
+    it "should get a image with parent" do
+      image = @sprite.get_image(File.join(@directory_path, 'icons/twitter_icon.png'))
+      @sprite.image_properties(image, @directory_path).should == {:name => 'icons/twitter_icon', :width => 14, :height => 14}
     end
   end
   
   describe "composite_images" do
     it "should composite two images into one horizontally" do
-      image1 = @sprite.get_image(File.join(IMAGE_PATH, 'css_sprite/gmail_logo.png'))
-      image2 = @sprite.get_image(File.join(IMAGE_PATH, 'css_sprite/hotmail_logo.png'))
+      image1 = @sprite.get_image(File.join(@directory_path, 'gmail_logo.png'))
+      image2 = @sprite.get_image(File.join(@directory_path, 'hotmail_logo.png'))
       image = @sprite.composite_images(image1, image2, image1.columns, 0)
-      @sprite.image_properties(image).should == {:name => "", :width => 206, :height => 36}
+      @sprite.image_properties(image, @directory_path).should == {:name => nil, :width => 206, :height => 36}
     end
     
     it "should composite two images into one verically" do
-      image1 = @sprite.get_image(File.join(IMAGE_PATH, 'css_sprite/gmail_logo.png'))
-      image2 = @sprite.get_image(File.join(IMAGE_PATH, 'css_sprite/hotmail_logo.png'))
+      image1 = @sprite.get_image(File.join(@directory_path, 'gmail_logo.png'))
+      image2 = @sprite.get_image(File.join(@directory_path, 'hotmail_logo.png'))
       image = @sprite.composite_images(image1, image2, 0, image1.rows)
-      @sprite.image_properties(image).should == {:name => "", :width => 103, :height => 72}
+      @sprite.image_properties(image, @directory_path).should == {:name => nil, :width => 103, :height => 72}
     end
   end
 end

data/spec/spec_helper.rb

@@ -8,6 +8,6 @@ class Rails
   end
 end
 
-IMAGE_PATH = File.join(Rails.root, 'public/images')
-STYLESHEET_PATH = File.join(Rails.root, 'public/stylesheets')
+IMAGE_PATH = File.expand_path(File.join(Rails.root, 'public/images'))
+STYLESHEET_PATH = File.expand_path(File.join(Rails.root, 'public/stylesheets'))
 require File.join(File.dirname(__FILE__), '/../lib/css_sprite.rb')

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 3
-  - 2
-  version: 1.3.2
+  - 3
+  version: 1.3.3
 platform: ruby
 authors: 
 - Richard Huang