dis 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cb8a9f8a44513293da86ca083dd5d21387f2369517da289682e0195f1ec2ad7
-  data.tar.gz: fd15cbc2724c0125dc90070d90b4c25097e801e73224e446eeece2f07593c46e
+  metadata.gz: e288aeab069c9e9d3e65daeb330c4a28cd639d9d83a70cad85b91fbcc156d91c
+  data.tar.gz: c9b4fd556e84eb7e3ade9155f62fdc0e7220b1fdbf1fef601255ece90b8df530
 SHA512:
-  metadata.gz: f07494205851ecaa4c0a9217c6721f42d04d4df8441da20bf3582f9f107dc35e5bd1b80220536147088e0387ccc265780a8ade62dbee42aad33c87d2d5d3e8e7
-  data.tar.gz: e06b2a61f8c282c34540f47d5aeaa2ce04293994aa19b0263940b40cfb203316a6d61d8a888faf246b3859c1f9257239273c1e65d34a8a567077e6d23048f7d5
+  metadata.gz: 7d61a6b68917905cd896300e7413e8676d7562cdd96599c6331928da12ef6f8a6bdc7ad2c7cfaccc3fff5d42bed45f6f123a1bf1f0138689dd2c26070f9c7ebe
+  data.tar.gz: b75616ead369930d1a52b2778afd50af9f252d75bad020836762b5247289cd4fe805fc2791b19158fdc1926d22313eb2240e5c441e8d0ac04589d966e2209a2b

data/lib/dis/jobs/change_type.rb

@@ -6,13 +6,13 @@ module Dis
     #
     # Handles delayed object type change.
     #
-    #   Dis::Jobs::ChangeType.perform_later("old_things", "new_things", hash)
+    #   Dis::Jobs::ChangeType.perform_later("old_things", "new_things", key)
     class ChangeType < ActiveJob::Base
       queue_as :dis
 
-      def perform(prev_type, new_type, hash)
-        Dis::Storage.delayed_store(new_type, hash)
-        Dis::Storage.delayed_delete(prev_type, hash)
+      def perform(prev_type, new_type, key)
+        Dis::Storage.delayed_store(new_type, key)
+        Dis::Storage.delayed_delete(prev_type, key)
       end
     end
   end

data/lib/dis/jobs/delete.rb

@@ -6,12 +6,12 @@ module Dis
     #
     # Handles delayed deletion of objects.
     #
-    #   Dis::Jobs::Delete.perform_later("documents", hash)
+    #   Dis::Jobs::Delete.perform_later("documents", key)
     class Delete < ActiveJob::Base
       queue_as :dis
 
-      def perform(type, hash)
-        Dis::Storage.delayed_delete(type, hash)
+      def perform(type, key)
+        Dis::Storage.delayed_delete(type, key)
       end
     end
   end

data/lib/dis/jobs/store.rb

@@ -6,12 +6,12 @@ module Dis
     #
     # Handles delayed storage of objects.
     #
-    #   Dis::Jobs::Store.perform_later("documents", hash)
+    #   Dis::Jobs::Store.perform_later("documents", key)
     class Store < ActiveJob::Base
       queue_as :dis
 
-      def perform(type, hash)
-        Dis::Storage.delayed_store(type, hash)
+      def perform(type, key)
+        Dis::Storage.delayed_store(type, key)
       end
     end
   end

data/lib/dis/layer.rb

@@ -66,7 +66,7 @@ module Dis
       !delayed?
     end
 
-    # Returns true if the layer isn't a delayed layer.
+    # Returns true if the layer is public.
     def public?
       @public
     end
@@ -83,26 +83,26 @@ module Dis
 
     # Stores a file.
     #
-    #   hash = Digest::SHA1.file(file.path).hexdigest
-    #   layer.store("documents", hash, path)
+    #   key = Digest::SHA1.file(file.path).hexdigest
+    #   layer.store("documents", key, path)
     #
-    # Hash must be a hex digest of the file content. If an object with the
+    # The key must be a hex digest of the file content. If an object with the
     # supplied hash already exists, no action will be performed. In other
     # words, no data will be overwritten if a hash collision occurs.
     #
     # Returns an instance of Fog::Model, or raises an error if the layer
     # is readonly.
-    def store(type, hash, file)
+    def store(type, key, file)
       raise Dis::Errors::ReadOnlyError if readonly?
-      store!(type, hash, file)
+      store!(type, key, file)
     end
 
-    # Returns true if a object with the given hash exists.
+    # Returns true if a object with the given key exists.
     #
-    #    layer.exists?("documents", hash)
-    def exists?(type, hash)
-      if directory(type, hash) &&
-         directory(type, hash).files.head(key_component(type, hash))
+    #    layer.exists?("documents", key)
+    def exists?(type, key)
+      if directory(type, key) &&
+         directory(type, key).files.head(key_component(type, key))
         true
       else
         false
@@ -111,22 +111,22 @@ module Dis
 
     # Retrieves a file from the store.
     #
-    #    layer.get("documents", hash)
-    def get(type, hash)
-      dir = directory(type, hash)
+    #    layer.get("documents", key)
+    def get(type, key)
+      dir = directory(type, key)
       return unless dir
-      dir.files.get(key_component(type, hash))
+      dir.files.get(key_component(type, key))
     end
 
     # Deletes a file from the store.
     #
