dis 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 835c04f15f51b3e319654d2a8040df778c62cc8a
-  data.tar.gz: 2dee85c2af96d2804140d449a79e1d43fc3da22a
+  metadata.gz: 7b2fd660ff2a6498b73046ce44d262e49440e48e
+  data.tar.gz: 9008b0cd219133671c8910dc5353b3a2fe665a0d
 SHA512:
-  metadata.gz: b1f15973ebba3a27e077c3cbcfc779d3e42be633663c5fe1bc64b4662ac37af18da246aac11644e20303b440b649aa53021a5aeadfd284f1b75961c6a1a22ced
-  data.tar.gz: dd16af7aacf26faeeaf9052acc7e7ca2a91df3c2b9ed4b526cbb7b4b85b155aa1e024e00f9f06c79ca890a0a556253ca353e3639e0849f90fbedada66c545417
+  metadata.gz: 98d5e2fe6406b2549902eff4ce453e747b16dae2da095feffef8c66f0b0ec454d94004d2ee0045de5915f01efed958c60d0c5f7cd23b527123c06cfe03ac7a28
+  data.tar.gz: 1ac6bbf53d47be0dfaf54b2be0cc596389eacb9f8cde4a42a98c77d3fa8de15b85bef305c85b08af30443836827e418409e043fbbbfb54eb580f1bfeb759a4d4

data/README.md

@@ -1,4 +1,4 @@
-# Dis [![Build Status](https://travis-ci.org/elektronaut/dis.png)](https://travis-ci.org/elektronaut/dis) [![Code Climate](https://codeclimate.com/github/elektronaut/dis.png)](https://codeclimate.com/github/elektronaut/dis) [![Code Climate](https://codeclimate.com/github/elektronaut/dis/coverage.png)](https://codeclimate.com/github/elektronaut/dis)
+# Dis [![Build Status](https://travis-ci.org/elektronaut/dis.svg?branch=master)](https://travis-ci.org/elektronaut/dis) [![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) [![Dependency Status](https://gemnasium.com/elektronaut/dis.svg)](https://gemnasium.com/elektronaut/dis)
 
 Dis handles file uploads for your Rails app.
 It's similar to [Paperclip](https://github.com/thoughtbot/paperclip)

data/lib/dis/errors.rb

@@ -8,4 +8,4 @@ module Dis
     class NotFoundError < Dis::Errors::Error; end
     class NoDataError < Dis::Errors::Error; end
   end
-end
+end

data/lib/dis/jobs.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 
-require "dis/jobs/delete"
-require "dis/jobs/store"
+require 'dis/jobs/delete'
+require 'dis/jobs/store'

data/lib/dis/layer.rb

@@ -47,7 +47,7 @@ module Dis
   class Layer
     attr_reader :connection
 
-    def initialize(connection, options={})
+    def initialize(connection, options = {})
       options     = default_options.merge(options)
       @connection = connection
       @delayed    = options[:delayed]
@@ -101,17 +101,21 @@ module Dis
     #
     #    layer.exists?("documents", hash)
     def exists?(type, hash)
-      (directory(type, hash) &&
-      directory(type, hash).files.head(key_component(type, hash))) ? true : false
+      if directory(type, hash) &&
+         directory(type, hash).files.head(key_component(type, hash))
+        true
+      else
+        false
+      end
     end
 
     # Retrieves a file from the store.
     #
     #    layer.get("documents", hash)
     def get(type, hash)
-      if dir = directory(type, hash)
-        dir.files.get(key_component(type, hash))
-      end
+      dir = directory(type, hash)
+      return unless dir
+      dir.files.get(key_component(type, hash))
     end
 
     # Deletes a file from the store.
@@ -138,8 +142,8 @@ module Dis
       { delayed: false, readonly: false, public: false, path: nil }
     end
 
-    def directory_component(type, hash)
-      path || ""
+    def directory_component(_type, _hash)
+      path || ''
     end
 
     def key_component(type, hash)
@@ -169,7 +173,7 @@ module Dis
       file.rewind if file.respond_to?(:rewind)
       directory!(type, hash).files.create(
         key:    key_component(type, hash),
-        body:   (file.kind_of?(Fog::Model) ? file.body : file),
+        body:   (file.is_a?(Fog::Model) ? file.body : file),
         public: public?
       )
     end

data/lib/dis/layers.rb

@@ -7,7 +7,7 @@ module Dis
   class Layers
     include Enumerable
 
-    def initialize(layers=[])
+    def initialize(layers = [])
       @layers = layers
     end
 
@@ -28,7 +28,7 @@ module Dis
 
     # Returns a new instance containing only the delayed layers.
     def delayed
-      self.class.new select { |layer| layer.delayed? }
+      self.class.new select(&:delayed?)
     end
 
     # Returns true if one or more delayed layers exist.
@@ -38,7 +38,7 @@ module Dis
 
     # Returns a new instance containing only the immediate layers.
     def immediate
-      self.class.new select { |layer| layer.immediate? }
+      self.class.new select(&:immediate?)
     end
 
     # Returns true if one or more immediate layers exist.
@@ -48,7 +48,7 @@ module Dis
 
     # Returns a new instance containing only the readonly layers.
     def readonly
-      self.class.new select { |layer| layer.readonly? }
+      self.class.new select(&:readonly?)
     end
 
     # Returns true if one or more readonly layers exist.
@@ -58,7 +58,7 @@ module Dis
 
     # Returns a new instance containing only the writeable layers.
     def writeable
-      self.class.new select { |layer| layer.writeable? }
+      self.class.new select(&:writeable?)
     end
 
     # Returns true if one or more writeable layers exist.
@@ -66,4 +66,4 @@ module Dis
       writeable.any?
     end
   end
-end
+end

data/lib/dis/model/class_methods.rb

@@ -25,7 +25,7 @@ module Dis
       #   class Document < ActiveRecord::Base; end
       #   Document.dis_type # => "documents"
       def dis_type
-        @dis_type ||= self.table_name
+        @dis_type ||= table_name
       end
 
       # Sets the storage type name.

data/lib/dis/model/data.rb

@@ -7,16 +7,16 @@ module Dis
     # Facilitates communication between the model and the storage,
     # and holds any newly assigned data before the record is saved.
     class Data
-      def initialize(record, raw=nil)
+      def initialize(record, raw = nil)
         @record = record
         @raw = raw
       end
 
       # Returns true if two Data objects represent the same data.
-      def ==(comp)
+      def ==(other)
         # TODO: This can be made faster by
         # comparing hashes for stored objects.
-        comp.read == read
+        other.read == read
       end
 
       # Returns true if data exists either in memory or in storage.
@@ -86,15 +86,19 @@ module Dis
         if object.respond_to?(:body)
           object.body
         elsif object.respond_to?(:read)
-          object.rewind
-          response = object.read
-          object.rewind
-          response
+          rewind_and_read(object)
         else
           object
         end
       end
 
+      def rewind_and_read(object)
+        object.rewind
+        response = object.read
+        object.rewind
+        response
+      end
+
       def storage_type
         @record.class.dis_type
       end
@@ -110,9 +114,7 @@ module Dis
         )
       end
 
-      def raw
-        @raw
-      end
+      attr_reader :raw
     end
   end
-end
+end

data/lib/dis/model.rb

@@ -76,7 +76,7 @@ module Dis
   # If you want to validate content types, size or similar, simply use standard
   # Rails validations on the metadata attributes:
   #
-  #   validates :content_type, presence: true, format: /\Aapplication\/(x\-)?pdf\z/
+  #   validates :content_type, presence: true, format: /\Aapplication\/pdf\z/
   #   validates :filename, presence: true, format: /\A[\w_\-\.]+\.pdf\z/i
   #   validates :content_length, numericality: { less_than: 5.megabytes }
   module Model
@@ -125,9 +125,9 @@ module Dis
     private
 
     def cleanup_data
-      if previous_hash = changes[dis_attribute(:content_hash)].try(&:first)
-        dis_data.expire(previous_hash)
-      end
+      previous_hash = changes[dis_attribute(:content_hash)].try(&:first)
+      return unless previous_hash
+      dis_data.expire(previous_hash)
     end
 
     def delete_data
@@ -135,9 +135,7 @@ module Dis
     end
 
     def store_data
-      if dis_data.changed?
-        dis_set :content_hash, dis_data.store!
-      end
+      dis_set :content_hash, dis_data.store! if dis_data.changed?
     end
 
     def dis_get(attribute_name)
