dis 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b2fd660ff2a6498b73046ce44d262e49440e48e
-  data.tar.gz: 9008b0cd219133671c8910dc5353b3a2fe665a0d
+  metadata.gz: 769e16af4437ba86e74fcae272a4e7d893737cc1
+  data.tar.gz: 64330af5cd3172d8f94804391bbbab85c8f87435
 SHA512:
-  metadata.gz: 98d5e2fe6406b2549902eff4ce453e747b16dae2da095feffef8c66f0b0ec454d94004d2ee0045de5915f01efed958c60d0c5f7cd23b527123c06cfe03ac7a28
-  data.tar.gz: 1ac6bbf53d47be0dfaf54b2be0cc596389eacb9f8cde4a42a98c77d3fa8de15b85bef305c85b08af30443836827e418409e043fbbbfb54eb580f1bfeb759a4d4
+  metadata.gz: 361ec8faf76e47ba5bb8185e4d34ea8f30667d395aee2530cf4956e021d3925d8f8196228506bfaa0080ef0a60d429f6915ceb67560be8cdde61e689749f3eb7
+  data.tar.gz: 0edc37ad592b0c61c01ff984b801e954472913b716d74d78f1556cfb23845d78600c64d0a925a8cd53cd205f582e52e6cf66a993677df93901111da0f33a432e

data/lib/dis/model.rb

@@ -100,11 +100,15 @@ module Dis
 
     # Assigns new data. This also sets <tt>content_length</tt>, and resets
     # <tt>content_hash</tt> to nil.
-    def data=(new_data)
-      new_data = Dis::Model::Data.new(self, new_data)
+    def data=(raw_data)
+      new_data = Dis::Model::Data.new(self, raw_data)
       attribute_will_change!('data') unless new_data == dis_data
       @dis_data = new_data
-      dis_set :content_hash, nil
+      dis_set :content_hash, if raw_data.nil?
+                               nil
+                             else
+                               Storage.file_digest(new_data.read)
+                             end
       dis_set :content_length, dis_data.content_length
     end
 
@@ -113,6 +117,10 @@ module Dis
       changes.include?('data')
     end
 
+    def dis_stored?
+      !(new_record? || data_changed?)
+    end
+
     # Assigns new data from an uploaded file. In addition to the actions
     # performed by <tt>data=</tt>, this will set <tt>content_type</tt> and
     # <tt>filename</tt>.

data/lib/dis/model/data.rb

@@ -104,7 +104,7 @@ module Dis
       end
 
       def stored?
-        !content_hash.blank?
+        @record.dis_stored? && !content_hash.blank?
       end
 
       def stored

data/lib/dis/validations/data_presence.rb

@@ -8,7 +8,7 @@ module Dis
       # Validates that a record has data, either freshly assigned or
       # persisted in the storage. Adds a `:blank` error on `:data`if not.
       def validate(record)
-        record.errors.add(:data, :blank) unless record.data?
+        record.errors.add(:data, :blank) if !record.data? || record.data.blank?
       end
     end
   end

data/lib/dis/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Dis
-  VERSION = '1.0.5'.freeze
+  VERSION = '1.0.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dis
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Inge Jørgensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-01 00:00:00.000000000 Z
+date: 2016-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails