attach 1.0.5 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2056ebcc16201f4fe826932ed8db99a711d32e27
-  data.tar.gz: 06ccf7d7fe3d431341cbebc15492ce557a5daed8
+SHA256:
+  metadata.gz: c7bbf0eb92bb9ffe4e7856ab71aed188f446a714508e0c18d2894f2438a81e0f
+  data.tar.gz: 9517712508be371342f5e5fb0cfb110b8e628c4935ab0096b13c473c1afe91e7
 SHA512:
-  metadata.gz: 2b769025cdcc24a045e155db751f7a0feaa8094d17b5bec19e5c1b104e791e78113b471f400ee80bf792288e4709047eb632ffc1797677b2fc48e346c67fbb55
-  data.tar.gz: 68071df914675ff62f3c862ff93dc8024b8b480158fe72ca64ebc1632c25cac8fcc224e2ea953eec3d1a1a90497debec58f634635b6e4ae3e974bcfd26de98d5
+  metadata.gz: ce2d2f261ab5eefa1583eec1b1180abc138c1ce6017499df74b2c42dc755aba48e6a267f23cf317329a1bfeba531e3ca3c34f807069887cf00d4ed136be0c35c
+  data.tar.gz: 604117cd6a9825a8bb8e586c1330daaef67221f080ed343b6397d2a0c76d5a0ad575a0f45f997cd177c7c99d316880eb03cc863a286cea41ac859ffffd04d797

data/lib/attach/attachment.rb

@@ -25,21 +25,21 @@ module Attach
     validates :digest, :presence => true
     validates :token, :presence => true, :uniqueness => true
 
-    # All attachments should have a token assigned to this
-    before_validation { self.token = SecureRandom.uuid if self.token.blank? }
-
     # Allow custom data to be stored on the attachment
     serialize :custom, Hash
 
     # Set size and digest
     before_validation do
-      self.digest = Digest::SHA1.hexdigest(self.binary)
-      self.file_size = self.binary.bytesize
+      self.token      ||= SecureRandom.uuid
+      self.digest     ||= self.binary.is_a?(String) ? Digest::SHA1.hexdigest(self.binary) : Attach.backend.digest(self.binary)
+      self.file_size  ||= self.binary.is_a?(String) ? self.binary.bytesize : Attach.backend.bytesize(self.binary)
     end
 
     # Write the binary to the backend storage
     after_create do
-      Attach.backend.write(self, self.binary)
+      if self.binary
+        Attach.backend.write(self, self.binary)
+      end
     end
 
     # Remove any old images for this owner/role when this is added

data/lib/attach/backends/abstract.rb

@@ -41,6 +41,34 @@ module Attach
         end
       end
 
+      #
+      # Return the SHA1 digest of a given binary
+      #
+      def digest(binary)
+        if binary.respond_to?(:path)
+          sha1 = Digest::SHA1.new
+          binary.binmode
+          binary.rewind
+          while chunk = binary.read(1024 * 1024)
+            sha1.update(chunk)
+          end
+          sha1.hexdigest
+        else
+          Digest::SHA1.hexdigest(binary)
+        end
+      end
+
+      #
+      # Return the bytesize of a given binary
+      #
+      def bytesize(binary)
+        if binary.respond_to?(:path)
+          ::File.size(binary.path)
+        else
+          binary.bytesize
+        end
+      end
+
     end
   end
 end

data/lib/attach/backends/database.rb

@@ -12,9 +12,14 @@ module Attach
         end
       end
 
-      def write(attachment, data)
+      def write(attachment, binary)
         binary = AttachmentBinary.where(:attachment_id => attachment.id).first_or_initialize
-        binary.data = data
+        if binary.respond_to?(:path)
+          binary.rewind
+          binary.data = binary.read
+        else
+          binary.data = binary
+        end
         binary.save!
       end
 

data/lib/attach/backends/file_system.rb

@@ -12,8 +12,12 @@ module Attach
       def write(attachment, data)
         path = path_for_attachment(attachment)
         FileUtils.mkdir_p(::File.dirname(path))
-        ::File.open(path, 'wb') do |f|
-          f.write(data)
+        if data.respond_to?(:path)
+          FileUtils.mv(data.path, path)
+        else
+          ::File.open(path, 'wb') do |f|
+            f.write(data)
+          end
         end
       end
 

data/lib/attach/model_extension.rb

@@ -12,6 +12,8 @@ module Attach
           self.attachments.where(:role => @pending_attachment_deletions).destroy_all
         end
 
+        @replaced_attachment&.destroy
+
         if @pending_attachments
           @pending_attachments.values.each(&:save!)
           @pending_attachments = nil
@@ -24,7 +26,7 @@ module Attach
       def includes_attachments(*options)
         manipulate do |records|
           if records.empty?
-            # Nothing to do
+            # Nothing to do
           else
 
             if options.first.is_a?(Hash)
@@ -141,12 +143,16 @@ module Attach
 
         define_method "#{name}=" do |file|
           if file.is_a?(Attach::Attachment)
+            @replaced_attachment = self.try(name)
             attachment = file
+            attachment.owner = self
+            attachment.role = name
+            attachment.processed = false
           elsif file
             attachment = Attachment.new({:owner => self, :role => name}.merge(options))
             case file
             when ActionDispatch::Http::UploadedFile
-              attachment.binary = file.tempfile.read
+              attachment.binary = file.tempfile
               attachment.file_name = file.original_filename
               attachment.file_type = file.content_type
             when Attach::File

data/lib/attach/version.rb

@@ -1,3 +1,3 @@
 module Attach
-  VERSION = '1.0.5'
+  VERSION = '1.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attach
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.0
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-28 00:00:00.000000000 Z
+date: 2020-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: records_manipulator
@@ -69,8 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Attach documents & files to Active Record models