dis 1.1.20 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9ee45bbfd73ef2cb1c66ccfe8acf9690270c8bfaaf772eea29d74562406458e
-  data.tar.gz: d766ec91185282c91603caf7ac9bd604ca7bfc2ee1a43f9a7e62222e2a6a47da
+  metadata.gz: cf00e607df1b1aa62ffa3e025c22ac42e3363d14fb0a06cb6b8f41d3b7757db5
+  data.tar.gz: 2cfe7f5a47d87bdd5e6c59e7f98446bec2918a27c8e3476c123ef1164842d437
 SHA512:
-  metadata.gz: b613abacbc2b21370cf893d689a5ccda253a3324e60201f15ede8e63c42cb3e2aad258f5c269ff136a097c6d6311dc9afa56f4d204e4dae055abfb8e2897d4fe
-  data.tar.gz: ee509a0c0403e0e54b631e561e4529793e728958e2a34714dba51ff4bf457ec5b00026b674ce4e01238a8a2f87802ce1bcf4c127fdab3cb0e4f67bf937105ae5
+  metadata.gz: e2428a8aa2299b730e1db9702fbec9e725cae6a38bfd3e04bce0ac1ba41484f45840f52cdfe0f998dfe5ffa3c5c5a5fa31bc01c380a1aa8a307392e4a4c9a6a4
+  data.tar.gz: d1e9bfbc53cdd753fa0b52730b4c6ac88ec00ca1ba3dd519086fdea58f117947f30d0eb5bef297d952a8fb8deab6d642ce939d5a045d19f70f0586c578b3111e

data/lib/dis/jobs/store.rb

@@ -16,10 +16,6 @@ module Dis
 
       def perform(type, key)
         Dis::Storage.delayed_store(type, key)
-      rescue Dis::Errors::NotFoundError
-        Rails.logger.warn(
-          "Delayed store failed, object not found: #{[type, key].inspect}"
-        )
       end
     end
   end

data/lib/dis/layer.rb

@@ -136,6 +136,21 @@ module Dis
       end
     end
 
+    # Returns the absolute file path for a locally stored file, or nil
+    # if the provider is not local or the file does not exist.
+    #
+    #    layer.file_path("documents", key)
+    def file_path(type, key)
+      return unless connection.respond_to?(:local_root)
+      return unless exists?(type, key)
+
+      File.join(
+        connection.local_root,
+        directory_component(type, key),
+        key_component(type, key)
+      )
+    end
+
     # Deletes a file from the store.
     #
     #   layer.delete("documents", key)

data/lib/dis/model/data.rb

@@ -14,9 +14,13 @@ module Dis
 
       # Returns true if two Data objects represent the same data.
       def ==(other)
-        # TODO: This can be made faster by
-        # comparing hashes for stored objects.
-        other.read == read
+        if !raw? && other.is_a?(self.class) && !other.changed?
+          content_hash == other.content_hash
+        elsif other.respond_to?(:read)
+          other.read == read
+        else
+          false
+        end
       end
 
       # Returns true if data exists either in memory or in storage.
@@ -66,6 +70,22 @@ module Dis
         Dis::Storage.store(storage_type, raw)
       end
 
+      # Clears cached data and tempfiles, allowing them to be garbage
+      # collected. Subsequent calls to read or tempfile will re-fetch.
+      def reset_read_cache!
+        @read = nil
+        return unless @tempfile
+
+        @tempfile.close!
+        @tempfile = nil
+      end
+
+      # Returns the file path to the data. Prefers a local storage path
+      # to avoid unnecessary copies, falls back to a tempfile.
+      def file_path
+        local_path || tempfile.path
+      end
+
       # Writes the data to a temporary file.
       def tempfile
         unless @tempfile
@@ -76,6 +96,12 @@ module Dis
         @tempfile
       end
 
+      protected
+
+      def content_hash
+        @record[@record.class.dis_attributes[:content_hash]]
+      end
+
       private
 
       def closest
@@ -86,10 +112,6 @@ module Dis
         end
       end
 
-      def content_hash
-        @record[@record.class.dis_attributes[:content_hash]]
-      end
-
       def raw?
         raw ? true : false
       end
@@ -127,6 +149,12 @@ module Dis
         Dis::Storage.get(storage_type, content_hash)
       end
 
+      def local_path
+        return if raw?
+
+        Dis::Storage.file_path(storage_type, content_hash)
+      end
+
       attr_reader :raw
     end
   end

data/lib/dis/model.rb

@@ -131,6 +131,11 @@ module Dis
       dis_set :filename, file.original_filename
     end
 
+    # Returns a file path to the data, preferring local storage paths.
+    def data_file_path
+      dis_data.file_path
+    end
+
     # Returns the data as a temporary file.
     delegate :tempfile, to: :dis_data
 

data/lib/dis/storage.rb

@@ -113,6 +113,19 @@ module Dis
         result
       end
 
+      # Returns the absolute file path from the first layer that has a
+      # local copy, or nil if no layer stores files locally.
+      #
+      #   Dis::Storage.file_path("things", key)
+      def file_path(type, key)
+        require_layers!
+        layers.each do |layer|
+          path = layer.file_path(type, key)
+          return path if path
+        end
+        nil
+      end
+
       # Deletes a file from all layers. Kicks off a
       # <tt>Dis::Jobs::Delete</tt> job if any delayed layers are defined.
       # Returns true if the file existed in any immediate layers,

data/lib/dis/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dis
-  VERSION = "1.1.20"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dis
 version: !ruby/object:Gem::Version
-  version: 1.1.20
+  version: 1.2.0
 platform: ruby
 authors:
 - Inge Jørgensen
@@ -27,16 +27,22 @@ dependencies:
   name: fog-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: fog-local
   requirement: !ruby/object:Gem::Requirement
@@ -128,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: A file store for your Rails app
 test_files: []