css_sprite 1.5.0 → 2.0.0

data/.rvmrc

@@ -1,2 +1,2 @@
 rvm_gemset_create_on_use_flag=1
-rvm gemset use ruby-1.9.2-p290@css_sprite
+rvm gemset use css_sprite

data/README.textile

@@ -7,8 +7,8 @@ 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
+"english version":http://huangzhimin.com/2010/04/03/css-sprite-best-practices-english-version
+"chinese version":http://huangzhimin.com/2010/04/02/css-sprite-best-practices-chinese-version
 
 otaviofcs wrote a brazilian version to introduce the css_sprite gem, check it here: "http://blog.riopro.com.br/2010/04/22/acabaram-as-desculpas-para-nao-usar-css-sprite-na-sua-aplicacao/":http://blog.riopro.com.br/2010/04/22/acabaram-as-desculpas-para-nao-usar-css-sprite-na-sua-aplicacao/
 and he also build a demo, "http://github.com/riopro/css_sprite_demo":http://github.com/riopro/css_sprite_demo
@@ -93,6 +93,7 @@ image_path: app/assets/images
 stylesheet_path: app/assets/stylesheets
 css_images_path: assets
 disable_optimization: true
+use_asset_url: true
 </code></pre>
 
 h3. ImageType
@@ -103,6 +104,8 @@ css_sprite uses RMagick to compose the images by default. It uses PaletteMatteTy
 
 Check the detailed information of image_type here: http://www.imagemagick.org/RMagick/doc/constants.html#ImageType
 
+for gif transparency, you must use <code>image_type: TrueColorMatteType</code>.
+
 h3. Destination Image Format
 
 css_sprite saves the css sprite image as a png file by default. You can change it to gif or any other format like

data/css_sprite.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = CssSprite::VERSION
 
-  gem.add_dependency("rmagick")
+  gem.add_dependency("mini_magick")
   gem.add_runtime_dependency("rspec")
   gem.add_runtime_dependency("mocha")
 end

data/lib/css_sprite/sprite.rb

@@ -1,5 +1,5 @@
 require 'find'
-require 'RMagick'
+require 'mini_magick'
 require 'yaml'
 require 'enumerator'
 
@@ -85,22 +85,30 @@ class Sprite
     results = []
     sources = all_images(directory)
     dest_image_path = dest_image_path(directory)
-    span = 5
-    unless sources.empty?
-      dest_image = get_image(sources.shift)
-      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, directory).merge(:x => x, :y => y)
-        dest_image = composite_images(dest_image, source_image, x, y)
-      end
-      dest_image.image_type = @config['image_type'] ? Magick.const_get(@config['image_type']) : Magick::PaletteMatteType
-      dest_image.format = @config['format'] || "PNG"
-      dest_image.write(dest_image_path)
+    return results if sources.empty?
+    last_y = 0
+    sources.each do |source|
+      source_image = get_image(source)
+      property =
+      x = 0
+      y = last_y
+      results << image_properties(source, directory).merge(:x => x, :y => y)
+      last_y = y + source_image[:height]
+    end
+
+    command = MiniMagick::CommandBuilder.new('montage')
+    sources.each do |source|
+      command.push command.escape_string source
     end
+    command.push('-tile 1x')
+    command.push("-geometry +0+0")
+    command.push('-background None')
+    command.push('-gravity West')
+    command.push('-format')
+    format = @config['format'] || "PNG"
+    command.push(command.escape_string(format))
+    command.push(command.escape_string(dest_image_path))
+    MiniMagick::Image.new(nil).run(command)
     results
   end
 
@@ -167,7 +175,11 @@ class Sprite
         end
 
         f.print class_names(results).join(",\n")
-        f.print " \n  background: url('/#{@css_images_path}/#{dest_image_name}?#{dest_image_time.to_i}') no-repeat\n"
+        if @config['use_asset_url']
+          f.print " \n  background: asset-url('#{dest_image_name}', image) no-repeat\n"
+        else
+          f.print " \n  background: url('/#{@css_images_path}/#{dest_image_name}?#{dest_image_time.to_i}') no-repeat\n"
+        end
 
         results.each do |result|
           f.print "#{class_name(result[:name])}\n"
@@ -199,7 +211,11 @@ class Sprite
         end
 
         f.print class_names(results).join(",\n")
