pothoven-attachment_fu 3.2.12 → 3.2.13

data/CHANGELOG

@@ -1,3 +1,6 @@
+* May 13, 2014 *
+* Pull in changes from bacrossland to fix thumbnails for S3 storage
+
 * Apr 17, 2014 *
 * Pull in changes from jasonbuehler to fix Rails 4 errors
 

data/lib/technoweenie/attachment_fu/backends/cloud_file_backend.rb

@@ -142,14 +142,15 @@ module Technoweenie # :nodoc:
 
         # The pseudo hierarchy containing the file relative to the container name
         # Example: <tt>:table_name/:id</tt>
-        def base_path
-          File.join(attachment_options[:path_prefix], attachment_path_id)
+        def base_path(thumbnail = nil)
+          file_system_path = (thumbnail ? thumbnail_class : self).attachment_options[:path_prefix]
+          File.join(file_system_path, attachment_path_id)
         end
 
         # The full path to the file relative to the container name
         # Example: <tt>:table_name/:id/:filename</tt>
         def full_filename(thumbnail = nil)
-          File.join(base_path, thumbnail_name_for(thumbnail))
+          File.join(base_path(thumbnail), thumbnail_name_for(thumbnail))
         end
 
         # All public objects are accessible via a GET request to the Cloud Files servers. You can generate a

data/lib/technoweenie/attachment_fu/backends/s3_backend.rb

@@ -252,14 +252,15 @@ module Technoweenie # :nodoc:
 
         # The pseudo hierarchy containing the file relative to the bucket name
         # Example: <tt>:table_name/:id</tt>
-        def base_path
-          File.join(attachment_options[:path_prefix], attachment_path_id)
+        def base_path(thumbnail = nil)
+          file_system_path = (thumbnail ? thumbnail_class : self).attachment_options[:path_prefix]
+          File.join(file_system_path, attachment_path_id)
         end
 
         # The full path to the file relative to the bucket name
         # Example: <tt>:table_name/:id/:filename</tt>
         def full_filename(thumbnail = nil)
-          File.join(base_path, thumbnail_name_for(thumbnail))
+          File.join(base_path(thumbnail), thumbnail_name_for(thumbnail))
         end
 
         # All public objects are accessible via a GET request to the S3 servers. You can generate a

data/lib/technoweenie/attachment_fu.rb

@@ -433,6 +433,11 @@ module Technoweenie # :nodoc:
       #   end
       #
       def with_image(&block)
+        # Write out the temporary data if it is not present
+        if temp_data.nil?
+          self.temp_data = current_data
+        end 
+        
         self.class.with_image(temp_path, &block)
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pothoven-attachment_fu
 version: !ruby/object:Gem::Version
-  version: 3.2.12
+  version: 3.2.13
   prerelease: 
 platform: ruby
 authors:
@@ -10,10 +10,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-17 00:00:00.000000000 Z
+date: 2014-05-13 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.
+  3.2 and Rails 4 support as well as some other enhancements.
 email: steven@pothoven.net
 executables: []
 extensions: []
@@ -66,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: nowarning
-rubygems_version: 1.8.24
+rubygems_version: 1.8.29
 signing_key: 
 specification_version: 2
 summary: attachment_fu as a gem