lemonade 0.2.0 → 0.3.0

data/CHANGELOG.md

@@ -0,0 +1,26 @@
+Changelog
+=========
+
+
+0.3.0
+-----
+
+* Switched from RMagick to chunky_png gem
+  * No RMagick/ImageMagick required anymore (Rails 2.3.x sometimes crashed)
+  * Only PNG files are supported (both input and output)
+* Don’t compose the same image twice (use background-position of first image instead)
+* Space between images now works as expected if more than 1 output image (path) is used
+* Wrote this changelog
+
+
+0.2.0
+-----
+
+* Support for background-positions
+* Support for 100%/right aligned images
+
+
+0.1.0
+-----
+
+* Initial release

data/README.md

@@ -35,6 +35,7 @@ Background
 * No Rake task needed
 * No additional classes
 * No configuration
+* No RMagick required (but full support for PNG)
 
 
 Installation
@@ -88,7 +89,6 @@ Right aligned images are possible:
     
 The original image will be placed on the right side of the sprite image.
 Use this, if you have a link with an arrow on the right side (like Apple).
-    
 
 
 Note on Patches/Pull Requests
@@ -102,6 +102,7 @@ Note on Patches/Pull Requests
   (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
+
 Copyright
 ---------
 

data/Rakefile

@@ -12,7 +12,7 @@ begin
     gem.authors = ["Nico Hagenburger"]
     gem.add_dependency "haml", ">= 3.0.0"
     gem.add_dependency "compass", ">= 0.10.0"
-    gem.add_dependency "rmagick"
+    gem.add_dependency "chunky_png", ">= 0.7.3"
     gem.add_development_dependency "rspec", ">= 1.2.9"
   end
   Jeweler::GemcutterTasks.new

data/TODO.md

@@ -0,0 +1,5 @@
+Todo
+====
+
+* Rails 3 support (currently Rails 2.3.x, Staticmatic, command line/`compass watch`)
+* Remove Compass from requirements (should work with Sass only)

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lemonade.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lemonade}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nico Hagenburger"]
-  s.date = %q{2010-05-21}
+  s.date = %q{2010-06-25}
   s.description = %q{Generates sprites on the fly by using `background: sprite-image("sprites/logo.png")`.}
   s.email = %q{gems@hagenburger.net}
   s.extra_rdoc_files = [
@@ -18,15 +18,18 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
      ".gitignore",
+     "CHANGELOG.md",
      "MIT-LICENSE",
      "README.md",
      "Rakefile",
+     "TODO.md",
      "VERSION",
      "lemonade.gemspec",
      "lib/lemonade.rb",
      "lib/lemonade/lemonade.rb",
      "lib/lemonade/sass_extensions/functions/lemonade.rb",
      "spec/images/other_images/more-images/sprites/test.png",
+     "spec/images/other_images/test.png",
      "spec/images/sprites/10x10.png",
      "spec/images/sprites/150x10.png",
      "spec/images/sprites/20x20.png",
@@ -38,7 +41,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/hagenburger/lemonade}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{On the fly sprite generator for Sass/Compass}
   s.test_files = [
     "spec/lemonade_spec.rb",
@@ -49,21 +52,21 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<haml>, [">= 3.0.0"])
       s.add_runtime_dependency(%q<compass>, [">= 0.10.0"])
-      s.add_runtime_dependency(%q<rmagick>, [">= 0"])
+      s.add_runtime_dependency(%q<chunky_png>, [">= 0.7.3"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
     else
       s.add_dependency(%q<haml>, [">= 3.0.0"])
       s.add_dependency(%q<compass>, [">= 0.10.0"])
-      s.add_dependency(%q<rmagick>, [">= 0"])
+      s.add_dependency(%q<chunky_png>, [">= 0.7.3"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
     end
   else
     s.add_dependency(%q<haml>, [">= 3.0.0"])
     s.add_dependency(%q<compass>, [">= 0.10.0"])
-    s.add_dependency(%q<rmagick>, [">= 0"])
+    s.add_dependency(%q<chunky_png>, [">= 0.7.3"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
   end
 end

data/lib/lemonade.rb

@@ -8,7 +8,7 @@ end
 require 'rubygems'
 require 'compass'
 require 'sass/plugin'
-require 'rmagick'
+require 'chunky_png'
 require File.dirname(__FILE__) + '/lemonade/sass_extensions/functions/lemonade'
 require File.dirname(__FILE__) + '/lemonade/lemonade'
 

data/lib/lemonade/lemonade.rb

@@ -2,21 +2,18 @@ module Lemonade
   def self.generate_sprites
     if $lemonade_sprites
       $lemonade_sprites.each do |sprite_name, sprite|
-        sprite_image = Magick::Image.new(sprite[:width], sprite[:height]) do
-          self.background_color = 'transparent'
-        end
+        sprite_image = ChunkyPNG::Image.new(sprite[:width], sprite[:height], ChunkyPNG::Color::TRANSPARENT)
         y = 0
         sprite[:images].each do |image|
           file = File.join(Compass.configuration.images_path, image[:file])
-          single_image  = Magick::Image::read(file).first
+          single_image  = ChunkyPNG::Image.from_file(file)
           x = (sprite[:width] - image[:width]) * image[:x]
-          sprite_image.composite!(single_image, x, image[:y], Magick::OverCompositeOp)
+          sprite_image.compose single_image, x, image[:y]
         end
         file = File.join(Compass.configuration.images_path, "#{ sprite_name }.png")
-        sprite_image.write file
+        sprite_image.save file#, :fast_rgba
       end
       $lemonade_sprites = nil
-      $lemonade_space_bottom = 0
     end
   end
 end

data/lib/lemonade/sass_extensions/functions/lemonade.rb

@@ -6,22 +6,34 @@ module Lemonade::SassExtensions::Functions::Lemonade
       raise Sass::SyntaxError, 'Please provide a file in a folder: e.g. sprites/button.png'
     end
     dir, name, filename = $1, $2, $3
-    height = image_height(file).value
-    width = image_width(file).value
-    margin_top = calculate_margin_top(margin_top_or_both, margin_bottom)
+    filestr = file.to_s.gsub('"', '')
 
     $lemonade_sprites ||= {}
-    sprite = $lemonade_sprites["#{ dir }/#{ name }"] ||= { :height => 0, :width => 0, :images => [] }
-    x = (add_x and add_x.numerator_units == %w(%)) ? add_x.value / 100 : 0
-    y = sprite[:height] + margin_top
-    sprite[:height] += height + margin_top
-    sprite[:width] = width if width > sprite[:width]
-    sprite[:images] << { :file => file.to_s.gsub('"', ''), :height => height, :width => width, :x => x, :y => y }
+    sprite = $lemonade_sprites["#{ dir }/#{ name }"] ||= {
+        :height => 0,
+        :width => 0,
+        :images => [],
+        :margin_bottom => 0
+      }
 
+    if image = sprite[:images].detect{ |image| image[:file] == filestr }
+      y = image[:y]
+    else
+      height = image_height(file).value
+      width = image_width(file).value
+      margin_top = calculate_margin_top(sprite, margin_top_or_both, margin_bottom)
+      x = (add_x and add_x.numerator_units == %w(%)) ? add_x.value / 100 : 0
+      y = sprite[:height] + margin_top
+      sprite[:height] += height + margin_top
+      sprite[:width] = width if width > sprite[:width]
+      sprite[:images] << { :file => filestr, :height => height, :width => width, :x => x, :y => y }
+    end
+    
     position = background_position(0, y, add_x, add_y)
-    file = image_url(Sass::Script::String.new("#{ dir }#{ name }.png"))
-    Sass::Script::String.new("#{ file }#{ position }")
+    output_file = image_url(Sass::Script::String.new("#{ dir }#{ name }.png"))
+    Sass::Script::String.new("#{ output_file }#{ position }")
   end
+  alias_method :sprite_img, :sprite_image
   
 private
 
@@ -34,10 +46,10 @@ private
     end
   end
   
-  def calculate_margin_top(margin_top_or_both, margin_bottom)
+  def calculate_margin_top(sprite, margin_top_or_both, margin_bottom)
     margin_top_or_both = margin_top_or_both ? margin_top_or_both.value : 0
-    margin_top = ($lemonade_margin_bottom ||= 0) > margin_top_or_both ? $lemonade_margin_bottom : margin_top_or_both
-    $lemonade_margin_bottom = margin_bottom ? margin_bottom.value : margin_top_or_both
+    margin_top = (sprite[:margin_bottom] ||= 0) > margin_top_or_both ? sprite[:margin_bottom] : margin_top_or_both
+    sprite[:margin_bottom] = margin_bottom ? margin_bottom.value : margin_top_or_both
     margin_top
   end
 

data/spec/lemonade_spec.rb

@@ -25,6 +25,10 @@ describe Lemonade::SassExtensions::Functions::Lemonade do
     evaluate('sprite-image("sprites/30x30.png")').should == "url('/sprites.png')"
   end
   
+  it "should also work with `sprite-img`" do
+    evaluate('sprite-img("sprites/30x30.png")').should == "url('/sprites.png')"
+  end
+  
   it "should work in folders with dashes and underscores" do
     evaluate('sprite-image("other_images/more-images/sprites/test.png")').should ==
       "url('/other_images/more-images/sprites.png')"
@@ -89,6 +93,12 @@ describe Lemonade::SassExtensions::Functions::Lemonade do
     image_size('sprites.png').should == [30, 100]
   end
   
+  it "should calculate empty space correctly when 2 output images are uses" do
+    evaluate('sprite-image("sprites/10x10.png", 0, 0, 0, 30px)').should == "url('/sprites.png')"
+    evaluate('sprite-image("other_images/test.png")').should == "url('/other_images.png')"
+    evaluate('sprite-image("sprites/20x20.png", 0, 0, 20px, 5px)').should == "url('/sprites.png') 0 -40px"
+  end
+  
   it "should allow % for x positions" do
     # Resulting sprite should look like (1 line = 10px height, X = placed image):
     
@@ -99,4 +109,11 @@ describe Lemonade::SassExtensions::Functions::Lemonade do
     evaluate('sprite-image("sprites/10x10.png", 100%)').should == "url('/sprites.png') 100% -10px"
   end
   
+  it "should not compose the same image twice" do
+    evaluate('sprite-image("sprites/10x10.png")').should == "url('/sprites.png')"
+    evaluate('sprite-image("sprites/20x20.png")').should == "url('/sprites.png') 0 -10px"
+    evaluate('sprite-image("sprites/20x20.png")').should == "url('/sprites.png') 0 -10px" # reuse image from line above
+    image_size('sprites.png').should == [20, 30]
+  end
+  
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Nico Hagenburger
@@ -14,14 +14,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-21 00:00:00 +02:00
+date: 2010-06-25 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: haml
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -36,7 +35,6 @@ dependencies:
   name: compass
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -48,23 +46,23 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rmagick
+  name: chunky_png
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
+        - 7
+        - 3
+        version: 0.7.3
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -86,15 +84,18 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- CHANGELOG.md
 - MIT-LICENSE
 - README.md
 - Rakefile
+- TODO.md
 - VERSION
 - lemonade.gemspec
 - lib/lemonade.rb
 - lib/lemonade/lemonade.rb
 - lib/lemonade/sass_extensions/functions/lemonade.rb
 - spec/images/other_images/more-images/sprites/test.png
+- spec/images/other_images/test.png
 - spec/images/sprites/10x10.png
 - spec/images/sprites/150x10.png
 - spec/images/sprites/20x20.png
@@ -112,7 +113,6 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -120,7 +120,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -130,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: On the fly sprite generator for Sass/Compass