smartthumbs 0.0.4 → 0.0.5

data/app/controllers/thumbs_controller.rb

@@ -1,8 +1,5 @@
 class ThumbsController < ApplicationController
   
-  require 'RMagick'
-  include Magick
-
   def deliver_crop
     klass, format, id = parse_params
     

data/lib/smartthumbs/thumbable.rb

@@ -1,11 +1,10 @@
 module Smartthumbs
 
   module Thumbable
-    require 'RMagick'
-    include Magick
 
     # return the rmagick instance
     def rmagick_img
+      return @rmagick_img unless @rmagick_img.blank?
       if self.class.st_config[:blob].present?
         @rmagick_img ||= Magick::ImageList.new.from_blob(
           self.send(self.class.st_config[:blob])
@@ -17,6 +16,12 @@ module Smartthumbs
       else
         raise "No thumb source defined. You have to define neither :blob or :file"
       end
+      
+      if self.class.st_config[:before_resize].present? && self.respond_to?(self.class.st_config[:before_resize].to_sym)
+        self.send(self.class.st_config[:before_resize].to_sym)
+      end
+      @rmagick_img
+      
     end
 
     # returns the specific format-array for the key f
@@ -27,7 +32,11 @@ module Smartthumbs
       if self.class.st_config[:formats].respond_to?(:call)
         self.class.st_config[:formats].call(f.to_sym)
       else
-        self.class.st_config[:formats][f]
+        if self.class.st_config[:formats][f].is_a?(Symbol)
+          self.send(self.class.st_config[:formats][f])
+        else
+          self.class.st_config[:formats][f]
+        end
       end
     end
     

data/lib/smartthumbs/version.rb

@@ -1,3 +1,3 @@
 module Smartthumbs
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: smartthumbs
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Alexander Pauly
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-01 00:00:00 +01:00
+date: 2011-03-26 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency