mongoid-grid_fs 1.9.0 → 1.9.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDA4MTUxMWE3YTM1ODFjM2M1NzAxOTM1MmJkMmE5ZGNhYzc4ZjdlMw==
+    MzQ5NjI1MDZlZmExMmYyNGRjNjRkMTlhZDk5ZDg3YzBjYzI0MmYzOA==
   data.tar.gz: !binary |-
-    NWEwZWE1ODhmMzk0MGNkOWViMDdjZjI4ZTNjYTZjMDczZGIzODAzNA==
+    NWY5ZWNmNTgzZjg4YzFmM2UwYjg5MjkyZTY0ZTYyZWY3MjFiZTJkYg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NGNjNzEzYmE1ODU0YWUxNWQ2MGRiOWQ5Nzc5YWYxNDNjNDJmODJkYWEyOGEw
-    YmQ1YTc4ZmRhZTc4MDY2ODA4NGZjNzM3Zjk1MzY1NzBkOTI0NWU2YTg4Nzc5
-    Y2FjMmUyNDk0NDNjYWZjZDUxODBmYmRkZjYwMTUxMmVkYzZhYWI=
+    ZTlhNDFiNGQxNTllYTIyZTVhM2U2NjdkNzc0NzA0ODk1ZDE3ODk1MzNkMWJm
+    YTQ1YzNkZThjYjg5OGQ0ZDVmYzY4NGEwY2M2NzY5NTMyY2NjMDI3OWMzNDFi
+    ZjI3ZmI3NTY5YWNiNmIxNmFkYjdmZTgwNGNhNzU5OTIzNTZiNzU=
   data.tar.gz: !binary |-
-    NGIzMjdmZDE5ZmYzYmFiY2QzNjI4MTQ3NjVkMzY3MGY3OWUwMDJjNzhmOTAy
-    NjVmNjczMWEzYjczMDcwMTcyM2NkNGE4MDMzNjhmY2JhOTc2YTczY2EwNmNh
-    NDJmMGYzMzdmMTRlZTczNjEzZmJjNzY5ZTFlMTE3MGUyN2ZjMjE=
+    MDczNzdlNDY5NDZkMDI3M2UwMDdmNjI2NzhlYjlmMDA0Y2IwNWRiNzY1YWU4
+    N2QwMjM5YWY3ZDk3NWM5YjVkN2NkYjEzYmU2MmU3MzJjN2U5MzZlNjU5YjU2
+    Zjc1ZGQyZTcxMmU4ZjczNTFkZDhmMTNkMWQzYzFlMjU1MTk4NTQ=

data/LICENSE

@@ -0,0 +1,3 @@
+same as Ruby's
+
+http://www.ruby-lang.org/en/about/license.txt

data/README.md

@@ -10,20 +10,12 @@ SYNOPSIS
 --------
 
 ````ruby
-
-  require 'mongoid-grid_fs'
-
-  grid_fs = Mongoid::GridFs
-
-  g = grid_fs.put(readable)
-
-  g = g.id
-
-  grid_fs.get(id)
-
-  grid_fs.delete(id)
-
-
+require 'mongoid-grid_fs'
+grid_fs = Mongoid::GridFs
+g = grid_fs.put(readable)
+id = g.id
+grid_fs.get(id)
+grid_fs.delete(id)
 ````
 
 DESCRIPTION

data/Rakefile

@@ -68,10 +68,10 @@ end
 
 task :gemspec do
   ignore_extensions = ['git', 'svn', 'tmp', /sw./, 'bak', 'gem']
-  ignore_directories = ['pkg', 'db']
-  ignore_files = ['test/log', 'test/db.yml', 'a.rb', 'b.rb'] + Dir['db/*'] + %w'db'
+  ignore_directories = ['pkg', 'db', 'vendor', 'gemfiles']
+  ignore_files = ['test/log', 'test/db.yml', 'a.rb', 'b.rb'] + Dir['Gemfile*'] + %w'db'
 
