has_image 0.3.0 → 0.4.0

data/lib/has_image/processor.rb

@@ -1,21 +1,21 @@
 require 'mini_magick'
 
 module HasImage
-  
+
   # Image processing functionality for the HasImage gem.
   class Processor
-    
+
     attr_accessor :options
-    
+
     class << self
-      
+
       # The form of an {extended geometry string}[http://www.imagemagick.org/script/command-line-options.php?#resize] is:
       #
       #   <width>x<height>{+-}<xoffset>{+-}<yoffset>{%}{!}{<}{>}
       def geometry_string_valid?(string)
-        string =~ /\A[\d]*x[\d]*([+-][0-9][+-][0-9])?[%@!<>^]?\Z/
+        string.nil? || string =~ /\A[\d]*x[\d]*([+-][0-9][+-][0-9])?[%@!<>^]?\z/
       end
-      
+
       # Arg should be either a file or a path. This runs ImageMagick's
       # "identify" command and looks for an exit status indicating an error.
       # If there is no error, then ImageMagick has identified the file as
@@ -34,22 +34,22 @@ module HasImage
           $? == 0
         end
       end
-      
+
     end
 
     # The constuctor should be invoked with the options set by has_image.
     def initialize(options) # :nodoc:
       @options = options
     end
-    
+
     # Creates the resized image, and transforms it to the desired output
-    # format if necessary. 
-    # 
+    # format if necessary.
+    #
     # +size+ should be a valid ImageMagick {geometry string}[http://www.imagemagick.org/script/command-line-options.php#resize].
     # +format+ should be an image format supported by ImageMagick, e.g. "PNG", "JPEG"
     # If a block is given, it yields the processed image file as a file-like object using IO#read.
     def process(file, size = options[:resize_to], format = options[:convert_to])
-      unless size.blank? || Processor.geometry_string_valid?(size)
+      unless Processor.geometry_string_valid?(size)
         raise InvalidGeometryError.new('"%s" is not a valid ImageMagick geometry string' % size)
       end
       with_image(file) do |image|
@@ -60,12 +60,12 @@ module HasImage
       end
     end
     alias_method :resize, :process #Backwards-compat
-    
+
     # Gets the given +dimension+ (width/height) from the image file at +path+.
     def measure(path, dimension)
       MiniMagick::Image.from_file(path)[dimension.to_sym]
     end
-    
+
   private
     # Operates on the image with MiniMagick. Yields a MiniMagick::Image object.
     def with_image(file)
@@ -75,14 +75,14 @@ module HasImage
         begin
           image = MiniMagick::Image.from_file(path)
           yield image
-        rescue MiniMagick::MiniMagickError
+        rescue MiniMagick::Invalid
           raise ProcessorError.new("#{path} doesn't look like an image file.")
         ensure
           image.tempfile.close! if defined?(image) && image
         end
       end
     end
-  
+
     # Image resizing is placed in a separate method for easy monkey-patching.
     # This is intended to be invoked from resize, rather than directly.
     # By default, the following ImageMagick functionality is invoked:
@@ -114,7 +114,6 @@ module HasImage
     def convert_image(image, format=options[:convert_to])
       image.format(format) unless image[:format] == format
     end
-    
-  end
 
-end
+  end
+end

data/lib/has_image/railtie.rb

@@ -0,0 +1,7 @@
+module FriendlyId
+  class Railtie < Rails::Railtie
+    initializer "has_image.configure_rails_initialization" do |app|
+      HasImage.enable
+    end
+  end
+end

data/lib/has_image/storage.rb

@@ -1,23 +1,23 @@
-require 'active_support'
+require 'cgi'
 require 'stringio'
 require 'fileutils'
 require 'zlib'
 
-module HasImage  
-  
+module HasImage
+
   # Filesystem storage for the HasImage gem. The methods that HasImage inserts
   # into ActiveRecord models only depend on the public methods in this class,
   # so it should be reasonably straightforward to implement a different
   # storage mechanism for Amazon AWS, Photobucket, DBFile, SFTP, or whatever
-  # you want.  
+  # you want.
   class Storage
     class_inheritable_accessor :thumbnail_separator
     write_inheritable_attribute :thumbnail_separator, '_'
-    
+
     attr_accessor :image_data, :options, :temp_file
 
     class << self
-      
+
       # {Jamis Buck's well known
       # solution}[http://www.37signals.com/svn/archives2/id_partitioning.php]
       # to this problem fails with high ids, such as those created by
@@ -29,17 +29,17 @@ module HasImage
       def partitioned_path(id, *args)
         ["%04d" % ((id.to_i / 1e4) % 1e4), "%04d" % (id.to_i % 1e4)].concat(args)
       end
-      
+
       def id_from_partitioned_path(partitioned_path)
         partitioned_path.join.to_i
       end
-      
+
       def id_from_path(path)
         path = path.split('/') if path.is_a?(String)
         path_partitions = 2
         id_from_partitioned_path(path.first(path_partitions))
       end
-      
+
       # By default, simply accepts and returns the id of the object. This is
       # here to allow you to monkey patch this method, for example, if you
       # wish instead to generate and return a UUID.
@@ -72,13 +72,13 @@ module HasImage
       @temp_file.open if @temp_file.closed?
       @temp_file.size < options[:min_size]
     end
-    
+
     # Is uploaded file larger than the allowed maximum?
     def image_too_big?
       @temp_file.open if @temp_file.closed?
       @temp_file.size > options[:max_size]
     end
-    
+
     # Invokes the processor to resize the image(s) and the installs them to
     # the appropriate directory.
     def install_images(object)
@@ -86,16 +86,16 @@ module HasImage
       install_main_image(object.has_image_id, generated_name)
       generate_thumbnails(object.has_image_id, generated_name) if thumbnails_needed?
       return generated_name
-    ensure  
+    ensure
       @temp_file.close! if !@temp_file.closed?
       @temp_file = nil
     end
-    
+
     # Measures the given dimension using the processor
     def measure(path, dimension)
       processor.measure(path, dimension)
     end
-    
+
     # Gets the "web" path for an image. For example:
     #
     #   /photos/0000/0001/3er0zs.jpg
@@ -103,24 +103,24 @@ module HasImage
       webpath = filesystem_path_for(object, thumbnail).gsub(/\A.*public/, '')
       escape_file_name_for_http(webpath)
     end
-    
+
     def escape_file_name_for_http(webpath)
       dir, file = File.split(webpath)
       File.join(dir, CGI.escape(file))
     end
-    
+
     # Deletes the images and directory that contains them.
     def remove_images(object, name)
       FileUtils.rm Dir.glob(File.join(path_for(object.has_image_id), name + '*'))
       Dir.rmdir path_for(object.has_image_id)
-    rescue SystemCallError 
+    rescue SystemCallError
     end
 
     # Is the uploaded file within the min and max allowed sizes?
     def valid?
       !(image_too_small? || image_too_big?)
     end
-    
+
     # Write the thumbnails to the install directory - probably somewhere under
     # RAILS_ROOT/public.
     def generate_thumbnails(id, name)
@@ -128,7 +128,7 @@ module HasImage
       options[:thumbnails].keys.each { |thumb_name| generate_thumbnail(id, name, thumb_name) }
     end
     alias_method :regenerate_thumbnails, :generate_thumbnails #Backwards-compat
-    
+
     def generate_thumbnail(id, name, thumb_name)
       size_spec = options[:thumbnails][thumb_name.to_sym]
       raise StorageError unless size_spec
@@ -139,23 +139,23 @@ module HasImage
         end
       end
     end
-     
+
     # Gets the full local filesystem path for an image. For example:
     #
     #   /var/sites/example.com/production/public/photos/0000/0001/3er0zs.jpg
     def filesystem_path_for(object, thumbnail = nil)
       File.join(path_for(object.has_image_id), file_name_for(object.send(options[:column]), thumbnail))
     end
-    
+
     protected
 
     # Gets the extension to append to the image. Transforms "jpeg" to "jpg."
     def extension
       options[:convert_to].to_s.downcase.gsub("jpeg", "jpg")
     end
-    
+
     private
-    
+
     # File name, plus thumbnail suffix, plus extension. For example:
     #
     #   file_name_for("abc123", :thumb)
@@ -163,7 +163,7 @@ module HasImage
     # gives you:
     #
     #   "abc123_thumb.jpg"
-    #   
+    #
     # It uses an underscore to separatore parts by default, but that is configurable
     # by setting HasImage::Storage.thumbnail_separator
     def file_name_for(*args)
@@ -177,15 +177,15 @@ module HasImage
       debugger if $debug
       File.join(options[:base_path], options[:path_prefix], Storage.partitioned_path(id))
     end
-    
+
     def absolute_path(id, *args)
       File.join(path_for(id), file_name_for(*args))
     end
-    
+
     def ensure_directory_exists!(id)
       FileUtils.mkdir_p path_for(id)
     end
-    
+
     # Write the main image to the install directory - probably somewhere under
     # RAILS_ROOT/public.
     def install_main_image(id, name)
@@ -196,12 +196,12 @@ module HasImage
         end
       end
     end
-    
+
     # used in #install_images
     def thumbnails_needed?
       !options[:thumbnails].empty? && options[:auto_generate_thumbnails]
     end
-    
+
     # Instantiates the processor using the options set in my contructor (if
     # not already instantiated), stores it in an instance variable, and
     # returns it.
@@ -209,5 +209,5 @@ module HasImage
       @processor ||= Processor.new(options)
     end
   end
-  
-end
+
+end

data/lib/has_image/version.rb

@@ -0,0 +1,3 @@
+module HasImage
+  VERSION = "0.4.0"
+end

data/lib/has_image/view_helpers.rb

@@ -1,9 +1,8 @@
 module HasImage
-  
   # Some helpers to make working with HasImage models in views a little
   # easier.
   module ViewHelpers
-  
+
     # Wraps the image_tag helper from Rails. Instead of passing the path to
     # an image, you can pass any object that uses HasImage. The options can
     # include the name of one of your thumbnails, for example:
@@ -23,7 +22,7 @@ module HasImage
     def image_tag_for(object, options = {})
       thumb = options.delete(:thumb)
       if !options[:size]
-        if thumb 
+        if thumb
           size = object.class.thumbnails[thumb.to_sym]
           options[:size] = size if size =~ /\A[\d]*x[\d]*\Z/
         else
@@ -31,9 +30,7 @@ module HasImage
           options[:size] = size if size =~ /\A[\d]*x[\d]*\Z/
         end
       end
-  	  image_tag(object.public_path(thumb), options)
+      image_tag(object.public_path(thumb), options)
     end
-  
   end
-
 end

data/{test_rails → test}/complex_pic_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require File.expand_path('../test_helper', __FILE__)
 
 class ComplexPic < ActiveRecord::Base
   has_image
@@ -12,11 +12,11 @@ class ComplexPicTest < Test::Unit::TestCase
     ComplexPic.has_image_options[:base_path] = File.join(RAILS_ROOT, 'tmp')
     ComplexPic.has_image_options[:resize_to] = nil
   end
-  
+
   def teardown
     FileUtils.rm_rf(File.join(RAILS_ROOT, 'tmp', 'complex_pics'))
   end
-  
+
   def test_should_save_width_to_db_on_create
     @pic = ComplexPic.create!(:image_data => fixture_file_upload("/image.jpg", "image/jpeg"))
     assert_equal 1916, @pic[:width]
@@ -26,7 +26,12 @@ class ComplexPicTest < Test::Unit::TestCase
     @pic = ComplexPic.create!(:image_data => fixture_file_upload("/image.jpg", "image/jpeg"))
     assert_equal 1990, @pic[:height]
   end
-  
+
+  def test_should_save_image_size_to_db_on_create
+    @pic = ComplexPic.create!(:image_data => fixture_file_upload("/image.jpg", "image/jpeg"))
+    assert_equal '1916x1990', @pic[:image_size]
+  end
+
   def test_should_use_value_from_db_in_height_reader
     @pic = ComplexPic.create!(:image_data => fixture_file_upload("/image.jpg", "image/jpeg"))
     @pic[:height] = 60_000
@@ -38,5 +43,5 @@ class ComplexPicTest < Test::Unit::TestCase
     @pic[:width] = 60_000
     assert_equal 60_000, @pic.width
   end
-  
+
 end

data/{test_rails → test}/pic_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require File.expand_path('../test_helper', __FILE__)
 
 class Pic < ActiveRecord::Base
   has_image
@@ -9,6 +9,7 @@ class PicWithDifferentTableName < ActiveRecord::Base
 end
 
 class PicTest < Test::Unit::TestCase
+
   def setup
     # Note: Be sure to not set the whole options hash in your tests below
     Pic.has_image_options = HasImage.default_options_for(Pic)
@@ -81,7 +82,7 @@ class PicTest < Test::Unit::TestCase
 
   def test_regenerate_thumbnails_succeeds
     Pic.has_image_options[:thumbnails] = {:small => "100x100", :tiny => "16x16"}
-    
+
     @pic = Pic.new(:image_data => fixture_file_upload("/image.jpg", "image/jpeg"))
     @pic.save!
     assert @pic.regenerate_thumbnails
@@ -150,4 +151,4 @@ class PicTest < Test::Unit::TestCase
     assert_equal 1990, pic.height
   end
 
-end
+end

data/test/processor_test.rb

@@ -1,20 +1,20 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.expand_path('../test_helper.rb', __FILE__)
 
 class StorageTest < Test::Unit::TestCase
-  
+
   def teardown
     @temp_file.close if @temp_file
     FileUtils.rm_rf(File.dirname(__FILE__) + '/../tmp')
   end
-  
+
   def temp_file(fixture)
     @temp_file = Tempfile.new('test')
-    @temp_file.write(File.new(File.dirname(__FILE__) + "/../test_rails/fixtures/#{fixture}", "r").read)
+    @temp_file.write(File.new(File.expand_path("../fixtures/#{fixture}", __FILE__), "r").read)
     return @temp_file
   end
-  
+
   def test_detect_valid_image
-    assert HasImage::Processor.valid?(File.dirname(__FILE__) + "/../test_rails/fixtures/image.jpg")
+    assert HasImage::Processor.valid?(File.expand_path("../fixtures/image.jpg", __FILE__))
   end
 
   def test_detect_valid_image_from_tmp_file
@@ -22,7 +22,7 @@ class StorageTest < Test::Unit::TestCase
   end
 
   def test_detect_invalid_image
-    assert !HasImage::Processor.valid?(File.dirname(__FILE__) + "/../test_rails/fixtures/bad_image.jpg")
+    assert !HasImage::Processor.valid?(File.expand_path("../fixtures/bad_image.jpg", __FILE__))
   end
 
   def test_detect_invalid_image_from_tmp_file
@@ -35,7 +35,7 @@ class StorageTest < Test::Unit::TestCase
       @processor.resize(temp_file("image.jpg"), "bad_geometry")
     end
   end
-  
+
   def test_resize_fixed
     @processor = HasImage::Processor.new({:convert_to => "JPEG", :output_quality => "85"})
     assert @processor.resize(temp_file("image.jpg"), "100x100")
@@ -57,5 +57,4 @@ class StorageTest < Test::Unit::TestCase
       @processor.resize(temp_file("bad_image.jpg"), "100x100")
     end
   end
-
-end
+end