attached 0.3.2 → 0.3.3

data/README.rdoc

@@ -1,6 +1,6 @@
 = Attached
 
-Attached is a Ruby on Rails file attachment tool that lets users upload to the cloud. The gem supports AWS, Google and Rackspace for storage networks by default. It is influenced (and copied) from Paperclip and uses the incredibly awesome Fog library in the back.
+Attached is a Ruby on Rails file attachment tool that lets users upload to the cloud. The gem supports AWS, Google and Rackspace for storage networks by default. It is influenced (and copied) from Paperclip and makes heavy use of the incredibly awesome Fog library.
 
 == Requirements
 
@@ -14,12 +14,13 @@ The gem is tested with Ruby 1.9.2 and Rails 3.0.5 but may well work with other v
 
 Migration:
 
+  rails g model video name:string encoding:attached
+
   class CreateVideo < ActiveRecord::Migration
     def self.up
       create_table :videos do |t|
-        t.string :encoding_identifier
-        t.string :encoding_extension
-        t.integer :encoding_size
+        t.string :name
+        t.attached :encoding
 
         t.timestamps
       end
@@ -31,16 +32,19 @@ Migration:
   end
 
 Model:
+
+  class Video < ActiveRecord::Base
   
-  has_attached :encoding, :styles => { 
-    :mp4_720p => { :extension => '.mp4' },
-    :mp4_480p => { :extension => '.mp4' },
-    :ogg_720p => { :extension => '.ogv' },
-    :ogg_480p => { :extension => '.ogv' },
-  }
+    has_attached :encoding, :styles => { 
+      :webm => { :extension => '.webm' },
+      :mp4  => { :extension => '.mp4' },
+      :ogv  => { :extension => '.ogv' },
+    }
+  
+    after_save do
+      remote.encode(self.encoding.url)
+    end
   
-  after_save do
-    remote.encode(self.encoding.url)
   end
   
 Form:
@@ -52,8 +56,9 @@ Form:
 View:
 
   <video>
-    <source src="<%= @video.encoding.url(:mp4_480p) %>" />
-    <source src="<%= @video.encoding.url(:ogg_480p) %>" />
+    <source src="<%= @video.encoding.url(:webm)" />
+    <source src="<%= @video.encoding.url(:mp4) %>" />
+    <source src="<%= @video.encoding.url(:ogg) %>" />
   </video>
   
 == Advanced
@@ -63,6 +68,7 @@ View:
   # app/models/person.rb
   validates_attached_presence :avatar
   validates_attached_size :avatar, :in => 2.kilobytes..2.megabytes
+  validates_attached_extension :avatar, :in => %w(jpe jpg jpeg png)
 
 ==== Storage
   

data/lib/attached.rb

@@ -10,6 +10,19 @@ module Attached
   end
   
   
+  module Definition
+    def attachment(*args)
+      options = args.extract_options!
+      
+      args.each do |name|
+        column("#{name}_identifier", :string, options)
+        column("#{name}_extension", :string, options)
+        column("#{name}_size", :integer, options)
+      end
+    end
+  end
+  
+  
   module ClassMethods
     
     

data/lib/attached/attachment.rb

@@ -73,9 +73,9 @@ module Attached
       @name        = name
       @instance    = instance
       
-      @queue = {}
-      @purge = []
-      @errors = []
+      @queue       = {}
+      @purge       = []
+      @errors      = []
       
       @path        = options[:path]
       @styles      = options[:styles]
@@ -118,10 +118,7 @@ module Attached
     #   @object.avatar.assign(...)
     
     def assign(file, identifier = "#{Guid.new}")
-      
-      if file.is_a?(Attached::Attachment)
-        file = file.file
-      end
+      file = file.file if file.is_a?(Attached::Attachment)
       
       @file = file.respond_to?(:tempfile) ? file.tempfile : file
       

data/lib/attached/railtie.rb

@@ -11,8 +11,8 @@ module Attached
     initializer 'attached.initialize' do
       ActiveSupport.on_load(:active_record) do
         ActiveRecord::Base.send :include, Attached
+        ActiveRecord::ConnectionAdapters::TableDefinition.send :include, Attached::Definition
       end
     end
-    
   end
 end

data/lib/attached/version.rb

@@ -1,3 +1,3 @@
 module Attached
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -2,7 +2,7 @@
 name: attached
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors: 
 - Kevin Sylvestre
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-08 00:00:00 -05:00
+date: 2011-03-16 00:00:00 -04: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.6.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: An attachment library designed with cloud processors in mind