pothoven-attachment_fu 3.2.15 → 3.2.16

data/CHANGELOG

@@ -1,3 +1,7 @@
+* Jul 15, 2015 *
+* Pull in changes from brauliobo to fix protected_attributes for Rails 4.2 *
+* Acknowlegement also to malmckay who provided another elegant fix to the protected_attributes problem and I want to thank him for it, but I had to pick 1 *
+
 * Jan 27, 2015 *
 * Pull in changes from bacrossland to fix test suite *
 

data/lib/technoweenie/attachment_fu.rb

@@ -319,17 +319,12 @@ 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
-          assign_attributes_args = []
-          assign_attributes_args << {
-            :content_type             => content_type,
-            :filename                 => thumbnail_name_for(file_name_suffix),
+          attributes = {
+            :content_type =>             content_type,
+            :filename =>                 thumbnail_name_for(file_name_suffix),
             :thumbnail_resize_options => size
           }
-          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)
+          attributes.each{ |a, v| thumb.send "#{a}=", v }
           callback_with_args :before_thumbnail_saved, thumb
           thumb.save!
         end
@@ -436,8 +431,8 @@ module Technoweenie # :nodoc:
         # Write out the temporary data if it is not present
         if temp_data.nil?
           self.temp_data = current_data
-        end 
-        
+        end
+
         self.class.with_image(temp_path, &block)
       end
 
@@ -445,7 +440,7 @@ module Technoweenie # :nodoc:
         # Generates a unique filename for a Tempfile.
         def random_tempfile_filename
           base_filename = filename ? filename.gsub(/\.\w+$/, '') : 'attachment'
-          ext = filename.slice(/\.\w+$/)
+          ext = filename ? filename.slice(/\.\w+$/) : ''
           ["#{rand Time.now.to_i}#{base_filename}", ext || '']
         end
 
@@ -480,15 +475,14 @@ module Technoweenie # :nodoc:
 
         # Initializes a new thumbnail with the given suffix.
         def find_or_initialize_thumbnail(file_name_suffix)
-          if defined?(Rails) && Rails::VERSION::MAJOR >= 4
-            respond_to?(:parent_id) ?
-              thumbnail_class.find_or_initialize_by(:thumbnail => file_name_suffix.to_s, :parent_id => id) :
-              thumbnail_class.find_or_initialize_by(:thumbnail => file_name_suffix.to_s)
-		  else
-            respond_to?(:parent_id) ?
-              thumbnail_class.find_or_initialize_by_thumbnail_and_parent_id(file_name_suffix.to_s, id) :
-              thumbnail_class.find_or_initialize_by_thumbnail(file_name_suffix.to_s)
+          attrs = {thumbnail: file_name_suffix.to_s}
+          attrs[:parent_id] = id if respond_to? :parent_id
+          thumb = thumbnail_class.where(attrs).first
+          unless thumb
+            thumb = thumbnail_class.new
+            attrs.each{ |a, v| thumb[a] = v }
           end
+          thumb
         end
 
         # Stub for a #process_attachment method in a processor

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pothoven-attachment_fu
 version: !ruby/object:Gem::Version
-  version: 3.2.15
+  version: 3.2.16
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-27 00:00:00.000000000 Z
+date: 2015-07-15 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 and Rails 4 support as well as some other enhancements.