dis 1.1.3 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e288aeab069c9e9d3e65daeb330c4a28cd639d9d83a70cad85b91fbcc156d91c
-  data.tar.gz: c9b4fd556e84eb7e3ade9155f62fdc0e7220b1fdbf1fef601255ece90b8df530
+  metadata.gz: 852a63ca2fc89b07329a0fab7b304292e677c2f9613160200835c993b36d4d4a
+  data.tar.gz: 6c9bf26338b97bfe039295df77d2fdb238218898fd375b3589e3ebe41635676e
 SHA512:
-  metadata.gz: 7d61a6b68917905cd896300e7413e8676d7562cdd96599c6331928da12ef6f8a6bdc7ad2c7cfaccc3fff5d42bed45f6f123a1bf1f0138689dd2c26070f9c7ebe
-  data.tar.gz: b75616ead369930d1a52b2778afd50af9f252d75bad020836762b5247289cd4fe805fc2791b19158fdc1926d22313eb2240e5c441e8d0ac04589d966e2209a2b
+  metadata.gz: 9238a9c59120eb645293e5bfdc43dc14a7fd62aa59040748c6b4c89464c066e0b2fe69d6c9bbe8b536b015e5256b41f1b2c1f942b2cb75e563c46f9aee6d97db
+  data.tar.gz: 5e9824d5c4058e0fd4ebe6c727f3ea30b670c5a32f5999ef059a8eb7c52b1a859e8f333def120875851cd84c1f10ec4b3806b12b3057c040dfc3eeae81fe4214

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)
@@ -17,7 +17,7 @@ your own on. If you're looking to handle image uploads, check out
 [DynamicImage](https://github.com/elektronaut/dynamic_image). It's
 built on top of Dis and handles resizing, cropping and more on demand.
 
-Requires Rails 4.2+.
+Requires Rails 5+
 
 ## Layers
 

data/lib/dis.rb

@@ -1,18 +1,18 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
-require 'digest/sha1'
-require 'fog/core'
-require 'fog/local'
-require 'active_job'
-require 'pmap'
-require 'dis/engine'
-require 'dis/errors'
-require 'dis/jobs'
-require 'dis/layer'
-require 'dis/layers'
-require 'dis/model'
-require 'dis/storage'
-require 'dis/validations'
+require "digest/sha1"
+require "fog/core"
+require "fog/local"
+require "active_job"
+require "pmap"
+require "dis/engine"
+require "dis/errors"
+require "dis/jobs"
+require "dis/layer"
+require "dis/layers"
+require "dis/model"
+require "dis/storage"
+require "dis/validations"
 
 module Dis
 end

data/lib/dis/engine.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Dis
   class Engine < ::Rails::Engine

data/lib/dis/errors.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Dis
   module Errors

data/lib/dis/jobs.rb

@@ -1,5 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
-require 'dis/jobs/delete'
-require 'dis/jobs/store'
-require 'dis/jobs/change_type'
+require "dis/jobs/delete"
+require "dis/jobs/store"
+require "dis/jobs/change_type"

data/lib/dis/jobs/change_type.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Dis
   module Jobs

data/lib/dis/jobs/delete.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Dis
   module Jobs

data/lib/dis/jobs/store.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Dis
   module Jobs
@@ -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/layer.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Dis
   # = Dis Layer
@@ -94,15 +94,29 @@ module Dis
     # is readonly.
     def store(type, key, file)
       raise Dis::Errors::ReadOnlyError if readonly?
+
       store!(type, key, file)
     end
 
+    # Returns all the given keys that exist in the layer.
+    #
+    #    layer.existing("documents", keys)
+    def existing(type, keys)
+      return [] if keys.empty?
+
+      list = []
+      directory(type, keys.first).files.each do |file|
+        list << file.key
+      end
+
+      keys.select { |key| list.include?(key_component(type, key)) }
+    end
+
     # Returns true if a object with the given key exists.
     #
     #    layer.exists?("documents", key)
     def exists?(type, key)
-      if directory(type, key) &&
-         directory(type, key).files.head(key_component(type, key))
+      if directory(type, key)&.files&.head(key_component(type, key))
         true
       else
         false
@@ -115,6 +129,7 @@ module Dis
     def get(type, key)
       dir = directory(type, key)
       return unless dir
+
       dir.files.get(key_component(type, key))
     end
 
@@ -126,6 +141,7 @@ module Dis
     # Raises an error if the layer is readonly.
     def delete(type, key)
       raise Dis::Errors::ReadOnlyError if readonly?
+
       delete!(type, key)
     end
 
@@ -143,15 +159,16 @@ module Dis
     end
 
     def directory_component(_type, _key)
-      path || ''
+      path || ""
     end
 
     def key_component(type, key)
-      [type, key[0...2], key[2..key.length]].compact.join('/')
+      [type, key[0...2], key[2..key.length]].compact.join("/")
     end
 
     def delete!(type, key)
       return false unless exists?(type, key)
+
       get(type, key).destroy
     end
 
@@ -162,7 +179,7 @@ module Dis
     def directory!(type, key)
       dir = directory(type, key)
       dir ||= connection.directories.create(
-        key:    directory_component(type, key),
+        key: directory_component(type, key),
         public: public?
       )
       dir
@@ -170,16 +187,17 @@ module Dis
 
     def store!(type, key, file)
       return get(type, key) if exists?(type, key)
+
       file.rewind if file.respond_to?(:rewind)
       directory!(type, key).files.create(
-        key:    key_component(type, key),
-        body:   (file.is_a?(Fog::Model) ? file.body : file),
+        key: key_component(type, key),
+        body: (file.is_a?(Fog::Model) ? file.body : file),
         public: public?
       )
     end
 
     def path
-      @path && !@path.empty? ? @path : nil
+      @path.presence
     end
   end
 end

data/lib/dis/layers.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Dis
   # = Dis Layers
@@ -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

@@ -1,7 +1,7 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
-require 'dis/model/class_methods'
-require 'dis/model/data'
+require "dis/model/class_methods"
+require "dis/model/data"
 
 module Dis
   # = Dis Model
@@ -103,7 +103,7 @@ module Dis
     # <tt>content_hash</tt> to nil.
     def data=(raw_data)
       new_data = Dis::Model::Data.new(self, raw_data)
-      attribute_will_change!('data') unless new_data == dis_data
+      attribute_will_change!("data") unless new_data == dis_data
       @dis_data = new_data
       dis_set :content_hash, if raw_data.nil?
                                nil
@@ -115,7 +115,7 @@ module Dis
 
     # Returns true if the data has been changed since the object was last saved.
     def data_changed?
-      changes.include?('data')
+      changes.include?("data")
     end
 
     def dis_stored?
@@ -135,6 +135,7 @@ module Dis
 
     def cleanup_data
       return if @previous_content_hash.blank?
+
       dis_data.expire(@previous_content_hash)
       @previous_content_hash = nil
     end
@@ -167,7 +168,7 @@ module Dis
 
     # We don't want the data column when doing a partial write.
     def keys_for_partial_write
-      super.reject { |a| a == 'data' }
+      super.reject { |a| a == "data" }
     end
   end
 end

data/lib/dis/model/class_methods.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Dis
   module Model

data/lib/dis/model/data.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Dis
   module Model
@@ -26,7 +26,7 @@ module Dis
 
       # Returns the data as a binary string.
       def read
-        @cached ||= read_from(closest)
+        @read ||= read_from(closest)
       end
 
       # Will be true if data has been explicitely set.
@@ -60,6 +60,7 @@ module Dis
       # Stores the data. Returns a hash of the content for reference.
       def store!
         raise Dis::Errors::NoDataError unless raw?
+
         Dis::Storage.store(storage_type, raw)
       end
 
@@ -83,6 +84,7 @@ module Dis
 
       def read_from(object)
         return nil unless object
+
         if object.respond_to?(:body)
           object.body
         elsif object.respond_to?(:read)
@@ -104,7 +106,7 @@ module Dis
       end
 
       def stored?
-        @record.dis_stored? && !content_hash.blank?
+        @record.dis_stored? && content_hash.present?
       end
 
       def stored

data/lib/dis/storage.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Dis
   # = Dis Storage
@@ -107,9 +107,7 @@ module Dis
             fetch_count += 1
             layer.get(type, key)
           end.call
-        end
-
-        raise Dis::Errors::NotFoundError unless result
+        end || raise(Dis::Errors::NotFoundError)
 
         store_immediately!(type, result) if fetch_count > 1
         result

data/lib/dis/validations.rb

@@ -1,3 +1,3 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
-require 'dis/validations/data_presence'
+require "dis/validations/data_presence"

data/lib/dis/validations/data_presence.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Dis
   module Validations

data/lib/dis/version.rb

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

data/lib/rails/generators/dis/install/install_generator.rb

@@ -1,16 +1,16 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
-require 'rails/generators'
-require 'rails/generators/rails/model/model_generator'
+require "rails/generators"
+require "rails/generators/rails/model/model_generator"
 
 module Dis
   module Generators
     class InstallGenerator < Rails::Generators::Base
-      desc 'Creates the Dis initializer'
-      source_root File.expand_path('../templates', __FILE__)
+      desc "Creates the Dis initializer"
+      source_root File.expand_path("templates", __dir__)
 
       def create_initializer
-        template 'initializer.rb', File.join('config', 'initializers', 'dis.rb')
+        template "initializer.rb", File.join("config", "initializers", "dis.rb")
       end
     end
   end

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

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # 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/rails/generators/dis/model/model_generator.rb

@@ -1,12 +1,12 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
-require 'rails/generators'
-require 'rails/generators/rails/model/model_generator'
+require "rails/generators"
+require "rails/generators/rails/model/model_generator"
 
 module Dis
   module Generators
     class ModelGenerator < Rails::Generators::ModelGenerator
-      desc 'Creates a Dis model'
+      desc "Creates a Dis model"
 
       def initialize(args, *options)
         super(inject_dis_attributes(args), *options)
@@ -14,7 +14,7 @@ module Dis
 
       def add_model_extension
         inject_into_file(
-          File.join('app/models', class_path, "#{file_name}.rb"),
+          File.join("app/models", class_path, "#{file_name}.rb"),
           after: "ActiveRecord::Base\n"
         ) do
           "  include Dis::Model\n"
@@ -32,12 +32,12 @@ module Dis
       end
 
       def dis_attributes
-        %w(
+        %w[
           content_hash:string
           content_type:string
           content_length:integer
           filename:string
-        )
+        ]
       end
     end
   end

data/lib/tasks/dis.rake

@@ -1,15 +1,15 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 namespace :dis do
-  desc 'Check stuff'
+  desc "Check stuff"
   task consistency_check: :environment do
-    unless ENV['MODELS']
+    unless ENV["MODELS"]
       puts "Usage: #{$PROGRAM_NAME} dis:consistency_check " \
-           'MODELS=Avatar,Document'
+           "MODELS=Avatar,Document"
       exit
     end
 
-    models = ENV['MODELS'].split(',').map(&:strip).map(&:constantize)
+    models = ENV["MODELS"].split(",").map(&:strip).map(&:constantize)
 
     jobs = Set.new
 
@@ -17,28 +17,24 @@ 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}"
 
       Dis::Storage.layers.each do |layer|
         print "Checking #{layer.name}... "
-        existing = objects
-                   .pmap { |hash| [hash, layer.exists?(model.dis_type, hash)] }
-                   .select(&:last)
-                   .map(&:first)
+
+        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? #&& layer.writeable?
+        next unless layer.delayed? && !layer.readonly?
 
-        jobs += missing.pmap do |hash|
-          [model.dis_type, hash] if Dis::Storage.exists?(model.dis_type, hash)
+        jobs += (missing - global_missing).pmap do |hash|
+          [model.dis_type, hash]
         end.compact
       end
 
@@ -53,8 +49,8 @@ namespace :dis do
     if jobs.any?
       print "#{jobs.length} objects can be transferred to delayed layers, " \
             "queue now? (y/n) "
-      response = STDIN.gets.chomp
-      if response =~ /^y/i
+      response = $stdin.gets.chomp
+      if /^y/i.match?(response)
         puts "Queueing jobs..."
         jobs.each { |type, hash| Dis::Jobs::Store.perform_later(type, hash) }
       end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: dis
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.8
 platform: ruby
 authors:
 - Inge Jørgensen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-13 00:00:00.000000000 Z
+date: 2020-08-31 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: fog-core
   requirement: !ruby/object:Gem::Requirement
@@ -67,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '5.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +80,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
+- !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:
@@ -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: 1.9.2
+      version: 2.4.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.1.2
+signing_key:
 specification_version: 4
 summary: A file store for your Rails app
 test_files: []