pothoven-attachment_fu 3.2.11 → 3.2.12

data/CHANGELOG

@@ -1,3 +1,6 @@
+* Apr 17, 2014 *
+* Pull in changes from jasonbuehler to fix Rails 4 errors
+
 * Jan 7, 2014 *
 * Pull in changes from twelvelabs to fix gem use in Rails 2
 

data/lib/technoweenie/attachment_fu.rb

@@ -325,7 +325,7 @@ module Technoweenie # :nodoc:
             :filename                 => thumbnail_name_for(file_name_suffix),
             :thumbnail_resize_options => size
           }
-          if defined?(Rails) && Rails::VERSION::MAJOR >= 3
+          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
@@ -475,9 +475,15 @@ module Technoweenie # :nodoc:
 
         # Initializes a new thumbnail with the given suffix.
         def find_or_initialize_thumbnail(file_name_suffix)
-          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)
+          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)
+          end
         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.11
+  version: 3.2.12
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-07 00:00:00.000000000 Z
+date: 2014-04-17 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.