sequel_paperclip 0.3.0 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/sequel_paperclip/attachment.rb

@@ -40,36 +40,34 @@ module Sequel
           @storage_updates = []
         end
 
-        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|
-              @storage_updates << {
-                :type => STORAGE_UPDATE_DELETE,
-                :path => path(style),
-              }
+        def update(file)
+          if file
+            unless file.is_a?(File) || file.is_a?(Tempfile)
+              raise ArgumentError, "#{name}: #{file} is not a File"
+            end
+          else
+            if exists?
+              options[:styles].each_pair do |style, style_options|
+                @storage_updates << {
+                  :type => STORAGE_UPDATE_DELETE,
+                  :path => path(style),
+                }
+              end
             end
           end
 
-          @queued_file = nil
+          @queued_file = file
         end
 
         def exists?
           !!model.send("#{name}_basename")
         end
 
-        def path(style)
+        def path(style = :original)
           Interpolations.interpolate(options[:path], self, model, style)
         end
 
-        def url(style)
+        def url(style = :original)
           Interpolations.interpolate(options[:url], self, model, style)
         end
 

data/lib/sequel_paperclip.rb

@@ -8,13 +8,11 @@ module Sequel
   module Plugins
     module Paperclip
       def self.apply(model, opts={}, &block)
-      end
-
-      def self.configure(model, opts={}, &block)
         model.class_inheritable_hash :attachments
         model.attachments = {}
+      end
 
-        model.send(:attr_accessor, :attachment_instances)
+      def self.configure(model, opts={}, &block)
       end
 
       module ClassMethods
@@ -65,25 +63,21 @@ 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
+            @attachment_instances ||= {}
+            @attachment_instances[name] ||= Attachment.new(self, name, options)
           end
 
           define_method("#{name}=") do |value|
-            attachment = send("#{name}_attachment_instance")
+            attachment = send("#{name}")
+
+            # queue destroy attachment, so all old files get deleted properly even
+            # if the basename/ filename changes
+            attachment.update(nil)
 
             if value
-              basename = send("#{name}_basename")
-              if basename.blank?
-                basename = ActiveSupport::SecureRandom.hex(4).to_s
-                send("#{name}_basename=", basename)
-              end
+              basename = attachment_generate_basename(attachment)
+              send("#{name}_basename=", basename)
 
               if respond_to?("#{name}_filename")
                 send("#{name}_filename=", basename+File.extname(file.original_filename).downcase)
@@ -96,39 +90,33 @@ module Sequel
               if respond_to?("#{name}_originalname")
                 send("#{name}_originalname=", file.original_filename)
               end
-
-              attachment.set(value)
             else
-              attachment.destroy
-
               send("#{name}_basename=", nil)
             end
 
+            # now queue the real update
+            attachment.update(value)
+
             # force sequel to call the hooks
             modified!
           end
 
           define_method("#{name}?") do
-            attachment = send("#{name}_attachment_instance")
+            attachment = send("#{name}")
             attachment.exists?
           end
-
-          define_method("#{name}_url") do |style|
-            attachment = send("#{name}_attachment_instance")
-            attachment.url(style)
-          end
-
-          define_method("#{name}_path") do |style|
-            attachment = send("#{name}_attachment_instance")
-            attachment.path(style)
-          end
         end
       end
 
       module InstanceMethods     
+        def attachment_generate_basename(attachment)
+          basename = send("#{attachment.name}_basename")
+          basename.blank? ? ActiveSupport::SecureRandom.hex(4).to_s : basename
+        end
+
         def after_save
-          if attachment_instances
-            attachment_instances.each_value do |attachment|
+          if @attachment_instances
+            @attachment_instances.each_value do |attachment|
               attachment.process
               attachment.update_storage
             end
@@ -138,12 +126,11 @@ module Sequel
 
         def after_destroy
           self.class.attachments.each_key do |name|
-            attachment = send("#{name}_attachment_instance")
-            attachment.destroy
+            send("#{name}=", nil)
           end
 
-          if attachment_instances
-            attachment_instances.each_value do |attachment|
+          if @attachment_instances
+            @attachment_instances.each_value do |attachment|
               attachment.update_storage
             end
           end

data/sequel_paperclip.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sequel_paperclip}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Corin Langosch"]

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Corin Langosch