model_attachment 0.0.15 → 0.0.17

data/lib/model_attachment/amazon.rb

@@ -4,9 +4,13 @@ module ModelAttachment
     # returns the aws url
     # +type+: type passed to has_attachment, ex. small, large
     def aws_url(type = "")
+      aws_connect
+      
       begin
         return AWS::S3::S3Object.find(aws_key(type), default_bucket).url
-      rescue
+      rescue Exception => e
+        log("Amazon: #{e.message}")
+        log("Backtrace: #{e.backtrace[0]}")
         log("Could not get object: #{aws_key(type)}")
       end
     end
@@ -52,11 +56,11 @@ module ModelAttachment
       aws_connect
       
       begin
-        AWS::S3::S3Object.store(aws_key, open(full_filename), default_bucket, :content_type => content_type)
+        AWS::S3::S3Object.store(aws_key, open(full_filename, 'rb'), default_bucket, :content_type => content_type)
         
         # copy over modified files
         process_image_types do |name, value|
-          AWS::S3::S3Object.store(aws_key(name.to_s), open(full_filename), default_bucket, :content_type => content_type)
+          AWS::S3::S3Object.store(aws_key(name.to_s), open(full_filename, 'rb'), default_bucket, :content_type => content_type)
         end
         
         self.bucket = default_bucket
@@ -92,18 +96,29 @@ module ModelAttachment
     def move_to_filesystem
       aws_connect
       begin 
-        open(full_filename, 'w') do |file|
-          AWS::S3::S3Object.stream(path + file_name, default_bucket) do |chunk|
-            file.write chunk
-          end
+        # streaming causes encoding error
+        
+        File.open(full_filename, 'wb') do |file|
+          
+          file.write(AWS::S3::S3Object.value(path + file_name, default_bucket))
+          file.rewind
+          
+          # AWS::S3::S3Object.stream(path + file_name, default_bucket) do |chunk|
+          #   log("Encoding: #{chunk.encoding}")
+          #   file.write chunk
+          # end
         end
         
         # copy over modified files
         process_image_types do |name, value|
-          open(full_filename(name), 'w') do |file|
-            AWS::S3::S3Object.stream(path + filename(name), default_bucket) do |chunk|
-              file.write chunk
-            end
+          File.open(full_filename(name), 'wb') do |file|
+            
+            file.write(AWS::S3::S3Object.value(path + file_name, default_bucket))
+            file.rewind
+            
+            # AWS::S3::S3Object.stream(path + filename(name), default_bucket) do |chunk|
+            #   file.write chunk
+            # end
           end
         end
         

data/lib/model_attachment/version.rb

@@ -1,3 +1,3 @@
 module ModelAttachment
-  VERSION = "0.0.15"
+  VERSION = "0.0.17"
 end

data/lib/model_attachment.rb

@@ -216,25 +216,20 @@ module ModelAttachment
     end
     
     private
-    
-    def process_image_types #:nodoc:
-      if self.class.attachment_options[:types]
-        self.class.attachment_options[:types].each do |name, value|
-          if image?
-            yield(name, value)
-          end
-        end
-      end
-    end
-    
+  
     # save the correct attribute info before the save
     def save_attributes
       return if file_name.nil? || file_name.class.to_s == "String"
       @temp_file = self.file_name
-      
+
       # get original filename info and clean up for storage
-      ext  = File.extname(@temp_file.original_filename)
-      base = File.basename(@temp_file.original_filename, ext).strip.gsub(/[^A-Za-z\d\.\-_]+/, '_')
+      filename = File.basename(@temp_file)
+      if @temp_file.original_filename 
+        filename = @temp_file.original_filename
+      end
+      
+      ext  = File.extname(filename)
+      base = File.basename(filename, ext).strip.gsub(/[^A-Za-z\d\.\-_]+/, '_')
       
       # save attributes
       self.file_name    = base + ext
@@ -248,31 +243,62 @@ module ModelAttachment
     def save_attached_files
       return if @temp_file.nil? or @temp_file == ""
       options = self.class.attachment_options
-            
+         
+      puts "Path: #{full_path} Basename: #{basename} Extension: #{extension}"
       log("Path: #{full_path} Basename: #{basename} Extension: #{extension}")
 
-      # copy image to correct path
-      FileUtils.mkdir_p(full_path)
-      FileUtils.chmod(0755, full_path)
-      FileUtils.mv(@temp_file.path, full_path + basename + extension)
-
-      # run any processing passed in on images
-      process_images
-      
-      @dirty = true 
-      @temp_file.close if @temp_file.respond_to?(:close)
-      @temp_file = nil
+      begin 
+        # copy image to correct path
+        unless Dir.exists?(full_path)
+          FileUtils.mkdir_p(full_path)
+        end
+        FileUtils.chmod(0755, full_path)
+        
+        if File.exists?(@temp_file.path)
+          FileUtils.mv(@temp_file.path, full_path + basename + extension)
+        else 
+          raise "File Error: #{@temp_file.path} does not exist"
+        end
+        
+        # run any processing passed in on images
+        process_images
+      rescue Exception => e
+        puts "Error: #{e.message}"
+        puts "\tBacktrace: #{e.backtrace[0..2]}"
+        
+        log("Error: #{e.message}")
+        log("\tBacktrace: #{e.backtrace[0]}")
+      ensure
+        @temp_file.close if @temp_file.respond_to?(:close)
+        @dirty = true 
+        @temp_file = nil
+      end
     end
         
     # run each processor on file
     def process_images
       process_image_types do |name, value|
-        command = value[:command]
-        old_filename = full_filename
-        new_filename = full_filename(name)
-        log("Create #{name} by running #{command} on #{old_filename}")
-        log("Created: #{new_filename}")
-        `#{command} #{old_filename} #{new_filename}`
+        begin
+          command = value[:command]
+          old_filename = full_filename
+          new_filename = full_filename(name)
+          log("Create #{name} by running #{command} on #{old_filename}")
+          log("Created: #{new_filename}")
+          `#{command} #{old_filename} #{new_filename}`
+        rescue Exception => e
+          puts "Process Images Error: #{e.message}"
+          puts "\tBacktrace: #{e.backtrace[0]}"
+        end
+      end
+    end
+    
+    def process_image_types #:nodoc:
+      if self.class.attachment_options[:types]
+        self.class.attachment_options[:types].each do |name, value|
+          if image?
+            yield(name, value)
+          end
+        end
       end
     end
     

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 15
-  version: 0.0.15
+  - 17
+  version: 0.0.17
 platform: ruby
 authors: 
 - Steve Walker
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-17 00:00:00 -04:00
+date: 2010-06-29 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency