elibri_xml_versions 0.1.1 → 0.1.2

data/.travis.yml

@@ -1,6 +1,9 @@
 language: ruby
 rvm:
   - ree
+  - 1.8.7
+  - jruby-18mode
+  - rbx-18mode
 notifications:
   email:
     - p.szmielew@ava.waw.pl

data/README.md

@@ -2,7 +2,7 @@
 
 Gem created for comparing eLibri xml objects.
 
-Currently working and tested only on REE.
+Currently working and tested on 1.8 version of Ruby (REE, jRuby 1.8, Ruby 1.8.7).
 
 Basic usage:
 ``Elibri::XmlVersions.new(product_ver1, product_ver2).diff``
@@ -19,6 +19,8 @@ It will return hash:
 ```
 
 under changes key, will be array of symbol and/or hashes.
+If there is change deeper in structure it will be represented like this:
+`:changes => [{:contributors => [{2167055520 => :key_names}]`
 Symbols represents attributes that in product_ver2 are different then in product_ver1. If there is hash in changes key, it represents some changes in object that is in one <-> one relation with product_ver2.
 
 Added and deleted contains array of hashes. Every hash has symbol as a key, that is used to access array of elements where changes occures. As a value it contains array of elements that has been added/deleted from product_ver2, in comparision to product_ver1.

data/lib/elibri_xml_versions/version.rb

@@ -1,3 +1,3 @@
 module ElibriXmlVersions
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/elibri_xml_versions.rb

@@ -118,6 +118,9 @@ module Elibri
         #obsługa różnych elementów w arrayu
         a.each_with_index do |element, i|
           ret = check_tree(element, b[i])
+          [:changes, :added, :deleted].each do |key|
+            ret[key] = ret[key].map { |x| {element.id => x}}
+          end
           changes += ret[:changes]
           added += ret[:added]
           deleted += ret[:deleted]
@@ -128,18 +131,19 @@ module Elibri
           attrib = attrib.to_s.gsub("@", "").to_sym
           if a.send(attrib).is_a? Array
             ret = check_tree(a.send(attrib), b.send(attrib))
-            changes << {attrib, ret[:changes]} if !ret[:changes].blank?
-            added << {attrib, ret[:added]} if !ret[:added].blank?
-            deleted << {attrib, ret[:deleted]} if !ret[:deleted].blank?
+            #TODO: otestować to
+            changes << {attrib => ret[:changes]} if !ret[:changes].blank?
+            added << {attrib => ret[:added]} if !ret[:added].blank?
+            deleted << {attrib => ret[:deleted]} if !ret[:deleted].blank?
           else
             if (a.send(attrib).is_a?(String) || a.send(attrib).is_a?(Numeric) || a.send(attrib).is_a?(NilClass) || b.send(attrib).is_a?(NilClass))
               changes << attrib if a.send(attrib) != b.send(attrib)
             else
               #klasa zlozona
               ret = check_tree(a.send(attrib), b.send(attrib))
-              changes << {attrib, ret[:changes]} if !ret[:changes].blank?
-              added << {attrib, ret[:added]} if !ret[:added].blank?
-              deleted << {attrib, ret[:deleted]} if !ret[:deleted].blank?
+              changes << {attrib => ret[:changes]} if !ret[:changes].blank?
+              added << {attrib => ret[:added]} if !ret[:added].blank?
+              deleted << {attrib => ret[:deleted]} if !ret[:deleted].blank?
             end
           end
         end

data/spec/elibri_xml_versions_spec.rb

@@ -35,6 +35,18 @@ describe Elibri::XmlVersions do
     @elibri_xml_versions = Elibri::XmlVersions.new(generated_product.products.first, generated_product_2.products.first)
     @elibri_xml_versions.diff.should eq({:deleted => [], :added => [], :changes => [:record_reference]})
   end
+  
+  it "should return change in author on same basic elibri objects" do
+    author = Elibri::XmlMocks::Examples.contributor_mock(:id => 2167055520)
+    author_2 = Elibri::XmlMocks::Examples.contributor_mock(:last_name => 'Waza', :id => 2167055520)
+    generated_product = onix_from_mock(:basic_product, :record_reference => 'fdb8fa072be774d97a97', :contributors => [author])
+    generated_product_2 = onix_from_mock(:basic_product, :record_reference => 'fdb8fa072be774d97a97', :contributors => [author_2])
+    @elibri_xml_versions = Elibri::XmlVersions.new(generated_product.products.first, generated_product_2.products.first)
+    diff = @elibri_xml_versions.diff
+    diff[:deleted].should eq([])
+    diff[:added].should eq([])
+    diff[:changes].should eq( [ {:contributors => [{2167055520 => :key_names}] }  ] )
+  end
 
   it "should return no changes for same book elibri objects" do
     generated_product = onix_from_mock(:book_example)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: elibri_xml_versions
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Piotr Szmielew
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-05 00:00:00 Z
+date: 2012-05-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -139,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: elibri_xml_versions
-rubygems_version: 1.8.17
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Gem created for comparing eLibri xml objects.