compass-magick 0.1.5 → 0.1.6

data/lib/magick.rb

@@ -32,7 +32,7 @@ module Compass::Magick
   # The current version of Compass Magick. This value is updated manually on
   # release. If you are using a Git clone, the version will always end with
   # '.git'.
-  VERSION = '0.1.5.git'
+  VERSION = '0.1.6'
 
   # The locations where plug-ins are located. These paths are scanned for
   # *.rb files and loaded in order.

data/lib/magick/canvas.rb

@@ -34,7 +34,7 @@ module Compass::Magick
     #     the Canvas instance.
     # @overload initialize(path, *commands)
     #   @param [Sass::Script::String] path The path to the image, relative to
-    #     the configured <tt>images_dir</tt>.
+    #     the configured <tt>generated_images_path</tt> or <tt>images_path</tt>.
     #   @param [Array<Command>] commands The list of commands to execute on
     #     the Canvas instance.
     # @overload initialize(width, height, *commands)
@@ -118,8 +118,12 @@ module Compass::Magick
             canvas   = ChunkyPNG::Canvas.from_file(path)
           end
         else
-          path   = File.join(Compass.configuration.images_path, source.value.split('?').shift())
-          canvas = ChunkyPNG::Canvas.from_file(path)
+          basename = source.value.split('?').shift()
+          path     = File.join(Compass.configuration.generated_images_path, basename)
+          if not File.exists?(path)
+            path   = File.join(Compass.configuration.images_path, basename)
+          end
+          canvas   = ChunkyPNG::Canvas.from_file(path)
         end
         inherit canvas, false
       else

data/lib/magick/functions/canvas.rb

@@ -21,7 +21,7 @@ module Compass::Magick
       #     the Canvas instance.
       # @overload magick_canvas(path, *commands)
       #   @param [Sass::Script::String] path The path to the image, relative
-      #     to the configured <tt>images_dir</tt>.
+      #     to the configured <tt>generated_images_path</tt> or <tt>images_path</tt>.
       #   @param [Array<Command>] commands The list of commands to execute on
       #     the Canvas instance.
       # @overload magick_canvas(width, height, *commands)

data/lib/magick/functions/sprites.rb

@@ -18,10 +18,10 @@ module Compass::Magick
         Compass::Magick::Utils.assert_type 'canvas',   canvas,   ChunkyPNG::Canvas
         extension = '.png'
         filename  = basename.value.chomp(extension) + extension
-        filepath  = File.join(Compass.configuration.images_path, filename)
+        filepath  = File.join(Compass.configuration.generated_images_path, filename)
         FileUtils.mkpath(File.dirname(filepath))
         canvas.save(filepath, :best_compression)
-        image_url(Sass::Script::String.new(filename))
+        generated_image_url(Sass::Script::String.new(filename))
       end
     end
   end

data/lib/plugins/phantom.rb

@@ -93,7 +93,7 @@ module Compass::Magick
         elements.push(instructions.join('; '))
       end
       basename = "~magick-phantom-#{ rand(36**8).to_s(36) }.png"
-      filename = File.join(Compass.configuration.images_path, basename)
+      filename = File.join(Compass.configuration.generated_images_path, basename)
       command  = [Compass.configuration.phantom_executable, Compass.configuration.phantom_script]
       command  = command.concat([width.to_s, height.to_s])
       command  = command.concat(elements)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: compass-magick
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Stan Angeloff
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-10 00:00:00 Z
+date: 2012-07-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: compass
@@ -25,7 +25,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: -3478083476
+        hash: -3214850198
         segments: 
         - 0
         - 11
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Dynamic image generation for Compass using ChunkyPNG/PhantomJS.