attached 0.2.8 → 0.2.9

data/lib/attached.rb

@@ -38,7 +38,7 @@ module Attached
     # Usage:
     #
     #   has_attached :video
-    #   has_attached :video, :storage => :s3
+    #   has_attached :video, :storage => :aws
     #   has_attached :video, styles => { :mov => { :size => "480p", :format => "mov" } }
     
     def has_attached(name, options = {})

data/lib/attached/storage/aws.rb

@@ -56,12 +56,10 @@ module Attached
       # * path - The path to save.
       
       def save(file, path)
-        file = File.open(file.path)
-        
         directory = connection.directories.get(self.bucket)
         directory ||= connection.directories.create(self.permissions.merge(:key => self.bucket))
         
-        directory.files.create(self.permissions.merge(:body => file, :key => path))
+        directory.files.create(self.options(path).merge(self.permissions.merge(:key => path, :body => file.read)))
       end
       
       

data/lib/attached/storage/base.rb

@@ -21,6 +21,49 @@ module Attached
       end
       
       
+      # Helper for determining options from a file
+      #
+      # Usage:
+      #
+      #   options("/images/1.jpg") 
+      #   options("/images/1.png")
+      #   options("/videos/1.mpg")
+      #   options("/videos/1.mov")
+      
+      def options(path)
+        options = {}
+        type = File.extname(path)
+        
+        case type
+        when /tiff/ then options[:content_type] = "image/tiff"
+        when /tif/  then options[:content_type] = "image/tiff"
+        when /jpeg/ then options[:content_type] = "image/jpeg"
+        when /jpe/  then options[:content_type] = "image/jpeg"
+        when /jpg/  then options[:content_type] = "image/jpeg"
+        when /png/  then options[:content_type] = "image/png"
+        when /gif/  then options[:content_type] = "image/gif"
+        when /bmp/  then options[:content_type] = "image/bmp"
+        when /mpeg/ then options[:content_type] = "video/mpeg"
+        when /mpa/  then options[:content_type] = "video/mpeg"
+        when /mpe/  then options[:content_type] = "video/mpeg"
+        when /mpg/  then options[:content_type] = "video/mpeg"
+        when /mov/  then options[:content_type] = "video/mov"
+        when /josn/ then options[:content_type] = "application/json"
+        when /xml/  then options[:content_type] = "application/xml"
+        when /pdf/  then options[:content_type] = "application/pdf"
+        when /rtf/  then options[:content_type] = "application/rtf"
+        when /zip/  then options[:content_type] = "application/zip"
+        when /js/   then options[:content_type] = "application/js"
+        when /html/ then options[:content_type] = "text/html"
+        when /html/ then options[:content_type] = "text/htm"
+        when /txt/  then options[:content_type] = "text/plain"
+        when /csv/  then options[:content_type] = "text/csv"
+        end
+        
+        return options
+      end
+      
+      
       # Create a new file system storage interface supporting save and destroy operations.
       #
       # Usage:

data/lib/attached/storage/google.rb

@@ -56,12 +56,10 @@ module Attached
       # * path - The path to save.
       
       def save(file, path)
-        file = File.open(file.path)
-        
         directory = connection.directories.get(self.bucket)
         directory ||= connection.directories.create(self.permissions.merge(:key => self.bucket))
         
-        directory.files.create(self.permissions.merge(:body => file, :key => path))
+        directory.files.create(self.options(path).merge(self.permissions.merge(:key => path, :body => file.read)))
       end
       
       

data/lib/attached/storage/rackspace.rb

@@ -55,12 +55,10 @@ module Attached
       # * path - The path to save.
       
       def save(file, path)
-        file = File.open(file.path)
+        directory = connection.directories.get(self.bucket)
+        directory ||= connection.directories.create(self.permissions.merge(:key => self.bucket))
         
-        directory = connection.directories.get(self.container)
-        directory ||= connection.directories.create(self.permissions.merge(:key => self.container))
-        
-        directory.files.create(self.permissions.merge(:body => file, :key => path))
+        directory.files.create(self.options(path).merge(self.permissions.merge(:key => path, :body => file.read)))
       end
       
       

data/lib/attached/version.rb

@@ -1,3 +1,3 @@
 module Attached
-  VERSION = "0.2.8"
+  VERSION = "0.2.9"
 end

metadata

@@ -2,7 +2,7 @@
 name: attached
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors: 
 - Kevin Sylvestre
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-23 00:00:00 -05:00
+date: 2011-03-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -90,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: An attachment library designed with cloud processors in mind