dis 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca1ddbb8f8cbce08f246eb2ae764fc1f330cee7b
-  data.tar.gz: 0faed0087f940954495eb77e994e78bc07b4f9b1
+  metadata.gz: 835c04f15f51b3e319654d2a8040df778c62cc8a
+  data.tar.gz: 2dee85c2af96d2804140d449a79e1d43fc3da22a
 SHA512:
-  metadata.gz: f4a242e9bf376396a498def8cd1cd457bb5e35b680781cc337faef9d57e238c851f1ddead2417fa6221da4c89130b5672990565d026b3b7f328e47cfcc8ef1a3
-  data.tar.gz: f811ffaf3e73c76e92df930ad03debd766da58d524d0bc2e929c6ba771a3e59b1167c385a2eab4469fd538a32d95be2edfa1f35c896b60b95bfe3a812235b95f
+  metadata.gz: b1f15973ebba3a27e077c3cbcfc779d3e42be633663c5fe1bc64b4662ac37af18da246aac11644e20303b440b649aa53021a5aeadfd284f1b75961c6a1a22ced
+  data.tar.gz: dd16af7aacf26faeeaf9052acc7e7ca2a91df3c2b9ed4b526cbb7b4b85b155aa1e024e00f9f06c79ca890a0a556253ca353e3639e0849f90fbedada66c545417

data/lib/dis.rb

@@ -4,6 +4,8 @@ require "digest/sha1"
 require "fog/core"
 require "fog/local/storage"
 require "active_job"
+require "pmap"
+require "dis/engine"
 require "dis/errors"
 require "dis/jobs"
 require "dis/layer"

data/lib/dis/engine.rb

@@ -0,0 +1,6 @@
+# encoding: utf-8
+
+module Dis
+  class Engine < ::Rails::Engine
+  end
+end

data/lib/dis/layer.rb

@@ -125,6 +125,13 @@ module Dis
       delete!(type, hash)
     end
 
+    # Returns a name for the layer.
+    #
+    #   layer.name # => "Fog::Storage::Local::Real/development"
+    def name
+      "#{connection.class.name}/#{path}"
+    end
+
     private
 
     def default_options

data/lib/dis/version.rb

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

data/lib/tasks/dis.rake

@@ -0,0 +1,39 @@
+# encoding: utf-8
+
+namespace :dis do
+  desc "Check stuff"
+  task consistency_check: :environment do
+    unless ENV["MODELS"]
+      puts "Usage: #{$PROGRAM_NAME} dis:consistency_check " \
+           "MODELS=Avatar,Document"
+      exit
+    end
+
+    models = ENV["MODELS"].split(",").map(&:strip).map(&:constantize)
+
+    models.each do |model|
+      puts "-- #{model.name} --"
+
+      content_hash_attr = model.dis_attributes[:content_hash]
+      objects = model
+        .select(content_hash_attr)
+        .uniq
+        .map { |r| r.send(content_hash_attr) }
+
+      puts "Unique objects: #{objects.length}"
+
+      Dis::Storage.layers.each do |layer|
+        existing = objects
+          .pmap { |hash| [hash, layer.exists?(model.dis_type, hash)] }
+          .select(&:last)
+          .map(&:first)
+        missing = objects - existing
+        puts "#{layer.name}: #{existing.length} (#{missing.length} missing)"
+
+        puts "Missing objects:\n#{missing.inspect}" if missing.any?
+      end
+
+      puts
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dis
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Inge Jørgensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-17 00:00:00.000000000 Z
+date: 2015-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.26.0
+- !ruby/object:Gem::Dependency
+  name: pmap
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -77,6 +91,7 @@ files:
 - MIT-LICENSE
 - README.md
 - lib/dis.rb
+- lib/dis/engine.rb
 - lib/dis/errors.rb
 - lib/dis/jobs.rb
 - lib/dis/jobs/delete.rb
@@ -86,7 +101,6 @@ 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
@@ -94,6 +108,7 @@ files:
 - lib/rails/generators/dis/install/install_generator.rb
 - lib/rails/generators/dis/install/templates/initializer.rb
 - lib/rails/generators/dis/model/model_generator.rb
+- lib/tasks/dis.rake
 homepage: https://github.com/elektronaut/dis
 licenses:
 - MIT

data/lib/dis/sparse_layer.rb

@@ -1,98 +0,0 @@
-# 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