elibri_xml_versions 0.1.8 → 0.1.9

data/lib/elibri_xml_versions/version.rb

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

data/lib/elibri_xml_versions.rb

@@ -55,7 +55,8 @@ module Elibri
       end
       diffs
 =end
-      check_tree(@a, @b)
+      @stored_diff ||= check_tree(@a, @b)
+      @stored_diff
     end
     
     
@@ -158,14 +159,18 @@ module Elibri
           next if SKIPPED_ATTRIBS.include? attrib
           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
-            changes << {attrib => ret[:changes]} if !ret[:changes].blank?
-            added << {attrib => ret[:added]} if !ret[:added].blank?
-            deleted << {attrib => ret[:deleted]} if !ret[:deleted].blank?
+            if is_all_simple?(a.send(attrib))
+              changes << attrib if a.send(attrib) != b.send(attrib)
+            else
+              ret = check_tree(a.send(attrib), b.send(attrib))
+              #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?
+            end
           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) ||
-                a.send(attrib).is_a?(TrueClass) || a.send(attrib).is_a?(FalseClass) || b.send(attrib).is_a?(TrueClass) || b.send(attrib).is_a?(FalseClass))
+            if (is_simple_type?(a.send(attrib)) || b.send(attrib).is_a?(NilClass) || 
+                b.send(attrib).is_a?(TrueClass) || b.send(attrib).is_a?(FalseClass) )
               changes << attrib if a.send(attrib) != b.send(attrib)
             else
               #klasa zlozona
@@ -197,7 +202,7 @@ module Elibri
           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)
+          elsif is_simple_type?(object.send(attrib))
             result << object.send(attrib)
           else
             result << calculate_hash(object.send(attrib))
@@ -215,6 +220,17 @@ module Elibri
       end
     end
     
+    def is_simple_type?(obj)
+      obj.is_a?(String) || obj.is_a?(Numeric) || 
+      obj.is_a?(NilClass) || obj.is_a?(TrueClass) || 
+      obj.is_a?(FalseClass) || obj.is_a?(Date) || 
+      obj.is_a?(Symbol) || obj.is_a?(Fixnum)
+    end
+    
+    def is_all_simple?(arr)
+      arr.all? {|e| is_simple_type?(e) }
+    end
+    
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elibri_xml_versions
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-26 00:00:00.000000000 Z
+date: 2013-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -127,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 191043771001115544
+      hash: -3513691374160647720
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 191043771001115544
+      hash: -3513691374160647720
 requirements: []
 rubyforge_project: elibri_xml_versions
 rubygems_version: 1.8.25