lib/attached/attachment.rb in attached-0.0.2 vs lib/attached/attachment.rb in attached-0.0.3

@@ -1,5 +1,7 @@
+require 'uuid'
+
 require 'attached/storage'
 
 module Attached
   
   class Attachment
@@ -7,18 +9,16 @@
     
     attr_reader :file
     attr_reader :name
     attr_reader :instance
     attr_reader :options
-    attr_reader :storage
     
     
     def self.options
       @options ||= {
-        :storage  => :fs,
-        :protocol => 'http',
-        :path     => "/:name/:style/:id:extension",
+        :storage  => :s3,
+        :path     => "/:name/:style/:identifier:extension",
         :styles   => {},
       }
     end
     
     
@@ -30,11 +30,11 @@
     # * instance    - The instance the attachment is attached to
     #
     # Options:
     #
     # * :path        - The location where the attachment is stored
-    # * :storage     - The storage medium represented as a symbol such as ':s3' or ':fs'
+    # * :storage     - The storage medium represented as a symbol such as ':s3'
     # * :credentials - A file, hash, or path used to authenticate with the specified storage medium
     
     def initialize(name, instance, options = {})
       @name       = name
       @instance   = instance
@@ -45,70 +45,72 @@
     
     # Usage:
     #
     #   @object.avatar.assign(...)
     
-    def assign(file)
-      @file = file
+    def assign(file, identifier = UUID.generate)
+      @file = file.tempfile
       
       extension = File.extname(file.original_filename)
       
       instance_set :size, file.size
       instance_set :extension, extension
+      instance_set :identifier, identifier
     end
     
     
     # Usage:
     #
     #   @object.avatar.save
     
     def save
       @storage ||= Attached::Storage.medium(options[:storage], options[:credentials])
       
-      storage.save(self.file, self.path) if self.file
+      @storage.save(self.file, self.path) if self.file and self.path
     end
     
     
     # Usage:
     #
     #   @object.avatar.destroy
     
     def destroy
       @storage ||= Attached::Storage.medium(options[:storage], options[:credentials])
       
-      storage.destroy(self.path)
+      @storage.destroy(self.path) if self.path
     end
     
-    
+    # Acesss the URL for an attachment.
+    #
     # Usage:
     #
     #   @object.avatar.url
     #   @object.avatar.url(:small)
     #   @object.avatar.url(:large)
     
     def url(style = :original)
       @storage ||= Attached::Storage.medium(options[:storage], options[:credentials])
       
-      return "#{options[:protocol]}://#{@storage.host}#{path(style)}"
+      return "#{@storage.host}#{path(style)}"
     end
     
     
-    # Access the URL 
+    # Access the path for an attachment. 
     #
     # Usage:
     #
     #   @object.avatar.url
     #   @object.avatar.url(:small)
     #   @object.avatar.url(:large)
     
     def path(style = :original)
-      path = String.new(options[:path])
+      path = options[:path].clone
       
-      path.gsub!(/:id/, instance.id.to_s)
       path.gsub!(/:name/, name.to_s)
       path.gsub!(/:style/, style.to_s)
       path.gsub!(/:extension/, extension(style).to_s)
+      path.gsub!(/:identifier/, identifier(style).to_s)
 
       return path
     end
     
     # Access the size for an attachment.
@@ -120,19 +122,60 @@
     def size
       return instance_get(:size)
     end
     
     
-    # Access the extension for an attachment.
+    # Access the extension for an attachment. It will first check the styles 
+    # to see if one is specified before checking the instance.
     #
     # Usage:
     #
     # @object.avatar.extension
     
-    def extension(style)
-      return options[:styles][style][:extension] if style and options[:styles][style]
-      
-      return instance_get(:extension)
+    def extension(style = nil)
+      style and
+      options[:styles] and 
+      options[:styles][style] and 
+      options[:styles][style][:extension] or 
+      instance_get(:extension)
+    end
+    
+    # Access the identifier for an attachment. It will first check the styles 
+    # to see if one is specified before checking the instance.
+    #
+    # Usage:
+    #
+    # @object.avatar.identifier
+    
+    def identifier(style = nil)
+      style and
+      options[:styles] and 
+      options[:styles][style] and 
+      options[:styles][style][:identifier] or 
+      instance_get(:identifier)
+    end
+    
+    
+    # Set the extension for an attachment. It will act independently of the 
+    # defined style.
+    #
+    # Usage:
+    #
+    # @object.avatar.extension = ".png"
+    
+    def extension=(extension)
+      instance_set(:extension, extension)
+    end
+    
+    # Set the identifier for an attachment. It will act independently of the 
+    # defined style.
+    #
+    # Usage:
+    #
+    # @object.avatar.identifier = "1234"
+    
+    def identifier=(identifier)
+      instance_set(:identifier, identifier)
     end
     
     
   private
   
\ No newline at end of file