pothoven-attachment_fu 3.2.10 → 3.2.11

data/CHANGELOG

@@ -1,3 +1,6 @@
+* Jan 7, 2014 *
+* Pull in changes from twelvelabs to fix gem use in Rails 2
+
 * Aug 22, 2013 *
 * Added cache-control header option and Ruby 1.9 fix for S3 from tricycle
 

data/lib/pothoven-attachment_fu.rb

@@ -1,12 +1,27 @@
-class Engine < Rails::Engine
-  # Mimic old vendored plugin behavior, attachment_fu/lib is autoloaded.
-  config.autoload_paths << File.expand_path("..", __FILE__)
 
-  initializer "attachment_fu" do
-    require 'geometry'
+if defined?(Rails::Engine)
+  # Rails >= 3
+  class Engine < Rails::Engine
+    # Mimic old vendored plugin behavior, attachment_fu/lib is autoloaded.
+    config.autoload_paths << File.expand_path("..", __FILE__)
 
-    ActiveRecord::Base.send(:extend, Technoweenie::AttachmentFu::ActMethods)
-    Technoweenie::AttachmentFu.tempfile_path = ATTACHMENT_FU_TEMPFILE_PATH if Object.const_defined?(:ATTACHMENT_FU_TEMPFILE_PATH)
-    FileUtils.mkdir_p Technoweenie::AttachmentFu.tempfile_path
+    initializer "attachment_fu" do
+      require 'geometry'
+
+      ActiveRecord::Base.send(:extend, Technoweenie::AttachmentFu::ActMethods)
+      Technoweenie::AttachmentFu.tempfile_path = ATTACHMENT_FU_TEMPFILE_PATH if Object.const_defined?(:ATTACHMENT_FU_TEMPFILE_PATH)
+      FileUtils.mkdir_p Technoweenie::AttachmentFu.tempfile_path
+    end
   end
+else
+  # Rails <= 2
+  require 'geometry'
+
+  ActiveSupport::Dependencies.autoload_paths << File.expand_path("..", __FILE__)
+
+  ActiveRecord::Base.send(:extend, Technoweenie::AttachmentFu::ActMethods)
+  Technoweenie::AttachmentFu.tempfile_path = ATTACHMENT_FU_TEMPFILE_PATH if Object.const_defined?(:ATTACHMENT_FU_TEMPFILE_PATH)
+  FileUtils.mkdir_p Technoweenie::AttachmentFu.tempfile_path
+
+  $:.unshift(File.expand_path("../vendor", __FILE__))
 end

data/lib/technoweenie/attachment_fu.rb

@@ -319,11 +319,17 @@ module Technoweenie # :nodoc:
         thumbnailable? || raise(ThumbnailError.new("Can't create a thumbnail if the content type is not an image or there is no parent_id column"))
         find_or_initialize_thumbnail(file_name_suffix).tap do |thumb|
           thumb.temp_paths.unshift temp_file
-          thumb.send(:assign_attributes, {
+          assign_attributes_args = []
+          assign_attributes_args << {
             :content_type             => content_type,
             :filename                 => thumbnail_name_for(file_name_suffix),
             :thumbnail_resize_options => size
-          }, :without_protection => true)
+          }
+          if defined?(Rails) && Rails::VERSION::MAJOR >= 3
+            # assign_attributes API in Rails 2.3 doesn't take a second argument
+            assign_attributes_args << { :without_protection => true }
+          end
+          thumb.send(:assign_attributes, *assign_attributes_args)
           callback_with_args :before_thumbnail_saved, thumb
           thumb.save!
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pothoven-attachment_fu
 version: !ruby/object:Gem::Version
-  version: 3.2.10
+  version: 3.2.11
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2014-01-07 00:00:00.000000000 Z
 dependencies: []
 description: This is a fork of Rick Olson's attachment_fu adding Ruby 1.9 and Rails
   3.2 support as well as some other enhancements.