dis 1.1.11 → 1.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a86353570fb3cc0e1beaade66c81c6f257589aae15311c0b8a9e4902cbd0e13
-  data.tar.gz: e3152f444d330fea8b18c8fd0aae990960a2ad9cdbbded148bd035a43c4d78d1
+  metadata.gz: c2ca8b5aa3b6e9e27987f33e3dd32c9a912cf7fe37c9277b53f4797be13653a1
+  data.tar.gz: 81ce7ff7957b0afcb8bfd1be7adac9551c6fa1773470e4bb23ba0f5cf2033dbe
 SHA512:
-  metadata.gz: d927cea9f4e1549528e6052301a6d568355487955f20425024b38c059bf72c9e4aedc0c93c8e598ad2d9028877f61abb71ef7cef875f1edca44de4f4bce79314
-  data.tar.gz: 7c42f028029cf055f679542ebf476d1a6e100f1a03bb782f7f605c45b9f8569eba3eb32c55be99cf2e656255fb7c679f4d8bf2b440c2beac1ec27a820227b597
+  metadata.gz: 9dfd2f361cc55b6d7f2f8db29323d56b0cbdbf03a614c961a5ce9d8a7b6199036e678e887205df4a472536fcfe92198bb068d7d87b5d5e7c0f533b2eee20bda0
+  data.tar.gz: ce2a50bd934b3ca7163191e46195be42e95713864157ccc2737bfdd0db514ab2074ac3d995ebb64b24cf46ca60c53a73d59a4f853ef5a2c78728c5999ff93a93

data/README.md

@@ -2,8 +2,6 @@
 ![Build](https://github.com/elektronaut/dis/workflows/Build/badge.svg)
 [![Code Climate](https://codeclimate.com/github/elektronaut/dis/badges/gpa.svg)](https://codeclimate.com/github/elektronaut/dis)
 [![Code Climate](https://codeclimate.com/github/elektronaut/dis/badges/coverage.svg)](https://codeclimate.com/github/elektronaut/dis)
-[![Inline docs](http://inch-ci.org/github/elektronaut/dis.svg)](http://inch-ci.org/github/elektronaut/dis)
-[![Security](https://hakiri.io/github/elektronaut/dis/master.svg)](https://hakiri.io/github/elektronaut/dis/master)
 
 # Dis
 
@@ -137,6 +135,10 @@ Dis::Storage.get("documents", hash).body     # => "foobar"
 Dis::Storage.delete("documents", hash)       # => true
 ```
 
+## Documentation
+
+See the [generated documentation on RubyDoc.info](https://www.rubydoc.info/gems/dis)
+
 ## License
 
 Copyright 2014 Inge Jørgensen

data/lib/dis/layer.rb

@@ -45,6 +45,8 @@ module Dis
   #     delayed: true
   #   )
   class Layer
+    include Dis::Logging
+
     attr_reader :connection
 
     def initialize(connection, options = {})
@@ -95,7 +97,9 @@ module Dis
     def store(type, key, file)
       raise Dis::Errors::ReadOnlyError if readonly?
 
-      store!(type, key, file)
+      debug_log("Store #{type}/#{key} to #{name}") do
+        store!(type, key, file)
+      end
     end
 
     # Returns all the given keys that exist in the layer.
@@ -130,7 +134,9 @@ module Dis
       dir = directory(type, key)
       return unless dir
 
-      dir.files.get(key_component(type, key))
+      debug_log("Get #{type}/#{key} from #{name}") do
+        dir.files.get(key_component(type, key))
+      end
     end
 
     # Deletes a file from the store.
@@ -142,7 +148,9 @@ module Dis
     def delete(type, key)
       raise Dis::Errors::ReadOnlyError if readonly?
 
-      delete!(type, key)
+      debug_log("Delete #{type}/#{key} from #{name}") do
+        delete!(type, key)
+      end
     end
 
     # Returns a name for the layer.

data/lib/dis/logging.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Dis
+  module Logging
+    def debug_log(message, &block)
+      result = nil
+      duration = Benchmark.ms { result = block.call }
+      logger.debug(format("[Dis] %<message>s (%<duration>.1fms)",
+                          message: message,
+                          duration: duration))
+      result
+    end
+
+    def logger
+      Rails.logger
+    end
+  end
+end

data/lib/dis/model/data.rb

@@ -50,6 +50,8 @@ module Dis
       # by existing records. This is triggered from callbacks on the record
       # whenever they are changed or destroyed.
       def expire(hash)
+        return if hash.blank?
+
         unless @record.class.where(
           @record.class.dis_attributes[:content_hash] => hash
         ).any?

data/lib/dis/validations/data_presence.rb

@@ -8,7 +8,15 @@ 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) if !record.data? || record.data.blank?
+        return if record.data? && record.content_hash != self.class.empty_hash
+
+        record.errors.add(:data, :blank)
+      end
+
+      class << self
+        def empty_hash
+          @empty_hash ||= Dis::Storage.file_digest("")
+        end
       end
     end
   end

data/lib/dis/version.rb

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

data/lib/dis.rb

@@ -8,6 +8,7 @@ require "pmap"
 require "dis/engine"
 require "dis/errors"
 require "dis/jobs"
+require "dis/logging"
 require "dis/layer"
 require "dis/layers"
 require "dis/model"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dis
 version: !ruby/object:Gem::Version
-  version: 1.1.11
+  version: 1.1.13
 platform: ruby
 authors:
 - Inge Jørgensen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-05 00:00:00.000000000 Z
+date: 2023-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -66,48 +66,6 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.17.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.17.1
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Dis is a Rails plugin that stores your file uploads and other binary
   blobs.
 email:
@@ -126,6 +84,7 @@ files:
 - lib/dis/jobs/store.rb
 - lib/dis/layer.rb
 - lib/dis/layers.rb
+- lib/dis/logging.rb
 - lib/dis/model.rb
 - lib/dis/model/class_methods.rb
 - lib/dis/model/data.rb
@@ -140,7 +99,8 @@ files:
 homepage: https://github.com/elektronaut/dis
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -156,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: A file store for your Rails app