elibri_xml_versions 0.1.2 → 0.1.3

data/Gemfile

@@ -2,5 +2,7 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in elibri_xml_versions.gemspec
 gemspec
+gem 'pry'
 
-#gem 'elibri_onix_mocks', :git => 'git://github.com/elibri/elibri_onix_mocks.git'
+#gem 'elibri_onix_mocks', :git => 'git://github.com/elibri/elibri_onix_mocks.git'
+gem 'elibri_onix', :git => 'git://github.com/elibri/elibri_onix.git'

data/lib/elibri_xml_versions/version.rb

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

data/lib/elibri_xml_versions.rb

@@ -126,9 +126,15 @@ module Elibri
           deleted += ret[:deleted]
         end
       else
-        a.instance_variables.each do |attrib|
+        vars = []
+        if a.class.to_s.include? "Elibri::ONIX"
+          vars += a.class::ATTRIBUTES
+          vars += a.class::RELATIONS
+        end
+        vars = a.instance_variables if vars.blank?
+        vars.each do |attrib|
           next if SKIPPED_ATTRIBS.include? attrib
-          attrib = attrib.to_s.gsub("@", "").to_sym
+          attrib = attrib.to_s.gsub("@", "").to_sym if attrib.is_a?(String)
           if a.send(attrib).is_a? Array
             ret = check_tree(a.send(attrib), b.send(attrib))
             #TODO: otestować to
@@ -136,7 +142,8 @@ module Elibri
             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))
+            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) ||
+                a.send(attrib).is_a?(TrueClass) || a.send(attrib).is_a?(FalseClass) || b.send(attrib).is_a?(TrueClass) || b.send(attrib).is_a?(FalseClass))
               changes << attrib if a.send(attrib) != b.send(attrib)
             else
               #klasa zlozona
@@ -156,10 +163,16 @@ module Elibri
       if object.is_a? Array
         object.each { |x| result << calculate_hash(x) }
       else
-        object.instance_variables.each do |attrib|
+        vars = []
+        if object.class.to_s.include? "Elibri::ONIX"
+          vars += object.class::ATTRIBUTES
+          vars += object.class::RELATIONS
+        end
+        vars = object.instance_variables if vars.blank?
+        vars.each do |attrib|
           next if SKIPPED_ATTRIBS.include? attrib
           next if SKIPPED_2.include? attrib
-          attrib = attrib.to_s.gsub("@", "").to_sym
+          attrib = attrib.to_s.gsub("@", "").to_sym if attrib.is_a?(String)
           if object.send(attrib).is_a? Array
             result << calculate_hash(object.send(attrib))
           elsif object.send(attrib).is_a?(String) || object.send(attrib).is_a?(Numeric) || object.send(attrib).is_a?(Fixnum) || object.send(attrib).is_a?(Symbol)

data/spec/elibri_xml_versions_spec.rb

@@ -15,7 +15,6 @@ describe Elibri::XmlVersions do
     :product_attachments => [],
     :product_availabilities => []
   }
-
   it "should return no changes for same basic elibri object" do
     generated_product = onix_from_mock(:basic_product)
     @elibri_xml_versions = Elibri::XmlVersions.new(generated_product.products.first, generated_product.products.first)
@@ -95,7 +94,6 @@ 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 => []})    
     end
-
     SPLITTING_SYMBOLS = [
       :publisher_name
     ]
@@ -113,16 +111,36 @@ describe Elibri::XmlVersions do
       :ean => :ean,
       :deletion_text => :deletion_text,
       :trade_title => :trade_title,
-      :pkwiu => :pkwiu_from_3_0_1,
+      :pkwiu => :pkwiu,
       :title => :title,
       :subtitle => :subtitle,
       :edition_statement => :edition_statement,
       :audience_age_from => :reading_age_from,
       :audience_age_to => :reading_age_to,
