mongo-fixture 0.0.4 → 0.0.5

data/Gemfile

@@ -11,4 +11,5 @@ end
 
 group :test do
   gem "rake"
+  gem "pry"
 end

data/features/play_around_with_fixtures.feature

@@ -64,9 +64,6 @@ Scenario: Misconfigured password field
         missing: The field
     """
   Then the loading of misconfigured fixture should fail
-  And I should see that the collection was "users"
-  And I should see that the field was "password"
-  And I should see that the entry was "wrong_entry"
   And I should see 0 records in users
 
 Scenario: I save the done fixtures so to perform the rollbacks later
@@ -113,3 +110,37 @@ Scenario: References across collections
   And I load the references fixture
   Then I should see 1 record in users with username "pepe" and name "Pepe"
   And I should see 3 records in sessions
+
+Scenario: Many-to-many associations
+  Given a collection users
+  And a collection documents
+  And a file "test/fixtures/associations/users.yaml" with:
+    """
+    johnny:
+      name: John
+      documents:
+        documents: [brief, docs, extra_data]
+    susan:
+      name: Susan
+      documents:
+        documents: [brief, resume, docs]
+    """
+  And a file "test/fixtures/associations/documents.yaml" with:
+    """
+    brief:
+      title: Data
+      text: Resumee
+    docs:
+      title: Doc
+      text: Documentation
+    extra_data:
+      title: Xtra
+      text: More and more data
+    resume:
+      title: CV
+      text: Curriculum Vitae
+    """
+  When I load the associations fixture
+  Then I should see 2 records in users
+  And I should see 4 records in documents
+  And the user named "John" should have in documents the id of the one titled "Doc"

data/features/stepdefs/play_around_with_fixtures/create_a_simple_fixture_push_it_and_rollback.rb

@@ -66,3 +66,10 @@ end
 Then /^I should see (\d+) records in (\w+)$/ do |amount, collection|
   @DB[collection].count.should == amount.to_i
 end
+
+And /^the user named "(\w+)" should have in documents the id of the one titled "(\w+)"$/ do 
+  |name, title|
+  user = @DB[:users].find_one :name => name
+  document = @DB[:documents].find_one :title => title
+  user["documents"].should include document["_id"]
+end

data/features/stepdefs/play_around_with_fixtures/misconfigured_password_field.rb

@@ -22,7 +22,7 @@
 Then /^the loading of (\w+) fixture should fail$/ do |fixture|
   begin
     Mongo::Fixture.new fixture.to_sym, @DB
-  rescue Mongo::Fixture::MissingProcessedValueError => e
+  rescue Mongo::Fixture::ReferencedRecordNotFoundError => e
     @exception = e
   end
 end

data/features/support/hooks.rb

@@ -1,5 +1,5 @@
 After do
-  [:visitors, :aliens, :visits, :users, :sessions].each do |collection|
+  [:visitors, :aliens, :visits, :users, :sessions, :documents].each do |collection|
     @DB[collection].drop
   end
   Fast.dir.remove! :test, :fixtures

data/lib/mongo-fixture/inserter.rb

@@ -0,0 +1,131 @@
+module Mongo
+  class Fixture
+    # Handles the actual insertion into the database.
+    class Inserter
+
+      # Receives a fixture as argument
+      def initialize fixture
+        @fixture = fixture 
+        @inserted = []
+      end
+
+      # Simplifies the hash in order to insert it into the database
+      # Resolves external references and flattens the values that provide alternatives
+      # @param [Hash] the hash to be processed 
+      def simplify the_record
+        the_returned_hash = {}
+        the_record.each do |field, value|
+          begin
+            value = resolve_field_hash value if value.is_a? Hash
+          rescue Mongo::Fixture::ReferencedRecordNotFoundError => e
+            @fixture.rollback
+            raise e
+          end
+          the_returned_hash[field] = value
+        end
+        return the_returned_hash
+      end
+
+      # Returns the correct data for this field resolving the hash
+      def resolve_field_hash value
+        raise ArgumentError, "Hash expected" unless value.is_a? Hash
+        return value[:processed] if value.has_key? :processed
+
+        intersection = value.keys & @fixture.data.keys
+        if intersection.empty?
+          raise Mongo::Fixture::ReferencedRecordNotFoundError,
+            "This fixture does not include data for the collections [#{value.keys.join(',')}]"
+        else
+          intersection.each do |collection|
+            insert_data_for collection unless data_was_inserted_in? collection
+            if value[collection].is_a? Array
+              ids = []
+              value[collection].each do |element|
+                ids.push do_the_resolving collection, element.to_sym
+              end
+              return ids
+            else
+              return do_the_resolving collection, value[collection].to_sym
+            end
+          end
+        end
+      end
+
+#            options = value.keys & @fixture.data.keys
+#            # If no alternative matches the name of a collection, look for a :processed value
+#            if options.empty?
+#              unless value.has_key? :processed
+#                raise MissingProcessedValueError.new "The processed value to insert into the db is missing from the field '#{field}', aborting", field 
+#              end
+#              the_returned_hash[field] = value[:processed]
+#            else
+#            
+#              # Does any of the options hold a record named after the value of the option?
+#              actual_option = options.each do |option|
+#                break option if @fixture.data[option].has_key? value[option].to_sym
+#              end
+#              
+#              unless data_was_inserted_in? actual_option
+#                insert_data_for actual_option
+#              end
+#              current_collection = @connection[actual_option]
+#              current_data = simplify @fixture.data[actual_option][value[actual_option].to_sym]
+#              the_returned_hash[field] = current_collection.find(current_data).first["_id"]
+#            end
+
+
+      # Inserts the collection data into the database
+      def insert_data_for collection
+#      @data.each do |collection, matrix|
+#        unless @inserter.data_was_inserted_in? collection
+#          matrix.each do |element, values|
+#            begin
+#                @connection[collection].insert @inserter.simplify values.to_hash
+#            rescue MissingProcessedValueError => m
+#              rollback
+#              raise MissingProcessedValueError, "In record '#{element}' to be inserted into '#{collection}', the processed value of field '#{m.field}' is missing, aborting"
+#            end
+#          end
+#          @inserted << collection
+#        end        
+        return if data_was_inserted_in? collection
+        @fixture.data[collection].each do |key, record|
+          begin
+            @fixture.connection[collection].insert simplify record
+          rescue MissingProcessedValueError => m
+            @fixture.rollback
+            raise MissingProcessedValueError, "In record '#{key}' to be inserted into '#{collection}', the processed value of field '#{m.field}' is missing, aborting"
+          end
+        end
+        @inserted << collection
+      end
+
+      # Returns true if the collection was already inserted
+      def data_was_inserted_in? collection
+        @inserted.include? collection
+      end      
+
+      def inserted
+        @inserted
+      end
+
+      # Returns the fixture
+      attr_reader :fixture
+
+      private
+        def validate_record_existence collection, record_name
+          unless @fixture.data[collection].has_key? record_name
+            raise Mongo::Fixture::ReferencedRecordNotFoundError,
+              "The collection '#{collection}' doesn't include the record '#{record_name}'"
+          end
+        end
+
+        def do_the_resolving collection, record_name
+          validate_record_existence collection, record_name
+
+          record_data = simplify @fixture.data[collection][record_name]
+          return @fixture.connection[collection].find(record_data).first["_id"]
+        end
+    end
+  end
+end

data/lib/mongo-fixture/version.rb

@@ -1,5 +1,5 @@
 module Mongo
   class Fixture
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/lib/mongo-fixture.rb

@@ -4,6 +4,7 @@ require "symbolmatrix"
 require "mongo"
 
 require "mongo-fixture/version"
+require "mongo-fixture/inserter"
 
 module Mongo
 
@@ -25,7 +26,7 @@ module Mongo
       load fixture if fixture
       
       @connection = connection if connection
-      @inserted = []
+      @inserter = Inserter.new self
       push if fixture && connection && option_push
     end    
     
@@ -62,6 +63,9 @@ module Mongo
     
     # Returns the current database connection
     attr_reader :connection   
+
+    # Returns the inserter for this fixture
+    attr_reader :inserter
     
     # Sets the connection. Raises an ChangingConnectionIllegal exception if this fixture has already been checked
     def connection= the_connection
@@ -89,65 +93,24 @@ module Mongo
     def push
       check
       
-      @data.each do |collection, matrix|
-        unless data_was_inserted_in? collection
-          matrix.each do |element, values|
-            begin
-                @connection[collection].insert simplify values.to_hash
-            rescue MissingProcessedValueError => m
-              rollback
-              raise MissingProcessedValueError, "In record '#{element}' to be inserted into '#{collection}', the processed value of field '#{m.field}' is missing, aborting"
-            end
-          end
-          @inserted << collection
-        end
+      data.each_key do |collection|
+        @inserter.insert_data_for collection
       end
+#      @data.each do |collection, matrix|
+#        unless @inserter.data_was_inserted_in? collection
+#          matrix.each do |element, values|
+#            begin
+#                @connection[collection].insert @inserter.simplify values.to_hash
+#            rescue MissingProcessedValueError => m
+#              rollback
+#              raise MissingProcessedValueError, "In record '#{element}' to be inserted into '#{collection}', the processed value of field '#{m.field}' is missing, aborting"
+#            end
+#          end
+#          @inserted << collection
+#        end
+#      end
     end
-    
-    # Simplifies the hash in order to insert it into the database
-    # Resolves external references and flattens the values that provide alternatives
-    # @param [Hash] the hash to be processed 
-    def simplify the_hash
-      the_returned_hash = {}
-      the_hash.each do |key, value|
-        if value.is_a? Hash
-          
-          # If no alternative matches the name of a collection, look for a :processed value
-          if (value.keys & @data.keys).empty?
-            unless value.has_key? :processed
-              raise MissingProcessedValueError.new "The processed value to insert into the db is missing from the field '#{key}', aborting", key 
-            end
-            the_returned_hash[key] = value[:processed]
-          else
-          
-            # Does any of the options hold a record named after the value of the option?
-            options = value.keys & @data.keys
-            actual_option = options.each do |option|
-              break option if @data[option].has_key? value[option].to_sym
-            end
-            
-            unless data_was_inserted_in? actual_option
-              insert_data_for actual_option
-            end
-            current_collection = @connection[actual_option]
-            current_data = simplify @data[actual_option][value[actual_option].to_sym]
-            the_returned_hash[key] = current_collection.find(current_data).first["_id"]
-          end
-        else
-          the_returned_hash[key] = value
-        end
-      end
-      return the_returned_hash
-    end
-    
-    # Inserts the collection data into the database
-    def insert_data_for collection
-      @data[collection].each do |key, record|
-        @connection[collection].insert simplify record
-      end
-      @inserted << collection
-    end
-    
+        
     # Empties the collections, only if they were empty to begin with
     def rollback
       begin
@@ -167,6 +130,7 @@ module Mongo
     class MissingConnectionError < StandardError; end
     class ChangingConnectionIllegal < StandardError; end
     class RollbackIllegalError < StandardError; end
+    class ReferencedRecordNotFoundError < StandardError; end
     class MissingProcessedValueError < StandardError
       attr_accessor :field
       def initialize message, field = nil
@@ -175,9 +139,6 @@ module Mongo
       end
     end    
     
-    private
-      def data_was_inserted_in? collection
-        @inserted.include? collection
-      end
+
   end
 end

data/spec/mongo/fixture/inserter_spec.rb

@@ -0,0 +1,429 @@
+require "spec_helper"
+
+describe Mongo::Fixture::Inserter do
+  describe ".new" do
+    it "should accept an argument" do
+      Mongo::Fixture::Inserter.new double "fixture"
+    end
+  end
+
+  describe "#simplify" do
+    context "when receiving a multidimensional hash containing a field with raw and processed" do
+      it "should convert it in a simple hash using the processed value as replacement" do
+        base_hash = {
+          :name => "Jane",
+          :band => "Witherspoons",
+          :pass => {
+            :raw => "secret",
+            :processed => "53oih7fhjdgj3f8="
+          },
+          :email => {
+            :raw => "Jane@gmail.com ",
+            :processed => "jane@gmail.com"
+          }
+        }
+        fixture = double 'fixture', :data => {}
+
+        ins = Mongo::Fixture::Inserter.new fixture
+        simplified = ins.simplify base_hash
+        simplified.should == {
+          :name => "Jane",
+          :band => "Witherspoons",
+          :pass => "53oih7fhjdgj3f8=",
+          :email => "jane@gmail.com"
+        }
+      end
+    end
+    
+    context "the multidimensional array is missing the processed part of the field" do
+      before do
+        @base_hash = {
+          :name => "Jane",
+          :pass => {
+            :raw => "secret",
+            :not_processed => "53oih7fhjdgj3f8="
+          },
+          :email => {
+            :raw => "Jane@gmail.com ",
+            :processed => "jane@gmail.com"
+          }
+        }
+      end
+
+      it "should raise an exception" do
+        fixture = double 'fixture', :data => {}, :rollback => nil
+        ins = Mongo::Fixture::Inserter.new fixture
+        expect { ins.simplify @base_hash
+        }.to raise_error Mongo::Fixture::ReferencedRecordNotFoundError, 
+          "This fixture does not include data for the collections [raw,not_processed]"
+      end
+
+      it "should call #resolve_field_hash with the data hash" do
+        fixture = double 'fixture', :data => {}
+        ins = Mongo::Fixture::Inserter.new fixture
+        ins.should_receive(:resolve_field_hash).with :raw => "secret", :not_processed => "53oih7fhjdgj3f8="
+        ins.should_receive(:resolve_field_hash).with :raw => "Jane@gmail.com ", :processed => "jane@gmail.com"        
+        ins.simplify @base_hash
+      end
+    end
+  end
+
+  describe "#resolve_field_hash" do
+    context "the data is not a hash" do
+      it "should raise a wrong argument exception" do
+        inserter = Mongo::Fixture::Inserter.new double 'fixture'
+        expect { inserter.resolve_field_hash "not a hash"
+        }.to raise_error ArgumentError, "Hash expected"
+      end
+    end
+
+    context "at leasts one key matches a collection name" do
+      context "no record name matches an existing record in target collection" do
+        before do
+          @data = { 
+            :users => { :pepe => { :name => "Jose" } },
+            :comments => { :demo => { :text => "Hola", :user => { :users => "lula" } } }
+          }
+        end
+
+        it "should raise an exception" do
+          coll = double "collection", :insert => nil
+          connection = double "connection", :[] => coll
+          fixture = double 'fixture', :data => @data, :connection => connection
+          inserter = Mongo::Fixture::Inserter.new fixture
+          expect { inserter.resolve_field_hash :users => "lula"
+          }.to raise_error Mongo::Fixture::ReferencedRecordNotFoundError, 
+            "The collection 'users' doesn't include the record 'lula'"
+        end
+      end
+    end
+
+    context "many to many associations" do
+      before do 
+        @data = {
+          :users => {
+            :pepe => {
+              :username => "jose",
+              :pass => "secret"
+            },
+            :lula => {
+              :username => "lula",
+              :pass => {
+                :raw => "moresecret",
+                :processed => "asdfhjlueiwywhetkjtret66666666"
+              }
+            }
+          },
+          :admins => {
+            :superadmin => {
+              :login => "super"
+            }
+          },
+          :comments => {
+            :demo => {
+              :text => "Simple text",
+              :user => {
+                :users => [ "pepe", "lula" ],
+                :admins => "superadmin"
+              }
+            },
+            :another => {
+              :text => "Die another day",
+              :user => {
+                :users => "pepe"
+              }
+            }
+          }
+        }
+      end
+
+      it "should send to each comment the respective ids" do
+        pepe_id = "ladjsfljasf"
+        lula_id = "gsuyhkasrhte"
+        superadmin_id = "323454"
+
+        lula_record_data = double "lula record data"
+        lula_record_data.should_receive( :[] ).with("_id").and_return lula_id
+        lula_record = double "lula record", :first => lula_record_data
+        pepe_record_data = double "pepe record data"
+        pepe_record_data.should_receive(:[]).twice.with("_id").and_return(pepe_id)
+        pepe_record = double "pepe record"
+        pepe_record.should_receive(:first).twice.and_return pepe_record_data
+        admin_record_data = double "admin record data"
+        admin_record_data.should_receive(:[]).with("_id").and_return superadmin_id
+        admin_record = double "admin record", :first => admin_record_data
+        admins = double "admins", :insert => nil
+        admins.should_receive(:find).with( :login => "super" ).and_return admin_record
+        users = double 'users', :insert => nil
+        users.should_receive(:find).twice.with( :username => "jose", :pass => "secret" ).and_return pepe_record
+        users.should_receive(:find).with( :username => "lula", :pass => "asdfhjlueiwywhetkjtret66666666" ).and_return lula_record
+        connection = double 'connection'
+        connection.should_receive(:[]).exactly(5).times.with(:users).and_return users
+        connection.should_receive(:[]).twice.with(:admins).and_return admins
+        fixture = double 'fixture', :data => @data, :connection => connection
+        inserter = Mongo::Fixture::Inserter.new fixture
+        inserter.resolve_field_hash( :users => [ "pepe", "lula" ] ).should == [ pepe_id, lula_id ]
+        inserter.resolve_field_hash( :admins => "superadmin" ).should == superadmin_id
+        inserter.resolve_field_hash( :users => "pepe" ).should == pepe_id
+      end
+
+      context "some user is missing" do
+        before do
+          @data = {
+            :users => {
+              :pepe => {
+                :username => "jose",
+                :pass => "secret"
+              },
+              :lula => {
+                :username => "lula",
+                :pass => {
+                  :raw => "moresecret",
+                  :processed => "asdfhjlueiwywhetkjtret66666666"
+                }
+              }
+            },
+            :comments => {
+              :demo => {
+                :text => "Simple text",
+                :user => {
+                  :users => [ "pepe", "lula", "noexiste" ],
+                }
+              },
+            }
+          }
+        end
+
+        it "should raise an exception" do
+          pepe_id = "ladjsfljasf"
+          lula_id = "gsuyhkasrhte"
+
+          lula_data = double "lula_data"
+          lula_data.should_receive(:[]).with("_id").and_return lula_id
+          lula = double "lula", :first => lula_data
+          pepe_data = double "pepe_data"
+          pepe_data.should_receive(:[]).with("_id").and_return pepe_id
+          pepe = double "pepe", :first => pepe_data
+          users = double "users", :insert => nil
+          users.should_receive(:find).with( :username => "jose", :pass => "secret" ).and_return pepe
+          users.should_receive(:find).with( :username => "lula", :pass => "asdfhjlueiwywhetkjtret66666666" ).and_return lula
+          connection = double "connection"
+          connection.should_receive(:[]).exactly(4).times.with(:users).and_return users
+          fixture = double "fixture", :data => @data, :connection => connection
+          inserter = Mongo::Fixture::Inserter.new fixture
+          expect { inserter.resolve_field_hash( :users => [ "pepe", "lula", "noexiste" ] )
+          }.to raise_error Mongo::Fixture::ReferencedRecordNotFoundError, 
+            "The collection 'users' doesn't include the record 'noexiste'"
+        end
+      end
+    end
+
+    context "reference from one record to another" do
+      context "the key matches a collection name" do
+        context "the referenced record exists" do
+          it "should call #data_was_inserted_in? with the collections name" do
+            @data = { 
+              :users => { :pepe => { :name => "Jose" } },
+              :comments => { :demo => { :text => "hola", :user => {:users => "pepe" } } }
+            }
+
+            pepe_data = double "pepe_data", :[] => nil
+            pepe = double "pepe", :insert => nil
+            pepe.should_receive(:find).with(:name => "Jose").and_return double"pepeee", :first => pepe_data
+            connection = double "connection"
+            connection.should_receive(:[]).twice.with(:users).and_return pepe
+            fixture = double "fixture", :data => @data, :connection => connection
+            inserter = Mongo::Fixture::Inserter.new fixture
+            inserter.should_receive(:data_was_inserted_in?).twice.with(:users)
+            inserter.resolve_field_hash(:users => "pepe")
+          end
+
+          context "the data wasn't inserted into users" do
+            it "should call #insert_data_for with the collections name" do
+              @data = { 
+                :users => { :pepe => { :name => "Jose" } },
+                :comments => { :demo => { :text => "hola", :user => {:users => "pepe" } } }
+              }
+
+              pepe_data = double "pepe_data", :[] => nil
+              pepe = double "pepe"
+              pepe.should_receive(:find).with(:name => "Jose").and_return double"pepeee", :first => pepe_data
+              connection = double "connection"
+              connection.should_receive(:[]).with(:users).and_return pepe
+              fixture = double "fixture", :data => @data, :connection => connection
+              inserter = Mongo::Fixture::Inserter.new fixture
+              inserter.should_receive(:insert_data_for).with(:users)
+              inserter.resolve_field_hash(:users => "pepe")
+            end
+          end
+
+          context "the data was inserted into users" do
+            it "should NOT call #insert_data_for with the collections name" do
+              @data = { 
+                :users => { :pepe => { :name => "Jose" } },
+                :comments => { :demo => { :text => "hola", :user => {:users => "pepe" } } }
+              }
+
+              pepe_data = double "pepe_data", :[] => nil
+              pepe = double "pepe"
+              pepe.should_receive(:find).with(:name => "Jose").and_return double"pepeee", :first => pepe_data
+              connection = double "connection"
+              connection.should_receive(:[]).with(:users).and_return pepe
+              fixture = double "fixture", :data => @data, :connection => connection
+              inserter = Mongo::Fixture::Inserter.new fixture
+              inserter.should_receive(:insert_data_for).with(:users)
+              inserter.resolve_field_hash(:users => "pepe")
+            end
+          end
+
+
+          it "should return the object id of the referenced record" do
+            @data = { 
+              :users => { :pepe => { :name => "Jose" } },
+              :comments => { :demo => { :text => "hola", :user => {:users => "pepe" } } }
+            }
+
+            actual_record = double "actual_record"
+            actual_record.should_receive(:[]).with("_id").and_return "un id"
+            record_from_db = double 'record from db', :first => actual_record
+
+            collection = double 'collection', :insert => nil
+            collection.should_receive(:find).with(:name => "Jose").and_return record_from_db
+            fixture = double 'fixture', :data => @data, :connection => double( :[] =>  collection)
+            inserter = Mongo::Fixture::Inserter.new fixture
+            inserter.resolve_field_hash( :users => "pepe" ).should == "un id"
+          end
+        end
+
+        context "the referenced record exists, but have complex field values" do
+          it "should return the object id of the referenced record" do
+            @data = { 
+              :users => { :pepe => { :name => "Jose", :pass => { :raw => "a", :processed => "234" } } },
+              :comments => { :demo => { :text => "hola", :user => {:users => "pepe" } } }
+            }
+
+            actual_record = double "actual_record"
+            actual_record.should_receive(:[]).with("_id").and_return "un id"
+            record_from_db = double 'record from db', :first => actual_record
+
+            collection = double 'collection', :insert => nil
+            collection.should_receive(:find).with(:name => "Jose", :pass => "234").and_return record_from_db
+            fixture = double 'fixture', :data => @data, :connection => double( :[] =>  collection)
+            inserter = Mongo::Fixture::Inserter.new fixture
+            inserter.resolve_field_hash( :users => "pepe" ).should == "un id"
+          end
+        end
+
+
+        context "the referenced record does not exist" do
+          it "should raise an error" do
+            data = { :users => "user" }
+            inserter = Mongo::Fixture::Inserter.new double 'fixture', :data => {}
+            expect { inserter.resolve_field_hash data
+            }.to raise_error Mongo::Fixture::ReferencedRecordNotFoundError, 
+              "This fixture does not include data for the collections [users]"
+          end
+        end
+      end
+
+      context "no key matches a collection name" do
+        it "should raise an error" do
+          data = { :users => "user", :comments => "comment"}
+          fixture = stub 'fixture', :data => { :collection => "", :another_collection => ""}
+          inserter = Mongo::Fixture::Inserter.new fixture
+          expect { inserter.resolve_field_hash data
+          }.to raise_error Mongo::Fixture::ReferencedRecordNotFoundError,
+            "This fixture does not include data for the collections [users,comments]"
+        end
+      end
+    end
+
+    context "there is a :processed key" do
+      it "should return the value of the :processed field" do
+        data = { :raw => "hello", :processed => "hash" }
+        inserter = Mongo::Fixture::Inserter.new double "fixture"
+        inserter.resolve_field_hash(data).should == "hash"
+      end
+    end
+  end
+
+  describe "#data_was_inserted_in?" do
+    context "there is a simple fixture and a collection has been inserted by this fixture" do
+      before do
+        Fast.file.write "test/fixtures/test/users.yaml", "pepe: { user: pepe }"
+      end
+      
+      it "should return true" do
+        database = double 'database'
+        coll = double 'collection', :count => 0, :insert => nil
+        database.stub :[] => coll
+        fix = Mongo::Fixture.new :test, database
+        ins = fix.inserter
+        ins.data_was_inserted_in?(:users).should === true
+      end
+      
+      after do
+        Fast.dir.remove! :test
+      end
+    end
+    
+    context "there is a simple fixture and a collection was inserted but not this" do
+      before do
+        Fast.file.write "test/fixtures/test/users.yaml", "pepe: { user: pepe }"
+      end
+      
+      it "should return false" do
+        database = double 'database'
+        coll = double 'collection', :count => 0, :insert => nil
+        database.stub :[] => coll
+        fix = Mongo::Fixture.new :test, database
+        ins = Mongo::Fixture::Inserter.new fix
+        def ins.loot
+          data_was_inserted_in?(:comment).should === false
+        end
+        ins.loot
+      end
+      
+      after do
+        Fast.dir.remove! :test
+      end
+    end
+  end  
+
+  describe "#insert_data_for" do
+    context "provided the collection has data in the fixture" do
+      it "should insert the data of the collection using the fixture's connection" do
+        @data = { :users => { :pepe => { :name => "Jose" } } }
+        collection = double "collection"
+        collection.should_receive(:insert).with( :name => "Jose" )
+        connection = double 'connection'
+        connection.should_receive(:[]).with(:users).and_return collection
+        fixture = double "fixture", :data => @data
+        fixture.should_receive(:connection).and_return connection
+        inserter = Mongo::Fixture::Inserter.new fixture
+        inserter.insert_data_for :users
+      end
+
+      it "should add the collection as inserted" do
+        @data = { :users => { :pepe => { :name => "Jose" } } }
+        collection = double "collection"
+        collection.should_receive(:insert).with( :name => "Jose" )
+        connection = double 'connection'
+        connection.should_receive(:[]).with(:users).and_return collection
+        fixture = double "fixture", :data => @data
+        fixture.should_receive(:connection).and_return connection
+        inserter = Mongo::Fixture::Inserter.new fixture
+        inserter.insert_data_for :users
+        inserter.inserted.should include :users
+      end
+    end
+  end
+
+  describe "#fixture" do
+    it "should return the fixture" do
+      fixture = double "fixture"
+      inserter = Mongo::Fixture::Inserter.new fixture
+      inserter.fixture.should === fixture
+    end
+  end
+end

data/spec/mongo/fixture_spec.rb

@@ -1,4 +1,4 @@
-require "mongo-fixture"
+require "spec_helper"
 
 describe Mongo::Fixture do
   describe ".path" do
@@ -84,7 +84,7 @@ describe Mongo::Fixture do
       end
     end
   end
-  
+
   describe "#force_checked!" do
     it "check should return true and should not call [] in the passed database" do
       database = stub 'database'
@@ -96,7 +96,7 @@ describe Mongo::Fixture do
       fix.check.should === true
     end
   end
-  
+
   describe "#[]" do
     context "a valid fixture has been loaded" do
       before do
@@ -122,7 +122,7 @@ describe Mongo::Fixture do
       end
     end    
   end
-  
+
   describe "#method_missing" do
     context "a valid fixture has been loaded" do
       context "a collection key is passed" do
@@ -153,7 +153,7 @@ describe Mongo::Fixture do
       }.to raise_error NoMethodError
     end
   end
-  
+
   describe "#fixtures_path" do
     it "should call Mongo::Fixture.path" do
       Mongo::Fixture.should_receive :path
@@ -288,7 +288,7 @@ describe Mongo::Fixture do
       fix.connection.should === connection
     end
   end
-  
+
   describe "#connection=" do
     it "sets the connection" do
       fix = Mongo::Fixture.new
@@ -318,7 +318,7 @@ describe Mongo::Fixture do
       end
     end
   end
-  
+
   describe "#data" do
     context "a fixture has been loaded" do
       before do 
@@ -343,7 +343,7 @@ describe Mongo::Fixture do
       end
     end
   end
-  
+
   describe "#push" do
     it "should call #check" do
       fix = Mongo::Fixture.new
@@ -407,8 +407,8 @@ describe Mongo::Fixture do
         database = double 'database', :[] => stub( 'collection', :count => 0, :drop => nil  )
         fix = Mongo::Fixture.new :test, database, false
         expect { fix.push
-        }.to raise_error Mongo::Fixture::MissingProcessedValueError, 
-          "In record 'hey' to be inserted into 'users', the processed value of field 'pass' is missing, aborting"
+        }.to raise_error Mongo::Fixture::ReferencedRecordNotFoundError, 
+          "This fixture does not include data for the collections [raw]"
       end
       
       
@@ -417,14 +417,14 @@ describe Mongo::Fixture do
         fix = Mongo::Fixture.new :test, database, false
         fix.should_receive :rollback
         expect { fix.push
-        }.to raise_error Mongo::Fixture::MissingProcessedValueError
+        }.to raise_error Mongo::Fixture::ReferencedRecordNotFoundError
       end      
       
       after do
         Fast.dir.remove! :test
       end
     end
-    
+
     context "a fixture with a field with one alternative name matches a collection name" do
       context "the alternative value matches a record and in the collection" do
         before do 
@@ -433,21 +433,26 @@ describe Mongo::Fixture do
         end
         
         it "should insert the comment so that the comment user value matches the '_id' of the user" do
-          database = double 'database'
-          comm = double 'comments', :count => 0, :drop => nil
-          comm.should_receive( :insert ).with( :user => "un id", :text => "FLAME" )
+          comments = double 'comments', :count => 0, :drop => nil
+          comments.should_receive( :insert ).with( :user => "un id", :text => "FLAME" )
+
           record = stub 'record'
           record.should_receive( :[] ).with( "_id" ).and_return "un id"
+
           usrs = double 'users', :count => 0, :find => stub( :first => record ), :drop => nil, :insert => nil
+
+          database = double 'database'
           database.stub :[] do |coll|
             case coll
               when :users
                 usrs
               when :comments
-                comm
+                comments
             end
           end
-          fix = Mongo::Fixture.new :test, database
+
+          fix = Mongo::Fixture.new :test, database, false
+          fix.push
         end
         
         context "the collection is ordered so that the comment collection comes before the users one" do
@@ -473,121 +478,25 @@ describe Mongo::Fixture do
             fix.push
           end
         end
-        
+          
         after do
           Fast.dir.remove! :test
         end
-      end      
-    end
-  end
-  
-  describe "#data_was_inserted_in?" do
-    it "should be private" do
-      fix = Mongo::Fixture.new
-      fix.private_methods(false).should include :data_was_inserted_in?
-    end
-    
-    context "there is a simple fixture and a collection has been inserted by this fixture" do
-      before do
-        Fast.file.write "test/fixtures/test/users.yaml", "pepe: { user: pepe }"
       end
-      
-      it "should return true" do
-        database = double 'database'
-        coll = double 'collection', :count => 0, :insert => nil
-        database.stub :[] => coll
-        fix = Mongo::Fixture.new :test, database
-        def fix.loot
-          data_was_inserted_in?(:users).should === true
-        end
-        fix.loot
-      end
-      
-      after do
-        Fast.dir.remove! :test
-      end
-    end
-    
-    context "there is a simple fixture and a collection was inserted but not this" do
-      before do
-        Fast.file.write "test/fixtures/test/users.yaml", "pepe: { user: pepe }"
-      end
-      
-      it "should return false" do
-        database = double 'database'
-        coll = double 'collection', :count => 0, :insert => nil
-        database.stub :[] => coll
-        fix = Mongo::Fixture.new :test, database
-        def fix.loot
-          data_was_inserted_in?(:comment).should === false
-        end
-        fix.loot
-      end
-      
-      after do
-        Fast.dir.remove! :test
-      end
-    end
+    end 
   end
-  
-  # This should go in a dependency, pending refactoring TODO
-  describe "#simplify" do
-    context "when receiving a multidimensional hash containing a field with raw and processed" do
-      it "should convert it in a simple hash using the processed value as replacement" do
-        base_hash = {
-          :name => "Jane",
-          :band => "Witherspoons",
-          :pass => {
-            :raw => "secret",
-            :processed => "53oih7fhjdgj3f8="
-          },
-          :email => {
-            :raw => "Jane@gmail.com ",
-            :processed => "jane@gmail.com"
-          }
-        }
-        
-        fix = Mongo::Fixture.new
-        def fix.stub_data
-          @data = {}
-        end
-        fix.stub_data
-        simplified = fix.simplify base_hash
-        simplified.should == {
-          :name => "Jane",
-          :band => "Witherspoons",
-          :pass => "53oih7fhjdgj3f8=",
-          :email => "jane@gmail.com"
-        }
-      end
-    end
-    
-    context "the multidimensional array is missing the processed part of the field" do
-      it "should raise an exception" do
-        base_hash = {
-          :name => "Jane",
-          :pass => {
-            :raw => "secret",
-            :not_processed => "53oih7fhjdgj3f8="
-          },
-          :email => {
-            :raw => "Jane@gmail.com ",
-            :processed => "jane@gmail.com"
-          }
-        }
-        
-        fix = Mongo::Fixture.new
-        def fix.stub_data
-          @data = {}
-        end
-        fix.stub_data
-        expect { fix.simplify base_hash
-        }.to raise_error Mongo::Fixture::MissingProcessedValueError, 
-          "The processed value to insert into the db is missing from the field 'pass', aborting"
-      end
+
+  describe "#inserter" do
+    it "should return an inserter with a reference to this" do
+      database = double 'database'
+      Mongo::Fixture.any_instance.stub :load
+      fixture = Mongo::Fixture.new :test, database, false
+      inserter = fixture.inserter
+      inserter.should be_a Mongo::Fixture::Inserter 
+      inserter.fixture.should === fixture
     end
   end
-  
+
   describe "#rollback" do
     it "should check" do
       fix = Mongo::Fixture.new
@@ -632,40 +541,4 @@ describe Mongo::Fixture do
       end
     end
   end
-  
-  context "two collections are to be inserted with references" do
-    before do 
-      Fast.file.write "test/fixtures/references/users.yaml", "pepe:
-  username: pepe
-  password: 
-  raw: secreto
-  processed: 252db48960f032db4bb604bc26f97106fa85ff88dedef3a28671b6bcd9f9644bf90d7e444d587c9351dfa237a6fc8fe38641a8469d084a166c7807d9c6564860
-  name: Pepe"
-      Fast.file.write "test/fixtures/references/sessions.yaml", "14_horas:
-  user: 
-  users: pepe
-  time: 2012-07-30T14:02:40-03:00
-  y_tres_minutos:
-  user: 
-  users: pepe
-  time: 2012-07-30T14:03:40-03:00
-  y_cuatro_minutos:
-  user: 
-  users: pepe
-  time: 2012-07-30T14:04:40-03:00"
-    end
-
-    it "should not fail!" do
-      collection = double 'coll', :count => 0, :insert => nil
-      database = double 'database'
-      database.stub :[] do |argument|
-        collection
-      end
-      Mongo::Fixture.new :references, database
-    end
-
-    after do
-      Fast.dir.remove! :test
-    end
-  end
 end

data/spec/spec_helper.rb

@@ -0,0 +1,2 @@
+require "mongo-fixture"
+require "pry"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo-fixture
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-14 00:00:00.000000000 Z
+date: 2012-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
@@ -97,10 +97,12 @@ files:
 - features/support/env.rb
 - features/support/hooks.rb
 - lib/mongo-fixture.rb
+- lib/mongo-fixture/inserter.rb
 - lib/mongo-fixture/version.rb
 - mongo-fixture.gemspec
-- spec/mongo/cross_references_spec.rb
+- spec/mongo/fixture/inserter_spec.rb
 - spec/mongo/fixture_spec.rb
+- spec/spec_helper.rb
 homepage: http://github.com/Fetcher/mongo-fixture
 licenses: []
 post_install_message: 
@@ -115,7 +117,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -277568515
+      hash: -421222579
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -124,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -277568515
+      hash: -421222579
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -139,5 +141,6 @@ test_files:
 - features/stepdefs/play_around_with_fixtures/misconfigured_password_field.rb
 - features/support/env.rb
 - features/support/hooks.rb
-- spec/mongo/cross_references_spec.rb
+- spec/mongo/fixture/inserter_spec.rb
 - spec/mongo/fixture_spec.rb
+- spec/spec_helper.rb

data/spec/mongo/cross_references_spec.rb

@@ -1,39 +0,0 @@
-require "mongo-fixture"
-
-describe Mongo::Fixture do
-  context "two collections are to be inserted with references" do
-    before do 
-      Fast.file.write "test/fixtures/references/users.yaml", "pepe:
-  username: pepe
-  password: 
-  raw: secreto
-  processed: 252db48960f032db4bb604bc26f97106fa85ff88dedef3a28671b6bcd9f9644bf90d7e444d587c9351dfa237a6fc8fe38641a8469d084a166c7807d9c6564860
-  name: Pepe"
-      Fast.file.write "test/fixtures/references/sessions.yaml", "14_horas:
-  user: 
-  users: pepe
-  time: 2012-07-30T14:02:40-03:00
-  y_tres_minutos:
-  user: 
-  users: pepe
-  time: 2012-07-30T14:03:40-03:00
-  y_cuatro_minutos:
-  user: 
-  users: pepe
-  time: 2012-07-30T14:04:40-03:00"
-    end
-
-    it "should not fail!" do
-      collection = double 'coll', :count => 0, :insert => nil
-      database = double 'database'
-      database.stub :[] do |argument|
-        collection
-      end
-      Mongo::Fixture.new :references, database
-    end
-
-    after do
-      Fast.dir.remove! :test
-    end
-  end
-end