attached 0.3.4 → 0.3.5

data/README.rdoc

@@ -13,7 +13,7 @@ The gem is tested with Ruby 1.9.2 and Rails 3.0.6 but may well work with other v
 == Optional
 
   brew install imagemagick
-  port install imagemagick
+  brew install lame
 
 == Examples
 
@@ -71,20 +71,20 @@ View:
 === Validations
 
   # 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)
+  validates_attached_presence :file
+  validates_attached_size :file, :in => 2.kilobytes..2.megabytes
+  validates_attached_extension :file, :in => %w(jpe jpg jpeg png)
 
 ==== Storage
   
-  # app/models/person.rb
-  has_attached :avatar, :medium => :aws, :credentials => "#{Rails.root}/config/aws.yml"
+  # app/models/user.rb
+  has_attached :file, :medium => :aws, :credentials => "#{Rails.root}/config/aws.yml"
   
-  # app/models/person.rb
-  has_attached :avatar, :medium => :google, :credentials => "#{Rails.root}/config/google.yml"
+  # app/models/user.rb
+  has_attached :file, :medium => :google, :credentials => "#{Rails.root}/config/google.yml"
   
-  # app/models/person.rb
-  has_attached :avatar, :medium => :rackspace, :credentials => "#{Rails.root}/config/rackspace.yml"
+  # app/models/user.rb
+  has_attached :file, :medium => :rackspace, :credentials => "#{Rails.root}/config/rackspace.yml"
   
   # config/initializers/attached.rb
   Attached::Attachment.options[:medium] = :aws
@@ -100,24 +100,31 @@ View:
   
 === Processor
 
-  # app/models/person.rb
-  has_attached :avatar, :processor => :image, :styles => {
-    :small => { :size => '200x200<', :extension => 'png' },
-    :large => { :size => '400x400>', :extension => 'png' },
-    :default => { :size => '300x300#' },
+  # app/models/image.rb
+  has_attached :file, :processor => :image, :styles => {
+    :small   => { :size => '200x200<', :extension => '.jpg', :quality => 90 },
+    :large   => { :size => '400x400>', :extension => '.jpg', :quality => 90 },
+    :default => { :size => '300x300#', :extension => '.jpg', :quality => 90 },
+  }
+  
+  # app/models/audio.rb
+  has_attached :file, :processor => :audio, :styles => {
+    :full  => { :preset => '320kbps', :extension => '.wav' },
+    :large => { :preset => '256kbps', :extension => '.wav' },
+    :small => { :preset => '128kbps', :extension => '.wav' },
   }
   
 === Aliases
 
   # app/initializer/attached.rb
-  Attached::Attachment.options[:alias] = http://c0378198.cdn2.cloudfiles.rackspacecloud.com/
+  Attached::Attachment.options[:alias] = http://storage.ksylvest.com/
 
   # app/initializer/attached.rb
   Attached::Attachment.options[:aliases] = %w(
-    http://d1kf5um3mxa8kv.cloudfront.net/
-    http://d3d5wf186mp1rv.cloudfront.net/
-    http://d2wmfkw6rydl1g.cloudfront.net/
-    http://d1gqpdc40l7s16.cloudfront.net/
+    http://a.storage.ksylvest.com/
+    http://b.storage.ksylvest.com/
+    http://c.storage.ksylvest.com/
+    http://d.storage.ksylvest.com/
   )
   
 == Copyright

data/lib/attached/processor/audio.rb

@@ -9,6 +9,7 @@ module Attached
       attr_reader :path
       attr_reader :extension
       attr_reader :preset
+      attr_reader :attachment
       
       
       # Create a processor.
@@ -27,7 +28,7 @@ module Attached
         @preset    = options[:preset]
         @extension = options[:extension]
         
-        @extension ||= File.extname(self.file.path)
+        @extension ||= self.attachment.extension
       end
       
       
@@ -50,7 +51,7 @@ module Attached
         result.binmode
         
         begin
-          
+        
           parameters = []
           
           parameters << "--preset #{self.preset}" if self.preset
@@ -65,7 +66,9 @@ module Attached
           raise Errno::ENOENT if $?.exitstatus == 127
           
         rescue Errno::ENOENT  
+          
           raise "command 'lame' not found: ensure LAME is installed"
+          
         end
         
         unless $?.exitstatus == 0

data/lib/attached/processor/image.rb

@@ -11,6 +11,7 @@ module Attached
     
       attr_reader :width
       attr_reader :height
+      attr_reader :quality
       attr_reader :operation
       
 
@@ -28,6 +29,7 @@ module Attached
         @path      = self.file.path
       
         @size      = options[:size]
+        @quality   = options[:quality]
         @extension = options[:extension]
       
         @width, @height, @operation = @size.match(/(\d*)x?(\d*)(.*)/)[1..3] if @size
@@ -36,7 +38,7 @@ module Attached
         @height    ||= options[:height]
         @operation ||= options[:operation]
       
-        @extension ||= File.extname(self.file.path)
+        @extension ||= self.attachment.extension
       
         @width     = Integer(self.width)  if self.width
         @height    = Integer(self.height) if self.height
@@ -76,6 +78,8 @@ module Attached
             end
           end
           
+          parameters << "-quality #{quality}" if quality
+          
           parameters << result.path
         
           parameters = parameters.join(" ").squeeze(" ")

data/lib/attached/storage/aws.rb

@@ -58,10 +58,14 @@ 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.options(path).merge(self.permissions.merge(:key => path, :body => file.read)))
+        directory.files.create(self.options(path).merge(self.permissions.merge(:key => path, :body => file)))
+        
+        file.close
       end
       
       

data/lib/attached/storage/google.rb

@@ -58,10 +58,14 @@ 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.options(path).merge(self.permissions.merge(:key => path, :body => file.read)))
+        directory.files.create(self.options(path).merge(self.permissions.merge(:key => path, :body => file)))
+        
+        file.close
       end
       
       

data/lib/attached/storage/rackspace.rb

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

data/lib/attached/version.rb

@@ -1,3 +1,3 @@
 module Attached
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

metadata

@@ -2,7 +2,7 @@
 name: attached
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors: 
 - Kevin Sylvestre
@@ -10,7 +10,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-13 00:00:00 Z
+date: 2011-05-15 00:00:00 -04:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fog
@@ -65,6 +66,7 @@ files:
 - LICENSE
 - Gemfile
 - Rakefile
+has_rdoc: true
 homepage: http://github.com/ksylvest/attached
 licenses: []
 
@@ -88,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: An attachment library designed with cloud processors in mind