-      :price_amount => :cover_price_from_3_0_1,
-      :vat => :vat_from_3_0_1
+      :price_amount => :cover_price,
+      :vat => :vat,
+      :preview_exists? => :preview_exists,
+      :elibri_product_category1_id => :elibri_product_category1_id,
+      :elibri_product_category2_id => :elibri_product_category2_id
     }
 
+    it "should find the difference in categories" do
+      generated_product = onix_from_mock(:onix_subjects_example)
+      generated_product_2 = onix_from_mock(:onix_subjects_example)
+      @elibri_xml_versions = Elibri::XmlVersions.new(generated_product.products.first, generated_product_2.products.first)
+      @elibri_xml_versions.diff.should eq({:deleted => [], :added => [], :changes => []})
+
+      generated_product = onix_from_mock(:onix_subjects_example, :elibri_product_category1_id => 440, :elibri_product_category2_id => nil)
+      generated_product_2 = onix_from_mock(:onix_subjects_example, :elibri_product_category1_id => 550, :elibri_product_category2_id => nil)
+      @elibri_xml_versions = Elibri::XmlVersions.new(generated_product.products.first, generated_product_2.products.first)
+      @elibri_xml_versions.diff[:changes].should include(:elibri_product_category1_id)
+
+      generated_product = onix_from_mock(:onix_subjects_example, :elibri_product_category1_id => 440, :elibri_product_category2_id => 441)
+      generated_product_2 = onix_from_mock(:onix_subjects_example, :elibri_product_category1_id => 550, :elibri_product_category2_id => 551)
+      @elibri_xml_versions = Elibri::XmlVersions.new(generated_product.products.first, generated_product_2.products.first)
+      @elibri_xml_versions.diff[:changes].should include(:elibri_product_category1_id, :elibri_product_category2_id)
+    end
+
     #strings
     [
       :publisher_name, :record_reference,
@@ -174,6 +192,21 @@ describe Elibri::XmlVersions do
     #end strings  
     end
 
+  #bools
+  [
+    :preview_exists?
+  ].each do |symbol|
+      
+     it "should see the change in #{symbol} attribute" do
+        generated_product = onix_from_mock(:basic_product, symbol => true)
+        generated_product_2 = onix_from_mock(:basic_product, symbol => false)
+        @elibri_xml_versions = Elibri::XmlVersions.new(generated_product.products.first, generated_product_2.products.first)
+        @elibri_xml_versions.diff[:changes].should include(TRAVERSE_VECTOR[symbol])
+     end
+  
+    #end bools 
+    end
+
 
   #integers
   [
@@ -240,5 +273,4 @@ describe Elibri::XmlVersions do
     @elibri_xml_versions = Elibri::XmlVersions.new(generated_product.products.first, generated_product_2.products.first)
     @elibri_xml_versions.diff[:changes].should include({:imprint => [:name]})
   end
- 
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: elibri_xml_versions
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Piotr Szmielew
@@ -15,12 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-07 00:00:00 Z
+date: 2012-05-10 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :development
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -29,12 +30,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  version_requirements: *id001
+  prerelease: false
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
+  type: :development
   name: rake
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -43,12 +44,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  version_requirements: *id002
+  prerelease: false
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
+  type: :development
   name: elibri_onix_mocks
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -57,12 +58,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  version_requirements: *id003
+  prerelease: false
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   name: elibri_api_client
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -71,12 +72,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id004
+  prerelease: false
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   name: elibri_onix_dict
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -85,8 +86,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id005
+  prerelease: false
+  requirement: *id005
 description: |-
   Gem created for comparing eLibri xml objects. More info coming soon. Currently working and tested only on REE.
   Basic usage: Elibri::XmlVersions.new(product_ver1, product_ver2).diff
@@ -110,6 +111,7 @@ files:
 - lib/elibri_xml_versions/version.rb
 - spec/elibri_xml_versions_spec.rb
 - spec/spec_helper.rb
+has_rdoc: true
 homepage: ""
 licenses: []
 
@@ -139,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: elibri_xml_versions
-rubygems_version: 1.8.21
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Gem created for comparing eLibri xml objects.