elibri_xml_versions 0.1.6 → 0.1.8

data/.travis.yml

@@ -3,7 +3,8 @@ rvm:
   - ree
   - 1.8.7
   - jruby-18mode
+  - 1.9.3
 notifications:
   email:
     - p.szmielew@ava.waw.pl
-    - tomek@gildia.pl
+    - tomek@gildia.pl

data/lib/elibri_xml_versions.rb

@@ -105,20 +105,37 @@ module Elibri
         end
      #   if a.map(&:id) != b.map(&:id)
         if a_m != b_m
-          deleted_ids = a.map(&:eid) - b.map(&:eid)
-          added_ids = b.map(&:eid) - a.map(&:eid)
-          deleted_ids.each do |eid|
-            if a.find { |x| x.eid == eid } && !a.find { |x| x.eid == eid }.blank?
-              deleted << a.find { |x| x.eid == eid }
-              a.delete(a.find { |x| x.eid == eid })
+          if a.all? { |x| x.respond_to?(:eid) } && b.all? { |x| x.respond_to?(:eid) }
+            deleted_ids = a.map(&:eid) - b.map(&:eid)
+            added_ids = b.map(&:eid) - a.map(&:eid)
+            deleted_ids.each do |eid|
+              if a.find { |x| x.eid == eid } && !a.find { |x| x.eid == eid }.blank?
+                deleted << a.find { |x| x.eid == eid }
+                a.delete(a.find { |x| x.eid == eid })
+              end
             end
-          end
-          added_ids.each do |eid|
-            if b.find { |x| x.eid == eid } && !b.find { |x| x.eid == eid }.blank?
-              added << b.find { |x| x.eid == eid }
-              b.delete(b.find { |x| x.eid == eid })
+            added_ids.each do |eid|
+              if b.find { |x| x.eid == eid } && !b.find { |x| x.eid == eid }.blank?
+                added << b.find { |x| x.eid == eid }
+                b.delete(b.find { |x| x.eid == eid })
+              end
             end
-          end
+          else
+            deleted_ids = a.map(&:id) - b.map(&:id)
+            added_ids = b.map(&:id) - a.map(&:id)
+            deleted_ids.each do |id|
+              if a.find { |x| x.id == id } && !a.find { |x| x.id == id }.blank?
+                deleted << a.find { |x| x.id == id }
+                a.delete(a.find { |x| x.id == id })
+              end
+            end
+            added_ids.each do |eid|
+              if b.find { |x| x.id == id } && !b.find { |x| x.id == id }.blank?
+                added << b.find { |x| x.id == id }
+                b.delete(b.find { |x| x.id == id })
+              end
+            end
+          end        
         end
         #obsługa różnych elementów w arrayu
         a.each_with_index do |element, i|

data/lib/elibri_xml_versions/version.rb

@@ -1,3 +1,3 @@
 module ElibriXmlVersions
-  VERSION = "0.1.6"
+  VERSION = "0.1.8"
 end

data/spec/elibri_xml_versions_spec.rb

@@ -39,8 +39,8 @@ describe Elibri::XmlVersions do
   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(:book_example, :record_reference => 'fdb8fa072be774d97a97', :contributors => [author])
-    generated_product_2 = onix_from_mock(:book_example, :record_reference => 'fdb8fa072be774d97a97', :contributors => [author_2])
+    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([])
@@ -267,7 +267,7 @@ describe Elibri::XmlVersions do
     generated_product = onix_from_mock(:basic_product, {:imprint => imprint})
     generated_product_2 = onix_from_mock(:basic_product, {:imprint => imprint_2})
     @elibri_xml_versions = Elibri::XmlVersions.new(generated_product.products.first, generated_product_2.products.first)
-    @elibri_xml_versions.diff[:changes].should include({:imprint => [:name]})
+    @elibri_xml_versions.diff[:changes].should include(:imprint_name)
   end
 
   it "should detect change in object inside book product" do
@@ -276,6 +276,6 @@ describe Elibri::XmlVersions do
     generated_product = onix_from_mock(:book_example, RAW_EXTRAS.merge({:imprint => imprint}))
     generated_product_2 = onix_from_mock(:book_example, RAW_EXTRAS.merge({:imprint => imprint_2}))
     @elibri_xml_versions = Elibri::XmlVersions.new(generated_product.products.first, generated_product_2.products.first)
-    @elibri_xml_versions.diff[:changes].should include({:imprint => [:name]})
+    @elibri_xml_versions.diff[:changes].should include(:imprint_name)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elibri_xml_versions
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-13 00:00:00.000000000 Z
+date: 2013-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -125,16 +125,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 191043771001115544
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 191043771001115544
 requirements: []
 rubyforge_project: elibri_xml_versions
-rubygems_version: 1.8.19
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Gem created for comparing eLibri xml objects.
-test_files: []
+test_files:
+- spec/elibri_xml_versions_spec.rb
+- spec/spec_helper.rb