css_sprite 1.4.2 → 1.4.3

data/README.textile

@@ -4,6 +4,14 @@ automatically css sprite.
 
 *************************************************************************
 
+h2. Best Practices
+
+I have written posts "css sprite best practices" to introduce the idea that the css_sprite gem follows.
+"english version":http://www.huangzhimin.com/entries/190-css-sprite-best-practices
+"chinese version":http://www.huangzhimin.com/entries/189-css-sprite-best-practices
+
+**************************************************************************
+
 h2. What css_sprite does?
 
 css sprite generates css_sprite image and css files automatically for you follow the conventions as follows.
@@ -67,16 +75,30 @@ h2. Configuration
 
 There is no need to create any configuration by default. If you want some customizations as follows, you need to define <code>config/css_sprite.yml</code> file.
 
+h3. ImageType
+
+css_sprite uses RMagick to compose the images by default. It uses PaletteMatteType as default image_type, you can change it to any image_type which RMagick supports.
+
+<pre><code>image_type: PaletteType</code></pre>
+
+Check the detailed information of image_type here: http://www.imagemagick.org/RMagick/doc/constants.html#ImageType
+
 h3. Sass
 
+css_sprite generates css file by default. If you like sass, you can just add following line in the configuration file.
+
 <pre><code>engine:sass</code></pre>
 
 h3. Image Optimization
 
-css_sprite use *optipng* with optimization level 2 to optimize the auto generated css_sprite image. You can change it to any image optimization command.
+css_sprite uses *optipng* with optimization level 2 to optimize the auto generated css_sprite image by default. You can change it to any image optimization command.
 
 <pre><code>optimization: optipng -o 7</code></pre>
 
+You can also disable the image optimization by
+
+<pre><code>disable_optimization: true</code></pre>
+
 h3. Customization styles
 
 * For css
@@ -119,12 +141,4 @@ if your image filename is icon suffixed (e.g. twitter_icon.png), the correspondi
 
 **************************************************************************
 
-h2. Best Practices
-
-I have written posts "css sprite best practices" to introduce the idea that the css_sprite gem follows.
-"english version":http://www.huangzhimin.com/entries/190-css-sprite-best-practices
-"chinese version":http://www.huangzhimin.com/entries/189-css-sprite-best-practices
-
-**************************************************************************
-
 Copyright (c) 2009 [Richard Huang (flyerhzm@gmail.com)], released under the MIT license

data/VERSION

@@ -1 +1 @@
-1.4.2
+1.4.3

data/css_sprite.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{css_sprite}
-  s.version = "1.4.2"
+  s.version = "1.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Richard Huang"]
-  s.date = %q{2010-04-08}
+  s.date = %q{2010-04-10}
   s.description = %q{css_sprite is a rails plugin/gem to generate css sprite image automatically.}
   s.email = %q{flyerhzm@gmail.com}
   s.extra_rdoc_files = [
@@ -26,12 +26,12 @@ Gem::Specification.new do |s|
      "lib/css_sprite/sprite.rb",
      "spec/css_sprite/sprite_spec.rb",
      "spec/public/images/another_css_sprite/no_image",
-     "spec/public/images/css_sprite/.DS_Store",
      "spec/public/images/css_sprite/gmail_logo.png",
      "spec/public/images/css_sprite/hotmail_logo.png",
      "spec/public/images/css_sprite/icons/facebook_icon.png",
      "spec/public/images/css_sprite/icons/facebook_icon_hover.png",
      "spec/public/images/css_sprite/icons/twitter_icon.png",
+     "spec/public/images/css_sprite/icons/twitter_icon_hover.png",
      "spec/public/images/css_sprite/not_image.txt",
      "spec/spec.opts",
      "spec/spec_helper.rb",
@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/flyerhzm/css_sprite}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{css_sprite is a rails plugin/gem to generate css sprite image automatically.}
   s.test_files = [
     "spec/css_sprite/sprite_spec.rb",

data/lib/css_sprite/sprite.rb

@@ -83,15 +83,19 @@ class Sprite
         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
+      dest_image.image_type = @config['image_type'] ? Magick.const_get(@config['image_type']) : Magick::PaletteMatteType
       dest_image.write(dest_image_path)
     end
     results
   end
   
   def optimize_image(directory)
-    dest_image_path = dest_image_path(directory)
-    @config['optimization'] ? system("#{@config['optimization']} #{dest_image_path}") : system("optipng -quiet #{dest_image_path}")
+    unless @config['disable_optimization']
+      dest_image_path = dest_image_path(directory)
+      command  = @config['optimization'] ? "#{@config['optimization']} #{dest_image_path}" : "optipng -quiet #{dest_image_path}"
+      result = system(command)
+      puts %Q(Optimization command "#{command}" execute failed) unless result
+    end
   end
 
   def output_css(directory, results)
@@ -118,8 +122,8 @@ class Sprite
         results.each do |result|
           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;"
+          f.print " width: #{result[:width]}px;" if result[:width]
+          f.print " height: #{result[:height]}px;" if result[:height]
           f.print " \}\n"
         end
       end
@@ -150,8 +154,8 @@ class Sprite
         results.each do |result|
           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"
+          f.print "  width: #{result[:width]}px\n" if result[:width]
+          f.print "  height: #{result[:height]}px\n" if result[:height]
         end
       end
     end
@@ -213,7 +217,20 @@ class Sprite
   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}
+    name = image.filename.slice(directory_length...-extname_length)
+    without = false
+    if hover?(name)
+      not_hover_file = image.filename.sub(/[_-]hover\./, '.')
+      if File.exist?(not_hover_file)
+        not_hover_image = get_image(not_hover_file)
+        without = true if image.columns == not_hover_image.columns and image.rows == not_hover_image.rows
+      end
+    end
+    without ? {:name => name} : {:name => name, :width => image.columns, :height => image.rows}
+  end
+
+  def hover?(name)
+    name =~ /[_-]hover/
   end
     
 end

data/spec/css_sprite/sprite_spec.rb

@@ -8,14 +8,26 @@ describe Sprite do
   
   describe "build" do
     it "should build css_sprite image and css" do
-      @sprite.build
+      Sprite.any_instance.expects(:system).with("optipng -quiet #{IMAGE_PATH}/css_sprite.png").returns(true)
+      Sprite.new.build
     end
     
     it "should build css_sprite image and sass" do
+      Sprite.any_instance.expects(:system).with("optipng -quiet #{IMAGE_PATH}/css_sprite.png").returns(true)
       Sprite.new('engine' => 'sass').build
     end
     
+    it "should build another image_type" do
+      Sprite.any_instance.expects(:system).with("optipng -quiet #{IMAGE_PATH}/css_sprite.png").returns(true)
+      Sprite.new('image_type' => 'PaletteType').build
+    end
+    
+    it "should disable image optimization" do
+      Sprite.new('disable_optimization' => true).build
+    end
+    
     it "should build another image optimization" do
+      Sprite.any_instance.expects(:system).with("optipng -o 1 #{IMAGE_PATH}/css_sprite.png").returns(true)
       Sprite.new('optimization' => "optipng -o 1").build
     end
   end
@@ -37,6 +49,7 @@ describe Sprite do
   describe "all_images" do
     it "should read all images from a directory" do
       expected_images = [File.join(IMAGE_PATH, 'css_sprite/icons/twitter_icon.png'),
+                         File.join(IMAGE_PATH, 'css_sprite/icons/twitter_icon_hover.png'),
                          File.join(IMAGE_PATH, 'css_sprite/icons/facebook_icon.png'),
                          File.join(IMAGE_PATH, 'css_sprite/icons/facebook_icon_hover.png'),
                          File.join(IMAGE_PATH, 'css_sprite/hotmail_logo.png'),

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'spec/autorun'
 require 'date'
+require 'mocha'
 
 class Rails
   def self.root

metadata

@@ -1,12 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: css_sprite
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 4
-  - 2
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors: 
 - Richard Huang
@@ -14,21 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-08 00:00:00 +08:00
+date: 2010-04-10 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rmagick
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id001
+    version: 
 description: css_sprite is a rails plugin/gem to generate css sprite image automatically.
 email: flyerhzm@gmail.com
 executables: []
@@ -48,12 +41,12 @@ files:
 - lib/css_sprite/sprite.rb
 - spec/css_sprite/sprite_spec.rb
 - spec/public/images/another_css_sprite/no_image
-- spec/public/images/css_sprite/.DS_Store
 - spec/public/images/css_sprite/gmail_logo.png
 - spec/public/images/css_sprite/hotmail_logo.png
 - spec/public/images/css_sprite/icons/facebook_icon.png
 - spec/public/images/css_sprite/icons/facebook_icon_hover.png
 - spec/public/images/css_sprite/icons/twitter_icon.png
+- spec/public/images/css_sprite/icons/twitter_icon_hover.png
 - spec/public/images/css_sprite/not_image.txt
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -71,20 +64,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: css_sprite is a rails plugin/gem to generate css sprite image automatically.