@@ -158,7 +156,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/storage.rb

@@ -19,15 +19,15 @@ module Dis
     class << self
       # Returns a hex digest for a given binary. Accepts files, strings
       # and Fog models.
-      def file_digest(file, &block)
+      def file_digest(file)
         hash = case file
-        when Fog::Model
-          digest.hexdigest(file.body)
-        when String
-          digest.hexdigest(file)
-        else
-          digest.file(file.path).hexdigest
-        end
+               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
@@ -83,15 +83,15 @@ module Dis
       # Returns an instance of Fog::Model.
       def get(type, hash)
         require_layers!
-        miss = false
-        layers.each do |layer|
-          if result = layer.get(type, hash)
-            store_immediately!(type, result) if miss
+
+        layers.inject(true) do |no_misses, layer|
+          result = layer.get(type, hash)
+          if result
+            store_immediately!(type, result) unless no_misses
             return result
-          else
-            miss = true
           end
         end
+
         raise Dis::Errors::NotFoundError
       end
 
@@ -136,15 +136,11 @@ module Dis
       end
 
       def require_layers!
-        unless layers.any?
-          raise Dis::Errors::NoLayersError
-        end
+        raise Dis::Errors::NoLayersError unless layers.any?
       end
 
       def require_writeable_layers!
-        unless layers.immediate.writeable.any?
-          raise Dis::Errors::NoLayersError
-        end
+        raise Dis::Errors::NoLayersError unless layers.immediate.writeable.any?
       end
 
       def digest

data/lib/dis/validations/data_presence.rb

@@ -8,10 +8,8 @@ module Dis
       # Validates that a record has data, either freshly assigned or
       # persisted in the storage. Adds a `:blank` error on `:data`if not.
       def validate(record)
-        unless record.data?
-          record.errors.add(:data, :blank)
-        end
+        record.errors.add(:data, :blank) unless record.data?
       end
     end
   end
-end
+end

data/lib/dis/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Dis
-  VERSION = "1.0.4"
+  VERSION = '1.0.5'.freeze
 end

data/lib/dis.rb

@@ -1,18 +1,18 @@
 # encoding: utf-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"
-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/rails/generators/dis/install/install_generator.rb

@@ -6,12 +6,12 @@ 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', __FILE__)
 
       def create_initializer
         template 'initializer.rb', File.join('config', 'initializers', 'dis.rb')
       end
     end
   end
-end
+end

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

@@ -3,7 +3,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/rails/generators/dis/model/model_generator.rb

@@ -6,14 +6,17 @@ 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)
       end
 
       def add_model_extension
-        inject_into_file File.join('app/models', class_path, "#{file_name}.rb"), after: "ActiveRecord::Base\n" do
+        inject_into_file(
+          File.join('app/models', class_path, "#{file_name}.rb"),
+          after: "ActiveRecord::Base\n"
+        ) do
           "  include Dis::Model\n"
         end
       end
@@ -22,20 +25,20 @@ module Dis
 
       def inject_dis_attributes(args)
         if args.any?
-          args = [args[0]] + dis_attributes + args[1..args.length]
+          [args[0]] + dis_attributes + args[1..args.length]
         else
           args
         end
       end
 
       def dis_attributes
-        %w{
+        %w(
           content_hash:string
           content_type:string
           content_length:integer
           filename:string
-        }
+        )
       end
     end
   end
-end
+end

data/lib/tasks/dis.rake

@@ -1,32 +1,32 @@
 # encoding: utf-8
 
 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)
 
     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) }
+                .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)
+                   .pmap { |hash| [hash, layer.exists?(model.dis_type, hash)] }
+                   .select(&:last)
+                   .map(&:first)
         missing = objects - existing
         puts "#{layer.name}: #{existing.length} (#{missing.length} missing)"
 

metadata

@@ -1,57 +1,77 @@
 --- !ruby/object:Gem::Specification
 name: dis
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Inge Jørgensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-15 00:00:00.000000000 Z
+date: 2016-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.26.0
+        version: '1.35'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.26.0
+        version: '1.35'
+- !ruby/object:Gem::Dependency
+  name: fog-local
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pmap
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.5.1
 description: Dis is a Rails plugin that stores your file uploads and other binary
   blobs.
 email: