attached 0.1.7 → 0.1.8

data/Gemfile

@@ -1,7 +1,3 @@
 source 'http://rubygems.org'
 
-gem 'rails'
-
-gem 'guid'
-
-gem 'aws-s3', :require => 'aws/s3'
+gemspec

data/lib/attached/attachment.rb

@@ -36,6 +36,7 @@ module Attached
       @options ||= {
         :path        => "/:name/:style/:identifier:extension",
         :default     => :original,
+        :medium      => :aws,
         :credentials => {},
         :styles      => {},
         :processors  => [],
@@ -110,14 +111,12 @@ module Attached
       @file = file.respond_to?(:tempfile) ? file.tempfile : file
       
       extension ||= File.extname(file.original_filename) if file.respond_to?(:original_filename)
-      extension ||= File.extname(file.path)
+      extension ||= File.extname(file.path) if file.respond_to?(:path)
        
       instance_set :size, file.size
       instance_set :extension, extension
       instance_set :identifier, identifier
       
-      self.queue[self.default] = self.file
-      
       process
     end
     
@@ -260,13 +259,15 @@ module Attached
     
   private
   
-    # Helper function for calling processors.
+    # Helper function for calling processors (will queue default).
     #
     # Usage:
     #
     #   self.process
     
     def process
+      self.queue[self.default] = self.file
+      
       self.processors.each do |processor|
         self.styles.each do |style, options|
           case processor

data/lib/attached/image.rb

@@ -1,20 +1,16 @@
 require 'attached/processor'
 
-begin
-  require 'rmagick' 
-rescue LoadError
-  require 'RMagick' 
-rescue LoadError
-  raise "Installation of 'rmagick' is required before using the 'image' processor"
-end
-
 module Attached
   
   class Image < Processor
     
     
     attr_reader :path
-    attr_reader :extname
+    attr_reader :extension
+    
+    attr_reader :width
+    attr_reader :height
+    attr_reader :operation
 
     # Create a processor.
     #
@@ -27,8 +23,24 @@ module Attached
     def initialize(file, options = {}, attachment = nil)
       super
         
-      @path     = @file.path
-      @extname  = File.extname(@file.path)
+      @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
     
     
@@ -39,32 +51,34 @@ module Attached
     #   self.process
     
     def process
-      result = Tempfile.new(["", options['extension'] || self.extname])
+      result = Tempfile.new(["", self.extension])
       result.binmode
-        
-      image = ::Magick::Image.read(self.path)
-      image_list  = ::Magick::ImageList.new
-      
-      width, height, operation = self.options[:size].match(/\b(\d*)x?(\d*)\b([\#\<\>])?/)[1..3] if self.options[:size]
-      
-      width     ||= self.options[:width]
-      height    ||= self.options[:height]
-      operation ||= self.options[:operation]
       
-      width  = width.to_i
-      height = height.to_i
-      
-      image.each do |frame|
+      begin
+        parameters = []
+        
+        parameters << self.path
+        
         case operation
-          when /!/ then puts "hi"
-          when /#/ then image_list << frame.resize_to_fill(width, height)
-          when /</ then image_list << frame.resize_to_fit(width, height)
-          when />/ then image_list << frame.resize_to_fit(width, height)
-          else image_list << frame.resize(width, height)
+        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}`
+        
+        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."
       
-      image_list.write(result.path)
+      end
       
       return result
     end

data/lib/attached/storage.rb

@@ -7,12 +7,14 @@ module Attached
     #
     # Usage:
     #
-    #   Attached::Storage.medium(aws)
+    #   Attached::Storage.medium()
+    #   Attached::Storage.medium(:aws)
     
     def self.storage(medium = :aws, credentials = nil)
       
       case medium
-      when :aws then return Attached::Storage::AWS.new(credentials)
+      when :aws then return Attached::Storage::AWS.new credentials
+      else raise "Undefined storage medium '#{medium}'."
       end
       
     end

data/lib/attached/storage/aws.rb

@@ -12,6 +12,7 @@ module Attached
 		class AWS < Base
 			
 			
+			attr_reader :access
 			attr_reader :bucket
 			attr_reader :access_key_id
 			attr_reader :secret_access_key
@@ -27,6 +28,7 @@ module Attached
 			def initialize(credentials)
 				credentials = parse(credentials)
 				
+				@access            = :public_read
 				@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']
@@ -54,7 +56,7 @@ module Attached
       def save(file, path)
         connect()
         begin
-          ::AWS::S3::S3Object.store(path, file, bucket, :access => :public_read)
+          ::AWS::S3::S3Object.store(path, file, bucket, :access => access)
         rescue AWS::S3::NoSuchBucket => e
   			  ::AWS::S3::Bucket.create(bucket)
           retry
@@ -71,10 +73,8 @@ module Attached
       def destroy(path)
         connect()
         begin
-          ::AWS::S3::S3Object.delete(path, bucket, :access => :authenticated_read)
+          ::AWS::S3::S3Object.delete(path, bucket)
         rescue AWS::S3::NoSuchBucket => e
-  			  ::AWS::S3::Bucket.create(bucket)
-          retry
         end
       end
 			

data/lib/attached/version.rb

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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Kevin Sylvestre
@@ -14,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-20 00:00:00 -05:00
+date: 2010-12-22 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: guid
+  name: aws-s3
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -31,7 +31,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: aws-s3
+  name: guid
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -60,6 +60,7 @@ files:
 - lib/attached/storage/aws.rb
 - lib/attached/storage/base.rb
 - lib/attached/storage.rb
+- lib/attached/version.rb
 - lib/attached.rb
 - lib/tasks/attached.rake
 - README.rdoc