sequel_paperclip 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/sequel_paperclip/attachment.rb

@@ -6,6 +6,9 @@ module Sequel
         attr_reader :options
         attr_accessor :processors
 
+        STORAGE_UPDATE_SAVE   = 1
+        STORAGE_UPDATE_DELETE = 2
+        
         def initialize(name, options = {})
           unless options[:styles]
             options[:styles] = {
@@ -25,22 +28,39 @@ module Sequel
           @options = options
           self.processors = []
           options[:processors].each do |processor|
-            self.processors << "Sequel::Plugins::Paperclip::Processors::#{processor[:type].to_s.capitalize}".constantize.new(self, processor)
+            klass = "Sequel::Plugins::Paperclip::Processors::#{processor[:type].to_s.capitalize}"
+            self.processors << klass.constantize.new(self, processor)
           end
+          @storage_updates = []
         end
 
         def process(model, src_path)
-          files_to_store = {}
           processors.each do |processor|
             processor.pre_runs(model, src_path)
             options[:styles].each_pair do |style, style_options|
-              files_to_store[style] ||= Tempfile.new("paperclip")
+              tmp_file = Tempfile.new("paperclip")
               puts "processing #{name} for style #{style} with processor #{processor.name}"
-              processor.run(style, style_options, files_to_store[style])
+              processor.run(style, style_options, tmp_file)
+              @storage_updates << {
+                :type => STORAGE_UPDATE_SAVE,
+                :src_file => tmp_file,
+                :dst_path => path(model, style),
+              }
             end
             processor.post_runs
           end
-          files_to_store
+        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)
         end
 
         def exists?(model)
@@ -54,6 +74,26 @@ module Sequel
         def url(model, style)
           Interpolations.interpolate(options[:url], self, model, style)
         end
+
+        def update_storage(model)
+          @storage_updates.each do |update|
+            case update[:type]
+              when STORAGE_UPDATE_SAVE
+                puts "saving #{update[:dst_path]} (#{update[:src_file].size} bytes)"
+                FileUtils.mkdir_p(File.dirname(update[:dst_path]))
+                FileUtils.cp(update[:src_file].path, update[:dst_path])
+                update[:src_file].close!
+              when STORAGE_UPDATE_DELETE
+                puts "deleting #{update[:path]}"
+                begin
+                  FileUtils.rm(update[:path])
+                rescue Errno::ENOENT => error
+                end
+              else
+                raise ArgumentError, "invalid type '#{update[:type]}'"
+            end
+          end        
+        end
       end
     end
   end

data/lib/sequel_paperclip/processors/dummy.rb

@@ -8,7 +8,7 @@ module Sequel
           attr_reader :options
           
           def initialize(attachment, options)
-            @name = self.class.name
+            @name = "dummy"
           end
 
           def pre_runs(model, src_path)

data/lib/sequel_paperclip/processors/image.rb

@@ -8,7 +8,7 @@ module Sequel
           attr_reader :options
           
           def initialize(attachment, options)
-            @name = self.class.name
+            @name = "image"
             @attachment = attachment
             @options = options
           end

data/lib/sequel_paperclip.rb

@@ -39,10 +39,24 @@ module Sequel
             end
             
             define_method("#{name}_basename=") do |basename|
-              old_filename = send("#{name}_filename")
-              extname = old_filename ? File.extname(old_filename) : ""
-              send("#{name}_filename=", basename+extname)
+              if basename
+                old_filename = send("#{name}_filename")
+                extname = old_filename ? File.extname(old_filename) : ""
+                send("#{name}_filename=", basename+extname)
+              else
+                send("#{name}_filename=", nil)
+              end
+            end
+          end
+
+          define_method("#{name}=") do |value|
+            if !value && attachment.exists?(self)
+              attachment.destroy(self)
             end
+            instance_variable_set("@#{name}", value);
+
+            # force sequel to call the hooks
+            modified!
           end
 
           define_method("#{name}?") do
@@ -59,67 +73,45 @@ module Sequel
         end
       end
 
-      module InstanceMethods       
+      module InstanceMethods
         def before_save
           self.class.attachments.each_value do |attachment|
             file = send(attachment.name)
-            next unless file
+            if file
+              unless file.is_a?(File) || file.is_a?(Tempfile)
+                raise ArgumentError, "#{attachment.name} is not a File"
+              end
 
-            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
 
-            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}_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}_filesize")
-              send("#{attachment.name}_filesize=", file.size)
-            end
+              if respond_to?("#{attachment.name}_originalname")
+                send("#{attachment.name}_originalname=", file.original_filename)
+              end
 
-            if respond_to?("#{attachment.name}_originalname")
-              send("#{attachment.name}_originalname=", file.original_filename)
+              attachment.process(self, file.path)
             end
-          end
-          super
-        end
-        
-        def after_save
-          self.class.attachments.each_value do |attachment|
-            file = send(attachment.name)
-            next unless file
-
-            files_to_store = attachment.process(self, file.path)
-            attachment.options[:styles].each_key do |style|
-              src_file = files_to_store[style]
-              dst_path = attachment.path(self, style)
-              puts "saving #{dst_path} (#{src_file.size} bytes)"
-              FileUtils.mkdir_p(File.dirname(dst_path))
-              FileUtils.cp(src_file.path, dst_path)
-              src_file.close!
-            end          
+
+            attachment.update_storage(self)
           end
           super
         end
 
         def after_destroy
           self.class.attachments.each_value do |attachment|
-            attachment.options[:styles].each_key do |style|
-              next unless attachment.exists?(self)
-              dst_path = attachment.path(self, style)
-
-              puts "deleting #{dst_path}"
-              begin
-                FileUtils.rm(dst_path)
-              rescue Errno::ENOENT => error
-              end
-            end          
+            send("#{attachment.name}=", nil)
+            attachment.update_storage(self)
           end
           super
         end

data/sequel_paperclip.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sequel_paperclip}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Corin Langosch"]
-  s.date = %q{2010-08-31}
+  s.date = %q{2010-09-09}
   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

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Corin Langosch
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-31 00:00:00 +02:00
+date: 2010-09-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency