attached 0.1.8 → 0.1.9

data/lib/attached.rb

@@ -65,6 +65,13 @@ module Attached
         attachment_for(name).file?
       end
       
+      validates_each(name) do |record, attr, value|
+        attachment = record.attachment_for(name)
+        attachment.errors.each do |error|
+          record.errors.add(name, error)
+        end
+      end
+      
       after_validation do
         
         self.errors[:"#{name}_size"].each do |message|
@@ -128,6 +135,29 @@ module Attached
     end
     
     
+    # Validates an attached extension in a specified set. 
+    #
+    # Options:
+    #
+    # * :in - allowed values for attached
+    #
+    # Usage:
+    #   
+    #   validates_attached_extension :avatar, :in => %w(png jpg)
+    #   validates_attached_extension :avatar, :in => [:png, :jpg]
+    #   validates_attached_extension :avatar, :in => %w(png jpg), :message => "extension must be :in"
+    #   validates_attached_extension :avatar, :in => %w(png jpg), :message => "extension must be :in"
+    
+    def validates_attached_extension(name, options = {})
+      
+      message = options[:message]
+      message ||= "extension must be specified"
+       
+      range = options[:in].map { |element| /element/ }
+      
+    end
+    
+    
     # Validates that an attachment is included.
     #
     # Options:

data/lib/attached/attachment.rb

@@ -1,8 +1,10 @@
 require 'guid'
 
 require 'attached/storage'
+require 'attached/storage/error'
+
 require 'attached/processor'
-require 'attached/image'
+require 'attached/processor/error'
 
 module Attached
   
@@ -13,6 +15,7 @@ module Attached
     attr_reader :name
     attr_reader :instance
     attr_reader :queue
+    attr_reader :errors
     attr_reader :path
     attr_reader :styles
     attr_reader :default
@@ -66,6 +69,7 @@ module Attached
       @instance    = instance
       
       @queue       = {}
+      @errors      = []
       
       @path        = options[:path]
       @styles      = options[:styles]
@@ -267,13 +271,18 @@ module Attached
     
     def process
       self.queue[self.default] = self.file
+              
+      begin
       
-      self.processors.each do |processor|
-        self.styles.each do |style, options|
-          case processor
-          when :image then self.queue[style] = Attached::Image.process(self.queue[style] || self.file, options, self)
+        self.processors.each do |processor|
+          processor = Attached::Processor.processor(processor)
+          self.styles.each do |style, options|
+            self.queue[style] = processor.process(self.queue[style] || self.file, options, self)
           end
         end
+        
+      rescue Attached::Processor::Error => error
+        self.errors << error.message
       end
     end
   

data/lib/attached/processor.rb

@@ -1,48 +1,32 @@
-module Attached
+require 'attached/processor/base'
+require 'attached/processor/audio'
+require 'attached/processor/image'
 
-  class Processor
-    
-    
-    attr_accessor :file
-    attr_accessor :options
-    attr_accessor :attachment
+module Attached
+  module Processor
     
     
-    # Create and run a processor.
+    # Create a storage object given a medium and credentials.
     #
-    # 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 self.process(file, options = {}, attachment = nil)
-      new(file, options, attachment).process
-    end
-    
-    
-    # Create a processor.
+    # Usage:
     #
-    # 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)
-      @file = file
-      @options = options
-      @attachment = attachment
-    end
-    
-    
-    # Run the processor. 
-
-    def process
-      raise NotImplementedError.new   
+    #   Attached::Processor.processor(:audio)
+    #   Attached::Processor.processor(:image)
+    #   Attached::Processor.processor(Attached::Processor::Video)
+    
+    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
+end

data/lib/attached/processor/audio.rb

@@ -0,0 +1,72 @@
+require 'attached/processor/base'
+require 'attached/processor/error'
+
+module Attached
+  module Processor
+    class Audio < Base
+      
+      
+      attr_reader :path
+      attr_reader :extension
+      attr_reader :preset
+      
+      
+      # 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 ||= File.extname(self.file.path)
+      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}`
+          
+        rescue Errno::ENOENT  
+          raise "command 'lame' not found: ensure LAME is installed"
+        end
+        
+        unless $?.exitstatus == 0
+          raise Attached::Processor::Error, "attachment file must be an audio file"
+        end
+        
+        return result
+        
+      end
+      
+    end
+  end
+end

data/lib/attached/processor/base.rb

@@ -0,0 +1,48 @@
+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.
+
+      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.
+
+      def initialize(file, options = {}, attachment = nil)
+        @file = file
+        @options = options
+        @attachment = attachment
+      end
+    
+    
+      # Run the processor. 
+
+      def process
+        raise NotImplementedError.new   
+      end
+    
+    
+    end
+  end
+end

data/lib/attached/processor/error.rb

@@ -0,0 +1,6 @@
+module Attached
+  module Processor
+    class Error < StandardError
+    end
+  end
+end

data/lib/attached/processor/image.rb

@@ -0,0 +1,92 @@
+require 'attached/processor/base'
+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 :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]
+        @extension = options[:extension]
+      
+        @width, @height, @operation = @size.match(/(\d*)x?(\d*)(.*)/)[1..3] if @size
+      
+        @width     ||= options[:width]
+        @height    ||= options[:height]
+        @operation ||= options[:operation]
+      
+        @extension ||= File.extname(self.file.path)
+      
+        @width     = Integer(self.width)  if self.width
+        @height    = Integer(self.height) if self.height
+      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}"
+            when '<' then parameters << "-resize #{width}x#{height}\\<"
+            when '>' then parameters << "-resize #{width}x#{height}\\>"
+            else          parameters << "-resize #{width}x#{height}"
+            end
+          end
+          
+          parameters << result.path
+        
+          parameters = parameters.join(" ").squeeze(" ")
+        
+          `convert #{parameters}`
+        
+        rescue Errno::ENOENT
+          raise "command 'convert' not found: ensure ImageMagick is installed"
+        end
+        
+        unless $?.exitstatus == 0
+          raise Attached::Processor::Error, "attachment file must be an image file"
+        end
+      
+        return result
+      
+      end
+      
+    end
+  end
+end

data/lib/attached/storage.rb

@@ -1,23 +1,27 @@
+require 'attached/storage/base'
 require 'attached/storage/aws'
 
 module Attached
   module Storage
     
+    
     # Create a storage object given a medium and credentials.
     #
     # Usage:
     #
-    #   Attached::Storage.medium()
-    #   Attached::Storage.medium(:aws)
+    #   Attached::Storage.storage()
+    #   Attached::Storage.storage(:aws)
+    #   Attached::Storage.storage(:aws, credentials)
     
     def self.storage(medium = :aws, credentials = nil)
       
       case medium
-      when :aws then return Attached::Storage::AWS.new credentials
-      else raise "Undefined storage medium '#{medium}'."
+        when :aws then return Attached::Storage::AWS.new credentials
+        else raise "undefined storage medium '#{medium}'"
       end
       
     end
     
+    
   end
 end

data/lib/attached/storage/aws.rb

@@ -3,7 +3,7 @@ require 'attached/storage/base'
 begin
   require 'aws/s3'
 rescue LoadError
-  raise "Installation of 'aws/s3' is required before using 'aws' for storage"
+  raise "installation of 'aws/s3' is required before using 'aws' for storage"
 end
 
 
@@ -57,8 +57,8 @@ module Attached
         connect()
         begin
           ::AWS::S3::S3Object.store(path, file, bucket, :access => access)
-        rescue AWS::S3::NoSuchBucket => e
-  			  ::AWS::S3::Bucket.create(bucket)
+        rescue ::AWS::S3::NoSuchBucket => e
+          ::AWS::S3::Bucket.create(bucket)
           retry
         end
       end
@@ -74,7 +74,7 @@ module Attached
         connect()
         begin
           ::AWS::S3::S3Object.delete(path, bucket)
-        rescue AWS::S3::NoSuchBucket => e
+        rescue ::AWS::S3::NoSuchBucket => e
         end
       end
 			

data/lib/attached/storage/error.rb

@@ -0,0 +1,6 @@
+module Attached
+  module Storage
+    class Error < StandardError
+    end
+  end
+end

data/lib/attached/version.rb

@@ -1,3 +1,3 @@
 module Attached
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/lib/tasks/attached.rake

@@ -3,10 +3,10 @@ namespace :attached do
   desc "Process a given 'model' and 'attachment'."
   task :process, :model, :attachment, :needs => :environment do |t, args|
     
-    model = args[:model] or raise "Must specify model."
-    attachment = args[:attachment] or raise "Must specify attachment."
+    model = args[:model] or raise "must specify model"
+    attachment = args[:attachment] or raise "must specify attachment"
     
-    klass = model.camelize.constantize or raise "Invalid model '#{model}'"
+    klass = model.camelize.constantize or raise "invalid model '#{model}'"
     
     klass.all.each do |instance|
       instance.send(attachment).reprocess!

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - Kevin Sylvestre
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-22 00:00:00 -05:00
+date: 2010-12-23 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,11 +54,15 @@ extra_rdoc_files: []
 
 files: 
 - lib/attached/attachment.rb
-- lib/attached/image.rb
+- lib/attached/processor/audio.rb
+- lib/attached/processor/base.rb
+- lib/attached/processor/error.rb
+- lib/attached/processor/image.rb
 - lib/attached/processor.rb
 - lib/attached/railtie.rb
 - lib/attached/storage/aws.rb
 - lib/attached/storage/base.rb
+- lib/attached/storage/error.rb
 - lib/attached/storage.rb
 - lib/attached/version.rb
 - lib/attached.rb

data/lib/attached/image.rb

@@ -1,88 +0,0 @@
-require 'attached/processor'
-
-module Attached
-  
-  class Image < Processor
-    
-    
-    attr_reader :path
-    attr_reader :extension
-    
-    attr_reader :width
-    attr_reader :height
-    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]
-      @extension = options[:extension]
-      
-      @width, @height, @operation = @size.match(/(\d*)x?(\d*)(.*)/)[1..3] if @size
-      
-      @width     ||= options[:width]
-      @height    ||= options[:height]
-      @operation ||= options[:operation]
-      
-      @extension ||= File.extname(self.file.path)
-      
-      @width     = Integer(self.width)
-      @height    = Integer(self.height)
-      
-      raise "Image processor requires specification of 'width' or 'size'"  unless self.width
-      raise "Image processor requires specification of 'height' or 'size'" unless self.height
-    end
-    
-    
-    # Helper function for calling processors.
-    #
-    # Usage:
-    #
-    #   self.process
-    
-    def process
-      result = Tempfile.new(["", self.extension])
-      result.binmode
-      
-      begin
-        parameters = []
-        
-        parameters << self.path
-        
-        case operation
-        when '#' then parameters << "-resize #{width}x#{height}^ -gravity center -extent #{width}x#{height}"
-        when '<' then parameters << "-resize #{width}x#{height}\\<"
-        when '>' then parameters << "-resize #{width}x#{height}\\>"
-        else          parameters << "-resize #{width}x#{height}"
-        end
-        
-        parameters << result.path
-        
-        parameters = parameters.join(" ").squeeze(" ")
-        
-        `convert #{parameters}`
-        
-        raise "Command 'convert' failed. Ensure upload file is an image and options are correct." unless $?.exitstatus == 0
-        
-      rescue Errno::ENOENT  
-        
-        raise "Command 'convert' not found. Ensure 'Image Magick' is installed."
-      
-      end
-      
-      return result
-    end
-    
-    
-  end
-end