attached 0.5.2 → 0.5.3

data/lib/attached/job.rb

@@ -1,9 +1,9 @@
 module Attached
-  
+
   class Job
-    
+
     @queue = :attached
-    
+
     def self.perform(klass, id, method)
       object = eval(klass).find(id)
       attachment = object.send(name)
@@ -11,14 +11,14 @@ module Attached
       attachment.status = 'active'
       object.save
     end
-    
+
     def self.enqueue(attachment)
       klass = attachment.instance.class.name
       id = attachment.instance.id
       method = attachment.name
       attachment.status = 'processing'
     end
-    
+
   end
-  
+
 end

data/lib/attached/processor.rb

@@ -4,8 +4,8 @@ require 'attached/processor/image'
 
 module Attached
   module Processor
-    
-    
+
+
     # Create a storage object given a medium and credentials.
     #
     # Usage:
@@ -13,20 +13,20 @@ module Attached
     #   Attached::Processor.processor(:audio)
     #   Attached::Processor.processor(:image)
     #   Attached::Processor.processor(Attached::Processor::Custom.new)
-    
+
     def self.processor(processor)
-      
+
       return processor if processor.is_a? Attached::Processor::Base
-      
+
       case processor
         when :audio then return Attached::Processor::Audio
         when :image then return Attached::Processor::Image
       end
-      
+
       raise "undefined processor '#{processor}'"
-      
+
     end
-    
-    
+
+
   end
 end

data/lib/attached/processor/audio.rb

@@ -4,79 +4,79 @@ require 'attached/processor/error'
 module Attached
   module Processor
     class Audio < Base
-      
-      
+
+
       attr_reader :path
       attr_reader :extension
       attr_reader :preset
       attr_reader :attachment
-      
-      
+
+
       # Create a processor.
       #
       # Parameters:
-      # 
+      #
       # * file       - The file to be processed.
       # * options    - The options to be applied to the processing.
       # * attachment - The attachment the processor is being run for.
-    
+
       def initialize(file, options = {}, attachment = nil)
         super
-        
+
         @path      = self.file.path
-        
+
         @preset    = options[:preset]
         @extension = options[:extension]
-        
+
         @extension ||= self.attachment.extension
       end
-      
-      
+
+
       # Redirect output path.
-      
+
       def redirect
         ">/dev/null 2>&1" if File.exist?("/dev/null")
       end
-    
-    
+
+
       # Helper function for calling processors.
       #
       # Usage:
       #
       #   self.process
-    
+
       def process
-        
+
         result = Tempfile.new(["", self.extension])
         result.binmode
-        
+
         begin
-        
+
           parameters = []
-          
+
           parameters << "--preset #{self.preset}" if self.preset
-          
+
           parameters << self.path
           parameters << result.path
-          
+
           parameters = parameters.join(" ").squeeze(" ")
-          
+
           `lame #{parameters} #{redirect}`
-          
+
           raise Errno::ENOENT if $?.exitstatus == 127
-          
-        rescue Errno::ENOENT  
+
+        rescue Errno::ENOENT
           raise "command 'lame' not found: ensure LAME is installed"
         end
-        
+
         unless $?.exitstatus == 0
           raise Attached::Processor::Error, "must be an audio file"
         end
-        
+
         return result
-        
+
       end
-      
+
     end
   end
 end

data/lib/attached/processor/base.rb

@@ -1,17 +1,17 @@
 module Attached
   module Processor
     class Base
-      
-      
+
+
       attr_accessor :file
       attr_accessor :options
       attr_accessor :attachment
-    
-    
+
+
       # Create and run a processor.
       #
       # Parameters:
-      # 
+      #
       # * file       - The file to be processed.
       # * options    - The options to be applied to the processing.
       # * attachment - The attachment the processor is being run for.
@@ -19,12 +19,12 @@ module Attached
       def self.process(file, options = {}, attachment = nil)
         new(file, options, attachment).process
       end
-    
-    
+
+
       # Create a processor.
       #
       # Parameters:
-      # 
+      #
       # * file       - The file to be processed.
       # * options    - The options to be applied to the processing.
       # * attachment - The attachment the processor is being run for.
@@ -34,15 +34,15 @@ module Attached
         @options = options
         @attachment = attachment
       end
-    
-    
-      # Run the processor. 
+
+
+      # Run the processor.
 
       def process
-        raise NotImplementedError.new   
+        raise NotImplementedError.new
       end
-    
-    
+
+
     end
   end
 end

data/lib/attached/processor/image.rb

@@ -4,40 +4,40 @@ require 'attached/processor/error'
 module Attached
   module Processor
     class Image < Base
-    
-    
+
+
       attr_reader :path
       attr_reader :extension
-    
+
       attr_reader :width
       attr_reader :height
       attr_reader :quality
       attr_reader :operation
-      
+
 
       # Create a processor.
       #
       # Parameters:
-      # 
+      #
       # * file       - The file to be processed.
       # * options    - The options to be applied to the processing.
       # * attachment - The attachment the processor is being run for.
-    
+
       def initialize(file, options = {}, attachment = nil)
         super
-        
+
         @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
-      
+
         @width     ||= options[:width]
         @height    ||= options[:height]
         @operation ||= options[:operation]
-        
+
         if @operation
           case @operation.intern
           when :decrease then @operation = '>'
@@ -45,39 +45,39 @@ module Attached
           when :default  then @operation = '#'
           end
         end
-        
+
         @operation ||= '#'
         @extension ||= self.attachment.extension
-      
+
         @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.
       #
       # Usage:
       #
       #   self.process
-    
+
       def process
-      
+
         result = Tempfile.new(["", self.extension])
         result.binmode
-      
+
         begin
-        
+
           parameters = []
-        
+
           parameters << self.path
-        
+
           if width and height
             case operation
             when '#' then parameters << "-resize #{width}x#{height}^ -gravity center -extent #{width}x#{height}"
@@ -86,29 +86,29 @@ module Attached
             else          parameters << "-resize #{width}x#{height}"
             end
           end
-          
+
           parameters << "-quality #{quality}" if quality
-          
+
           parameters << result.path
-        
+
           parameters = parameters.join(" ").squeeze(" ")
-        
+
           `convert #{parameters} #{redirect}`
-          
+
           raise Errno::ENOENT if $?.exitstatus == 127
-        
+
         rescue Errno::ENOENT
           raise "command 'convert' not found: ensure ImageMagick is installed"
         end
-        
+
         unless $?.exitstatus == 0
           raise Attached::Processor::Error, "must be an image file"
         end
-      
+
         return result
-      
+
       end
-      
+
     end
   end
 end

data/lib/attached/railtie.rb

@@ -3,11 +3,11 @@ require 'rails'
 
 module Attached
   class Railtie < Rails::Railtie
-    
+
     rake_tasks do
       load 'tasks/attached.rake'
     end
-    
+
     initializer 'attached.initialize' do
       ActiveSupport.on_load(:active_record) do
         ActiveRecord::Base.send :include, Attached

data/lib/attached/storage.rb

@@ -6,8 +6,8 @@ require 'attached/storage/local'
 
 module Attached
   module Storage
-    
-    
+
+
     # Create a storage object given a medium and credentials.
     #
     # Usage:
@@ -17,11 +17,11 @@ module Attached
     #   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(storage, credentials)
-      
+
       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
@@ -29,9 +29,9 @@ module Attached
         when :local     then return Attached::Storage::Local.new
         else raise "undefined storage '#{storage}'"
       end
-      
+
     end
-    
-    
+
+
   end
 end

data/lib/attached/storage/aws.rb

@@ -8,120 +8,120 @@ end
 
 
 module Attached
-	module Storage
-		class AWS < Base
-			
-			
-			attr_reader :permissions
-			
-			attr_reader :bucket
-			attr_reader :access_key_id
-			attr_reader :secret_access_key
-			
-			
-			# Create a new interface supporting save and destroy operations.
-			#
-			# Usage:
-			#
-			#		Attached::Storage::AWS.new()
-			#		Attached::Storage::AWS.new("aws.yml")
-			
-			def initialize(credentials)
-				credentials = parse(credentials)
-				
-				@permissions       = { :public => true }
-				
-				@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']
-				
-				raise "'bucket' must be specified if using 'aws' for storage" unless @bucket
-			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
-			
-			
+  module Storage
+    class AWS < Base
+
+
+      attr_reader :permissions
+
+      attr_reader :bucket
+      attr_reader :access_key_id
+      attr_reader :secret_access_key
+
+
+      # Create a new interface supporting save and destroy operations.
+      #
+      # Usage:
+      #
+      #   Attached::Storage::AWS.new()
+      #   Attached::Storage::AWS.new("aws.yml")
+
+      def initialize(credentials)
+        credentials = parse(credentials)
+
+        @permissions       = { :public => true }
+
+        @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']
+
+        raise "'bucket' must be specified if using 'aws' for storage" unless @bucket
+      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.
       #
       # Parameters:
       #
       # * file - The file to save.
       # * 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)))
-        
+
         file.close
       end
-      
-      
+
+
       # Retrieve a file from a given path.
       #
       # Parameters:
       #
       # * path - The path to retrieve.
-      
+
       def retrieve(path)
         directory = connection.directories.get(self.bucket)
         directory ||= connection.directories.create(self.permissions.merge(:key => self.bucket))
-        
+
         file = directory.files.get(path)
-        
+
         body = file.body
-        
+
         extname = File.extname(path)
         basename = File.basename(path, extname)
-        
+
         file = Tempfile.new([basename, extname])
         file.binmode
         file.write(body)
         file.rewind
-        
+
         file
       end
-      
-      
+
+
       # Destroy a file at a given path.
       #
       # Parameters:
       #
       # * path - The path to destroy.
-      
+
       def destroy(path)
         directory = connection.directories.get(self.bucket)
         directory ||= connection.directories.create(self.permissions.merge(:key => self.bucket))
-        
+
         file = directory.files.get(path)
         file.destroy if file
       end
-			
-			
-		private
 
-			
-			def connection
-			  @connection ||= Fog::Storage.new(
+
+    private
+
+
+      def connection
+        @connection ||= Fog::Storage.new(
           :aws_secret_access_key => self.secret_access_key,
           :aws_access_key_id     => self.access_key_id,
           :provider => 'AWS'
         )
-			end
-			
-			
-		end
-	end
+      end
+
+
+    end
+  end
 end