active_assets 0.2.7 → 0.2.8

data/active_assets.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = "active_assets"
-  s.version     = '0.2.7'
+  s.version     = '0.2.8'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Sam Woodard"]
   s.email       = ["sam@wildfireapp.com"]

data/lib/active_assets/active_expansions/expansion.rb

@@ -24,7 +24,8 @@ module ActiveAssets
 
       def asset(path, options = {})
         options = HashWithIndifferentAccess.new(options)
-        options.assert_valid_keys(*Asset.members)
+        # map is for 1.9.2; HashWithIndifferentAccess bug?
+        options.assert_valid_keys(*Asset.members.map(&:to_s))
       
         inferred_type, extension = inferred_type(path)
 

data/lib/active_assets/active_sprites/runners/abstract_runner.rb

@@ -104,6 +104,10 @@ module ActiveAssets
           path.split('?').first
         end
 
+        def sprite_url(sprite, sprite_path)
+          sprite.url.present? ? sprite.url : ::Rack::Mount::Utils.normalize_path(sprite_path)
+        end
+
     end
   end
 end

data/lib/active_assets/active_sprites/runners/chunky_png_runner.rb

@@ -15,7 +15,7 @@ module ActiveAssets
             sprite_piece_path = image_computed_full_path(sp.path)
             sp_image =  ChunkyPNG::Image.from_file(sprite_piece_path)
             sp.details = SpritePiece::Details.new(
-              sprite.url.present? ? sprite.url : sprite_path,
+              sprite_url(sprite, sprite_path),
               orientation == Sprite::Orientation::VERTICAL ? 0 : width,
               orientation == Sprite::Orientation::VERTICAL ? height : 0,
               sp_image.width,

data/lib/active_assets/active_sprites/runners/mini_magick_runner.rb

@@ -3,12 +3,6 @@ require 'mini_magick'
 module ActiveAssets
   module ActiveSprites
     class MiniMagickRunner < AbstractRunner
-      class ImageTempfile < Tempfile
-        def make_tmpname(ext, n)
-          'mini_magick%d-%d%s' % [$$, n, ext ? ".#{ext}" : '']
-        end
-      end
-
       private
         def set_sprite_details_and_return_image_list(sprite, sprite_path, sprite_pieces, orientation)
           offset = 0
@@ -17,7 +11,7 @@ module ActiveAssets
             sp_path = image_computed_full_path(sp.path)
             image = MiniMagick::Image.open(sp_path)
             sp.details = SpritePiece::Details.new(
-              sprite.url.present? ? sprite.url : sprite_path,
+              sprite_url(sprite, sprite_path),
               orientation == Sprite::Orientation::VERTICAL ? 0 : offset,
               orientation == Sprite::Orientation::VERTICAL ? offset : 0,
               image["width"],
@@ -32,7 +26,7 @@ module ActiveAssets
 
         def create_sprite(sprite, sprite_path, sprite_pieces, image_list, width, height, orientation, verbose)
           begin
-            tempfile = ImageTempfile.new(File.extname(sprite_path)[1..-1])
+            tempfile = Tempfile.new(File.extname(sprite_path)[1..-1])
             tempfile.binmode
           ensure
             tempfile.close

data/lib/active_assets/active_sprites/runners/rmagick_runner.rb

@@ -18,7 +18,7 @@ module ActiveAssets
 
           image_list.each_with_index do |image, i|
             sprite_pieces[i].details = SpritePiece::Details.new(
-              sprite.url.present? ? sprite.url : sprite_path,
+              sprite_url(sprite, sprite_path),
               orientation == Sprite::Orientation::VERTICAL ? 0 : offset,
               orientation == Sprite::Orientation::VERTICAL ? offset : 0,
               image.columns,

data/lib/active_assets/active_sprites/sprite_piece.rb

@@ -36,12 +36,13 @@ module ActiveAssets
 
       def to_css
         return '' if details.nil?
+
         <<-CSS
 #{css_selector}
 {
   width:#{width || "#{details.width}px"};
   height:#{height || "#{details.height}px"};
-  background:url('#{::Rack::Mount::Utils.normalize_path(details.sprite_path)}') no-repeat #{x || "#{-details.x}px"} #{y || "#{-details.y}px"};
+  background:url('#{details.sprite_path}') no-repeat #{x || "#{-details.x}px"} #{y || "#{-details.y}px"};
   display:block;
 }
         CSS

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_assets
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 2
-  - 7
-  version: 0.2.7
+  - 8
+  version: 0.2.8
 platform: ruby
 authors: 
 - Sam Woodard
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-03 00:00:00 -08:00
+date: 2011-02-12 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency