Merge pull request #216 from af83/5416_checksum_attribute

5416 checksum attribute

3 files changed, 26 insertions, 5 deletions

diff --git a/app/models/chouette/route.rb b/app/models/chouette/route.rb
index 47c18af09..5cc5d8b0d 100644
--- a/app/models/chouette/route.rb
+++ b/app/models/chouette/route.rb
@@ -133,7 +133,7 @@ module Chouette
     def checksum_attributes
       values = self.slice(*['name', 'published_name', 'wayback']).values
       values.tap do |attrs|
-        attrs << self.stop_points.sort_by(&:position).map{|sp| "#{sp.stop_area.user_objectid}#{sp.for_boarding}#{sp.for_alighting}" }.join
+        attrs << self.stop_points.sort_by(&:position).map{|sp| [sp.stop_area.user_objectid, sp.for_boarding, sp.for_alighting]}
         attrs << self.routing_constraint_zones.map(&:checksum)
       end
     end
diff --git a/app/models/chouette/routing_constraint_zone.rb b/app/models/chouette/routing_constraint_zone.rb
index 903922241..58703598e 100644
--- a/app/models/chouette/routing_constraint_zone.rb
+++ b/app/models/chouette/routing_constraint_zone.rb
@@ -25,7 +25,9 @@ module Chouette
     end
 
     def checksum_attributes
-      self.stop_points.map(&:stop_area).map(&:user_objectid)
+      [
+        self.stop_points.map(&:stop_area).map(&:user_objectid)
+      ]
     end
 
     def stop_points_belong_to_route
diff --git a/app/models/concerns/checksum_support.rb b/app/models/concerns/checksum_support.rb
index a76995b0f..92103798e 100644
--- a/app/models/concerns/checksum_support.rb
+++ b/app/models/concerns/checksum_support.rb
@@ -24,10 +24,29 @@ module ChecksumSupport
     self.attributes.values
   end
 
+  def checksum_replace_nil_or_empty_values values
+    # Replace empty array by nil & nil by VALUE_FOR_NIL_ATTRIBUTE
+    values
+      .map { |x| x.present? && x || VALUE_FOR_NIL_ATTRIBUTE }
+      .map do |item|
+        item =
+          if item.kind_of?(Array)
+            checksum_replace_nil_or_empty_values(item)
+          else
+            item
+          end
+      end
+  end
+
   def current_checksum_source
-    source = self.checksum_attributes.map{ |x| x unless x.try(:empty?) }
-    source = source.map{ |x| x || VALUE_FOR_NIL_ATTRIBUTE }
-    source.map(&:to_s).join(SEPARATOR)
+    source = checksum_replace_nil_or_empty_values(self.checksum_attributes)
+    source.map{ |item|
+      if item.kind_of?(Array)
+        item.map{ |x| x.kind_of?(Array) ? "(#{x.join(',')})" : x }.join(',')
+      else
+        item
+      end
+    }.join(SEPARATOR)
   end
 
   def set_current_checksum_source