attached 0.1.4 → 0.1.5

data/README.rdoc

@@ -5,6 +5,7 @@ Attached is a Ruby on Rails file attachment tool that lets users upload to the c
 == Installation
 
   gem install attached
+  gem install rmagick
   
 == Examples
 
@@ -43,7 +44,6 @@ Form:
 
   <%= form_for @video, :html => { :multipart => true } do |form| %>
     <%= form.file_field :encoding %>
-    <p class="errors"><%= @video.errors[:encoding] %></p>
   <% end %>
   
 View:
@@ -57,12 +57,7 @@ View:
 
 === Storage
   
-  has_attached :avatar, :provider => :amazon, :credentials => {
-    :secret_access_key => "*****",
-    :access_key_id     => "*****",
-  }
-  
-  has_attached :avatar, :provider => :google, :credentials => {
+  has_attached :avatar, :provider => :aws, :credentials => {
     :secret_access_key => "*****",
     :access_key_id     => "*****",
   }
@@ -74,10 +69,14 @@ View:
     :large => { :size => "400x400#" }
   }
   
-  has_attached :avatar, :processors => [:image], :styles => {
-    :small => { :size => "200x200#" }
-    :large => { :size => "400x400#" }
-  }
+=== Alias
+
+  Attached::Attachment.options[:aliases] = %w(
+    d1kf5um3mxa8kv.cloudfront.net
+    d3d5wf186mp1rv.cloudfront.net
+    d2wmfkw6rydl1g.cloudfront.net
+    d1gqpdc40l7s16.cloudfront.net
+  )
   
 == Copyright
 

data/lib/attached/attachment.rb

@@ -12,7 +12,6 @@ module Attached
     attr_reader :file
     attr_reader :name
     attr_reader :instance
-    attr_reader :options
     attr_reader :queue
     attr_reader :path
     attr_reader :styles
@@ -21,6 +20,10 @@ module Attached
     attr_reader :credentials
     attr_reader :processors
     attr_reader :processor
+    attr_reader :aliases
+    attr_reader :alias
+    attr_reader :storage
+    attr_reader :host
     
     
     # A default set of options that can be extended to customize the path, storage or credentials.
@@ -31,10 +34,12 @@ module Attached
     
     def self.options
       @options ||= {
-        :path       => "/:name/:style/:identifier:extension",
-        :default    => :original,
-        :styles     => {},
-        :processors => [],
+        :path        => "/:name/:style/:identifier:extension",
+        :default     => :original,
+        :credentials => {},
+        :styles      => {},
+        :processors  => [],
+        :aliases     => [],
       }
     end
     
@@ -54,21 +59,29 @@ module Attached
     # * :styles      - A hash containing optional parameters including extension and identifier
     
     def initialize(name, instance, options = {})
+      options      = self.class.options.merge(options)
+      
       @name        = name
       @instance    = instance
-      @options     = self.class.options.merge(options)
       
       @queue       = {}
       
-      @path        = @options[:path]
-      @styles      = @options[:styles]
-      @default     = @options[:default]
-      @medium      = @options[:medium]
-      @credentials = @options[:credentials]
-      @processors  = @options[:processors]
-      @processor   = @options[:processor]
+      @path        = options[:path]
+      @styles      = options[:styles]
+      @default     = options[:default]
+      @medium      = options[:medium]
+      @credentials = options[:credentials]
+      @processors  = options[:processors]
+      @processor   = options[:processor]
+      @aliases     = options[:aliases]
+      @alias       = options[:alias]
+      
+      @processors  = self.processors + [self.processor] if self.processor
+      @aliases     = self.aliases + [self.alias] if self.alias
       
-      @processors  = @processors + [@processor] if @processor
+      @storage     = Attached::Storage.storage(self.medium, self.credentials)
+      
+      @host        = self.storage.host
     end
     
     
@@ -82,6 +95,10 @@ module Attached
       instance.changed.include? "#{name}_identifier"
     end
     
+    def file?
+      not identifier.blank?
+    end
+    
     
     # Assign an attachment to a file.
     #
@@ -111,8 +128,6 @@ module Attached
     #   @object.avatar.save
     
     def save
-      @storage ||= Attached::Storage.storage(self.medium, self.credentials)
-      
       @queue.each do |style, file|
         @storage.save(file, self.path(style)) if file and self.path(style)
       end
@@ -128,8 +143,6 @@ module Attached
     #   @object.avatar.destroy
     
     def destroy
-      @storage ||= Attached::Storage.storage(self.medium, self.credentials)
-      
       @storage.destroy(self.path) if self.path
     end
     
@@ -143,9 +156,12 @@ module Attached
     #   @object.avatar.url(:large)
     
     def url(style = self.default)
-      @storage ||= Attached::Storage.storage(self.medium, self.credentials)
+      path = self.path(style)
+      
+      host = self.host
+      host = self.aliases[path.hash % self.aliases.count] unless self.aliases.empty?
       
-      return "#{@storage.host}#{path(style)}"
+      return "#{host}#{path}"
     end
     
     

data/lib/attached/storage.rb

@@ -1,4 +1,4 @@
-require 'attached/storage/s3'
+require 'attached/storage/aws'
 
 module Attached
   module Storage
@@ -7,12 +7,12 @@ module Attached
     #
     # Usage:
     #
-    #   Attached::Storage.medium(s3)
+    #   Attached::Storage.medium(aws)
     
-    def self.storage(medium = :s3, credentials = nil)
+    def self.storage(medium = :aws, credentials = nil)
       
       case medium
-      when :s3 then return Attached::Storage::S3.new(credentials)
+      when :aws then return Attached::Storage::AWS.new(credentials)
       end
       
     end

data/lib/attached/storage/{s3.rb → aws.rb}

@@ -5,7 +5,7 @@ require 'aws/s3'
 
 module Attached
 	module Storage
-		class S3 < Base
+		class AWS < Base
 			
 			
 			attr_reader :bucket
@@ -50,9 +50,9 @@ module Attached
       def save(file, path)
         connect()
         begin
-          AWS::S3::S3Object.store(path, file, bucket, :access => :public_read)
+          ::AWS::S3::S3Object.store(path, file, bucket, :access => :public_read)
         rescue AWS::S3::NoSuchBucket => e
-  			  AWS::S3::Bucket.create(bucket)
+  			  ::AWS::S3::Bucket.create(bucket)
           retry
         end
       end
@@ -67,9 +67,9 @@ module Attached
       def destroy(path)
         connect()
         begin
-          AWS::S3::S3Object.delete(path, bucket, :access => :authenticated_read)
+          ::AWS::S3::S3Object.delete(path, bucket, :access => :authenticated_read)
         rescue AWS::S3::NoSuchBucket => e
-  			  AWS::S3::Bucket.create(bucket)
+  			  ::AWS::S3::Bucket.create(bucket)
           retry
         end
       end
@@ -81,7 +81,7 @@ module Attached
 			# Connect to an AWS S3 server.
 			
 			def connect()
-        @connection ||= AWS::S3::Base.establish_connection!(
+        @connection ||= ::AWS::S3::Base.establish_connection!(
           :access_key_id => access_key_id, :secret_access_key => secret_access_key
         )
 			end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Kevin Sylvestre
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-15 00:00:00 -05:00
+date: 2010-12-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,8 +57,8 @@ files:
 - lib/attached/image.rb
 - lib/attached/processor.rb
 - lib/attached/railtie.rb
+- lib/attached/storage/aws.rb
 - lib/attached/storage/base.rb
-- lib/attached/storage/s3.rb
 - lib/attached/storage.rb
 - lib/attached.rb
 - README.rdoc