Merge pull request #100 from zarathustra323/hotfix-0.3.15

Add embed hashing and proper collection dirty check

Author: Jacob Bare

src/Models/AbstractModel.php

@@ -119,9 +119,14 @@ public function apply(array $properties)
                 continue;
             }
 
-            // @todo This will always mark the model as dirty, even if the applied embed values are the same as the original.
-            $this->clear($key);
             $collection = $this->getStore()->createEmbedCollection($embeddedPropMeta, $properties[$key]);
+            if ($collection->getHash() === $this->get($key)->getHash()) {
+                // The current collection is the same as the incoming collection.
+                continue;
+            }
+
+            // The incoming collection is different. Clear the current collection and push the new values.
+            $this->clear($key);
             foreach ($collection as $value) {
                 $this->pushEmbed($key, $value);
             }

src/Models/Collections/EmbedCollection.php

@@ -44,6 +44,21 @@ public function createNewEmbed()
         return $embed;
     }
 
+    /**
+     * Gets the unique hash for this collection.
+     *
+     * @return  string
+     */
+    public function getHash()
+    {
+        $hash = [];
+        foreach ($this as $embed) {
+            $hash[] = $embed->getHash();
+        }
+        sort($hash);
+        return md5(serialize($hash));
+    }
+
     /**
      * Gets the metadata for the model collection.
      *

src/Models/Embed.php

@@ -40,6 +40,50 @@ public function getCompositeKey()
         return spl_object_hash($this);
     }
 
+    /**
+     * Gets the unique hash for this embed.
+     *
+     * @return  string
+     */
+    public function getHash()
+    {
+        $hash = [];
+        foreach ($this->metadata->getAttributes() as $key => $attrMeta) {
+            $value = $this->get($key);
+            if (null === $value) {
+                $hash[$key] = $value;
+                continue;
+            }
+            switch ($attrMeta->dataType) {
+                case 'date':
+                    $value = $value->getTimestamp();
+                    break;
+                case 'object':
+                    $value = (array) $object;
+                    ksort($value);
+                    break;
+                case 'mixed':
+                    $value = serialize($value);
+                    break;
+                case 'array':
+                    sort($value);
+                    break;
+            }
+            $hash[$key] = $value;
+        }
+        foreach ($this->metadata->getEmbeds() as $key => $embbedPropMeta) {
+            if (true === $embbedPropMeta->isOne()) {
+                $embed = $this->get($key);
+                $hash[$key] = (null === $embed) ? null : $embed->getHash();
+            } else {
+                $collection = $this->get($key);
+                $hash[$key] = $collection->getHash();
+            }
+        }
+        ksort($hash);
+        return md5(serialize($hash));
+    }
+
     /**
      * Gets the metadata for this model.
      *

src/Version.php

@@ -9,10 +9,10 @@
  */
 class Version
 {
-    const VERSION = '0.3.14';
-    const ID = 3014;
+    const VERSION = '0.3.15';
+    const ID = 3015;
     const MAJOR = 0;
     const MINOR = 3;
-    const PATCH = 14;
+    const PATCH = 15;
     const EXTRA = '';
 }