jekyll-retinamagick 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f059a36c0d5a85e6ea78310cc4d7981cf2a3013
-  data.tar.gz: 301979a3cf3257a1cc1132a31a234ff1e4b449da
+  metadata.gz: 33a537388d726e82dde5fa52b96cc09f8c0589c9
+  data.tar.gz: 7aaa267ca13188232d14db7cb3d25eaca81c899d
 SHA512:
-  metadata.gz: 15be8a6357ddd63372e12d83599caa02896321b12db0a7a2ecb443a983b009fa1f30dff284851d2103e441fa56aa43c8aa21737bba7918c0d1cd28e8e614c809
-  data.tar.gz: 8d164bede5fc3a86400ca20c05f821b8460d83aaaf9d6c1ce4a19d3ea265dea341666e942654384f7f0b8f7ad27049cc2310b3164296dfbf3afffc42b420aa24
+  metadata.gz: 680185aed2affdef8bb349d24ee1ec1b099b33cfb53b9b269f592d0ebc7181eeb23c7fcb142fb9f9de8b413bd54f9eb4e8adbfa5b9a7cee7cc38e7988f30fbfe
+  data.tar.gz: 3f423ddcc8e36cffa5357d5dc68cf06899eda92b2ad73374f2d28e16bc4bbcfc501c9401ad957adcce8b0fe65339ce85074320114464acd3ea866578e3e491f2

data/lib/jekyll-retinamagick/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Retinamagick
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/lib/jekyll-retinamagick.rb

@@ -18,9 +18,17 @@ module Jekyll
         @dir  = dir
         @name = name
         @dst_dir = preset.delete('destination')
-        @src_dir = preset.delete('source')
+        @src = File.join(@base, preset.delete('source'), name)
         @commands = preset
-        @retina = retina
+        if retina
+          filepath, extension = name.match(/(.+)(\.[a-zA-Z]{3,4})/i).captures
+          @name = "#{filepath}@2x#{extension}"
+          if @commands.has_key?("resize")
+            size = @commands["resize"]
+            width, height = size.match(/([0-9]+)x([0-9]+)/i).captures
+            @commands[:resize] = "#{Integer(width) * 2}x#{Integer(height) * 2}"
+          end
+        end
       end
 
       # Obtains source file path by substituting the preset's source directory
@@ -28,7 +36,7 @@ module Jekyll
       #
       # Returns source file path.
       def path
-        File.join(@base, @dir.sub(@dst_dir, @src_dir), @name)
+        @src
       end
 
       # Use MiniMagick to create a derivative image at the destination
@@ -38,23 +46,15 @@ module Jekyll
       # Returns false if the file was not modified since last time (no-op).
       def write(dest)
         dest_path = destination(dest)
-        if @retina
-          filepath, extension = dest_path.match(/(.+)(\.[a-zA-Z]{3,4})/i).captures
-          dest_path = "#{filepath}@2x#{extension}"
-        end
 
-        return false if File.exist? dest_path and !modified?
+        return false if File.exist? dest_path
 
         @@mtimes[path] = mtime
 
         FileUtils.mkdir_p(File.dirname(dest_path))
         image = ::MiniMagick::Image.open(path)
         @commands.each_pair do |command, arg|
-          if @retina
-            width, height = arg.match(/([0-9]+)x([0-9]+)/i).captures
-            arg = "#{Integer(width) * 2}x#{Integer(height) * 2}"
-          end
-          image.resize arg
+          image.send command, arg
         end
         image.write dest_path
 
@@ -75,7 +75,9 @@ module Jekyll
         site.config['retinamagick'].each_pair do |name, preset|
           Dir.glob(File.join(site.source, preset['source'], "*.{png,jpg,jpeg,gif}")) do |source|
             site.static_files << GeneratedImageFile.new(site, site.source, preset['destination'], File.basename(source), preset.clone, false)
-            site.static_files << GeneratedImageFile.new(site, site.source, preset['destination'], File.basename(source), preset.clone, true)
+            if preset.has_key?("resize")
+              site.static_files << GeneratedImageFile.new(site, site.source, preset['destination'], File.basename(source), preset.clone, true)
+            end
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-retinamagick
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Brendan Tobolaski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-03 00:00:00.000000000 Z
+date: 2013-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll