attached 0.0.2 → 0.0.3

data/Gemfile

@@ -2,4 +2,6 @@ source 'http://rubygems.org'
 
 gem 'rails'
 
+gem 'uuid'
+
 gem 'aws-s3', :require => 'aws/s3'

data/README.rdoc

@@ -13,6 +13,7 @@ Migration:
   class CreateVideo < ActiveRecord::Migration
     def self.up
       create_table :videos do |t|
+        t.string :video_identifier
         t.string :video_extension
         t.integer :video_size
 

data/lib/attached.rb

@@ -36,10 +36,11 @@ module Attached
     #
     # Usage:
     #
-    #   has_attached :avatar
-    #   has_attached :avatar, :storage => :s3
-    #   has_attached :clip, styles => [ :mp4, :ogv ]
-    #   has_attached :clip, styles => { :main => { :size => "480p", :format => "mp4" } }
+    #   has_attached :video
+    #   has_attached :video, :storage => :s3
+    #   has_attached :video, styles => [ :mp4, :ogv ]
+    #   has_attached :video, styles => { :main => { :size => "480p", :format => "mp4" } }
+    #   has_attached :thumbnail, :range => (1..4)
     
     def has_attached(name, options = {})
       
@@ -73,8 +74,13 @@ module Attached
           self.errors.add(name, message)
         end
         
+        self.errors[:"#{name}_identifier"].each do |message|
+          self.errors.add(name, message)
+        end
+        
         self.errors.delete(:"#{name}_size")
         self.errors.delete(:"#{name}_extension")
+        self.errors.delete(:"#{name}_identifier")
         
       end
       
@@ -129,7 +135,7 @@ module Attached
       
       message = options[:message] || "must be attached"
       
-      validates_presence_of :"#{name}_extension", :message => message,
+      validates_presence_of :"#{name}_identifier", :message => message,
         :if => options[:if], :unless => options[:unless]
       
     end

data/lib/attached/attachment.rb

@@ -1,3 +1,5 @@
+require 'uuid'
+
 require 'attached/storage'
 
 module Attached
@@ -9,14 +11,12 @@ module Attached
     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
@@ -32,7 +32,7 @@ module Attached
     # 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 = {})
@@ -47,13 +47,14 @@ module Attached
     #
     #   @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
     
     
@@ -64,7 +65,7 @@ module Attached
     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
     
     
@@ -75,10 +76,11 @@ module Attached
     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
@@ -88,11 +90,11 @@ module Attached
     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:
     #
@@ -101,12 +103,12 @@ module Attached
     #   @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
@@ -122,16 +124,57 @@ module Attached
     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
     
     

data/lib/attached/storage.rb

@@ -1,5 +1,3 @@
-require 'attached/storage/base'
-require 'attached/storage/fs'
 require 'attached/storage/s3'
 
 module Attached
@@ -9,13 +7,11 @@ module Attached
     #
     # Usage:
     #
-    #   Attached::Storage.medium(:fs)
-    #   Attached::Storage.medium(:s3)
+    #   Attached::Storage.medium(s3)
     
-    def self.medium(storage = :fs, credentials = nil)
+    def self.medium(storage = :s3, credentials = nil)
       
       case storage
-      when :fs then return Attached::Storage::FS.new(credentials)
       when :s3 then return Attached::Storage::S3.new(credentials)
       end
       

data/lib/attached/storage/base.rb

@@ -1,5 +1,3 @@
-require 'attached/storage/base'
-
 module Attached
   module Storage
     class Base
@@ -34,7 +32,7 @@ module Attached
       end
       
       
-      # Access the host (e.g. localhost:3000) for a storage service.
+      # Access the host for a storage service or return null if local.
       #
       # Usage:
       #

data/lib/attached/storage/s3.rb

@@ -1,42 +1,46 @@
+require 'attached/storage/base'
+
 require 'aws/s3'
 
+
 module Attached
-  module Storage
-    class S3 < Base
-      
-      attr_reader :bucket
-      attr_reader :access_key_id
-      attr_reader :secret_access_key
-      
-      
-      # Create a new Amazon S3 storage interface supporting save and destroy operations.
-      #
-      # Usage:
-      #
-      #   Attached::Storage::S3.new()
-      #   Attached::Storage::S3.new("#{Rails.root}/config/s3.yml")
-      
-      def initialize(credentials = "#{Rails.root}/config/s3.yml")
-        credentials = parse(credentials)
-        
-        @bucket            = credentials[:bucket] || credentials['bucket']
-        @access_key_id     = credentials[:access_key_id] || credentials['access_key_id']
-        @secret_access_key = credentials[:secret_access_key] || credentials['secret_access_key']
-      end
-      
-      
-      # Access the host (e.g. bucket.s3.amazonaws.com) for a storage service.
-      #
-      # Usage:
-      #
-      #   storage.host
-      
-      def host()
-        "#{self.bucket}.s3.amazonaws.com"
-      end
-      
-      
-      # Save a file to a given path on Amazon S3.
+	module Storage
+		class S3 < Base
+			
+			
+			attr_reader :bucket
+			attr_reader :access_key_id
+			attr_reader :secret_access_key
+			
+			
+			# Create a new AWS interface supporting save and destroy operations.
+			#
+			# Usage:
+			#
+			#		Attached::Storage::S3.new()
+			#		Attached::Storage::S3.new("s3.yml")
+			
+			def initialize(credentials)
+				credentials = parse(credentials)
+				
+				@bucket						 = credentials[:bucket]            || credentials['bucket']
+				@access_key_id		 = credentials[:access_key_id]     || credentials['access_key_id']
+				@secret_access_key = credentials[:secret_access_key] || credentials['secret_access_key']
+			end
+			
+			
+			# Access the host (e.g. bucket.s3.amazonaws.com) for a storage service.
+			#
+			# Usage:
+			#
+			#		storage.host
+			
+			def host()
+				"https://#{self.bucket}.s3.amazonaws.com"
+			end
+			
+			
+      # Save a file to a given path on AWS S3.
       #
       # Parameters:
       #
@@ -45,11 +49,16 @@ module Attached
       
       def save(file, path)
         connect()
-        AWS::S3::S3Object.store(path, file, bucket)
+        begin
+          AWS::S3::S3Object.store(path, file, bucket, :access => :authenticated_read)
+        rescue AWS::S3::NoSuchBucket => e
+  			  AWS::S3::Bucket.create(bucket)
+          retry
+        end
       end
       
       
-      # Destroy a file at a given path on Amazon S3.
+      # Destroy a file at a given path on AWS S3.
       #
       # Parameters:
       #
@@ -57,23 +66,27 @@ module Attached
       
       def destroy(path)
         connect()
-        AWS::S3::S3Object.delete(path, bucket)
+        begin
+          AWS::S3::S3Object.delete(path, bucket, :access => :authenticated_read)
+        rescue AWS::S3::NoSuchBucket => e
+  			  AWS::S3::Bucket.create(bucket)
+          retry
+        end
       end
-      
-      
-      private
-      
-      
-      # Connect to an Amazon S3 server.
-      
-      def connect
-        return AWS::S3::Base.establish_connection!(
-          :access_key_id => self.access_key_id, 
-          :secret_access_key => self.secret_access_key
+			
+			
+		private
+			
+			
+			# Connect to an AWS S3 server.
+			
+			def connect()
+        @connection ||= AWS::S3::Base.establish_connection!(
+          :access_key_id => access_key_id, :secret_access_key => secret_access_key
         )
-      end
-      
-      
-    end
-  end
+			end
+			
+			
+		end
+	end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Kevin Sylvestre
@@ -14,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-02 00:00:00 -05:00
+date: 2010-12-07 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: aws-s3
+  name: uuid
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -30,6 +30,19 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: aws-s3
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
 description: Attached is a Ruby on Rails cloud attachment and processor library inspired by Paperclip. Attached lets users push files to the cloud, then perform remote processing on the files.
 email: 
 - kevin@ksylvest.com
@@ -43,7 +56,6 @@ files:
 - lib/attached/attachment.rb
 - lib/attached/railtie.rb
 - lib/attached/storage/base.rb
-- lib/attached/storage/fs.rb
 - lib/attached/storage/s3.rb
 - lib/attached/storage.rb
 - lib/attached.rb

data/lib/attached/storage/fs.rb

@@ -1,39 +0,0 @@
-module Attached
-  module Storage
-    class FS < Base
-      
-      
-      # Create a new file system storage interface supporting save and destroy operations.
-      #
-      # Usage:
-      #
-      #   FS.new()
-      
-      def initialize(credentials = nil)
-        credentials = parse(credentials)
-      end
-      
-      
-      # Save a file to a given path on a file system.
-      #
-      # Parameters:
-      #
-      # * file - The file to save.
-      # * path - The path to save.
-      
-      def save(file, path)
-      end
-      
-      
-      # Destroy a file at a given path on a file system.
-      #
-      # Parameters:
-      #
-      # * path - The path to destroy.
-      
-      def destroy(path)
-      end
-      
-    end
-  end
-end