mongoid-grid_fs 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c175ff638f8c7bea0bf38455b0d2ed073f054edb
-  data.tar.gz: e3dd05342dd15cae3de9969490738f24761987d6
+  metadata.gz: 2adba8b6e95828d619a449203b5d8d452110b353
+  data.tar.gz: 3777d4236521b3c2b42d177551c8bb5915c79bff
 SHA512:
-  metadata.gz: 09bc2641f04c456a88a960eee4300ee70ea01996010abc05350d3bd45f5692db8e47e03de4e6dd3446145ec74c2dfd3c9de271e6bb524651a3a1b16c4cff3053
-  data.tar.gz: 7a8303cdce64c6a2e92d54a8e174e629cd18f44f1a726aeb2baf98564d3eab38e128ab472a4174a35bdc7e441cd14649aaadf9bd25bccec58a9bfb6c4b52434e
+  metadata.gz: 70cd98b5cc29e726e957b5491e2464e69230b6086864191b2d3af114de4703efc0670fc32e8123e872d24f28825173828efbecbabe2a73d7d01a7ad7381becff
+  data.tar.gz: 4654cf20cd201027cb99c771a325889d9603c3d5fe58f2fa55192a81670d87e6a814e68d28beff40d944c9cf67d154834bc7024f9fce927d1c782abc0582e1fb

data/README.md

@@ -2,7 +2,7 @@ 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/ahoward/mongoid-grid_fs.svg)](https://travis-ci.org/ahoward/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)
 
 A pure Mongoid/Moped implementation of the MongoDB GridFS specification
@@ -68,10 +68,7 @@ It has the following features:
 CONTRIBUTING
 ------------
 
-```
-$ bundle install
-$ bundle exec rake test
-```
+See [CONTRIBUTING](CONTRIBUTING.md).
 
 LICENSE
 -------

data/Rakefile

@@ -1,12 +1,15 @@
-require "bundler/gem_tasks"
-require "bundler/setup"
-require "rake/testtask"
+require 'bundler/gem_tasks'
+require 'bundler/setup'
+require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << "lib"
-  t.libs << "test"
-  t.pattern = "test/**/*_test.rb"
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
   t.verbose = false
 end
 
-task :default => :test
+require 'rubocop/rake_task'
+RuboCop::RakeTask.new(:rubocop)
+
+task default: [:rubocop, :test]

data/lib/mongoid-grid_fs.rb

@@ -1 +1 @@
-require "mongoid/grid_fs"
+require 'mongoid/grid_fs'

data/lib/mongoid/grid_fs.rb

@@ -1,585 +1,583 @@
-require "mongoid"
-require "mime/types"
+require 'mongoid'
+require 'mime/types'
 
 ##
 #
-  module Mongoid
-    class GridFs
-      class << GridFs
-        attr_accessor :namespace
-        attr_accessor :file_model
-        attr_accessor :chunk_model
-
-        def init!
-          GridFs.build_namespace_for(:Fs)
-
-          GridFs.namespace = Fs
-          GridFs.file_model = Fs.file_model
-          GridFs.chunk_model = Fs.chunk_model
-
-          const_set(:File, Fs.file_model)
-          const_set(:Chunk, Fs.chunk_model)
-
-          to_delegate = %w(
-            put
-            get
-            delete
-            find
-            []
-            []=
-            clear
-          )
-
-          to_delegate.each do |method|
-            class_eval <<-__
-              def self.#{ method }(*args, &block)
-                ::Mongoid::GridFs::Fs::#{ method }(*args, &block)
+module Mongoid
+  class GridFs
+    class << GridFs
+      attr_accessor :namespace
+      attr_accessor :file_model
+      attr_accessor :chunk_model
+
+      def init!
+        GridFs.build_namespace_for(:Fs)
+
+        GridFs.namespace = Fs
+        GridFs.file_model = Fs.file_model
+        GridFs.chunk_model = Fs.chunk_model
+
+        const_set(:File, Fs.file_model)
+        const_set(:Chunk, Fs.chunk_model)
+
+        to_delegate = %w(
+          put
+          get
+          delete
+          find
+          []
+          []=
+          clear
+        )
+
+        to_delegate.each do |method|
+          class_eval <<-__
+              def self.#{method}(*args, &block)
+                ::Mongoid::GridFs::Fs::#{method}(*args, &block)
               end
             __
-          end
         end
       end
+    end
 
     ##
     #
-      def GridFs.namespace_for(prefix)
-        prefix = prefix.to_s.downcase
-        const = "::GridFs::#{ prefix.to_s.camelize }"
-        namespace = const.split(/::/).last
-        const_defined?(namespace) ? const_get(namespace) : build_namespace_for(namespace)
-      end
+    def self.namespace_for(prefix)
+      prefix = prefix.to_s.downcase
+      const = "::GridFs::#{prefix.to_s.camelize}"
+      namespace = const.split(/::/).last
+      const_defined?(namespace) ? const_get(namespace) : build_namespace_for(namespace)
+    end
 
     ##
     #
-      def GridFs.build_namespace_for(prefix)
-        prefix = prefix.to_s.downcase
-        const = prefix.camelize
-
-        namespace =
-          Module.new do
-            module_eval(&NamespaceMixin)
-            self
-          end
+    def self.build_namespace_for(prefix)
+      prefix = prefix.to_s.downcase
+      const = prefix.camelize
+
+      namespace =
+        Module.new do
+          module_eval(&NamespaceMixin)
+          self
+        end
 
-        const_set(const, namespace)
+      const_set(const, namespace)
 
-        file_model = build_file_model_for(namespace)
-        chunk_model = build_chunk_model_for(namespace)
+      file_model = build_file_model_for(namespace)
+      chunk_model = build_chunk_model_for(namespace)
 
-        file_model.namespace = namespace
-        chunk_model.namespace = namespace
+      file_model.namespace = namespace
+      chunk_model.namespace = namespace
 
-        file_model.chunk_model = chunk_model
-        chunk_model.file_model = file_model
+      file_model.chunk_model = chunk_model
+      chunk_model.file_model = file_model
 
-        namespace.prefix = prefix
-        namespace.file_model = file_model
-        namespace.chunk_model = chunk_model
+      namespace.prefix = prefix
+      namespace.file_model = file_model
+      namespace.chunk_model = chunk_model
 
-        namespace.send(:const_set, :File, file_model)
-        namespace.send(:const_set, :Chunk, chunk_model)
+      namespace.send(:const_set, :File, file_model)
+      namespace.send(:const_set, :Chunk, chunk_model)
 
-        #at_exit{ file_model.create_indexes rescue nil }
-        #at_exit{ chunk_model.create_indexes rescue nil }
+      # at_exit{ file_model.create_indexes rescue nil }
+      # at_exit{ chunk_model.create_indexes rescue nil }
 
-        const_get(const)
-      end
+      const_get(const)
+    end
 
-      NamespaceMixin = proc do
-        class << self
-          attr_accessor :prefix
-          attr_accessor :file_model
-          attr_accessor :chunk_model
+    NamespaceMixin = proc do
+      class << self
+        attr_accessor :prefix
+        attr_accessor :file_model
+        attr_accessor :chunk_model
 
-          def to_s
-            prefix
-          end
+        def to_s
+          prefix
+        end
 
-          def namespace
-            prefix
-          end
+        def namespace
+          prefix
+        end
 
-          def put(readable, attributes = {})
-            file = file_model.create
-            attributes.to_options!
+        def put(readable, attributes = {})
+          file = file_model.create
+          attributes.to_options!
 
-            if attributes.has_key?(:id)
-              file.id = attributes.delete(:id)
-            end
+          file.id = attributes.delete(:id) if attributes.key?(:id)
 
-            if attributes.has_key?(:_id)
-              file.id = attributes.delete(:_id)
-            end
+          file.id = attributes.delete(:_id) if attributes.key?(:_id)
 
-            if attributes.has_key?(:content_type)
-              attributes[:contentType] = attributes.delete(:content_type)
-            end
+          if attributes.key?(:content_type)
+            attributes[:contentType] = attributes.delete(:content_type)
+          end
 
-            if attributes.has_key?(:upload_date)
-              attributes[:uploadDate] = attributes.delete(:upload_date)
-            end
+          if attributes.key?(:upload_date)
+            attributes[:uploadDate] = attributes.delete(:upload_date)
+          end
 
-            if attributes.has_key?(:meta_data)
-              attributes[:metadata] = attributes.delete(:meta_data)
-            end
+          if attributes.key?(:meta_data)
+            attributes[:metadata] = attributes.delete(:meta_data)
+          end
 
-            if attributes.has_key?(:aliases)
-              attributes[:aliases] = Array(attributes.delete(:aliases)).flatten.compact.map{|a| "#{ a }"}
-            end
+          if attributes.key?(:aliases)
+            attributes[:aliases] = Array(attributes.delete(:aliases)).flatten.compact.map(&:to_s)
+          end
 
-            md5 = Digest::MD5.new
-            length = 0
-            chunkSize = file.chunkSize
-            n = 0
+          md5 = Digest::MD5.new
+          length = 0
+          chunkSize = file.chunkSize
+          n = 0
 
-            GridFs.reading(readable) do |io|
-              unless attributes.has_key?(:filename)
-                attributes[:filename] =
-                  [file.id.to_s, GridFs.extract_basename(io)].join('/').squeeze('/')
-              end
+          GridFs.reading(readable) do |io|
+            unless attributes.key?(:filename)
+              attributes[:filename] =
+                [file.id.to_s, GridFs.extract_basename(io)].join('/').squeeze('/')
+            end
 
-              unless attributes.has_key?(:contentType)
-                attributes[:contentType] =
-                  GridFs.extract_content_type(attributes[:filename]) || file.contentType
-              end
+            unless attributes.key?(:contentType)
+              attributes[:contentType] =
+                GridFs.extract_content_type(attributes[:filename]) || file.contentType
+            end
 
-              GridFs.chunking(io, chunkSize) do |buf|
-                md5 << buf
-                length += buf.size
-                chunk = file.chunks.create(data: binary_for(buf), n: n)
-                n += 1
-              end
+            GridFs.chunking(io, chunkSize) do |buf|
+              md5 << buf
+              length += buf.size
+              chunk = file.chunks.create(data: binary_for(buf), n: n)
+              n += 1
             end
+          end
 
-            attributes[:length] ||= length
-            attributes[:uploadDate] ||= Time.now.utc
-            attributes[:md5] ||= md5.hexdigest
+          attributes[:length] ||= length
+          attributes[:uploadDate] ||= Time.now.utc
+          attributes[:md5] ||= md5.hexdigest
 
-            file.update_attributes(attributes)
+          file.update_attributes(attributes)
 
-            file
-          rescue
-            file.destroy
-            raise
-          end
+          file
+        rescue
+          file.destroy
+          raise
+        end
 
-          def binary_for(*buf)
-            if defined?(Moped::BSON)
-              Moped::BSON::Binary.new(:generic, buf.join)
-            else
-              BSON::Binary.new(buf.join, :generic)
-            end
+        def binary_for(*buf)
+          if defined?(Moped::BSON)
+            Moped::BSON::Binary.new(:generic, buf.join)
+          else
+            BSON::Binary.new(buf.join, :generic)
           end
+        end
 
-          def get(id)
-            file_model.find(id)
-          end
+        def get(id)
+          file_model.find(id)
+        end
 
-          def delete(id)
-            file_model.find(id).destroy
-          rescue
-            nil
-          end
+        def delete(id)
+          file_model.find(id).destroy
+        rescue
+          nil
+        end
 
-          def where(conditions = {})
-            case conditions
-              when String
-                file_model.where(:filename => conditions)
-              else
-                file_model.where(conditions)
-            end
+        def where(conditions = {})
+          case conditions
+          when String
+            file_model.where(filename: conditions)
+          else
+            file_model.where(conditions)
           end
+        end
 
-          def find(*args)
-            where(*args).first
-          end
+        def find(*args)
+          where(*args).first
+        end
 
-          def [](filename)
-            file_model.
-              where(:filename => filename.to_s).
-                order_by(:uploadDate => :desc).
-                  limit(1).
-                    first
-          end
+        def [](filename)
+          file_model
+            .where(filename: filename.to_s)
+            .order_by(uploadDate: :desc)
+            .limit(1)
+            .first
+        end
 
-          def []=(filename, readable)
-            put(readable, :filename => filename.to_s)
-          end
+        def []=(filename, readable)
+          put(readable, filename: filename.to_s)
+        end
 
-          def clear
-            file_model.destroy_all
-          end
+        def clear
+          file_model.destroy_all
+        end
 
-        # TODO - opening with a mode = 'w' should return a GridIO::IOProxy
+        # TODO: - opening with a mode = 'w' should return a GridIO::IOProxy
         # implementing a StringIO-like interface
         #
-          def open(filename, mode = 'r', &block)
-            raise NotImplementedError
-          end
+        def open(_filename, _mode = 'r')
+          raise NotImplementedError
         end
       end
+    end
 
     ##
     #
-      class Defaults < ::Hash
-        def method_missing(method, *args, &block)
-          case method.to_s
-            when /(.*)=/
-              key = $1
-              val = args.first
-              update(key => val)
-            else
-              key = method.to_s
-              super unless has_key?(key)
-              fetch(key)
-          end
+    class Defaults < ::Hash
+      def method_missing(method, *args, &block)
+        case method.to_s
+        when /(.*)=/
+          key = Regexp.last_match(1)
+          val = args.first
+          update(key => val)
+        else
+          key = method.to_s
+          super unless key?(key)
+          fetch(key)
         end
       end
+    end
 
     ##
     #
-      def GridFs.build_file_model_for(namespace)
-        prefix = namespace.name.split(/::/).last.downcase
-        file_model_name = "#{ namespace.name }::File"
-        chunk_model_name = "#{ namespace.name }::Chunk"
-
-        Class.new do
-          include Mongoid::Document
-          include Mongoid::Attributes::Dynamic if Mongoid::VERSION.to_i >= 4
-
-          singleton_class = class << self; self; end
-
-          singleton_class.instance_eval do
-            define_method(:name){ file_model_name }
-            attr_accessor :namespace
-            attr_accessor :chunk_model
-            attr_accessor :defaults
-          end
+    def self.build_file_model_for(namespace)
+      prefix = namespace.name.split(/::/).last.downcase
+      file_model_name = "#{namespace.name}::File"
+      chunk_model_name = "#{namespace.name}::Chunk"
 
-          self.store_in :collection => "#{ prefix }.files"
+      Class.new do
+        include Mongoid::Document
+        include Mongoid::Attributes::Dynamic if Mongoid::VERSION.to_i >= 4
 
-          self.defaults = Defaults.new
+        singleton_class = class << self; self; end
 
-          self.defaults.chunkSize = 4 * (mb = 2**20)
-          self.defaults.contentType = 'application/octet-stream'
+        singleton_class.instance_eval do
+          define_method(:name) { file_model_name }
+          attr_accessor :namespace
+          attr_accessor :chunk_model
+          attr_accessor :defaults
+        end
 
-          field(:length, :type => Integer, :default => 0)
-          field(:chunkSize, :type => Integer, :default => defaults.chunkSize)
-          field(:uploadDate, :type => Time, :default => Time.now.utc)
-          field(:md5, :type => String, :default => Digest::MD5.hexdigest(''))
+        store_in collection: "#{prefix}.files"
 
-          field(:filename, :type => String)
-          field(:contentType, :type => String, :default => defaults.contentType)
-          field(:aliases, :type => Array)
-          field(:metadata) rescue nil
+        self.defaults = Defaults.new
 
-          required = %w( length chunkSize uploadDate md5 )
+        defaults.chunkSize = 4 * (mb = 2**20)
+        defaults.contentType = 'application/octet-stream'
 
-          required.each do |f|
-            validates_presence_of(f)
-          end
+        field(:length, type: Integer, default: 0)
+        field(:chunkSize, type: Integer, default: defaults.chunkSize)
+        field(:uploadDate, type: Time, default: Time.now.utc)
+        field(:md5, type: String, default: Digest::MD5.hexdigest(''))
 
-          index({:filename => 1})
-          index({:aliases => 1})
-          index({:uploadDate => 1})
-          index({:md5 => 1})
+        field(:filename, type: String)
+        field(:contentType, type: String, default: defaults.contentType)
+        field(:aliases, type: Array)
+        begin
+            field(:metadata)
+          rescue
+            nil
+          end
 
-          has_many(:chunks, :class_name => chunk_model_name, :inverse_of => :files, :dependent => :destroy, :order => [:n, :asc])
+        required = %w(length chunkSize uploadDate md5)
 
-          def path
-            filename
-          end
+        required.each do |f|
+          validates_presence_of(f)
+        end
 
-          def basename
-            ::File.basename(filename) if filename
-          end
+        index(filename: 1)
+        index(aliases: 1)
+        index(uploadDate: 1)
+        index(md5: 1)
 
-          def attachment_filename(*paths)
-            return basename if basename
+        has_many(:chunks, class_name: chunk_model_name, inverse_of: :files, dependent: :destroy, order: [:n, :asc])
 
-            if paths.empty?
-              paths.push('attachment')
-              paths.push(id.to_s)
-              paths.push(updateDate.iso8601)
-            end
+        def path
+          filename
+        end
 
-            path = paths.join('--')
-            base = ::File.basename(path).split('.', 2).first
-            ext = GridFs.extract_extension(contentType)
+        def basename
+          ::File.basename(filename) if filename
+        end
 
-            "#{ base }.#{ ext }"
-          end
+        def attachment_filename(*paths)
+          return basename if basename
 
-          def prefix
-            self.class.namespace.prefix
+          if paths.empty?
+            paths.push('attachment')
+            paths.push(id.to_s)
+            paths.push(updateDate.iso8601)
           end
 
-          def each(&block)
-            fetched, limit = 0, 7
-
-            while fetched < chunks.size
-              chunks.where(:n.lt => fetched+limit, :n.gte => fetched).
-                order_by([:n, :asc]).each do |chunk|
-                  block.call(chunk.to_s)
-                end
+          path = paths.join('--')
+          base = ::File.basename(path).split('.', 2).first
+          ext = GridFs.extract_extension(contentType)
 
-              fetched += limit
-            end
-          end
+          "#{base}.#{ext}"
+        end
 
-          def slice(*args)
-            case args.first
-              when Range
-                range = args.first
-                first_chunk = (range.min / chunkSize).floor
-                last_chunk = (range.max / chunkSize).floor
-                offset = range.min % chunkSize
-                length = range.max - range.min + 1
-              when Fixnum
-                start = args.first
-                start = self.length + start if start < 0
-                length = args.size == 2 ? args.last : 1
-                first_chunk = (start / chunkSize).floor
-                last_chunk = ((start + length) / chunkSize).floor
-                offset = start % chunkSize
-            end
+        def prefix
+          self.class.namespace.prefix
+        end
 
-            data = ''
+        def each
+          fetched = 0
+          limit = 7
 
-            chunks.where(:n => (first_chunk..last_chunk)).order_by(n: 'asc').each do |chunk|
-              data << chunk
+          while fetched < chunks.size
+            chunks.where(:n.lt => fetched + limit, :n.gte => fetched)
+                  .order_by([:n, :asc]).each do |chunk|
+              yield(chunk.to_s)
             end
 
-            data[offset, length]
+            fetched += limit
           end
+        end
 
-          def data
-            data = ''
-            each{|chunk| data << chunk}
-            data
+        def slice(*args)
+          case args.first
+          when Range
+            range = args.first
+            first_chunk = (range.min / chunkSize).floor
+            last_chunk = (range.max / chunkSize).floor
+            offset = range.min % chunkSize
+            length = range.max - range.min + 1
+          when Integer
+            start = args.first
+            start = self.length + start if start < 0
+            length = args.size == 2 ? args.last : 1
+            first_chunk = (start / chunkSize).floor
+            last_chunk = ((start + length) / chunkSize).floor
+            offset = start % chunkSize
           end
 
-          def base64
-            Array(to_s).pack('m')
-          end
+          data = ''
 
-          def data_uri(options = {})
-            data = base64.chomp
-            "data:#{ content_type };base64,".concat(data)
+          chunks.where(n: (first_chunk..last_chunk)).order_by(n: 'asc').each do |chunk|
+            data << chunk
           end
 
-          def bytes(&block)
-            if block
-              each{|data| block.call(data)}
-              length
-            else
-              bytes = []
-              each{|data| bytes.push(*data)}
-              bytes
-            end
-          end
+          data[offset, length]
+        end
 
-          def close
-            self
-          end
+        def data
+          data = ''
+          each { |chunk| data << chunk }
+          data
+        end
 
-          def content_type
-            contentType
-          end
+        def base64
+          Array(to_s).pack('m')
+        end
 
-          def update_date
-            updateDate
-          end
+        def data_uri(_options = {})
+          data = base64.chomp
+          "data:#{content_type};base64,".concat(data)
+        end
 
-          def created_at
-            updateDate
+        def bytes(&block)
+          if block
+            each { |data| yield(data) }
+            length
+          else
+            bytes = []
+            each { |data| bytes.push(*data) }
+            bytes
           end
+        end
 
-          def namespace
-            self.class.namespace
-          end
+        def close
+          self
+        end
+
+        def content_type
+          contentType
+        end
+
+        def update_date
+          updateDate
+        end
+
+        def created_at
+          updateDate
+        end
+
+        def namespace
+          self.class.namespace
         end
       end
+    end
 
     ##
     #
-      def GridFs.build_chunk_model_for(namespace)
-        prefix = namespace.name.split(/::/).last.downcase
-        file_model_name = "#{ namespace.name }::File"
-        chunk_model_name = "#{ namespace.name }::Chunk"
+    def self.build_chunk_model_for(namespace)
+      prefix = namespace.name.split(/::/).last.downcase
+      file_model_name = "#{namespace.name}::File"
+      chunk_model_name = "#{namespace.name}::Chunk"
 
-        Class.new do
-          include Mongoid::Document
+      Class.new do
+        include Mongoid::Document
 
-          singleton_class = class << self; self; end
+        singleton_class = class << self; self; end
 
-          singleton_class.instance_eval do
-            define_method(:name){ chunk_model_name }
-            attr_accessor :file_model
-            attr_accessor :namespace
-          end
-
-          self.store_in :collection => "#{ prefix }.chunks"
+        singleton_class.instance_eval do
+          define_method(:name) { chunk_model_name }
+          attr_accessor :file_model
+          attr_accessor :namespace
+        end
 
-          field(:n, :type => Integer, :default => 0)
-          field(:data, :type => (defined?(Moped::BSON) ? Moped::BSON::Binary : BSON::Binary))
+        store_in collection: "#{prefix}.chunks"
 
-          belongs_to(:file, :foreign_key => :files_id, :class_name => file_model_name)
+        field(:n, type: Integer, default: 0)
+        field(:data, type: (defined?(Moped::BSON) ? Moped::BSON::Binary : BSON::Binary))
 
-          index({:files_id => 1, :n => -1}, :unique => true)
+        belongs_to(:file, foreign_key: :files_id, class_name: file_model_name)
 
-          def namespace
-            self.class.namespace
-          end
+        index({ files_id: 1, n: -1 }, unique: true)
 
-          def to_s
-            data.data
-          end
+        def namespace
+          self.class.namespace
+        end
 
-          alias_method 'to_str', 'to_s'
+        def to_s
+          data.data
         end
+
+        alias_method 'to_str', 'to_s'
       end
+    end
 
     ##
     #
-      def GridFs.reading(arg, &block)
-        if arg.respond_to?(:read)
-          rewind(arg) do |io|
-            block.call(io)
-          end
-        else
-          open(arg.to_s) do |io|
-            block.call(io)
-          end
+    def self.reading(arg, &block)
+      if arg.respond_to?(:read)
+        rewind(arg) do |io|
+          block.call(io)
+        end
+      else
+        open(arg.to_s) do |io|
+          block.call(io)
         end
       end
+    end
 
-      def GridFs.chunking(io, chunk_size, &block)
-        if io.method(:read).arity == 0
-          data = io.read
-          i = 0
-          loop do
-            offset = i * chunk_size
-            length = i + chunk_size < data.size ? chunk_size : data.size - offset
+    def self.chunking(io, chunk_size, &block)
+      if io.method(:read).arity == 0
+        data = io.read
+        i = 0
+        loop do
+          offset = i * chunk_size
+          length = i + chunk_size < data.size ? chunk_size : data.size - offset
 
-            break if offset >= data.size
+          break if offset >= data.size
 
-            buf = data[offset, length]
-            block.call(buf)
-            i += 1
-          end
-        else
-          while((buf = io.read(chunk_size)))
-            block.call(buf)
-          end
+          buf = data[offset, length]
+          block.call(buf)
+          i += 1
+        end
+      else
+        while (buf = io.read(chunk_size))
+          block.call(buf)
         end
       end
+    end
+
+    def self.rewind(io, &block)
+      begin
+        pos = io.pos
+        io.flush
+        io.rewind
+      rescue
+        nil
+      end
 
-      def GridFs.rewind(io, &block)
+      begin
+        block.call(io)
+      ensure
         begin
-          pos = io.pos
-          io.flush
-          io.rewind
+          io.pos = pos
         rescue
           nil
         end
-
-        begin
-          block.call(io)
-        ensure
-          begin
-            io.pos = pos
-          rescue
-            nil
-          end
-        end
       end
+    end
 
-      def GridFs.extract_basename(object)
-        filename = nil
+    def self.extract_basename(object)
+      filename = nil
 
-        [:original_path, :original_filename, :path, :filename, :pathname].each do |msg|
-          if object.respond_to?(msg)
-            filename = object.send(msg)
-            break
-          end
+      [:original_path, :original_filename, :path, :filename, :pathname].each do |msg|
+        if object.respond_to?(msg)
+          filename = object.send(msg)
+          break
         end
-
-        filename ? cleanname(filename) : nil
       end
 
-      MIME_TYPES = {
-        'md' => 'text/x-markdown; charset=UTF-8'
-      }
+      filename ? cleanname(filename) : nil
+    end
 
-      def GridFs.mime_types
-        MIME_TYPES
-      end
+    MIME_TYPES = {
+      'md' => 'text/x-markdown; charset=UTF-8'
+    }.freeze
 
-      def GridFs.extract_content_type(filename, options = {})
-        options.to_options!
-
-        basename = ::File.basename(filename.to_s)
-        parts = basename.split('.')
-        parts.shift
-        ext = parts.pop
-
-        default =
-          case
-            when options[:default]==false
-              nil
-            when options[:default]==true
-              "application/octet-stream"
-            else
-              (options[:default] || "application/octet-stream").to_s
-          end
+    def self.mime_types
+      MIME_TYPES
+    end
+
+    def self.extract_content_type(filename, options = {})
+      options.to_options!
 
-        content_type = mime_types[ext] || MIME::Types.type_for(::File.basename(filename.to_s)).first
+      basename = ::File.basename(filename.to_s)
+      parts = basename.split('.')
+      parts.shift
+      ext = parts.pop
 
-        if content_type
-          content_type.to_s
+      default =
+        if options[:default] == false
+          nil
+        elsif options[:default] == true
+          'application/octet-stream'
         else
-          default
+          (options[:default] || 'application/octet-stream').to_s
         end
-      end
 
-      def GridFs.extract_extension(content_type)
-        list = MIME::Types[content_type.to_s]
-        type = list.first
-        if type
-          type.extensions.first
-        end
-      end
+      content_type = mime_types[ext] || MIME::Types.type_for(::File.basename(filename.to_s)).first
 
-      def GridFs.cleanname(pathname)
-        basename = ::File.basename(pathname.to_s)
-        CGI.unescape(basename).gsub(%r/[^0-9a-zA-Z_@)(~.-]/, '_').gsub(%r/_+/,'_')
+      if content_type
+        content_type.to_s
+      else
+        default
       end
     end
 
-    GridFS = GridFs
-    GridFs.init!
+    def self.extract_extension(content_type)
+      list = MIME::Types[content_type.to_s]
+      type = list.first
+      type.extensions.first if type
+    end
+
+    def self.cleanname(pathname)
+      basename = ::File.basename(pathname.to_s)
+      CGI.unescape(basename).gsub(/[^0-9a-zA-Z_@)(~.-]/, '_').gsub(/_+/, '_')
+    end
   end
 
+  GridFS = GridFs
+  GridFs.init!
+end
+
 ##
 #
-  if defined?(Rails)
-    class Mongoid::GridFs::Engine < Rails::Engine
-      paths['app/models'] = File.dirname(File.expand_path("../", __FILE__))
-    end
-
-    module Mongoid::GridFsHelper
-      def grid_fs_render(grid_fs_file, options = {})
-        options.to_options!
+if defined?(Rails)
+  class Mongoid::GridFs::Engine < Rails::Engine
+    paths['app/models'] = File.dirname(File.expand_path('../', __FILE__))
+  end
 
-        if options[:inline] == false or options[:attachment] == true
-          headers['Content-Disposition'] = "attachment; filename=#{ grid_fs_file.attachment_filename }"
-        end
+  module Mongoid::GridFsHelper
+    def grid_fs_render(grid_fs_file, options = {})
+      options.to_options!
 
-        self.content_type = grid_fs_file.content_type
-        self.response_body = grid_fs_file
+      if (options[:inline] == false) || (options[:attachment] == true)
+        headers['Content-Disposition'] = "attachment; filename=#{grid_fs_file.attachment_filename}"
       end
-    end
 
-    Mongoid::GridFs::Helper = Mongoid::GridFsHelper
+      self.content_type = grid_fs_file.content_type
+      self.response_body = grid_fs_file
+    end
   end
+
+  Mongoid::GridFs::Helper = Mongoid::GridFsHelper
+end