data_active 0.0.5 → 0.0.6

data/features/step_definitions/sync_books_with_xml.rb

@@ -110,6 +110,12 @@ When /^the book price will be identical to those in "([^"]*)"$/ do |xml_document
         if book_price.nil?
           fail "BookPrice with id #{book_price_id} is missing"
         else
+          if book_price.book_id.nil?
+            fail "BookPrice.book_id in database isn't being set (expecting book_id = #{book_id})"
+          elsif book_price.book_id != book_id.to_i
+            fail "BookPrice.book_id in database is set incorrectly (expecting book_id = #{book_id} and got #{book_price.book_id})"
+          end
+
           book_price_sell = book_price_element.xpath("sell").text
           book_price_educational = book_price_element.xpath("educational").text
           book_price_cost = book_price_element.xpath("cost").text
@@ -141,6 +147,40 @@ When /^the book price will be identical to those in "([^"]*)"$/ do |xml_document
   end
 end
 
+When /^the book price will be identical to those in "([^"]*)" with new ids$/ do |xml_document_file|
+  xml_document = Nokogiri::XML(File.open(Rails.root.join(xml_document_file)).read)
+
+  # Ensure that all chapters in the xml document have been recorded
+  xml_document.xpath('//book').each do |book_element|
+    book = Book.find_by_name book_element.xpath('name')[0].text
+    book_id = book.id
+    book_price_element = book_element.xpath('book_price')
+    book_price = BookPrice.find_by_book_id book_id
+
+    fail 'Too many book prices' if book_price_element.count > 1
+
+    if book_price.nil?
+      fail "BookPrice for book '#{book.name}' is missing"
+    else
+      book_price_sell = book_price_element.xpath('sell').text
+      book_price_educational = book_price_element.xpath('educational').text
+      book_price_cost = book_price_element.xpath('cost').text
+
+      if Float(book_price_sell) != book_price.sell
+        fail "BookPrice 'sell' in database doesn't match book price sell in xml for book '#{book.name}', XML: #{book_price_sell}, Database: #{book_price.sell}"
+      end
+
+      if Float(book_price_cost) != book_price.cost
+        fail "BookPrice 'cost' in database doesn't match book price cost in xml for book '#{book.name}', XML: #{book_price_cost}, Database: #{book_price.cost}"
+      end
+
+      if Float(book_price_educational) != book_price.educational
+        fail "BookPrice 'educational' in database doesn't match book price educational in xml for book '#{book.name}', XML: #{book_price_educational}, Database: #{book_price.educational}"
+      end
+    end
+  end
+end
+
 When /^the chapters will be identical to those in "([^"]*)"$/ do |xml_document_file|
   chapters_in_database = Chapter.all
   if chapters_in_database.count > 0
@@ -190,18 +230,23 @@ When /^the chapters will be identical to those in "([^"]*)" with new ids$/ do |x
   xml_document.xpath("//book").each do |book_element|
     book = Book.where(:name => book_element.xpath("name")[0].text).first
     book_id = book.id
-    xml_document.xpath("//book[name[text()='#{book_id}']]/chapters/chapter").each do |chapter_element|
+    xml_document.xpath("//book[name[text()='#{book.name}']]/chapters/chapter").each do |chapter_element|
       chapter_title = chapter_element.xpath("title")[0].text
       chapter_introduction = chapter_element.xpath("introduction")[0].text
-      chapter = book.chapters.where(:title => chapter_title)
+      chapter = book.chapters.where(:title => chapter_title).first
 
       if chapter == nil
         fail "Chapters #{chapter_title} is missing"
       else
+        if chapter.book_id.nil?
+          fail "Chapter.book_id in database isn't being set (expecting book_id = #{book_id}"
+        elsif chapter.book_id != book_id
+          fail "Chapter.book_id in database is set incorrectly (expecting book_id = #{book_id} and got #{chapter.book_id})"
+        end
         if chapter_introduction != chapter.introduction
           fail "Chapter introduction in database doesn't match chapter introduction in xml for chapter #{chapter_title}, XML: #{chapter_introduction}, Database: #{chapter.introduction}"
         end
-        if book_id != chapter.book_id.to_s
+        if book_id != chapter.book_id
           fail "Chapter book_id in database doesn't match chapter book_id in xml for chapter #{chapter_title}, XML: #{book_id}, Database: #{chapter.book_id}"
         end
       end

data/features/support/fixtures/xml/books_fresh_without_ids.xml

@@ -74,6 +74,11 @@
   </book>
   <book>
     <name>Book 1</name>
+    <book_price>
+      <sell>50.00</sell>
+      <educational>35.00</educational>
+      <cost>20.00</cost>
+    </book_price>
     <chapters type="array">
       <chapter>
         <title>Chapter 1</title>

data/features/support/fixtures/xml/ms_access/books_fresh_without_ids.xml

@@ -110,6 +110,11 @@
   </book>
   <book>
     <name>Book 2</name>
+    <book_price>
+      <sell>50.00</sell>
+      <educational>35.00</educational>
+      <cost>20.00</cost>
+    </book_price>
     <chapter>
       <title>B2 Chapter 1</title>
       <introduction>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus purus nulla, condimentum vitae

data/features/sync_one_to_many.feature

@@ -45,6 +45,7 @@ Feature: Synchronise one to many relationships
     When I synchronise with "<xml_file>"
     Then the books in the database will be identical to those in "<xml_file>" with new ids
     And the chapters will be identical to those in "<xml_file>" with new ids
+    And the book price will be identical to those in "<xml_file>" with new ids
 
   Examples:
     | xml_file                                                            |

data/lib/data_active.rb

@@ -28,7 +28,7 @@ module DataActive
         # Load or create a new record
         pk_node = current_node.xpath self.primary_key.to_s
 
-        active_record = find_record_based_on(pk_node)
+        active_record = find_or_create_based_on(pk_node)
 
         unless active_record.nil?
           # Process the attributes
@@ -41,7 +41,6 @@ module DataActive
           end
 
           # Check through associations and apply sync appropriately
-          associations = self.reflect_on_all_associations
           self.reflect_on_all_associations.each do |association|
             foreign_key = foreign_key_from(association)
             klass = association.klass
@@ -101,7 +100,11 @@ module DataActive
                     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]
-                      new_record.save!
+                      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
@@ -142,6 +145,44 @@ module DataActive
     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
@@ -150,7 +191,7 @@ module DataActive
       end
     end
 
-    def find_record_based_on(pk_node)
+    def find_or_create_based_on(pk_node)
       ar = nil
       if pk_node
         begin
@@ -232,7 +273,7 @@ module DataActive
         # 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."
+        raise 'Unsupported version of ActiveRecord. Unable to identify the foreign key.'
       end
       foreign_key
     end
@@ -259,61 +300,6 @@ module DataActive
         end
       end
     end
-
-    def many_from_rails_xml(current_node)
-      records = []
-      recorded_ids = []
-
-      current_node.element_children.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 many_from_ms_xml(current_node)
-      records = []
-      recorded_ids = []
-
-      current_node.element_children.each do |node|
-        if self.name.underscore.eql?(node.name.underscore)
-          record = self.one_from_xml(node, @data_active_options)
-          if record
-            recorded_ids << record[primary_key.to_sym]
-            records << record
-          end
-        end
-      end
-
-      remove_records_not_in recorded_ids
-
-      records
-    end
-
-    def many_from(current_node)
-      case
-        when self.name.pluralize.underscore.eql?(current_node.name.underscore)
-          many_from_rails_xml current_node
-
-        when (current_node.name.eql?('dataroot') \
-          and current_node.namespace_definitions.map { |ns| ns.href }.include?('urn:schemas-microsoft-com:officedata'))
-          # Identified as data generated from Microsoft Access
-          many_from_ms_xml 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
   end
 end
 

data/lib/data_active/version.rb

@@ -1,3 +1,3 @@
 module DataActive
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_active
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-03 00:00:00.000000000 Z
+date: 2013-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -280,7 +280,7 @@ rubyforge_project: data_active
 rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
-summary: data_active 0.0.5
+summary: data_active 0.0.6
 test_files:
 - features/remove_records_missing_in_xml.feature
 - features/step_definitions/remove_records_missing_in_xml.rb