Merge pull request #110 from STRML/master

Fix for hashing issue with multiple SASS or CoffeeScript files. Fixes #107, #98
welaika · Sep 19, 2012 · dd48f89 · dd48f89
2 parents 463fa33 + 4a60db7
commit dd48f89
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/wordless/preprocessors/compass_preprocessor.php b/wordless/preprocessors/compass_preprocessor.php
@@ -44,6 +44,8 @@ protected function asset_hash($file_path) {
     foreach ($files as $file) {
       $hash_seed[] = $file . date("%U", filemtime($file));
     }
+    // Concat original file onto hash seed for uniqueness so each file is unique
+    $hash_seed[] = $file_path;
     return md5(join($hash_seed));
   }
 

diff --git a/wordless/preprocessors/less_preprocessor.php b/wordless/preprocessors/less_preprocessor.php
@@ -39,6 +39,8 @@ protected function asset_hash($file_path) {
     foreach ($files as $file) {
       $hash_seed[] = $file . date("%U", filemtime($file));
     }
+    // Concat original file onto hash seed for uniqueness so each file is unique
+    $hash_seed[] = $file_path;
     return md5(join($hash_seed));
   }
 

diff --git a/wordless/preprocessors/sprockets_preprocessor.php b/wordless/preprocessors/sprockets_preprocessor.php
@@ -40,6 +40,8 @@ protected function asset_hash($file_path) {
     foreach ($files as $file) {
       $hash_seed[] = $file . date("%U", filemtime($file));
     }
+    // Concat original file onto hash seed for uniqueness so each file is unique
+    $hash_seed[] = $file_path;
     return md5(join($hash_seed));
   }
 

diff --git a/wordless/preprocessors/wordless_preprocessor.php b/wordless/preprocessors/wordless_preprocessor.php
@@ -92,12 +92,12 @@ protected function comment_line($line) {
    *
    */
   protected function asset_hash($file_path) {
-    // First we get the file content
+    // First we get the file's modified date
     $hash_seed = date("%U", filemtime($file_path));
 
     // Then we attach the preferences
     foreach ($this->preferences_defaults as $pref => $value) {
-      $hash_seed .= $pref . '=' . $this->preference($pref) . ';';
+      $hash_seed .= $pref . '=' . (is_array($this->preference($pref)) ? implode(" ", $this->preference($pref)) : $this->preference($pref)) . ';';
     }
 
     return md5($hash_seed);