mongoid-grid_fs 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2adba8b6e95828d619a449203b5d8d452110b353
-  data.tar.gz: 3777d4236521b3c2b42d177551c8bb5915c79bff
+SHA256:
+  metadata.gz: badeed24be962cfe0703db3b729a4d3941e4f707774be209b224b37f74fb709a
+  data.tar.gz: df22b750f61661cff90eaaceaf6faeb73ea75cbab44e2b52c4ae95bb22989f8d
 SHA512:
-  metadata.gz: 70cd98b5cc29e726e957b5491e2464e69230b6086864191b2d3af114de4703efc0670fc32e8123e872d24f28825173828efbecbabe2a73d7d01a7ad7381becff
-  data.tar.gz: 4654cf20cd201027cb99c771a325889d9603c3d5fe58f2fa55192a81670d87e6a814e68d28beff40d944c9cf67d154834bc7024f9fce927d1c782abc0582e1fb
+  metadata.gz: 59c26d3fbbd58640ca92808f1ee46f312092ed9139b551da5f99bf8418eac76815943a980e53e86347980a12e4089c7c8529eb3e548bf0bb0fe6b2753b4bf29f
+  data.tar.gz: 4ba07aa7b6319fcb8c62c0a50edec2e99321c0827220292b1dca1fd9f3710f1b37f5c9e3cbed1d9f15d77dc7a6a34058a4cb2b0d942e93895e5097a860a7bcf7

data/README.md

@@ -1,9 +1,8 @@
 mongoid-grid_fs
 ---------------
 
-[![Gem Version](https://img.shields.io/gem/v/mongoid-grid_fs.svg)](https://rubygems.org/gems/mongoid-grid_fs)
-[![Build Status](https://travis-ci.org/mongoid/mongoid-grid_fs.svg)](https://travis-ci.org/mongoid/mongoid-grid_fs)
-[![Gem Downloads](https://img.shields.io/gem/dt/mongoid-grid_fs.svg)](https://rubygems.org/gems/mongoid-grid_fs)
+[![Gem Version](https://badge.fury.io/rb/mongoid-grid_fs.svg)](https://badge.fury.io/rb/mongoid-grid_fs)
+[![CI](https://github.com/mongoid/mongoid-grid_fs/actions/workflows/ci.yml/badge.svg)](https://github.com/mongoid/mongoid-grid_fs/actions/workflows/ci.yml)
 
 A pure Mongoid/Moped implementation of the MongoDB GridFS specification
 

data/Rakefile

@@ -12,4 +12,4 @@ end
 require 'rubocop/rake_task'
 RuboCop::RakeTask.new(:rubocop)
 
-task default: [:rubocop, :test]
+task default: %i[rubocop test]

data/lib/mongoid/grid_fs/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   class GridFs
-    VERSION = '2.4.0'.freeze
+    VERSION = '2.5.0'.freeze
   end
 end

data/lib/mongoid/grid_fs.rb

@@ -107,21 +107,13 @@ module Mongoid
 
           file.id = attributes.delete(:_id) if attributes.key?(:_id)
 
-          if attributes.key?(:content_type)
-            attributes[:contentType] = attributes.delete(:content_type)
-          end
+          attributes[:contentType] = attributes.delete(:content_type) if attributes.key?(:content_type)
 
-          if attributes.key?(:upload_date)
-            attributes[:uploadDate] = attributes.delete(:upload_date)
-          end
+          attributes[:uploadDate] = attributes.delete(:upload_date) if attributes.key?(:upload_date)
 
-          if attributes.key?(:meta_data)
-            attributes[:metadata] = attributes.delete(:meta_data)
-          end
+          attributes[:metadata] = attributes.delete(:meta_data) if attributes.key?(:meta_data)
 
-          if attributes.key?(:aliases)
-            attributes[:aliases] = Array(attributes.delete(:aliases)).flatten.compact.map(&:to_s)
-          end
+          attributes[:aliases] = Array(attributes.delete(:aliases)).flatten.compact.map(&:to_s) if attributes.key?(:aliases)
 
           md5 = Digest::MD5.new
           length = 0
@@ -142,7 +134,7 @@ module Mongoid
             GridFs.chunking(io, chunkSize) do |buf|
               md5 << buf
               length += buf.size
-              chunk = file.chunks.create(data: binary_for(buf), n: n)
+              file.chunks.create(data: binary_for(buf), n: n)
               n += 1
             end
           end
@@ -154,7 +146,7 @@ module Mongoid
           file.update_attributes(attributes)
 
           file
-        rescue
+        rescue StandardError
           file.destroy
           raise
         end
@@ -173,7 +165,7 @@ module Mongoid
 
         def delete(id)
           file_model.find(id).destroy
-        rescue
+        rescue StandardError
           nil
         end
 
@@ -256,7 +248,7 @@ module Mongoid
 
         self.defaults = Defaults.new
 
-        defaults.chunkSize = 4 * (mb = 2**20)
+        defaults.chunkSize = 4 * (2**20)
         defaults.contentType = 'application/octet-stream'
 
         field(:length, type: Integer, default: 0)
@@ -269,11 +261,11 @@ module Mongoid
         field(:aliases, type: Array)
         begin
             field(:metadata)
-          rescue
+          rescue StandardError
             nil
           end
 
-        required = %w(length chunkSize uploadDate md5)
+        required = %w[length chunkSize uploadDate md5]
 
         required.each do |f|
           validates_presence_of(f)
@@ -284,7 +276,7 @@ module Mongoid
         index(uploadDate: 1)
         index(md5: 1)
 
-        has_many(:chunks, class_name: chunk_model_name, inverse_of: :files, dependent: :destroy, order: [:n, :asc])
+        has_many(:chunks, class_name: chunk_model_name, inverse_of: :files, dependent: :destroy, order: %i[n asc])
 
         def path
           filename
@@ -320,7 +312,7 @@ module Mongoid
 
           while fetched < chunks.size
             chunks.where(:n.lt => fetched + limit, :n.gte => fetched)
-                  .order_by([:n, :asc]).each do |chunk|
+                  .order_by(%i[n asc]).each do |chunk|
               yield(chunk.to_s)
             end
 
@@ -456,7 +448,7 @@ module Mongoid
     end
 
     def self.chunking(io, chunk_size, &block)
-      if io.method(:read).arity == 0
+      if io.method(:read).arity.zero?
         data = io.read
         i = 0
         loop do
@@ -481,7 +473,7 @@ module Mongoid
         pos = io.pos
         io.flush
         io.rewind
-      rescue
+      rescue StandardError
         nil
       end
 
@@ -490,7 +482,7 @@ module Mongoid
       ensure
         begin
           io.pos = pos
-        rescue
+        rescue StandardError
           nil
         end
       end
@@ -499,7 +491,7 @@ module Mongoid
     def self.extract_basename(object)
       filename = nil
 
-      [:original_path, :original_filename, :path, :filename, :pathname].each do |msg|
+      %i[original_path original_filename path filename pathname].each do |msg|
         if object.respond_to?(msg)
           filename = object.send(msg)
           break
@@ -563,16 +555,14 @@ end
 #
 if defined?(Rails)
   class Mongoid::GridFs::Engine < Rails::Engine
-    paths['app/models'] = File.dirname(File.expand_path('../', __FILE__))
+    paths['app/models'] = File.dirname(File.expand_path(__dir__))
   end
 
   module Mongoid::GridFsHelper
     def grid_fs_render(grid_fs_file, options = {})
       options.to_options!
 
-      if (options[:inline] == false) || (options[:attachment] == true)
-        headers['Content-Disposition'] = "attachment; filename=#{grid_fs_file.attachment_filename}"
-      end
+      headers['Content-Disposition'] = "attachment; filename=#{grid_fs_file.attachment_filename}" if (options[:inline] == false) || (options[:attachment] == true)
 
       self.content_type = grid_fs_file.content_type
       self.response_body = grid_fs_file

data/test/helper.rb

@@ -1,5 +1,3 @@
-# -*- encoding : utf-8 -*-
-
 require 'rails'
 require 'stringio'
 
@@ -22,6 +20,4 @@ end
 Mongo::Logger.logger.level = Logger::INFO if defined?(Mongo) == 'constant'
 
 # Avoid annoying deprecation warning
-if I18n.respond_to?(:enforce_available_locales=)
-  I18n.enforce_available_locales = false
-end
+I18n.enforce_available_locales = false if I18n.respond_to?(:enforce_available_locales=)

data/test/mongoid-grid_fs_test.rb

@@ -1,6 +1,6 @@
 require_relative 'helper'
 
-Testing Mongoid::GridFs do
+_testing Mongoid::GridFs do
   ##
   #
   GridFs = Mongoid::GridFs
@@ -52,7 +52,7 @@ Testing Mongoid::GridFs do
   context '#get' do
     test 'default' do
       id = assert { GridFs::File.last.id }
-      g = assert { GridFs.get(id) }
+      assert { GridFs.get(id) }
     end
   end
 
@@ -61,7 +61,7 @@ Testing Mongoid::GridFs do
   context '#delete' do
     test 'default' do
       id = assert { GridFs::File.last.id }
-      g = assert { GridFs.get(id) }
+      assert { GridFs.get(id) }
       assert { GridFs.delete(id) }
       assert_raises(Mongoid::Errors::DocumentNotFound) { GridFs.get(id) }
     end
@@ -163,7 +163,7 @@ Testing Mongoid::GridFs do
       test 'having file size more than 42mb' do
         require 'tempfile'
 
-        orig, copy = %w(orig copy).map do |suffix|
+        orig, copy = %w[orig copy].map do |suffix|
           Tempfile.new("mongoid-grid_fs~43mb.#{suffix}")
         end
 
@@ -202,7 +202,7 @@ Testing Mongoid::GridFs do
 
         count = GridFs::File.count
 
-        assert { ns.file_model.count == 0 }
+        assert { ns.file_model.count.zero? }
         assert { ns.put __FILE__ }
         assert { ns.file_model.count == 1 }
 

data/test/testing.rb

@@ -1,7 +1,7 @@
-# -*- encoding : utf-8 -*-
+
 require 'minitest/autorun'
 
-testdir = File.expand_path(File.dirname(__FILE__))
+testdir = __dir__
 rootdir = File.dirname(testdir)
 libdir = File.join(rootdir, 'lib')
 
@@ -16,7 +16,7 @@ class Testing
     def self.for(*args)
       string = args.flatten.compact.join('-')
       words = string.to_s.scan(/\w+/)
-      words.map! { |word| word.gsub /[^0-9a-zA-Z_-]/, '' }
+      words.map! { |word| word.gsub(/[^0-9a-zA-Z_-]/, '') }
       words.delete_if { |word| word.nil? || word.strip.empty? }
       new(words.join('-').downcase)
     end
@@ -35,7 +35,7 @@ class Testing
   end
 end
 
-def Testing(*args, &block)
+def _testing(*args, &block)
   Class.new(::Minitest::Test) do
     i_suck_and_my_tests_are_order_dependent!
 
@@ -62,7 +62,7 @@ def Testing(*args, &block)
       def slug_for(*args)
         string = [context, args].flatten.compact.join('-')
         words = string.to_s.scan(/\w+/)
-        words.map! { |word| word.gsub /[^0-9a-zA-Z_-]/, '' }
+        words.map! { |word| word.gsub(/[^0-9a-zA-Z_-]/, '') }
         words.delete_if { |word| word.nil? || word.strip.empty? }
         words.join('-').downcase.sub(/_$/, '')
       end
@@ -72,7 +72,7 @@ def Testing(*args, &block)
       end
 
       def testno
-        '%05d' % (@testno ||= 0)
+        format('%05d', (@testno ||= 0))
       ensure
         @testno += 1
       end
@@ -111,7 +111,7 @@ def Testing(*args, &block)
     #
     const_set(:Testno, '0')
     slug = slug_for(*args).tr('-', '_')
-    name = ['TESTING', '%03d' % const_get(:Testno), slug].delete_if(&:empty?).join('_')
+    name = ['TESTING', format('%03d', const_get(:Testno)), slug].delete_if(&:empty?).join('_')
     name = name.upcase!
     const_set(:Name, name)
     const_set(:Missing, Object.new.freeze)
@@ -125,9 +125,7 @@ def Testing(*args, &block)
         options = args.first
         expected = getopt(:expected, options) { missing }
         actual = getopt(:actual, options) { missing }
-        if (expected == missing) && (actual == missing)
-          actual, expected, *ignored = options.to_a.flatten
-        end
+        actual, expected, = options.to_a.flatten if (expected == missing) && (actual == missing)
         expected = expected.call if expected.respond_to?(:call)
         actual = actual.call if actual.respond_to?(:call)
         assert_equal(expected, actual)
@@ -135,16 +133,14 @@ def Testing(*args, &block)
 
       result = if block
                  label = "assert(#{args.join(' ')})"
-                 result = nil
-                 result = yield
-                 __assert__(result, label)
-                 result
+                 yield
                else
                  result = args.shift
                  label = "assert(#{args.join(' ')})"
-                 __assert__(result, label)
                  result
-      end
+               end
+      __assert__(result, label)
+      result
     end
 
     def missing
@@ -191,7 +187,7 @@ end
 
 if $PROGRAM_NAME == __FILE__
 
-  Testing 'Testing' do
+  _testing 'Testing' do
     testing('foo') { assert true }
     test { assert true }
     p instance_methods.grep(/test/)

metadata

@@ -1,35 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-grid_fs
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Ara T. Howard
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-07-11 00:00:00.000000000 Z
+date: 2023-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: mongoid
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '8.0'
-  type: :runtime
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mongoid-danger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: 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: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.36.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.36.0
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -51,25 +101,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.7.0
+        version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
-  type: :development
+        version: '9.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.7.0
+        version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '9.0'
 description: A pure Mongoid/Moped implementation of the MongoDB GridFS specification
 email:
 - ara.t.howard@gmail.com
@@ -93,7 +143,7 @@ homepage: https://github.com/mongoid/mongoid-grid_fs
 licenses:
 - Ruby
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -108,9 +158,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
-signing_key: 
+rubygems_version: 3.3.17
+signing_key:
 specification_version: 4
 summary: A MongoDB GridFS implementation for Mongoid
 test_files: