attached 0.2.7 → 0.2.8

data/lib/attached/attachment.rb

@@ -40,7 +40,7 @@ module Attached
       @options ||= {
         :path        => ":name/:style/:identifier:extension",
         :default     => :original,
-        :medium      => :aws,
+        :medium      => :local,
         :credentials => {},
         :styles      => {},
         :processors  => [],
@@ -118,6 +118,11 @@ module Attached
     #   @object.avatar.assign(...)
     
     def assign(file, identifier = "#{Guid.new}")
+      
+      if file.is_a?(Attached::Attachment)
+        file = file.file
+      end
+      
       @file = file.respond_to?(:tempfile) ? file.tempfile : file
       
       extension ||= File.extname(file.original_filename) if file.respond_to?(:original_filename)
@@ -130,6 +135,9 @@ module Attached
       instance_set :identifier, identifier
       
       process
+      
+    ensure
+      file.close if file.respond_to?(:close)
     end
     
     

data/lib/attached/processor.rb

@@ -12,7 +12,7 @@ module Attached
     #
     #   Attached::Processor.processor(:audio)
     #   Attached::Processor.processor(:image)
-    #   Attached::Processor.processor(Attached::Processor::Video)
+    #   Attached::Processor.processor(Attached::Processor::Custom.new)
     
     def self.processor(processor)
       

data/lib/attached/processor/audio.rb

@@ -29,6 +29,13 @@ module Attached
         
         @extension ||= File.extname(self.file.path)
       end
+      
+      
+      # Redirect output path.
+      
+      def redirect
+        ">/dev/null 2>&1" if File.exist?("/dev/null")
+      end
     
     
       # Helper function for calling processors.
@@ -53,7 +60,7 @@ module Attached
           
           parameters = parameters.join(" ").squeeze(" ")
           
-          `lame #{parameters}`
+          `lame #{parameters} #{redirect}`
           
           raise Errno::ENOENT if $?.exitstatus == 127
           
@@ -62,7 +69,7 @@ module Attached
         end
         
         unless $?.exitstatus == 0
-          raise Attached::Processor::Error, "attachment file must be an audio file"
+          raise Attached::Processor::Error, "must be an audio file"
         end
         
         return result

data/lib/attached/processor/image.rb

@@ -41,6 +41,13 @@ module Attached
         @width     = Integer(self.width)  if self.width
         @height    = Integer(self.height) if self.height
       end
+      
+      
+      # Redirect output path.
+      
+      def redirect
+        ">/dev/null 2>&1" if File.exist?("/dev/null")
+      end
     
     
       # Helper function for calling processors.
@@ -73,7 +80,7 @@ module Attached
         
           parameters = parameters.join(" ").squeeze(" ")
         
-          `convert #{parameters}`
+          `convert #{parameters} #{redirect}`
           
           raise Errno::ENOENT if $?.exitstatus == 127
         
@@ -82,7 +89,7 @@ module Attached
         end
         
         unless $?.exitstatus == 0
-          raise Attached::Processor::Error, "attachment file must be an image file"
+          raise Attached::Processor::Error, "must be an image file"
         end
       
         return result

data/lib/attached/storage.rb

@@ -1,6 +1,8 @@
+require 'attached/storage/base'
 require 'attached/storage/aws'
 require 'attached/storage/google'
 require 'attached/storage/rackspace'
+require 'attached/storage/local'
 
 module Attached
   module Storage
@@ -10,17 +12,22 @@ module Attached
     #
     # Usage:
     #
+    #   Attached::Storage.storage(:local)
     #   Attached::Storage.storage(:aws,       "#{Rails.root}/config/aws.yml"      )
     #   Attached::Storage.storage(:google,    "#{Rails.root}/config/google.yml"   )
     #   Attached::Storage.storage(:rackspace, "#{Rails.root}/config/rackspace.yml")
+    #   Attached::Storage.storage(Attached::Storage::Custom.new)
     
-    def self.storage(medium, credentials)
+    def self.storage(storage, credentials)
       
-      case medium
+      return storage if storage.is_a? Attached::Storage::Base
+      
+      case storage
         when :aws       then return Attached::Storage::AWS.new       credentials
         when :google    then return Attached::Storage::Google.new    credentials
         when :rackspace then return Attached::Storage::Rackspace.new credentials
-        else raise "undefined storage medium '#{medium}'"
+        when :local     then return Attached::Storage::Local.new
+        else raise "undefined storage '#{storage}'"
       end
       
     end

data/lib/attached/storage/aws.rb

@@ -19,7 +19,7 @@ module Attached
 			attr_reader :secret_access_key
 			
 			
-			# Create a new AWS interface supporting save and destroy operations.
+			# Create a new interface supporting save and destroy operations.
 			#
 			# Usage:
 			#

data/lib/attached/storage/google.rb

@@ -19,7 +19,7 @@ module Attached
 			attr_reader :secret_access_key
 			
 			
-			# Create a new AWS interface supporting save and destroy operations.
+			# Create a new interface supporting save and destroy operations.
 			#
 			# Usage:
 			#

data/lib/attached/storage/local.rb

@@ -0,0 +1,72 @@
+require 'attached/storage/base'
+
+module Attached
+	module Storage
+		class Local < Base
+			
+			
+			attr_reader :mode
+			
+			
+			# Create a new interface supporting save and destroy operations.
+			#
+			# Usage:
+			#
+			#		Attached::Storage::Local.new()
+			
+			def initialize()
+				@mode = 0644
+			end
+			
+			
+			# Access the host (e.g. https://attached.commondatastorage.googleapis.com/) for a storage service.
+			#
+			# Usage:
+			#
+			#		storage.host
+			
+			def host()
+			  "/system/"
+			end
+			
+			
+      # Save a file to a given path.
+      #
+      # Parameters:
+      #
+      # * file - The file to save.
+      # * path - The path to save.
+      
+      def save(file, path)
+        path = "#{Rails.root}/public/system/#{path}"
+        dirname, basename = File.split(path)
+        
+        begin
+          FileUtils.mkdir_p(dirname)
+          FileUtils.cp(file.path, path)
+          FileUtils.chmod(self.mode, path)
+        rescue Errno::ENOENT
+        end
+      end
+      
+      
+      # Destroy a file at a given path.
+      #
+      # Parameters:
+      #
+      # * path - The path to destroy.
+      
+      def destroy(path)
+        path = "#{Rails.root}/public/system/#{path}"
+        dirname, basename = File.split(path)
+    
+        begin
+          FileUtils.rm(path)
+        rescue Errno::ENOENT
+        end
+      end
+      
+			
+		end
+	end
+end

data/lib/attached/storage/rackspace.rb

@@ -18,7 +18,7 @@ module Attached
 			attr_reader :api_key
 			
 			
-			# Create a new AWS interface supporting save and destroy operations.
+			# Create a new interface supporting save and destroy operations.
 			#
 			# Usage:
 			#
@@ -47,7 +47,7 @@ module Attached
 			end
 			
 			
-      # Save a file to a given path on AWS S3.
+      # Save a file to a given path.
       #
       # Parameters:
       #
@@ -64,7 +64,7 @@ module Attached
       end
       
       
-      # Destroy a file at a given path on AWS S3.
+      # Destroy a file at a given path.
       #
       # Parameters:
       #

data/lib/attached/version.rb

@@ -1,3 +1,3 @@
 module Attached
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

metadata

@@ -2,7 +2,7 @@
 name: attached
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors: 
 - Kevin Sylvestre
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-21 00:00:00 -05:00
+date: 2011-02-23 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,6 +56,7 @@ files:
 - lib/attached/storage/base.rb
 - lib/attached/storage/error.rb
 - lib/attached/storage/google.rb
+- lib/attached/storage/local.rb
 - lib/attached/storage/rackspace.rb
 - lib/attached/storage.rb
 - lib/attached/version.rb