-    #   layer.delete("documents", hash)
+    #   layer.delete("documents", key)
     #
     # Returns true if the file was deleted, or false if it could not be found.
     # Raises an error if the layer is readonly.
-    def delete(type, hash)
+    def delete(type, key)
       raise Dis::Errors::ReadOnlyError if readonly?
-      delete!(type, hash)
+      delete!(type, key)
     end
 
     # Returns a name for the layer.
@@ -142,37 +142,37 @@ module Dis
       { delayed: false, readonly: false, public: false, path: nil }
     end
 
-    def directory_component(_type, _hash)
+    def directory_component(_type, _key)
       path || ''
     end
 
-    def key_component(type, hash)
-      [type, hash[0...2], hash[2..hash.length]].compact.join('/')
+    def key_component(type, key)
+      [type, key[0...2], key[2..key.length]].compact.join('/')
     end
 
-    def delete!(type, hash)
-      return false unless exists?(type, hash)
-      get(type, hash).destroy
+    def delete!(type, key)
+      return false unless exists?(type, key)
+      get(type, key).destroy
     end
 
-    def directory(type, hash)
-      connection.directories.get(directory_component(type, hash))
+    def directory(type, key)
+      connection.directories.get(directory_component(type, key))
     end
 
-    def directory!(type, hash)
-      dir = directory(type, hash)
+    def directory!(type, key)
+      dir = directory(type, key)
       dir ||= connection.directories.create(
-        key:    directory_component(type, hash),
+        key:    directory_component(type, key),
         public: public?
       )
       dir
     end
 
-    def store!(type, hash, file)
-      return get(type, hash) if exists?(type, hash)
+    def store!(type, key, file)
+      return get(type, key) if exists?(type, key)
       file.rewind if file.respond_to?(:rewind)
-      directory!(type, hash).files.create(
-        key:    key_component(type, hash),
+      directory!(type, key).files.create(
+        key:    key_component(type, key),
         body:   (file.is_a?(Fog::Model) ? file.body : file),
         public: public?
       )

data/lib/dis/storage.rb

@@ -41,18 +41,18 @@ module Dis
       # Changes the type of an object. Kicks off a
       # <tt>Dis::Jobs::ChangeType</tt> job if any delayed layers are defined.
       #
-      #   Dis::Storage.change_type("old_things", "new_things", hash)
-      def change_type(prev_type, new_type, hash)
+      #   Dis::Storage.change_type("old_things", "new_things", key)
+      def change_type(prev_type, new_type, key)
         require_writeable_layers!
-        file = get(prev_type, hash)
+        file = get(prev_type, key)
         store_immediately!(new_type, file)
         layers.immediate.writeable.each do |layer|
-          layer.delete(prev_type, hash)
+          layer.delete(prev_type, key)
         end
         if layers.delayed.writeable.any?
-          Dis::Jobs::ChangeType.perform_later(prev_type, new_type, hash)
+          Dis::Jobs::ChangeType.perform_later(prev_type, new_type, key)
         end
-        hash
+        key
       end
 
       # Stores a file and returns a digest. Kicks off a
@@ -81,11 +81,11 @@ module Dis
 
       # Returns true if the file exists in any layer.
       #
-      #   Dis::Storage.exists?("things", hash) # => true
-      def exists?(type, hash)
+      #   Dis::Storage.exists?("things", key) # => true
+      def exists?(type, key)
         require_layers!
         layers.each do |layer|
-          return true if layer.exists?(type, hash)
+          return true if layer.exists?(type, key)
         end
         false
       end
@@ -98,14 +98,14 @@ module Dis
       # first available layer, then store it in all immediate layer.
       #
       # Returns an instance of Fog::Model.
-      def get(type, hash)
+      def get(type, key)
         require_layers!
 
         fetch_count = 0
         result = layers.inject(nil) do |res, layer|
           res || lambda do
             fetch_count += 1
-            layer.get(type, hash)
+            layer.get(type, key)
           end.call
         end
 
@@ -120,18 +120,18 @@ module Dis
       # Returns true if the file existed in any immediate layers,
       # or false if not.
       #
-      #   Dis::Storage.delete("things", hash)
+      #   Dis::Storage.delete("things", key)
       #   # => true
-      #   Dis::Storage.delete("things", hash)
+      #   Dis::Storage.delete("things", key)
       #   # => false
-      def delete(type, hash)
+      def delete(type, key)
         require_writeable_layers!
         deleted = false
         layers.immediate.writeable.each do |layer|
-          deleted = true if layer.delete(type, hash)
+          deleted = true if layer.delete(type, key)
         end
         if layers.delayed.writeable.any?
-          Dis::Jobs::Delete.perform_later(type, hash)
+          Dis::Jobs::Delete.perform_later(type, key)
         end
         deleted
       end
@@ -139,9 +139,9 @@ module Dis
       # Deletes content from all delayed layers.
       #
       #   Dis::Storage.delayed_delete("things", hash)
-      def delayed_delete(type, hash)
+      def delayed_delete(type, key)
         layers.delayed.writeable.each do |layer|
-          layer.delete(type, hash)
+          layer.delete(type, key)
         end
       end
 

data/lib/dis/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dis
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Inge Jørgensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-11 00:00:00.000000000 Z
+date: 2019-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: fog
+  name: fog-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.35'
+        version: 2.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.35'
+        version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: fog-local
   requirement: !ruby/object:Gem::Requirement