-        f.print " \{\n  background: url('/#{@css_images_path}/#{dest_image_name}?#{dest_image_time.to_i}') no-repeat;\n\}\n"
+        if @config['use_asset_url']
+          f.print " \{\n  background: asset-url('#{dest_image_name}', image) no-repeat;\n\}\n"
+        else
+          f.print " \{\n  background: url('/#{@css_images_path}/#{dest_image_name}?#{dest_image_time.to_i}') no-repeat;\n\}\n"
+        end
 
         results.each do |result|
           f.print "#{class_name(result[:name])} \{\n"
@@ -254,47 +270,38 @@ class Sprite
     File.join(@stylesheet_path, File.basename(directory) + "." + @engine)
   end
 
-  # append src_image to the dest_image with position (x, y)
-  def composite_images(dest_image, src_image, x, y)
-    width = [src_image.columns + x, dest_image.columns].max
-    height = [src_image.rows + y, dest_image.rows].max
-    image = Magick::Image.new(width, height) {self.background_color = 'none'}
-    image.composite!(dest_image, 0, 0, Magick::CopyCompositeOp)
-    image.composite!(src_image, x, y, Magick::CopyCompositeOp)
-    image
-  end
-
   # get the Magick::Image
   def get_image(image_filename)
-    Magick::Image::read(image_filename).first
+    MiniMagick::Image.open(image_filename)
   end
 
   # get image properties, including name, width and height
-  def image_properties(image, directory)
-    name = get_image_name(image, directory)
-    need_wh?(image, directory) ? {:name => name, :width => image.columns, :height => image.rows} : {:name => name}
+  def image_properties(image_path, directory)
+    name = get_image_name(image_path, directory)
+    image = get_image(image_path)
+    need_wh?(image_path, directory) ? {:name => name, :width => image[:width], :height => image[:height]} : {:name => name}
   end
 
   # check if the hover class needs width and height
   # if the hover class has the same width and height property with not hover class,
   # then the hover class does not need width and height
-  def need_wh?(image, directory)
-    name = get_image_name(image, directory)
+  def need_wh?(image_path, directory)
+    name = get_image_name(image_path, directory)
     if hover?(name) or active?(name)
-      not_file = image.filename.sub(/[_-](hover|active)\./, '.').sub(/[_-](hover|active)\//, '/')
+      not_file = image_path.sub(/[_-](hover|active)\./, '.').sub(/[_-](hover|active)\//, '/')
       if File.exist?(not_file)
+        image = get_image(image_path)
         not_image = get_image(not_file)
-        return false if image.columns == not_image.columns and image.rows == not_image.rows
+        return false if image[:width] == not_image[:width] and image[:height] == not_image[:height]
       end
     end
     return true
   end
 
   # get the image name substracting base directory and extname
-  def get_image_name(image, directory)
-    directory_length = directory.length + 1
-    extname_length = File.extname(image.filename).length
-    image.filename.slice(directory_length...-extname_length)
+  def get_image_name(image_path, directory)
+    extname_length = File.extname(image_path).length
+    image_path.slice(directory.length+1...-extname_length)
   end
 
   # test if the filename contains a hover or active.

data/lib/css_sprite/version.rb

@@ -1,3 +1,3 @@
 module CssSprite
-  VERSION = "1.5.0"
+  VERSION = "2.0.0"
 end

data/spec/css_sprite/sprite_spec.rb

@@ -151,35 +151,19 @@ describe Sprite do
 
   describe "get_image" do
     it "should get a image" do
-      @sprite.get_image(File.join(IMAGE_PATH, 'css_sprite/gmail_logo.png')).class.should == Magick::Image
+      @sprite.get_image(File.join(IMAGE_PATH, 'css_sprite/gmail_logo.png')).class.should == MiniMagick::Image
     end
   end
 
   describe "image_properties" do
     it "should get image properties" do
-      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}
+      image_path = File.join(@directory_path, 'gmail_logo.png')
+      @sprite.image_properties(image_path, @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(@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, @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(@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, @directory_path).should == {:name => nil, :width => 103, :height => 72}
+      image_path = File.join(@directory_path, 'icons/twitter_icon.png')
+      @sprite.image_properties(image_path, @directory_path).should == {:name => 'icons/twitter_icon', :width => 14, :height => 14}
     end
   end
 end

data/spec/spec_helper.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: css_sprite
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-04 00:00:00.000000000Z
+date: 2013-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rmagick
-  requirement: &70303733426760 !ruby/object:Gem::Requirement
+  name: mini_magick
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70303733426760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70303733426300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70303733426300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70303733425880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +53,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70303733425880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: css_sprite is a rails plugin/gem to generate css sprite image automatically.
 email:
 - flyerhzm@gmail.com
@@ -103,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: css_sprite is a rails plugin/gem to generate css sprite image automatically.