middleman-simple-thumbnailer 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f73765adf97c15fc2ffefd078aac9bae3646122d
-  data.tar.gz: 7287fbac263dd1b35686eb068f9c5d6718eaa54d
+  metadata.gz: a8fcbef0d63780a552248c4a83a2450abdacb456
+  data.tar.gz: 0dba15673827e0da8cbe89d9ee4f49dc844d29a6
 SHA512:
-  metadata.gz: 9db70c0e818fa2d613e879a6c066a2646b4b15cf6cd3a4969bb40a38c4dfd08846d5337f77c930942be48ebea8aede70383f7eda556b74a89a64443039806eee
-  data.tar.gz: d6ad8be072908e271bd5490cb0dd6f9246d58a846f2177aa11c998c0d46f45e70596182a7b12666b61cf80daa116743e2f0910dc62ee80ae5dfa68ac3cd6c777
+  metadata.gz: dcbfcc6a3f1373bb78c578c522a002fc265971d701dc9fc98efd7c40d9c8cc599be47a4fd05d3cb3463f105769a1134a901448f1c4fd0eec89a0af657bd76bf0
+  data.tar.gz: cd5abd6b19674cbab8273324022711d3cda865f70e3cf3df484cfd8273a1a7b51cdeb20d706ce60429b1155111539a478cdeace265f30edb35825108c2e554f7

data/features/generate_image_thumbnails.feature

@@ -20,8 +20,9 @@ Feature: Generate image thumbnails
     Given a fixture app "basic-app"
     And a successfully built app at "basic-app"
     When I cd to "build"
-    Then the following files should exist:
-      | images/original.10x10gt.jpg    |
-      | images/original.5x5.jpg      |
+    Then the following images should exist:
+      | filename                    | dimensions |
+      | images/original.10x10gt.jpg | 10x5       |
+      | images/original.5x5.jpg     |  5x2       |
     And the file "page-with-images-to-resize.html" should contain '<img class="image-resized-to10x10" src="/images/original.10x10gt.jpg" />'
     And the file "page-with-images-to-resize.html" should contain '<img class="image-resized-to5x5" src="/images/original.5x5.jpg" />'

data/features/support/image_thumbnails_steps.rb

@@ -25,3 +25,12 @@ Then(/^I should see base64ed data of the cached thumbnails$/) do
   step %Q{I should see '#{image10x10}'}
   step %Q{I should see '#{image5x5}'}
 end
+
+Then(/^the following images should exist:$/) do |table|
+  table.hashes.each do |row|
+    in_current_dir do
+      image = MiniMagick::Image.open(row["filename"])
+      expect(image.dimensions).to eq row["dimensions"].split("x").map(&:to_i)
+    end
+  end
+end

data/lib/middleman-simple-thumbnailer/extension.rb

@@ -30,8 +30,7 @@ module MiddlemanSimpleThumbnailer
         resize_to = options.delete(:resize_to)
         return super(path, options) unless resize_to
 
-        image = MiddlemanSimpleThumbnailer::Image.new(path, self.config)
-        image.resize!(resize_to)
+        image = MiddlemanSimpleThumbnailer::Image.new(path, resize_to, self.config)
         if environment == :development
           super("data:#{image.mime_type};base64,#{image.base64_data}", options)
         else

data/lib/middleman-simple-thumbnailer/image.rb

@@ -1,5 +1,4 @@
 require "digest"
-require 'fileutils'
 
 module MiddlemanSimpleThumbnailer
   class Image
@@ -8,10 +7,11 @@ module MiddlemanSimpleThumbnailer
 
     attr_accessor :img_path, :middleman_config, :resize_to
 
-    def initialize(img_path, middleman_config)
+    def initialize(img_path, resize_to, middleman_config)
       @@all_objects << self
 
       @img_path = img_path
+      @resize_to = resize_to
       @middleman_config = middleman_config
     end
 
@@ -24,22 +24,16 @@ module MiddlemanSimpleThumbnailer
     end
 
     def base64_data
+      unless cached_thumbnail_available?
+        resize!
+        save_cached_thumbnail
+      end
       Base64.encode64(File.read(cached_resized_img_abs_path))
     end
 
-    def resize!(resize_to)
-      self.resize_to = resize_to
-      return if cached_thumbnail_available?
-      image.resize(resize_to)
-      save_cached_thumbnail
-    end
-
     def save!
-      if cached_thumbnail_available?
-        FileUtils.cp cached_resized_img_abs_path, resized_img_abs_path
-      else
-        image.write(resized_img_abs_path)
-      end
+      resize!
+      image.write(resized_img_abs_path)
     end
 
     def self.all_objects
@@ -52,6 +46,13 @@ module MiddlemanSimpleThumbnailer
     
     
     private
+    
+    def resize!
+      unless @already_resized
+        image.resize(resize_to)
+        @already_resized = true
+      end
+    end
 
     def image
       @image ||= MiniMagick::Image.open(abs_path)
@@ -67,7 +68,7 @@ module MiddlemanSimpleThumbnailer
 
     def resized_image_name
       image_name.split('.').tap { |a| a.insert(-2, resize_to) }.join('.') # add resize_to sufix
-          .gsub(/[%@!<>]/, '>' => 'gt', '<' => 'lt')                      # sanitize file name
+          .gsub(/[%@!<>^]/, '>' => 'gt', '<' => 'lt', '^' => 'c')                     # sanitize file name
     end
 
     def abs_path

data/lib/middleman-simple-thumbnailer/version.rb

@@ -1,3 +1,3 @@
 module MiddlemanSimpleThumbnailer
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-simple-thumbnailer
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Jakub Niewczas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-06 00:00:00.000000000 Z
+date: 2015-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core