-  shiteless = 
+  shiteless =
     lambda do |list|
       list.delete_if do |entry|
         next unless test(?e, entry)
@@ -79,9 +79,8 @@ task :gemspec do
         ignore_extensions.any?{|ext| ext === extension}
       end
       list.delete_if do |entry|
-        next unless test(?d, entry)
         dirname = File.expand_path(entry)
-        ignore_directories.any?{|dir| File.expand_path(dir) == dirname}
+        ignore_directories.any?{|dir| dirname.include?(File.expand_path(dir)) }
       end
       list.delete_if do |entry|
         next unless test(?f, entry)
@@ -99,6 +98,7 @@ task :gemspec do
   test_files  = test(?e, "test/#{ lib }.rb") ? "test/#{ lib }.rb" : nil
   summary     = This.summary || This.synopsis || "#{ lib } kicks the ass"
   description = This.description || summary
+  license = 'Ruby' 
 
   if This.extensions.nil?
     This.extensions = []
@@ -136,6 +136,7 @@ task :gemspec do
             spec.platform = Gem::Platform::RUBY
             spec.summary = <%= lib.inspect %>
             spec.description = <%= description.inspect %>
+            spec.license = <%= license.inspect %>
 
             spec.files =\n<%= files.sort.pretty_inspect %>
             spec.executables = <%= executables.inspect %>

data/lib/mongoid-grid_fs.rb

@@ -2,7 +2,7 @@
 #
   module Mongoid
     class GridFS
-      const_set :Version, '1.9.0'
+      const_set :Version, '1.9.1'
 
       class << GridFS
         def version
@@ -11,8 +11,8 @@
 
         def dependencies
           {
-            'mongoid'         => [ 'mongoid'         , '~> 3.0' ] ,
-            'mime/types'      => [ 'mime-types'      , '~> 1.19'] ,
+            'mongoid'         => [ 'mongoid'         , '>= 3.0', '< 5.0' ] ,
+            'mime/types'      => [ 'mime-types'      , '>= 1.19', '< 2.0'] ,
           }
         end
 
@@ -82,7 +82,7 @@
             []=
             clear
           )
-          
+
           to_delegate.each do |method|
             class_eval <<-__
               def self.#{ method }(*args, &block)
@@ -214,13 +214,11 @@
             raise
           end
 
-          if defined?(Moped)
-            def binary_for(*buf)
+          def binary_for(*buf)
+            if defined?(Moped::BSON)
               Moped::BSON::Binary.new(:generic, buf.join)
-            end
-          else
-            def binary_for(buf)
-              BSON::Binary.new(buf.bytes.to_a)
+            else
+              BSON::Binary.new(buf.join, :generic)
             end
           end
 
@@ -296,6 +294,7 @@
 
         Class.new do
           include Mongoid::Document
+          include Mongoid::Attributes::Dynamic if Mongoid::VERSION.to_i >= 4
 
           singleton_class = class << self; self; end
 
@@ -306,7 +305,8 @@
             attr_accessor :defaults
           end
 
-          self.default_collection_name = "#{ prefix }.files"
+          self.store_in :collection => "#{ prefix }.files"
+
           self.defaults = Defaults.new
 
           self.defaults.chunkSize = 4 * (mb = 2**20)
@@ -317,7 +317,7 @@
 
           field(:length, :type => Integer, :default => 0)
           field(:chunkSize, :type => Integer, :default => defaults.chunkSize)
-          field(:uploadDate, :type => Date, :default => Time.now.utc)
+          field(:uploadDate, :type => Time, :default => Time.now.utc)
           field(:md5, :type => String, :default => Digest::MD5.hexdigest(''))
 
           %w( filename contentType length chunkSize uploadDate md5 ).each do |f|
@@ -327,7 +327,7 @@
 
           has_many(:chunks, :class_name => chunk_model_name, :inverse_of => :files, :dependent => :destroy, :order => [:n, :asc])
 
-          index({:filename => 1}, :unique => true) 
+          index({:filename => 1}, :unique => true)
 
           def path
             filename
@@ -342,8 +342,15 @@
           end
 
           def each(&block)
-            chunks.all.order_by([:n, :asc]).each do |chunk|
-              block.call(chunk.to_s)
+            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
+
+              fetched += limit
             end
           end
 
@@ -352,7 +359,7 @@
               when Range
                 range = args.first
                 first_chunk = (range.min / chunkSize).floor
-                last_chunk = (range.max / chunkSize).ceil
+                last_chunk = (range.max / chunkSize).floor
                 offset = range.min % chunkSize
                 length = range.max - range.min + 1
               when Fixnum
@@ -360,7 +367,7 @@
                 start = self.length + start if start < 0
                 length = args.size == 2 ? args.last : 1
                 first_chunk = (start / chunkSize).floor
-                last_chunk = ((start + length) / chunkSize).ceil
+                last_chunk = ((start + length) / chunkSize).floor
                 offset = start % chunkSize
             end
 
@@ -407,7 +414,7 @@
             contentType
           end
 
-          def update_date 
+          def update_date
             updateDate
           end
 
@@ -439,14 +446,14 @@
             attr_accessor :namespace
           end
 
-          self.default_collection_name = "#{ prefix }.chunks"
+          self.store_in :collection => "#{ prefix }.chunks"
 
           field(:n, :type => Integer, :default => 0)
-          field(:data, :type => (defined?(Moped) ? Moped::BSON::Binary : BSON::Binary))
+          field(:data, :type => (defined?(Moped::BSON) ? Moped::BSON::Binary : BSON::Binary))
 
           belongs_to(:file, :foreign_key => :files_id, :class_name => file_model_name)
 
-          index({:files_id => 1, :n => -1}, :unique => true) 
+          index({:files_id => 1, :n => -1}, :unique => true)
 
           def namespace
             self.class.namespace

data/mongoid-grid_fs.gemspec

@@ -3,13 +3,14 @@
 
 Gem::Specification::new do |spec|
   spec.name = "mongoid-grid_fs"
-  spec.version = "1.9.0"
+  spec.version = "1.9.1"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "mongoid-grid_fs"
   spec.description = "a mongoid 3/moped compatible implementation of the grid_fs specification"
+  spec.license = "Ruby"
 
   spec.files =
-["Gemfile",
+["LICENSE",
  "README.md",
  "Rakefile",
  "lib",
@@ -35,9 +36,9 @@ Gem::Specification::new do |spec|
   spec.test_files = nil
 
   
-    spec.add_dependency(*["mongoid", "~> 3.0"])
+    spec.add_dependency(*["mongoid", ">= 3.0", "< 5.0"])
   
-    spec.add_dependency(*["mime-types", "~> 1.19"])
+    spec.add_dependency(*["mime-types", ">= 1.19", "< 2.0"])
   
 
   spec.extensions.push(*[])

data/test/helper.rb

@@ -21,4 +21,9 @@ Mongoid.configure do |config|
   config.connect_to('mongoid-grid_fs_test')
 end
 
+BEGIN {
+  gem 'rails', '>= 3', '< 4'
+  require 'rails'
+  require 'active_model'
+}
 

data/test/mongoid-grid_fs_test.rb

@@ -8,8 +8,8 @@ Testing Mongoid::GridFs do
     Mongoid::GridFS
 
   prepare do
-    GridFS::File.destroy_all
-    GridFS::Chunk.destroy_all
+    GridFS::File.delete_all
+    GridFS::Chunk.delete_all
   end
 
 ##
@@ -35,6 +35,14 @@ Testing Mongoid::GridFs do
       assert{ g.filename == filename }
     end
 
+    test 'with your own attributes' do
+      my_value = "my_value"
+
+      g = assert{ GridFS.put(__FILE__, :my_value => my_value) }
+
+      assert{ g.my_value == my_value }
+    end
+
     test 'when error occurs (eg. missing file)' do
       file = '/path/to/missing'
 
@@ -76,7 +84,7 @@ Testing Mongoid::GridFs do
       path = 'a.rb'
       data = IO.read(__FILE__)
 
-      sio = SIO.new(path, data) 
+      sio = SIO.new(path, data)
 
       g = assert{ GridFs[path] = sio and GridFs[path] }
 
@@ -160,13 +168,33 @@ Testing Mongoid::GridFs do
     end
   end
 
+##
+#
+  context 'iterating each chunk' do
+    test 'having file size more than 42mb' do
+      require 'tempfile'
+
+      orig, copy = %w{orig copy}.map do |suffix|
+        Tempfile.new("mongoid-grid_fs~43mb.#{suffix}")
+      end
+
+      assert system("dd if=/dev/zero of=#{orig.path} bs=#{43*1024*1024} count=1 &> /dev/null")
+
+      GridFs.get(GridFs.put(orig.path).id).each do |chunk|
+        copy.print(chunk.to_s)
+      end
+
+      assert { File.size(copy.path) == File.size(orig.path) }
+    end
+  end
+
 ##
 #
   context 'namespaces' do
     test 'default' do
       assert{ GridFs.namespace.prefix == 'fs' }
-      assert{ GridFs.file_model.collection_name == 'fs.files' }
-      assert{ GridFs.chunk_model.collection_name == 'fs.chunks' }
+      assert{ GridFs.file_model.collection_name.to_s == 'fs.files' }
+      assert{ GridFs.chunk_model.collection_name.to_s == 'fs.chunks' }
     end
 
     test 'new' do
@@ -175,10 +203,10 @@ Testing Mongoid::GridFs do
       assert{ ns.prefix == 'ns' }
 
       assert{ ns.file_model < Mongoid::Document }
-      assert{ ns.file_model.collection_name == 'ns.files' }
+      assert{ ns.file_model.collection_name.to_s == 'ns.files' }
 
       assert{ ns.chunk_model < Mongoid::Document }
-      assert{ ns.chunk_model.collection_name == 'ns.chunks' }
+      assert{ ns.chunk_model.collection_name.to_s == 'ns.chunks' }
 
       assert{ ns.file_model.destroy_all }
 
@@ -204,7 +232,7 @@ Testing Mongoid::GridFs do
 
       expanded = proc{|paths| Array(paths).map{|path| File.expand_path(path)}}
 
-      assert{ 
+      assert{
         expanded[ Mongoid::GridFS::Engine.paths['app/models'] ] == expanded[ libdir ]
       }
     end
@@ -212,7 +240,7 @@ Testing Mongoid::GridFs do
 
 protected
   def object_id_re
-    object_id = defined?(Moped) ? Moped::BSON::ObjectId.new : BSON::ObjectId.new
+    object_id = defined?(Moped::BSON) ? Moped::BSON::ObjectId.new : BSON::ObjectId.new
 
     %r| \w{#{ object_id.to_s.size }} |iomx
   end

metadata

@@ -1,50 +1,62 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-grid_fs
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
 platform: ruby
 authors:
 - Ara T. Howard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-09 00:00:00.000000000 Z
+date: 2014-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.19'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.19'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: a mongoid 3/moped compatible implementation of the grid_fs specification
 email: ara.t.howard@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - lib/app/models/mongoid/grid_fs.rb
@@ -56,7 +68,8 @@ files:
 - test/mongoid-grid_fs_test.rb
 - test/testing.rb
 homepage: https://github.com/ahoward/mongoid-grid_fs
-licenses: []
+licenses:
+- Ruby
 metadata: {}
 post_install_message: 
 rdoc_options: []

data/Gemfile

@@ -1,5 +0,0 @@
-source "https://rubygems.org"
-
-gem "rails"
-
-gemspec