spriter 0.10.0 → 0.12.0

data/lib/rack/spriter.rb

@@ -10,6 +10,7 @@ module Rack
       @app = app
       @stylesheets_path = options[:stylesheets_path]
       @stylesheets_url_pattern = options[:stylesheets_url_pattern]
+      @images = []
       ::Spriter.assets_path = options[:assets_path]
       ::Spriter.sprite_image_path = options[:sprite_image_path]
       ::Spriter.sprite_image_url = options[:sprite_image_url]
@@ -56,8 +57,12 @@ module Rack
 
       if @generated_css.nil? or files.max{ |a,b| a.mtime <=> b.mtime }.mtime > @generated_at
         names = paths.map{ |p| p.sub(/\.spriter$/, '').sub(/^#{@stylesheets_path}\//, '') }
-        css = ::Spriter.transform(*files)
+
+        spriter = ::Spriter.new
+        css = spriter.transform(*(files + [@images]))
         css = [css] unless css.is_a? Array
+
+        @images = spriter.images
         @generated_at = Time.now
         @generated_css = Hash[*names.zip(css).flatten]
       end

data/lib/spriter.rb

@@ -7,20 +7,28 @@ class Spriter
     attr_accessor :sprite_image_url
 
     def transform(*args)
-      new(assets_path, sprite_image_path, sprite_image_url).transform(*args)
+      new.transform(*args)
     end
 
     def transform_files(*args)
-      new(assets_path, sprite_image_path, sprite_image_url).transform_files(*args)
+      new.transform_files(*args)
     end
 
     def image_dimensions(path)
-      magick_image = MiniMagick::Image.from_file(path)
-      return magick_image[:width], magick_image[:height]
+      if path =~ /\.png$/
+        IO.read(path)[0x10..0x18].unpack('NN')
+      elsif path =~ /\.gif$/
+        IO.read(path)[6..10].unpack('SS')
+      else
+        magick_image = MiniMagick::Image.from_file(path)
+        [ magick_image[:width], magick_image[:height] ]
+      end
     end
   end
 
-  def initialize(assets_path, sprite_image_path, sprite_image_url)
+  attr_reader :images
+
+  def initialize(assets_path = Spriter.assets_path, sprite_image_path = Spriter.sprite_image_path, sprite_image_url = Spriter.sprite_image_url)
     @assets_path, @sprite_image_path, @sprite_image_url = assets_path, sprite_image_path, sprite_image_url
     @images = []
     @y_offsets = {}
@@ -28,19 +36,20 @@ class Spriter
   end
 
   def transform(*inputs)
+    previous_image_list = inputs.last.is_a?(Array) ? inputs.pop : []
+
     image_matcher = /([^a-z])-spriter-background:\s*([^;\}]+)([;\}])/
     new_css = inputs.inject([]) do |new_css, css|
       css = css.read if css.respond_to? :read
       new_css << css.gsub(image_matcher) do |matched|
-        indent = $1
-        terminator = $3
-        image = $2.strip.gsub(/(?:^['"]|['"]$)/, '')
+        indent, image, terminator = $1, $2, $3
+        image = image.strip.gsub(/(?:^['"]|['"]$)/, '')
         add_image(image)
         "#{indent}background: url(#{@sprite_image_url}) no-repeat 0 #{-y_offset(image)}#{y_offset(image) == 0 ? '' : 'px'}#{terminator} /* #{image} */"
       end
     end
 
-    generate_sprite_image
+    generate_sprite_image unless @images == previous_image_list
 
     if new_css.length == 1
       new_css.first
@@ -70,7 +79,7 @@ class Spriter
   end
 
   def y_offset(image)
-    @y_offsets[image] or raise ArgumentError, 'Unknown image'
+    @y_offsets[image] or raise ArgumentError, "Unknown image (#{image})\nKnown images are: #{@images.join(', ')}"
   end
 
   def generate_sprite_image

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 10
+  - 12
   - 0
-  version: 0.10.0
+  version: 0.12.0
 platform: ruby
 authors: 
 - Reevoo
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-11 00:00:00 +01:00
+date: 2010-08-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,6 +41,18 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: 
 email: 
 executables: []
@@ -83,6 +95,6 @@ rubyforge_project:
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: Managers sprites and your css in a mega way.
+summary: Makes CSS sprites easy.
 test_files: []