dis 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e3efb0078d31c5dad69adb12179ac307e07e44b
-  data.tar.gz: 568d166000b658f28b4456d1210117164b7d66d2
+  metadata.gz: ca1ddbb8f8cbce08f246eb2ae764fc1f330cee7b
+  data.tar.gz: 0faed0087f940954495eb77e994e78bc07b4f9b1
 SHA512:
-  metadata.gz: 184a32e5b464fcc2a4f8598bf4773a2dd7bfc4ec950ce8624764a72ba64d67cdc0bec3f0c4cb430dc3b224cac141db56cc1f40951d8462782c53f83fc88a5024
-  data.tar.gz: 4f12596ecd11fbb0fa52af015021b90607d9fda21c2f6aada34057c6ea8b3e6f6222f29afde2d2e3825c88366b45a88bf2c45a75dbb5391d6713fc060285c962
+  metadata.gz: f4a242e9bf376396a498def8cd1cd457bb5e35b680781cc337faef9d57e238c851f1ddead2417fa6221da4c89130b5672990565d026b3b7f328e47cfcc8ef1a3
+  data.tar.gz: f811ffaf3e73c76e92df930ad03debd766da58d524d0bc2e929c6ba771a3e59b1167c385a2eab4469fd538a32d95be2edfa1f35c896b60b95bfe3a812235b95f

data/lib/dis/sparse_layer.rb

@@ -0,0 +1,98 @@
+# encoding: utf-8
+
+module Dis
+  # = Dis SparseLayer
+  #
+  # A special case of Dis::Layer intended to be sparsely populated.
+  # Can be configured with a size limit, objects that have been transferred
+  # to other layers will be evicted based on a Least Recently Used basis.
+  #
+  # ==== Example
+  #
+  #   Dis::SparseLayer.new(
+  #     Fog::Storage.new({
+  #       provider: 'Local',
+  #       local_root: Rails.root.join('db', 'dis')
+  #     }),
+  #     path: Rails.env,
+  #     limit: 10.gigabytes
+  #   )
+  class SparseLayer < Layer
+    def initialize(connection, options={})
+      super
+      @limit = options[:limit]
+    end
+
+    def limit?
+      @limit ? true : false
+    end
+
+    def store(type, hash, file)
+      super.tap do
+        update_timestamp(type, hash)
+      end
+    end
+
+    def get(type, hash)
+      super.tap do |result|
+        update_timestamp(type, hash) if result
+      end
+    end
+
+    def delete(type, hash)
+      super.tap do
+        delete_timestamp(type, hash)
+      end
+    end
+
+    private
+
+    def delete_timestamp(type, path)
+      return false unless timestamp_exists?(type, path)
+      get_timestamp(type, path).destroy
+    end
+
+    def get_timestamp(type, hash)
+      if dir = directory(type, hash)
+        dir.files.get(timestamp_path(type, hash))
+      end
+    end
+
+    def outdated_timestamp?(timestamp)
+      !timestamp || timestamp < 5.minutes.ago
+    end
+
+    def read_timestamp(type, hash)
+      if timestamp = get_timestamp(type, hash)
+        DateTime.parse(timestamp.body)
+      end
+    end
+
+    def timestamp_exists?(type, hash)
+      if (directory(type, hash) &&
+          directory(type, hash).files.head(timestamp_path(type, hash)))
+        true
+      else
+        false
+      end
+    end
+
+    def timestamp_path(type, hash)
+      key_component(type, hash) + ".timestamp"
+    end
+
+    def update_timestamp(type, hash)
+      if outdated_timestamp?(read_timestamp(type, hash))
+        write_timestamp(type, hash)
+      end
+    end
+
+    def write_timestamp(type, hash)
+      directory!(type, hash).files.create(
+        key:    timestamp_path(type, hash),
+        body:   DateTime.now.to_s,
+        public: public?
+      )
+    end
+  end
+end

data/lib/dis/storage.rb

@@ -17,6 +17,21 @@ module Dis
   # one writeable, non-delayed layer must exist.
   class Storage
     class << self
+      # Returns a hex digest for a given binary. Accepts files, strings
+      # and Fog models.
+      def file_digest(file, &block)
+        hash = case file
+        when Fog::Model
+          digest.hexdigest(file.body)
+        when String
+          digest.hexdigest(file)
+        else
+          digest.file(file.path).hexdigest
+        end
+        yield hash if block_given?
+        hash
+      end
+
       # Exposes the layer set, which is an instance of
       # <tt>Dis::Layers</tt>.
       def layers
@@ -113,7 +128,7 @@ module Dis
       private
 
       def store_immediately!(type, file)
-        hash_file(file) do |hash|
+        file_digest(file) do |hash|
           layers.immediate.writeable.each do |layer|
             layer.store(type, hash, file)
           end
@@ -135,19 +150,6 @@ module Dis
       def digest
         Digest::SHA1
       end
-
-      def hash_file(file, &block)
-        hash = case file
-        when Fog::Model
-          digest.hexdigest(file.body)
-        when String
-          digest.hexdigest(file)
-        else
-          digest.file(file.path).hexdigest
-        end
-        yield hash if block_given?
-        hash
-      end
     end
   end
 end

data/lib/dis/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Dis
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dis
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Inge Jørgensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-28 00:00:00.000000000 Z
+date: 2015-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -86,6 +86,7 @@ files:
 - lib/dis/model.rb
 - lib/dis/model/class_methods.rb
 - lib/dis/model/data.rb
+- lib/dis/sparse_layer.rb
 - lib/dis/storage.rb
 - lib/dis/validations.rb
 - lib/dis/validations/data_presence.rb
@@ -113,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A file store for your Rails app