elibri_xml_versions 0.1.4 → 0.1.5

data/.travis.yml

@@ -3,7 +3,6 @@ rvm:
   - ree
   - 1.8.7
   - jruby-18mode
-  - rbx-18mode
 notifications:
   email:
     - p.szmielew@ava.waw.pl

data/Gemfile

@@ -2,4 +2,4 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in elibri_xml_versions.gemspec
 gemspec
-gem 'pry'
+#gem 'pry'

data/README.md

@@ -18,9 +18,29 @@ It will return hash:
   }
 ```
 
+In case of comparising Elibri products:
+
+* added and deleted may contain only: contributors, related_products, languages, measures, supply_details, measures, title_details, collections, extents, subjects, audience_ranges, text_contents, supporting_resources, sales_restrictions, authors, ghostwriters, scenarists, originators, illustrators, photographers, author_of_prefaces, drawers, cover_designers, inked_or_colored_bys, editors, revisors, translators, editor_in_chiefs, read_bys
+
+* changes may contain all previous mentioned elements as a keys for embedded hashes (meaning changes in embedded elements) and also may contain additional attributes: elibri_dialect, height, width, thickness, weight, ean, isbn13, number_of_pages, duration, file_size, publisher_name, publisher_id, imprint_name, current_state, reading_age_from, reading_age_to, table_of_contents, description, reviews, excerpts, series, title, subtitle, collection_title, collection_part, full_title, original_title, trade_title, parsed_publishing_date, record_reference, deletion_text, cover_type, cover_price, vat, pkwiu, product_composition, product_form, imprint, publisher, product_form, no_contributor, edition_statement, number_of_illustrations, publishing_status, publishing_date, premiere, front_cover, series_names, elibri_product_category1_id, elibri_product_category2_id, preview_exists, short_description
+
+* If attribute appear as a symbol in changes array, that it means it has been changed between compared products.
+
+* If hash appears in changes, that means that key of that hash is a embedded relation that has been changed, and in values you will find array containing hashes. In that most inner hashes, key means Elibri internal id of element changed and value is symbol for attribute changed.
+
+* In added and deleted arrays you will find objects that needed to be removed or added to your local copy of Elibri object.
+
 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.
+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.
+
+Example of result, when comparing two elibri products, when full_title changed and in contributors name of one changes. Also it adds a new language and delete one text_content.
+```ruby
+{
+  :added => [<Elibri::ONIX::Release_3_0::Language>],
+  :changes => [:full_title, {:contributors => [ {123456 => :name} ] } ],
+  :deleted => [<Elibri::ONIX::Release_3_0::TextContent>]
+}

data/lib/elibri_xml_versions/version.rb

@@ -1,3 +1,3 @@
 module ElibriXmlVersions
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/lib/elibri_xml_versions.rb

@@ -17,6 +17,9 @@ module Elibri
     SKIPPED_2 = ["@id", "@id_before_type_cast"]
                         
 
+    def eid
+      return "fcb38e846e666d8d686c491a23431a7b0336451b"
+    end
     
     attr_accessor :a, :b
     
@@ -76,11 +79,13 @@ module Elibri
       if a.is_a? Array
         a.compact!
         b.compact!
-        a.sort! { |x,y| x.id <=> y.id }
-        b.sort! { |x,y| x.id <=> y.id }
+        if a.all? { |x| x.respond_to?(:eid) }
+          a.sort! { |x,y| x.eid <=> y.eid }
+          b.sort! { |x,y| x.eid <=> y.eid }
+        end
         if a.all? { |x| x.instance_variables.include? "@id_before_type_cast"} || a.all? { |x| x.instance_variables.include? "@import_id"}
-          a_m = a.map { |x| x.id }
-          b_m = b.map { |x| x.id }
+          a_m = a.map { |x| x.eid }
+          b_m = b.map { |x| x.eid }
         else
 =begin
         ch = []
@@ -100,18 +105,18 @@ module Elibri
         end
      #   if a.map(&:id) != b.map(&:id)
         if a_m != b_m
-          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 })
+          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
-          added_ids.each do |id|
-            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 })
+          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
@@ -119,7 +124,7 @@ module Elibri
         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}}
+            ret[key] = ret[key].map { |x| {element.eid => x}}
           end
           changes += ret[:changes]
           added += ret[:added]

data/spec/elibri_xml_versions_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
-$VERBOSE = nil #temp: supress id warnings
+#require 'ruby-debug'
+#$VERBOSE = nil #temp: supress id warnings
 describe Elibri::XmlVersions do
 
   RAW_EXTRAS = {

data/spec/spec_helper.rb

@@ -22,11 +22,11 @@ RSpec.configure do |config|
 end
 
 def onix_from_mock(sym, *args)
-  Elibri::ONIX::Release_3_0::ONIXMessage.from_xml(Elibri::ONIX::XMLGenerator.new(Elibri::XmlMocks::Examples.send(sym, *args)).to_s)
+  Elibri::ONIX::Release_3_0::ONIXMessage.new(Elibri::ONIX::XMLGenerator.new(Elibri::XmlMocks::Examples.send(sym, *args)).to_s)
 end
 
 def xml_parse(xml_string)
-  Elibri::ONIX::Release_3_0::ONIXMessage.from_xml(xml_string)
+  Elibri::ONIX::Release_3_0::ONIXMessage.new(xml_string)
 end
 
 def generate_xml(mock)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: elibri_xml_versions
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Piotr Szmielew
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-10 00:00:00 Z
+date: 2012-06-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec