rails_magick 0.0.7 → 0.0.8

data/lib/rails_magick.rb

@@ -53,11 +53,22 @@ module RailsMagick
   end
 
   # Generates a thumbnail. Ruthless about cropping. 
-  def self.create_thumbnail(infile, outfile, width, height, quality = 80)
+  # regenerate_thumb - if false, will check the dimensions of the incoming thumbnail and NOT regenerate the thumbnail if it is the same size. Defaults to true so that it will ruthlessly crop and overwrite the thumbnail.
+  def self.create_thumbnail(infile, outfile, width, height, quality = 80, regenerate_thumb = true)
     if !File.exist?(infile)
       raise IOError, "No such file #{file}"
     end
 
+    # Check if the thumbnail is already the same width and height. Don't run if it is.
+    if !regenerate_thumb
+      info = self.identify(infile)
+      if info[:width] == width and info[:height] == height
+        # Copy the file
+        FileUtils.copy(infile, outfile)
+        return true
+      end
+    end
+
     # Do the convert
     result = `#{CONVERT} #{infile} -resize '#{width}x#{height}^' -quality #{quality} -gravity center -extent '#{width}x#{height}' #{outfile}`
 

data/lib/rails_magick/version.rb

@@ -1,3 +1,3 @@
 module RailsMagick
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/test/dummy/log/test.log

@@ -92,3 +92,28 @@ Connecting to database specified by database.yml
    (0.1ms)  rollback transaction
    (0.0ms)  begin transaction
    (0.1ms)  rollback transaction
+Connecting to database specified by database.yml
+   (0.2ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+Connecting to database specified by database.yml
+   (0.2ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.7ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+Connecting to database specified by database.yml
+   (0.2ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction

data/test/rails_magick_test.rb

@@ -53,4 +53,13 @@ class RailsMagickTest < ActiveSupport::TestCase
 
   end
 
+  test "should create thumbnail same size" do
+    infile = "#{File.dirname(__FILE__)}/files/test_thumb.jpg"
+    result = RailsMagick.create_thumbnail(infile, @outfile, 100, 100, 80, false)
+    assert(File.exists?(@outfile))
+    result = RailsMagick.identify(@outfile)
+    assert_equal(100, result[:height])
+    assert_equal(100, result[:width])
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_magick
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-04 00:00:00.000000000 Z
+date: 2012-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -88,6 +88,7 @@ files:
 - test/dummy/README.rdoc
 - test/dummy/script/rails
 - test/files/test.jpg
+- test/files/test_thumb.jpg
 - test/rails_magick_test.rb
 - test/test_helper.rb
 homepage: https://github.com/ballistiq/RailsMagick
@@ -147,5 +148,6 @@ test_files:
 - test/dummy/README.rdoc
 - test/dummy/script/rails
 - test/files/test.jpg
+- test/files/test_thumb.jpg
 - test/rails_magick_test.rb
 - test/test_helper.rb