dis 1.1.6 → 1.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75c6c1d614d13eaa8ae3b3fd30762e1a22069fb60629ebc2bb6b396caf72a25e
-  data.tar.gz: fa6552876ae2e87d50416d004b34ee9039ceabfe459a2dbff899028650346a43
+  metadata.gz: 3a86353570fb3cc0e1beaade66c81c6f257589aae15311c0b8a9e4902cbd0e13
+  data.tar.gz: e3152f444d330fea8b18c8fd0aae990960a2ad9cdbbded148bd035a43c4d78d1
 SHA512:
-  metadata.gz: 3e299491b62a599f7e0cb16e2de1ad67152e96fd6496b58e01d407f728c3739530822626c551405fd06585f0d7590ea7ca438a2bf0774770776d4ce4dc8b288f
-  data.tar.gz: 78e7d8efea50cff8bc50d4a412166b2f814644781e2c86b99041a554eb29bab70ff81f61f0898039b9c108072669ecbe17247aed3706805fdada761e51345941
+  metadata.gz: d927cea9f4e1549528e6052301a6d568355487955f20425024b38c059bf72c9e4aedc0c93c8e598ad2d9028877f61abb71ef7cef875f1edca44de4f4bce79314
+  data.tar.gz: 7c42f028029cf055f679542ebf476d1a6e100f1a03bb782f7f605c45b9f8569eba3eb32c55be99cf2e656255fb7c679f4d8bf2b440c2beac1ec27a820227b597

data/README.md

@@ -1,5 +1,5 @@
 [![Version](https://img.shields.io/gem/v/dis.svg?style=flat)](https://rubygems.org/gems/dis)
-[![Build Status](https://travis-ci.org/elektronaut/dis.svg?branch=master)](https://travis-ci.org/elektronaut/dis)
+![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)

data/lib/dis/errors.rb

@@ -3,9 +3,13 @@
 module Dis
   module Errors
     class Error < StandardError; end
+
     class ReadOnlyError < Dis::Errors::Error; end
+
     class NoLayersError < Dis::Errors::Error; end
+
     class NotFoundError < Dis::Errors::Error; end
+
     class NoDataError < Dis::Errors::Error; end
   end
 end

data/lib/dis/jobs/store.rb

@@ -12,6 +12,10 @@ 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/layers.rb

@@ -22,8 +22,8 @@ module Dis
     end
 
     # Iterates over the layers.
-    def each
-      @layers.each { |layer| yield layer }
+    def each(&block)
+      @layers.each { |layer| block.call(layer) }
     end
 
     # Returns a new instance containing only the delayed layers.

data/lib/dis/model.rb

@@ -131,6 +131,9 @@ module Dis
       dis_set :filename, file.original_filename
     end
 
+    # Returns the data as a temporary file.
+    delegate :tempfile, to: :dis_data
+
     private
 
     def cleanup_data

data/lib/dis/model/data.rb

@@ -64,6 +64,16 @@ module Dis
         Dis::Storage.store(storage_type, raw)
       end
 
+      # Writes the data to a temporary file.
+      def tempfile
+        unless @tempfile
+          @tempfile = Tempfile.new(binmode: true)
+          @tempfile.write(@read || read_from(closest))
+          @tempfile.open
+        end
+        @tempfile
+      end
+
       private
 
       def closest
@@ -106,14 +116,13 @@ module Dis
       end
 
       def stored?
-        @record.dis_stored? && content_hash.present?
+        content_hash.present? &&
+          (@record.dis_stored? ||
+           Dis::Storage.exists?(storage_type, content_hash))
       end
 
       def stored
-        Dis::Storage.get(
-          storage_type,
-          content_hash
-        )
+        Dis::Storage.get(storage_type, content_hash)
       end
 
       attr_reader :raw

data/lib/dis/version.rb

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

data/lib/rails/generators/dis/install/templates/initializer.rb

@@ -5,7 +5,7 @@
 # Creates a local storage layer in db/dis:
 
 Dis::Storage.layers << Dis::Layer.new(
-  Fog::Storage.new(provider: "Local", local_root: Rails.root.join("db", "dis")),
+  Fog::Storage.new(provider: "Local", local_root: Rails.root.join("db/dis")),
   path: Rails.env
 )
 

data/lib/tasks/dis.rake

@@ -17,10 +17,7 @@ namespace :dis do
       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) }
+      objects = model.pluck(content_hash_attr).uniq
       global_missing = objects.dup
 
       puts "Unique objects: #{objects.length}"
@@ -31,9 +28,10 @@ namespace :dis do
         existing = layer.existing(model.dis_type, objects)
         missing = objects - existing
         global_missing -= existing
-        puts "#{existing.length} existing, #{missing.length} missing"
+        puts "#{existing.length} existing, #{missing.length} missing" +
+             (layer.readonly? ? " (read-only)" : "")
 
-        next unless layer.delayed?
+        next unless layer.delayed? && !layer.readonly?
 
         jobs += (missing - global_missing).pmap do |hash|
           [model.dis_type, hash]
@@ -51,7 +49,7 @@ namespace :dis do
     if jobs.any?
       print "#{jobs.length} objects can be transferred to delayed layers, " \
             "queue now? (y/n) "
-      response = STDIN.gets.chomp
+      response = $stdin.gets.chomp
       if /^y/i.match?(response)
         puts "Queueing jobs..."
         jobs.each { |type, hash| Dis::Jobs::Store.perform_later(type, hash) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dis
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.11
 platform: ruby
 authors:
 - Inge Jørgensen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-17 00:00:00.000000000 Z
+date: 2021-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -68,18 +68,32 @@ dependencies:
         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: '3.5'
+        version: 0.17.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: 0.17.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -127,7 +141,7 @@ homepage: https://github.com/elektronaut/dis
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -135,15 +149,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: A file store for your Rails app
 test_files: []