data_active 0.0.6 → 0.0.7

data/README.rdoc

@@ -231,7 +231,7 @@ You can combine any of the options (:create, :update or :destroy) and Data Activ
 
 * <b>:sync</b> is really the combination of :create, :update and :destroy. Using this option will cause Data Active to ignore :create, :update and :destroy options and will proceed to make your database records match those in the XML document.
 
-* <b>:fail_on_invalid</b> will raise an exception when an invalid record is found (i.e. one that doesn't pass the model validity rules).  When this option isn't used Data Active will fail silently not saving the invalid record.
+* <b>:strict</b> will raise an exception when elements that do not exist as ActiveRecord classes or attibutes on those classes.  When this option isn't used Data Active will ignore those unknow classes and attributes.
 
 
 === One to One Associations
@@ -266,6 +266,7 @@ Data Active supports has_one association with all options and following arr the
 * 0.0.1 First Release
 * 0.0.2 Resolved issue where the parent record in a one to many relationship had not been saved causing validation errors when saving child records
 * 0.0.3 Added option to raise exception when an invalid record id found
+* 0.0.7 Ractoring of internals to optimise speed and memory usage for large documents
 
 === Future Features
 

data/data_active.gemspec

@@ -1,21 +1,23 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "data_active/version"
+$:.push File.expand_path('../lib', __FILE__)
+require 'data_active/version'
 
 Gem::Specification.new do |s|
-  s.name        = "data_active"
+  s.name        = 'data_active'
   s.version     = DataActive::VERSION
-  s.authors     = ["Michael Harrison"]
+  s.authors     = ['Michael Harrison']
   s.email       = %w(michael@focalpause.com)
-  s.homepage    = "https://github.com/michael-harrison/data_active"
+  s.homepage    = 'https://github.com/michael-harrison/data_active'
   s.summary     = "data_active #{s.version}"
   s.description = %q{Data Active is an extension of ActiveRecord that provides features to synchronise an ActiveRecord Model with a supplied XML document}
 
-  s.rubyforge_project = "data_active"
+  s.rubyforge_project = 'data_active'
 
   s.add_dependency 'nokogiri'
   s.add_dependency 'rails'
   s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rspec-rails'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test_apps,test,spec,features}/*`.split("\n")

data/features/step_definitions/step_helper.rb

@@ -1,14 +1,15 @@
 module StepHelper
   def StepHelper.load_fixtures(path)
-    fixtures_folder = path
-    fixtures = Dir[File.join(fixtures_folder, '*.yml')].map {|f| File.basename(f, '.yml') }
+    fixtures = Dir[File.join(path, '*.yml')].map {|f| File.basename(f, '.yml') }
 
     if defined? Fixtures == nil
+      puts 'create via Fixtures'
       Fixtures.reset_cache
-      Fixtures.create_fixtures(fixtures_folder, fixtures)
+      Fixtures.create_fixtures(path, fixtures)
     else
+      puts 'create via ActiveRecord::Fixtures'
       ActiveRecord::Fixtures.reset_cache
-      ActiveRecord::Fixtures.create_fixtures(fixtures_folder, fixtures)
+      ActiveRecord::Fixtures.create_fixtures(path, fixtures)
     end
   end
 end

data/features/step_definitions/sync_books_with_xml.rb

@@ -21,18 +21,18 @@ When /^I have the "([^"]*)" file$/ do |xml_document_file|
 end
 
 When /^I synchronise with "([^"]*)"$/ do |xml_document_file|
-  Book.many_from_xml(File.open(Rails.root.join(xml_document_file)).read, [:sync]) != nil
+  Book.many_from_xml(File.open(Rails.root.join(xml_document_file)), [:sync]) != nil
 end
 
 When /^I synchronise with "([^"]*)" I should get an error$/ do |xml_document_file|
+  failed = true
   begin
     Book.many_from_xml(File.open(Rails.root.join(xml_document_file)).read, [:sync]) != nil
-    fail "Error was didn't happen"
-  rescue Exception => e
-    if e.message.exclude? "Too many records for one to one association"
-      fail "Wrong exception was raised"
-    end
+  rescue
+    failed = false
   end
+
+  fail "Error was didn't happen" if failed
 end
 
 When /^I update with "([^"]*)"$/ do |xml_document_file|
@@ -284,7 +284,7 @@ When /^the database will contain identical pages for the chapters as those in "(
               fail "Page with id #{page_id} is missing"
             else
               if page_content != page.content
-                file "Page content in database doesn't match page content in xml for page with id #{page_id}, XML: #{page_content}, Database: #{page.content}"
+                fail "Page content in database doesn't match page content in xml for page with id #{page_id}, XML: #{page_content}, Database: #{page.content}"
               end
               
               if page_number != page.number.to_s
@@ -337,3 +337,7 @@ end
 Then /^I should have a failure$/ do
   fail "no error message" if @error_message.nil?
 end
+When /^I synchronise with "([^"]*)" I should only have one book price for all books$/ do |xml_document_file|
+  Book.many_from_xml(File.open(Rails.root.join(xml_document_file)).read, [:sync])
+  BookPrice.count.should eq 1
+end

data/features/support/book_generator.rb

@@ -0,0 +1,29 @@
+require 'factory_girl'
+
+class BookGenerator
+  def fresh
+    FactoryGirl.create_list(:book, 2).each do |book|
+      FactoryGirl.create(:book_price, book_id: book.id) if book.id.eql? 1
+      FactoryGirl.create_list(:chapter, 3, book_id: book.id).each do |chapter|
+        FactoryGirl.create_list(:page, )
+      end
+    end
+
+  end
+
+  def changed
+
+  end
+
+  def no_matching_records
+
+  end
+
+  def without_chapters
+
+  end
+
+  def without_one_to_one
+
+  end
+end

data/features/support/factories/book.rb

@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :book do
+    sequence(:id) { |n| n }
+    sequence(:name) { |n| "Book #{n}" }
+  end
+end

data/features/support/factories/book_price.rb

@@ -0,0 +1,8 @@
+FactoryGirl.define do
+  factory :book_price do
+    sequence(:id) { |n| n }
+    sequence(:sell) { |n| n * 50.0 }
+    sequence(:educational) { |n| n * 35.0 }
+    sequence(:cost) { |n| n * 20.0 }
+  end
+end

data/features/support/factories/chapter.rb

@@ -0,0 +1,7 @@
+FactoryGirl.define do
+  factory :chapter do
+    sequence(:id) { |n| n }
+    sequence(:title) { |n| "Chapter #{n}" }
+    sequence(:introduction) { |n| 1.upto(n).each { 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.' }.join(' ') }
+  end
+end

data/features/support/factories/page.rb

@@ -0,0 +1,7 @@
+FactoryGirl.define do
+  factory :page do
+    sequence(:id) { |n| n }
+    sequence(:number) { |n| "Chapter #{n}" }
+    sequence(:content) { |n| 1.upto(n).each { 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.' }.join(' ') }
+  end
+end

data/features/support/fixtures/fresh/pages.yml

@@ -34,19 +34,19 @@ book_1_chapter_2_page_1:
   content: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus purus nulla, condimentum vitae hendrerit nec, blandit et felis. Suspendisse vulputate mollis suscipit. Vivamus non libero quis urna gravida euismod quis in nisi. Morbi turpis orci, posuere nec ultrices ut, egestas ac purus. Morbi id pretium erat. In ullamcorper, ligula id porta pellentesque, sem turpis ultricies libero, non elementum ipsum neque at dui. Donec auctor nulla id mi dapibus id faucibus felis mollis. Curabitur imperdiet tristique nisi, consectetur molestie purus accumsan id. Curabitur lacinia diam et nisl iaculis eleifend. Quisque turpis elit, volutpat eget dapibus sed, egestas nec leo. Mauris dignissim tellus non lorem fringilla pharetra.
   number: 1
 
-book_1_chapter_2_page_1:
+book_1_chapter_2_page_2:
   id: 6
   chapter_id: 2
   content: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus purus nulla, condimentum vitae hendrerit nec, blandit et felis. Suspendisse vulputate mollis suscipit. Vivamus non libero quis urna gravida euismod quis in nisi. Morbi turpis orci, posuere nec ultrices ut, egestas ac purus. Morbi id pretium erat. In ullamcorper, ligula id porta pellentesque, sem turpis ultricies libero, non elementum ipsum neque at dui. Donec auctor nulla id mi dapibus id faucibus felis mollis. Curabitur imperdiet tristique nisi, consectetur molestie purus accumsan id. Curabitur lacinia diam et nisl iaculis eleifend. Quisque turpis elit, volutpat eget dapibus sed, egestas nec leo. Mauris dignissim tellus non lorem fringilla pharetra.
   number: 2
 
-book_1_chapter_2_page_1:
+book_1_chapter_2_page_3:
   id: 7
   chapter_id: 2
   content: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus purus nulla, condimentum vitae hendrerit nec, blandit et felis. Suspendisse vulputate mollis suscipit. Vivamus non libero quis urna gravida euismod quis in nisi. Morbi turpis orci, posuere nec ultrices ut, egestas ac purus. Morbi id pretium erat. In ullamcorper, ligula id porta pellentesque, sem turpis ultricies libero, non elementum ipsum neque at dui. Donec auctor nulla id mi dapibus id faucibus felis mollis. Curabitur imperdiet tristique nisi, consectetur molestie purus accumsan id. Curabitur lacinia diam et nisl iaculis eleifend. Quisque turpis elit, volutpat eget dapibus sed, egestas nec leo. Mauris dignissim tellus non lorem fringilla pharetra.
   number: 3
 
-book_1_chapter_2_page_1:
+book_1_chapter_2_page_4:
   id: 8
   chapter_id: 2
   content: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus purus nulla, condimentum vitae hendrerit nec, blandit et felis. Suspendisse vulputate mollis suscipit. Vivamus non libero quis urna gravida euismod quis in nisi. Morbi turpis orci, posuere nec ultrices ut, egestas ac purus. Morbi id pretium erat. In ullamcorper, ligula id porta pellentesque, sem turpis ultricies libero, non elementum ipsum neque at dui. Donec auctor nulla id mi dapibus id faucibus felis mollis. Curabitur imperdiet tristique nisi, consectetur molestie purus accumsan id. Curabitur lacinia diam et nisl iaculis eleifend. Quisque turpis elit, volutpat eget dapibus sed, egestas nec leo. Mauris dignissim tellus non lorem fringilla pharetra.
@@ -61,13 +61,13 @@ book_1_chapter_3_page_1:
   content: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus purus nulla, condimentum vitae hendrerit nec, blandit et felis. Suspendisse vulputate mollis suscipit. Vivamus non libero quis urna gravida euismod quis in nisi. Morbi turpis orci, posuere nec ultrices ut, egestas ac purus. Morbi id pretium erat. In ullamcorper, ligula id porta pellentesque, sem turpis ultricies libero, non elementum ipsum neque at dui. Donec auctor nulla id mi dapibus id faucibus felis mollis. Curabitur imperdiet tristique nisi, consectetur molestie purus accumsan id. Curabitur lacinia diam et nisl iaculis eleifend. Quisque turpis elit, volutpat eget dapibus sed, egestas nec leo. Mauris dignissim tellus non lorem fringilla pharetra.
   number: 1
 
-book_1_chapter_3_page_1:
+book_1_chapter_3_page_2:
   id: 10
   chapter_id: 3
   content: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus purus nulla, condimentum vitae hendrerit nec, blandit et felis. Suspendisse vulputate mollis suscipit. Vivamus non libero quis urna gravida euismod quis in nisi. Morbi turpis orci, posuere nec ultrices ut, egestas ac purus. Morbi id pretium erat. In ullamcorper, ligula id porta pellentesque, sem turpis ultricies libero, non elementum ipsum neque at dui. Donec auctor nulla id mi dapibus id faucibus felis mollis. Curabitur imperdiet tristique nisi, consectetur molestie purus accumsan id. Curabitur lacinia diam et nisl iaculis eleifend. Quisque turpis elit, volutpat eget dapibus sed, egestas nec leo. Mauris dignissim tellus non lorem fringilla pharetra.
   number: 2
 
-book_1_chapter_3_page_1:
+book_1_chapter_3_page_3:
   id: 11
   chapter_id: 3
   content: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus purus nulla, condimentum vitae hendrerit nec, blandit et felis. Suspendisse vulputate mollis suscipit. Vivamus non libero quis urna gravida euismod quis in nisi. Morbi turpis orci, posuere nec ultrices ut, egestas ac purus. Morbi id pretium erat. In ullamcorper, ligula id porta pellentesque, sem turpis ultricies libero, non elementum ipsum neque at dui. Donec auctor nulla id mi dapibus id faucibus felis mollis. Curabitur imperdiet tristique nisi, consectetur molestie purus accumsan id. Curabitur lacinia diam et nisl iaculis eleifend. Quisque turpis elit, volutpat eget dapibus sed, egestas nec leo. Mauris dignissim tellus non lorem fringilla pharetra.
@@ -109,19 +109,19 @@ book_2_chapter_2_page_1:
   content: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus purus nulla, condimentum vitae hendrerit nec, blandit et felis. Suspendisse vulputate mollis suscipit. Vivamus non libero quis urna gravida euismod quis in nisi. Morbi turpis orci, posuere nec ultrices ut, egestas ac purus. Morbi id pretium erat. In ullamcorper, ligula id porta pellentesque, sem turpis ultricies libero, non elementum ipsum neque at dui. Donec auctor nulla id mi dapibus id faucibus felis mollis. Curabitur imperdiet tristique nisi, consectetur molestie purus accumsan id. Curabitur lacinia diam et nisl iaculis eleifend. Quisque turpis elit, volutpat eget dapibus sed, egestas nec leo. Mauris dignissim tellus non lorem fringilla pharetra.
   number: 1
 
-book_2_chapter_2_page_1:
+book_2_chapter_2_page_2:
   id: 17
   chapter_id: 5
   content: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus purus nulla, condimentum vitae hendrerit nec, blandit et felis. Suspendisse vulputate mollis suscipit. Vivamus non libero quis urna gravida euismod quis in nisi. Morbi turpis orci, posuere nec ultrices ut, egestas ac purus. Morbi id pretium erat. In ullamcorper, ligula id porta pellentesque, sem turpis ultricies libero, non elementum ipsum neque at dui. Donec auctor nulla id mi dapibus id faucibus felis mollis. Curabitur imperdiet tristique nisi, consectetur molestie purus accumsan id. Curabitur lacinia diam et nisl iaculis eleifend. Quisque turpis elit, volutpat eget dapibus sed, egestas nec leo. Mauris dignissim tellus non lorem fringilla pharetra.
   number: 2
 
-book_2_chapter_2_page_1:
+book_2_chapter_2_page_3:
   id: 18
   chapter_id: 5
   content: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus purus nulla, condimentum vitae hendrerit nec, blandit et felis. Suspendisse vulputate mollis suscipit. Vivamus non libero quis urna gravida euismod quis in nisi. Morbi turpis orci, posuere nec ultrices ut, egestas ac purus. Morbi id pretium erat. In ullamcorper, ligula id porta pellentesque, sem turpis ultricies libero, non elementum ipsum neque at dui. Donec auctor nulla id mi dapibus id faucibus felis mollis. Curabitur imperdiet tristique nisi, consectetur molestie purus accumsan id. Curabitur lacinia diam et nisl iaculis eleifend. Quisque turpis elit, volutpat eget dapibus sed, egestas nec leo. Mauris dignissim tellus non lorem fringilla pharetra.
   number: 3
 
-book_2_chapter_2_page_1:
+book_2_chapter_2_page_4:
   id: 19
   chapter_id: 5
   content: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus purus nulla, condimentum vitae hendrerit nec, blandit et felis. Suspendisse vulputate mollis suscipit. Vivamus non libero quis urna gravida euismod quis in nisi. Morbi turpis orci, posuere nec ultrices ut, egestas ac purus. Morbi id pretium erat. In ullamcorper, ligula id porta pellentesque, sem turpis ultricies libero, non elementum ipsum neque at dui. Donec auctor nulla id mi dapibus id faucibus felis mollis. Curabitur imperdiet tristique nisi, consectetur molestie purus accumsan id. Curabitur lacinia diam et nisl iaculis eleifend. Quisque turpis elit, volutpat eget dapibus sed, egestas nec leo. Mauris dignissim tellus non lorem fringilla pharetra.
@@ -136,13 +136,13 @@ book_2_chapter_3_page_1:
   content: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus purus nulla, condimentum vitae hendrerit nec, blandit et felis. Suspendisse vulputate mollis suscipit. Vivamus non libero quis urna gravida euismod quis in nisi. Morbi turpis orci, posuere nec ultrices ut, egestas ac purus. Morbi id pretium erat. In ullamcorper, ligula id porta pellentesque, sem turpis ultricies libero, non elementum ipsum neque at dui. Donec auctor nulla id mi dapibus id faucibus felis mollis. Curabitur imperdiet tristique nisi, consectetur molestie purus accumsan id. Curabitur lacinia diam et nisl iaculis eleifend. Quisque turpis elit, volutpat eget dapibus sed, egestas nec leo. Mauris dignissim tellus non lorem fringilla pharetra.
   number: 1
 
-book_2_chapter_3_page_1:
+book_2_chapter_3_page_2:
   id: 21
   chapter_id: 6
   content: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus purus nulla, condimentum vitae hendrerit nec, blandit et felis. Suspendisse vulputate mollis suscipit. Vivamus non libero quis urna gravida euismod quis in nisi. Morbi turpis orci, posuere nec ultrices ut, egestas ac purus. Morbi id pretium erat. In ullamcorper, ligula id porta pellentesque, sem turpis ultricies libero, non elementum ipsum neque at dui. Donec auctor nulla id mi dapibus id faucibus felis mollis. Curabitur imperdiet tristique nisi, consectetur molestie purus accumsan id. Curabitur lacinia diam et nisl iaculis eleifend. Quisque turpis elit, volutpat eget dapibus sed, egestas nec leo. Mauris dignissim tellus non lorem fringilla pharetra.
   number: 2
 
-book_2_chapter_3_page_1:
+book_2_chapter_3_page_3:
   id: 22
   chapter_id: 6
   content: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus purus nulla, condimentum vitae hendrerit nec, blandit et felis. Suspendisse vulputate mollis suscipit. Vivamus non libero quis urna gravida euismod quis in nisi. Morbi turpis orci, posuere nec ultrices ut, egestas ac purus. Morbi id pretium erat. In ullamcorper, ligula id porta pellentesque, sem turpis ultricies libero, non elementum ipsum neque at dui. Donec auctor nulla id mi dapibus id faucibus felis mollis. Curabitur imperdiet tristique nisi, consectetur molestie purus accumsan id. Curabitur lacinia diam et nisl iaculis eleifend. Quisque turpis elit, volutpat eget dapibus sed, egestas nec leo. Mauris dignissim tellus non lorem fringilla pharetra.

data/features/sync_database_with_xml.feature

@@ -28,5 +28,5 @@ Feature: Synchronise database with XML
 
   Examples: 
     | xml_file                                                  |
-    | features/support/fixtures/xml/books_changed.xml           |
-    | features/support/fixtures/xml/ms_access/books_changed.xml |
+    | features/support/fixtures/xml/books_fresh.xml           |
+    | features/support/fixtures/xml/ms_access/books_fresh.xml |

data/features/sync_one_to_many.feature

@@ -15,12 +15,6 @@ Feature: Synchronise one to many relationships
     When I synchronise with "features/support/fixtures/xml/books_with_changed_chapters.xml"
     Then the chapters will be identical to those in "features/support/fixtures/xml/books_with_changed_chapters.xml"
 
-  Scenario: Replace records in the database
-    Given I have a fresh set of books
-    And I have the "features/support/fixtures/xml/books_with_mismatched_chapters.xml" file
-    When I synchronise with "features/support/fixtures/xml/books_with_mismatched_chapters.xml"
-    Then the chapters will be identical to those in "features/support/fixtures/xml/books_with_mismatched_chapters.xml"
-
   Scenario: Parent changes records in the database
     Given I have a fresh set of books
     And I have the "features/support/fixtures/xml/books_with_moved_chapters.xml" file

data/features/sync_one_to_one.feature

@@ -30,4 +30,4 @@ Feature: Synchronise one to one relationships
   Scenario: Duplicate records in the xml
     Given I have a fresh set of books
     And I have the "features/support/fixtures/xml/books_with_many_one_to_one_records.xml" file
-    When I synchronise with "features/support/fixtures/xml/books_with_many_one_to_one_records.xml" I should get an error
+    When I synchronise with "features/support/fixtures/xml/books_with_many_one_to_one_records.xml" I should only have one book price for all books

data/lib/data_active.rb

@@ -1,4 +1,8 @@
-require "data_active/version"
+require 'data_active/version'
+require 'data_active/entity'
+require 'data_active/sax_document'
+require 'data_active/parser'
+require 'data_active/attribute'
 
 module DataActive
   def self.included(base)
@@ -15,290 +19,12 @@ module DataActive
 
   module ClassMethods
     def many_from_xml(source_xml, options = [])
-      @data_active_options = options
-      many_from root_node_in source_xml
+      parser = Nokogiri::XML::SAX::Parser.new(DataActive::SaxDocument.new(self.name.underscore, options))
+      parser.parse(source_xml)
     end
 
     def one_from_xml(source_xml, options = [])
-      @data_active_options = options
-
-      current_node = root_node_in source_xml
-
-      if current_node.name.underscore.eql?(self.name.underscore)
-        # Load or create a new record
-        pk_node = current_node.xpath self.primary_key.to_s
-
-        active_record = find_or_create_based_on(pk_node)
-
-        unless active_record.nil?
-          # Process the attributes
-          if options.include? :update or options.include? :sync or options.include? :create
-            assign_attributes_from current_node, :to => active_record
-            if options.include? :fail_on_invalid and !active_record.valid?
-              messages = active_record.errors.messages.map { |attribute, messages| "#{attribute} #{messages.map { |message| message }.join(', ')}" }.join(', ')
-              raise "Found an invalid #{active_record.class.name} with the following errors: #{messages}. Source: #{current_node.to_s}"
-            end
-          end
-
-          # Check through associations and apply sync appropriately
-          self.reflect_on_all_associations.each do |association|
-            foreign_key = foreign_key_from(association)
-            klass = association.klass
-
-            case
-              when association.macro == :has_many, association.macro == :has_and_belongs_to_many
-                instances = instances_for association, :from => current_node, :for => active_record
-
-                child_ids = []
-                instances.each do |instance|
-                  new_record = klass.one_from_xml(instance, options)
-                  if new_record != nil
-                    child_ids << new_record[klass.primary_key]
-                    active_record.__send__(klass.name.underscore.pluralize.to_sym) << new_record
-                  end
-                end
-
-                unless active_record.new_record?
-                  if options.include?(:sync) or options.include?(:destroy)
-                    if child_ids.length > 0
-                      klass.destroy_all [klass.primary_key.to_s + " not in (?) and #{foreign_key} = ?", child_ids.collect, active_record.attributes[self.primary_key.to_s]]
-                    else
-                      klass.destroy_all
-                    end
-                  end
-                end
-
-              when association.macro == :has_one
-                klass = association.klass
-                if active_record.new_record?
-                  single_objects = current_node.xpath(".//#{association.name}")
-                else
-                  record = klass.where(foreign_key => active_record.attributes[self.primary_key.to_s]).all
-                  single_objects = current_node.xpath("//#{self.name.underscore}[#{self.primary_key}=#{active_record.attributes[self.primary_key.to_s]}]/#{association.name}")
-                end
-
-                if single_objects.count == 1
-                  # Check to see if the already record exists
-                  if record.present?
-                    if record.count == 1
-                      db_pk_value = record[0][klass.primary_key]
-                      xml_pk_value = Integer(single_objects[0].element_children.xpath("//#{self.name.underscore}/#{klass.primary_key}").text)
-
-                      if db_pk_value != xml_pk_value
-                        # Different record in xml
-                        if options.include?(:sync) or options.include?(:destroy)
-                          # Delete the one in the database
-                          klass.destroy(record[0][klass.primary_key])
-                        end
-                      end
-                    elsif record.count > 1
-                      raise "Too many records for one to one association in the database. Found #{record.count} records of '#{association.name}' for association with '#{self.name}'"
-                    end
-                  end
-
-                  if options.include?(:create) or options.include?(:update) or options.include?(:sync)
-                    new_record = klass.one_from_xml(single_objects[0], options)
-                    if new_record != nil
-                      new_record[foreign_key.to_sym] = active_record[self.primary_key.to_s]
-                      if active_record.new_record?
-                        active_record.send("#{klass.name.underscore.to_sym}=", new_record)
-                      else
-                        new_record.save!
-                      end
-                    end
-                  end
-                elsif single_objects.count > 1
-                  # There are more than one associations
-                  raise "Too many records for one to one association in the provided XML. Found #{single_objects.count} records of '#{association.name}' for association with '#{self.name}'"
-                else
-                  # There are no records in the XML
-                  if record.present?
-                    if record.count > 0 and options.include?(:sync) or options.include?(:destroy)
-                      # Found some in the database: destroy then
-                      klass.destroy_all("#{foreign_key} = #{active_record.attributes[self.primary_key.to_s]}")
-                    end
-                  end
-                end
-
-              when association.macro == :belongs_to
-
-              else
-                raise "unsupported association #{association.macro} for #{association.name  } on #{self.name}"
-            end
-          end
-
-          # Save the record
-          if options.include? :sync
-            # Doing complete synchronisation with XML
-            active_record.save
-          elsif options.include?(:create) and active_record.new_record?
-            active_record.save
-          elsif options.include?(:update) and not active_record.new_record?
-            active_record.save
-          end
-        end
-
-        active_record
-      else
-        raise "The supplied XML (#{current_node.name}) cannot be mapped to this class (#{self.name})"
-      end
-    end
-
-    private
-    def many_from(current_node)
-      case
-        when (is_ms_access_xml?(current_node) or is_rails_like_xml?(current_node))
-          process_children_for current_node
-
-        when self.name.underscore.eql?(current_node.name.underscore)
-          raise "The supplied XML (#{current_node.name}) is a single instance of '#{self.name}'. Please use one_from_xml"
-
-        else
-          raise "The supplied XML (#{current_node.name}) cannot be mapped to this class (#{self.name})"
-
-      end
-    end
-
-    def process_children_for(current_node)
-      records = []
-      recorded_ids = []
-
-      current_node.xpath(".//#{self.name.underscore}").each do |node|
-        record = self.one_from_xml(node, @data_active_options)
-        if record
-          recorded_ids << record[primary_key.to_sym]
-          records << record
-        end
-      end
-
-      remove_records_not_in recorded_ids
-      records
-    end
-
-    def is_ms_access_xml?(node)
-      node.name.eql?('dataroot') and node.namespace_definitions.map { |ns| ns.href }.include?('urn:schemas-microsoft-com:officedata')
-    end
-
-    def is_rails_like_xml?(current_node)
-      self.name.pluralize.underscore.eql?(current_node.name.underscore)
-    end
-
-    def xml_node_matches_class(xml_node)
-      if xml_node.attributes['type'].blank?
-        xml_node.name.underscore == self.name.underscore
-      else
-        xml_node.attributes['type'].value.underscore == self.name.underscore
-      end
-    end
-
-    def find_or_create_based_on(pk_node)
-      ar = nil
-      if pk_node
-        begin
-          ar = find pk_node.text
-        rescue
-          # No record exists, create a new one
-          if @data_active_options.include?(:sync) or @data_active_options.include?(:create)
-            ar = self.new
-          end
-        end
-      else
-        # No primary key value, must be a new record
-        if @data_active_options.include?(:sync) or @data_active_options.include?(:create)
-          ar = self.new
-        end
-      end
-      ar
-    end
-
-    def assign_attributes_from(current_node, options)
-      record = options[:to]
-
-      record.attributes.each do |name, value|
-        attribute_nodes = current_node.xpath name.to_s
-        if attribute_nodes.count == 1
-          if attribute_nodes[0].attributes['nil'].try(:value)
-            record[name] = nil
-          else
-            record[name] = attribute_nodes[0].text
-          end
-        elsif attribute_nodes.count > 1
-          raise "Found duplicate elements in xml for active record attribute '#{name}'"
-        end
-      end
-    end
-
-    def instances_for(association, options)
-      current_node = options[:from]
-      active_record = options[:for]
-
-      # Attempt to find instances which are in the following format
-      # <books>
-      #   <book>
-      #     ...
-      #   </book>
-      #   <book>
-      #     ...
-      #   </book>
-      # </books>
-      if active_record.new_record?
-        results = current_node.xpath("#{association.name}")
-      else
-        results = current_node.xpath("//#{self.name.underscore}[#{self.primary_key}=#{active_record.attributes[self.primary_key.to_s]}]/#{association.name}")
-      end
-
-
-      if results.count.eql? 0
-        # Attempt to find instances which are in the following format
-        # <book>
-        #   ...
-        # </book>
-        if active_record.new_record?
-          results = current_node.xpath("#{association.name.to_s.singularize}")
-        else
-          results = current_node.xpath("//#{self.name.underscore}[#{self.primary_key}=#{active_record.attributes[self.primary_key.to_s]}]/#{association.name.to_s.singularize}")
-        end
-      else
-        results = results.first.element_children
-      end
-
-      results
-    end
-
-    def foreign_key_from(association)
-      if ActiveRecord::Reflection::AssociationReflection.method_defined? :foreign_key
-        # Support for Rails 3.1 and later
-        foreign_key = association.foreign_key
-      elsif ActiveRecord::Reflection::AssociationReflection.method_defined? :primary_key_name
-        # Support for Rails earlier than 3.1
-        foreign_key = association.primary_key_name
-      else
-        raise 'Unsupported version of ActiveRecord. Unable to identify the foreign key.'
-      end
-      foreign_key
-    end
-
-    def root_node_in(source_xml)
-      if source_xml.is_a?(String)
-        doc = Nokogiri::XML(source_xml)
-        doc.children.first
-      else
-        source_xml
-      end
-    end
-
-    def remove_records_not_in(recorded_ids)
-      if @data_active_options.include?(:sync)
-        if recorded_ids.length > 0
-          self.destroy_all [self.primary_key.to_s + " not in (?)", recorded_ids.collect]
-        end
-      elsif @data_active_options.include?(:destroy)
-        if recorded_ids.length > 0
-          self.destroy_all [self.primary_key.to_s + " not in (?)", recorded_ids.collect]
-        else
-          self.destroy_all
-        end
-      end
+      many_from_xml(source_xml, options)
     end
   end
 end