sequel_paperclip 0.2.0 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/sequel_paperclip/attachment.rb

@@ -2,14 +2,15 @@ module Sequel
   module Plugins
     module Paperclip
       class Attachment
+        attr_reader :model
         attr_reader :name
         attr_reader :options
-        attr_accessor :processors
+        attr_reader :queued_file
 
         STORAGE_UPDATE_SAVE   = 1
         STORAGE_UPDATE_DELETE = 2
-        
-        def initialize(name, options = {})
+
+        def self.preprocess_options(options = {})
           unless options[:styles]
             options[:styles] = {
               :original => {}
@@ -24,58 +25,74 @@ module Sequel
             ]
           end
 
-          @name = name
-          @options = options
-          self.processors = []
-          options[:processors].each do |processor|
-            klass = "Sequel::Plugins::Paperclip::Processors::#{processor[:type].to_s.capitalize}"
-            self.processors << klass.constantize.new(self, processor)
+          options[:processors].each_with_index do |processor, i|
+            if processor.is_a?(Hash)
+              klass = "Sequel::Plugins::Paperclip::Processors::#{processor[:type].to_s.capitalize}"
+              options[:processors][i] = klass.constantize.new(self, processor)
+            end
           end
+        end
+
+        def initialize(model, name, preprocessed_options)
+          @model = model
+          @name = name
+          @options = preprocessed_options
           @storage_updates = []
         end
 
-        def process(model, src_path)
-          processors.each do |processor|
-            processor.pre_runs(model, src_path)
+        def set(file)
+          unless file.is_a?(File) || file.is_a?(Tempfile)
+            raise ArgumentError, "#{name}: #{file} is not a File"
+          end
+
+          @queued_file = file
+        end
+
+        def destroy
+          if exists?
             options[:styles].each_pair do |style, style_options|
-              tmp_file = Tempfile.new("paperclip")
-              puts "processing #{name} for style #{style} with processor #{processor.name}"
-              processor.run(style, style_options, tmp_file)
               @storage_updates << {
-                :type => STORAGE_UPDATE_SAVE,
-                :src_file => tmp_file,
-                :dst_path => path(model, style),
+                :type => STORAGE_UPDATE_DELETE,
+                :path => path(style),
               }
             end
-            processor.post_runs
           end
-        end
 
-        def destroy(model)
-          return unless exists?(model)
-
-          options[:styles].each_pair do |style, style_options|
-            @storage_updates << {
-              :type => STORAGE_UPDATE_DELETE,
-              :path => path(model, style),
-            }
-          end
-          model.send("#{name}_basename=", nil)
+          @queued_file = nil
         end
 
-        def exists?(model)
+        def exists?
           !!model.send("#{name}_basename")
         end
 
-        def path(model, style)
+        def path(style)
           Interpolations.interpolate(options[:path], self, model, style)
         end
 
-        def url(model, style)
+        def url(style)
           Interpolations.interpolate(options[:url], self, model, style)
         end
 
-        def update_storage(model)
+        def process
+          return unless @queued_file
+          src_path = @queued_file.path
+          options[:processors].each do |processor|
+            processor.pre_runs(model, src_path)
+            options[:styles].each_pair do |style, style_options|
+              tmp_file = Tempfile.new("paperclip")
+              puts "processing #{name} for style #{style} with processor #{processor.name}"
+              processor.run(style, style_options, tmp_file)
+              @storage_updates << {
+                :type => STORAGE_UPDATE_SAVE,
+                :src_file => tmp_file,
+                :dst_path => path(style),
+              }
+            end
+            processor.post_runs
+          end
+        end
+
+        def update_storage
           @storage_updates.each do |update|
             case update[:type]
               when STORAGE_UPDATE_SAVE

data/lib/sequel_paperclip.rb

@@ -13,14 +13,16 @@ module Sequel
       def self.configure(model, opts={}, &block)
         model.class_inheritable_hash :attachments
         model.attachments = {}
+
+        model.send(:attr_accessor, :attachment_instances)
       end
 
       module ClassMethods
         def attachment(name, options)
           attr_accessor name
 
-          attachment = Attachment.new(name, options)
-          attachments[name] = attachment
+          Attachment.preprocess_options(options)
+          self.attachments[name] = options
 
           columns = db_schema.keys
           unless columns.include?(:"#{name}_filename") || columns.include?(:"#{name}_basename")
@@ -63,77 +65,87 @@ module Sequel
             end
           end
 
+          define_method("#{name}_attachment_instance") do
+            self.attachment_instances ||= {}
+            self.attachment_instances[name] ||= Attachment.new(self, name, options)
+          end
+
+          define_method("#{name}") do
+            attachment = send("#{name}_attachment_instance")
+            attachment.exists? ? attachment : nil
+          end
+
           define_method("#{name}=") do |value|
-            if !value && attachment.exists?(self)
-              attachment.destroy(self)
+            attachment = send("#{name}_attachment_instance")
+
+            if value
+              basename = send("#{name}_basename")
+              if basename.blank?
+                basename = ActiveSupport::SecureRandom.hex(4).to_s
+                send("#{name}_basename=", basename)
+              end
+
+              if respond_to?("#{name}_filename")
+                send("#{name}_filename=", basename+File.extname(file.original_filename).downcase)
+              end
+
+              if respond_to?("#{name}_filesize")
+                send("#{name}_filesize=", file.size)
+              end
+
+              if respond_to?("#{name}_originalname")
+                send("#{name}_originalname=", file.original_filename)
+              end
+
+              attachment.set(value)
+            else
+              attachment.destroy
+
+              send("#{name}_basename=", nil)
             end
-            instance_variable_set("@#{name}", value);
 
             # force sequel to call the hooks
             modified!
           end
 
           define_method("#{name}?") do
-            attachment.exists?(self)
+            attachment = send("#{name}_attachment_instance")
+            attachment.exists?
           end
 
           define_method("#{name}_url") do |style|
-            attachment.url(self, style)
+            attachment = send("#{name}_attachment_instance")
+            attachment.url(style)
           end
 
           define_method("#{name}_path") do |style|
-            attachment.path(self, style)
+            attachment = send("#{name}_attachment_instance")
+            attachment.path(style)
           end
         end
       end
 
-      module InstanceMethods
-        def before_save
-          self.class.attachments.each_value do |attachment|
-            file = send(attachment.name)
-            if file
-              unless file.is_a?(File) || file.is_a?(Tempfile)
-                raise ArgumentError, "#{attachment.name} is not a File"
-              end
-
-              basename = send("#{attachment.name}_basename")
-              if basename.blank?
-                basename = ActiveSupport::SecureRandom.hex(4).to_s
-                send("#{attachment.name}_basename=", basename)
-              end
-
-              if respond_to?("#{attachment.name}_filename")
-                send("#{attachment.name}_filename=", basename+File.extname(file.original_filename).downcase)
-              end
-
-              if respond_to?("#{attachment.name}_filesize")
-                send("#{attachment.name}_filesize=", file.size)
-              end
-
-              if respond_to?("#{attachment.name}_originalname")
-                send("#{attachment.name}_originalname=", file.original_filename)
-              end
-            end
-          end
-          super
-        end
-        
+      module InstanceMethods     
         def after_save
-          self.class.attachments.each_value do |attachment|
-            file = send(attachment.name)
-            if file
-              attachment.process(self, file.path)
+          if attachment_instances
+            attachment_instances.each_value do |attachment|
+              attachment.process
+              attachment.update_storage
             end
-
-            attachment.update_storage(self)
           end
           super
         end
 
         def after_destroy
-          self.class.attachments.each_value do |attachment|
-            send("#{attachment.name}=", nil)
-            attachment.update_storage(self)
+          self.class.attachments.each_key do |name|
+            attachment = send("#{name}_attachment_instance")
+            attachment.destroy
+          end
+
+          if attachment_instances
+            attachment_instances.each_value do |attachment|
+              attachment.update_storage
+            end
           end
           super
         end

data/sequel_paperclip.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sequel_paperclip}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Corin Langosch"]
-  s.date = %q{2010-09-14}
+  s.date = %q{2010-09-21}
   s.description = %q{Sequel plugin which provides Paperclip (attachments, thumbnail resizing, etc.) functionality for model.}
   s.email = %q{info@netskin.com}
   s.extra_rdoc_files = [

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Corin Langosch
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-14 00:00:00 +01:00
+date: 2010-09-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency