attached 0.4.1 → 0.4.2

data/README.rdoc

@@ -4,7 +4,7 @@ Attached is a Ruby on Rails file attachment tool that lets users upload to the c
 
 == Requirements
 
-The gem is tested with Ruby 1.9.2 and Rails 3.0.6 but may well work with other versions of Ruby and Rails.
+The gem is tested with Ruby 1.9.2 and Rails 3.0.9 but may well work with other versions of Ruby and Rails.
 
 == Installation
 
@@ -98,7 +98,7 @@ View:
   Attached::Attachment.options[:medium] = :rackspace
   Attached::Attachment.options[:credentials] = "#{Rails.root}/config/rackspace.yml"
   
-=== Processor
+=== Processors
 
   # app/models/image.rb
   has_attached :file, processor: :image, styles: {
@@ -135,11 +135,16 @@ View:
     small: { preset: 'medium',  extension: '.wav' },
   }
   
-  -preset fast extreme
+=== Strategies
+
+  # app/models/sample.rb
+  has_attached :file, processor: ..., styles: { ... }, strategy: :delay
+  has_attached :file, processor: ..., styles: { ... }, strategy: :cache
   
 === Reprocessing
 
   rake attached:process[Image,file]
+  rake attached:process[Audio,file]
   
 === Aliases
 

data/lib/attached.rb

@@ -17,6 +17,7 @@ module Attached
       args.each do |name|
         column("#{name}_identifier", :string, options)
         column("#{name}_extension", :string, options)
+        column("#{name}_status", :string, options)
         column("#{name}_size", :integer, options)
       end
     end

data/lib/attached/attachment.rb

@@ -1,4 +1,4 @@
-require 'guid'
+require 'identifier'
 
 require 'attached/storage'
 require 'attached/storage/error'
@@ -21,6 +21,7 @@ module Attached
     attr_reader :missing
     attr_reader :styles
     attr_reader :default
+    attr_reader :strategy
     attr_reader :medium
     attr_reader :credentials
     attr_reader :processors
@@ -44,9 +45,6 @@ module Attached
         :default     => :original,
         :medium      => :local,
         :credentials => {},
-        :styles      => {},
-        :processors  => [],
-        :aliases     => [],
       }
     end
     
@@ -70,7 +68,11 @@ module Attached
     # * :aliases     - An array of aliases
     
     def initialize(name, instance, options = {})
-      options      = self.class.options.merge(options)
+      options      = self.class.options.clone.merge(options)
+      
+      options[:styles]     ||= {}
+      options[:aliases]    ||= []
+      options[:processors] ||= []
       
       @name        = name
       @instance    = instance
@@ -83,6 +85,7 @@ module Attached
       @missing     = options[:missing]
       @styles      = options[:styles]
       @default     = options[:default]
+      @strategy    = options[:strategy]
       @medium      = options[:medium]
       @credentials = options[:credentials]
       @processors  = options[:processors]
@@ -90,8 +93,8 @@ module Attached
       @aliases     = options[:aliases]
       @alias       = options[:alias]
       
-      @processors  = self.processors + [self.processor] if self.processor
-      @aliases     = self.aliases + [self.alias] if self.alias
+      @aliases     = self.aliases << self.alias if self.alias
+      @processors  = self.processors << self.processor if self.processor
       
       @storage     = Attached::Storage.storage(self.medium, self.credentials)
       
@@ -150,19 +153,21 @@ module Attached
     #
     #   @object.avatar.assign(...)
     
-    def assign(file, identifier = "#{Guid.new}")
+    def assign(file, identifier = Identifier.generate)
       self.file = file
       
-      extension ||= File.extname(file.original_filename) if file.respond_to?(:original_filename)
-      extension ||= File.extname(file.path) if file.respond_to?(:path)
+      if file
+        extension ||= File.extname(file.original_filename) if file.respond_to?(:original_filename)
+        extension ||= File.extname(file.path) if file.respond_to?(:path)
+      end
       
       @purge = [self.path, *self.styles.map { |style, options| self.path(style) }] if attached?
       
-      instance_set :size, file.size
-      instance_set :extension, extension
-      instance_set :identifier, identifier
+      self.size       = file ? file.size  : nil
+      self.extension  = file ? extension  : nil
+      self.identifier = file ? identifier : nil
       
-      process
+      process if file
     end
     
     
@@ -255,6 +260,17 @@ module Attached
     end
     
     
+    # Access the status for an attachment.
+    #
+    # Usage:
+    #
+    # @object.avatar.status
+    
+    def status
+      instance_get(:status)
+    end
+    
+    
     # Access the extension for an attachment. It will first check the styles 
     # to see if one is specified before checking the instance.
     #
@@ -287,6 +303,28 @@ module Attached
     end
     
     
+    # Set the size for an attachment.
+    #
+    # Usage:
+    #
+    # @object.avatar.size = 1024
+    
+    def size=(size)
+      instance_set(:size, size)
+    end
+    
+    
+    # Set the status for an attachment.
+    #
+    # Usage:
+    #
+    # @object.avatar.status = 'processing'
+    
+    def status=(status)
+      instance_set(:size, status)
+    end
+    
+    
     # Set the extension for an attachment. It will act independently of the 
     # defined style.
     #

data/lib/attached/job.rb

@@ -0,0 +1,20 @@
+module Attached
+  class Job
+    @queue = :attached
+    
+    def self.perform(klass, id, method)
+      object = eval(klass).find(id)
+      attachment = object.send(name)
+      attachment.reprocess!
+      attachment.status = 'active'
+    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/version.rb

@@ -1,3 +1,3 @@
 module Attached
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,50 +1,50 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: attached
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.4.2
   prerelease: 
-  version: 0.4.1
 platform: ruby
-authors: 
+authors:
 - Kevin Sylvestre
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-09 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-07-24 00:00:00.000000000 -07:00
+default_executable: 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: fog
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70341108747620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: guid
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70341108747620
+- !ruby/object:Gem::Dependency
+  name: identifier
+  requirement: &70341108747060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-description: Attached is a Ruby on Rails cloud attachment and processor library inspired by Paperclip. Attached lets users push files to the cloud, then perform remote processing on the files.
-email: 
+  prerelease: false
+  version_requirements: *70341108747060
+description: Attached is a Ruby on Rails cloud attachment and processor library inspired
+  by Paperclip. Attached lets users push files to the cloud, then perform remote processing
+  on the files.
+email:
 - kevin@ksylvest.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/attached/attachment.rb
+- lib/attached/job.rb
 - lib/attached/processor/audio.rb
 - lib/attached/processor/base.rb
 - lib/attached/processor/error.rb
@@ -65,32 +65,29 @@ files:
 - LICENSE
 - Gemfile
 - Rakefile
+has_rdoc: true
 homepage: http://github.com/ksylvest/attached
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: An attachment library designed with cloud processors in mind
 test_files: []
-