mongo 2.1.0.beta → 2.2.0

data/spec/mongo/grid/file/chunk_spec.rb

@@ -10,8 +10,8 @@ describe Mongo::Grid::File::Chunk do
     BSON::ObjectId.new
   end
 
-  let(:metadata) do
-    Mongo::Grid::File::Metadata.new(:files_id => file_id)
+  let(:file_info) do
+    Mongo::Grid::File::Info.new(:files_id => file_id)
   end
 
   describe '#==' do
@@ -72,7 +72,7 @@ describe Mongo::Grid::File::Chunk do
     end
 
     let(:chunks) do
-      described_class.split(raw_data, metadata)
+      described_class.split(raw_data, file_info)
     end
 
     it 'returns the chunks assembled into the raw data' do
@@ -140,7 +140,7 @@ describe Mongo::Grid::File::Chunk do
     end
 
     it 'returns the document as bson' do
-      expect(chunk.to_bson).to eq(document.to_bson)
+      expect(chunk.to_bson.to_s).to eq(document.to_bson.to_s)
     end
   end
 
@@ -157,7 +157,7 @@ describe Mongo::Grid::File::Chunk do
       end
 
       let(:chunks) do
-        described_class.split(raw_data, metadata)
+        described_class.split(raw_data, file_info)
       end
 
       let(:chunk) do
@@ -204,7 +204,7 @@ describe Mongo::Grid::File::Chunk do
       end
 
       let(:chunks) do
-        described_class.split(raw_data, metadata)
+        described_class.split(raw_data, file_info)
       end
 
       it 'returns the correct number of chunks' do

data/spec/mongo/grid/file/{metadata_spec.rb → info_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Mongo::Grid::File::Metadata do
+describe Mongo::Grid::File::Info do
 
   describe '#==' do
 
@@ -8,23 +8,23 @@ describe Mongo::Grid::File::Metadata do
       Time.now.utc
     end
 
-    let(:metadata) do
+    let(:info) do
       described_class.new(:filename => 'test.txt', :length => 7, :uploadDate => upload_date)
     end
 
-    context 'when the other is not metadata' do
+    context 'when the other is not a file info object' do
 
       it 'returns false' do
-        expect(metadata).to_not eq('test')
+        expect(info).to_not eq('test')
       end
     end
 
-    context 'when the other object is metadata' do
+    context 'when the other object is file info object' do
 
       context 'when the documents are equal' do
 
         it 'returns true' do
-          expect(metadata).to eq(metadata)
+          expect(info).to eq(info)
         end
       end
 
@@ -35,7 +35,7 @@ describe Mongo::Grid::File::Metadata do
         end
 
         it 'returns false' do
-          expect(metadata).to_not eq(other)
+          expect(info).to_not eq(other)
         end
       end
     end
@@ -45,48 +45,60 @@ describe Mongo::Grid::File::Metadata do
 
     context 'when provided only a filename and length' do
 
-      let(:metadata) do
+      let(:info) do
         described_class.new(:filename => 'test.txt', :length => 7)
       end
 
       it 'sets the default id' do
-        expect(metadata.id).to be_a(BSON::ObjectId)
+        expect(info.id).to be_a(BSON::ObjectId)
       end
 
       it 'sets the upload date' do
-        expect(metadata.upload_date).to be_a(Time)
+        expect(info.upload_date).to be_a(Time)
       end
 
       it 'sets the chunk size' do
-        expect(metadata.chunk_size).to eq(Mongo::Grid::File::Chunk::DEFAULT_SIZE)
+        expect(info.chunk_size).to eq(Mongo::Grid::File::Chunk::DEFAULT_SIZE)
       end
 
       it 'sets the content type' do
-        expect(metadata.content_type).to eq(Mongo::Grid::File::Metadata::DEFAULT_CONTENT_TYPE)
+        expect(info.content_type).to eq(Mongo::Grid::File::Info::DEFAULT_CONTENT_TYPE)
       end
     end
   end
 
   describe '#inspect' do
 
-    let(:metadata) do
+    let(:info) do
       described_class.new(:filename => 'test.txt', :length => 7)
     end
 
     it 'includes the chunk size' do
-      expect(metadata.inspect).to include(metadata.chunk_size.to_s)
+      expect(info.inspect).to include(info.chunk_size.to_s)
     end
 
     it 'includes the filename' do
-      expect(metadata.inspect).to include(metadata.filename)
+      expect(info.inspect).to include(info.filename)
     end
 
     it 'includes the md5' do
-      expect(metadata.inspect).to include(metadata.md5.to_s)
+      expect(info.inspect).to include(info.md5.to_s)
     end
 
     it 'includes the id' do
-      expect(metadata.inspect).to include(metadata.id.to_s)
+      expect(info.inspect).to include(info.id.to_s)
+    end
+  end
+
+  context 'when there are extra options' do
+
+    let(:info) do
+      described_class.new(:filename => 'test.txt', :extra_field => 'extra')
+    end
+
+    it 'does not include them in the document written to the database' do
+      expect(info.document['extra_field']).to be_nil
+      expect(info.document[:extra_field]).to be_nil
     end
   end
 end

data/spec/mongo/grid/file_spec.rb

@@ -51,7 +51,7 @@ describe Mongo::Grid::File do
       (1..data_size).each{ |i| data << '1' }
     end
 
-    context 'when provided data and metadata' do
+    context 'when provided data and file information' do
 
       let(:file) do
         described_class.new(data, :filename => 'test.txt')
@@ -118,31 +118,31 @@ describe Mongo::Grid::File do
       end
     end
 
-    context 'when provided chunks and metadata' do
+    context 'when provided chunks and file information' do
 
       let(:file_id) do
         BSON::ObjectId.new
       end
 
-      let(:metadata) do
+      let(:info) do
         BSON::Document.new(
           :_id => file_id,
           :uploadDate => Time.now.utc,
           :filename => 'test.txt',
           :chunkSize => Mongo::Grid::File::Chunk::DEFAULT_SIZE,
           :length => data.length,
-          :contentType => Mongo::Grid::File::Metadata::DEFAULT_CONTENT_TYPE
+          :contentType => Mongo::Grid::File::Info::DEFAULT_CONTENT_TYPE
         )
       end
 
       let(:chunks) do
         Mongo::Grid::File::Chunk.split(
-          data, Mongo::Grid::File::Metadata.new(metadata)
+          data, Mongo::Grid::File::Info.new(info)
         ).map{ |chunk| chunk.document }
       end
 
       let(:file) do
-        described_class.new(chunks, metadata)
+        described_class.new(chunks, info)
       end
 
       it 'sets the chunks' do
@@ -153,8 +153,8 @@ describe Mongo::Grid::File do
         expect(file.data).to eq(data)
       end
 
-      it 'sets the metadata' do
-        expect(file.metadata.id).to eq(metadata[:_id])
+      it 'sets the file information' do
+        expect(file.info.id).to eq(info[:_id])
       end
     end
   end