Merge pull request #546 from robinheghan/use-fnv-hash

Use fnv hash

Author: rtfeldman

elm.json

@@ -30,9 +30,10 @@
         "elm/core": "1.0.0 <= v < 2.0.0",
         "elm/json": "1.0.0 <= v < 2.0.0",
         "elm/virtual-dom": "1.0.0 <= v < 2.0.0",
+        "robinheghan/fnv1a": "1.0.0 <= v < 2.0.0",
         "rtfeldman/elm-hex": "1.0.0 <= v < 2.0.0"
     },
     "test-dependencies": {
         "elm-explorations/test": "1.2.2 <= v < 2.0.0"
     }
-}
+}

src/Css/Structure/Hash.elm

@@ -3,13 +3,13 @@ module Css.Structure.Hash exposing (hashDeclarations)
 import Css.String
 import Css.Structure exposing (..)
 import Css.Structure.Output as Output
-import Hash exposing (hash)
+import FNV1a
 import String
 
 
 hashDeclarations : List Declaration -> Int
 hashDeclarations declarations =
-    List.foldl hashDeclaration Hash.initialSeed declarations
+    List.foldl hashDeclaration FNV1a.initialSeed declarations
 
 
 hashDeclaration : Declaration -> Int -> Int
@@ -22,12 +22,12 @@ hashDeclaration decl hash =
             let
                 queryHash =
                     List.map Output.mediaQueryToString mediaQueries
-                        |> List.foldl Hash.hash hash
+                        |> List.foldl FNV1a.hashWithSeed hash
 
                 blockHash =
                     List.foldl hashStyleBlock queryHash styleBlocks
             in
-            Hash.hash "@media" blockHash
+            FNV1a.hashWithSeed "@media" blockHash
 
         SupportsRule _ _ ->
             hash
@@ -42,7 +42,7 @@ hashDeclaration decl hash =
             hash
 
         Keyframes { name, declaration } ->
-            List.foldl Hash.hash hash [ "@keyframes", name, declaration ]
+            List.foldl FNV1a.hashWithSeed hash [ "@keyframes", name, declaration ]
 
         Viewport _ ->
             hash
@@ -61,4 +61,4 @@ hashStyleBlock (StyleBlock firstSelector otherSelectors properties) hash =
             (firstSelector :: otherSelectors)
                 |> Css.String.mapJoin Output.selectorToString ", "
     in
-    List.foldl Hash.hash hash (selectorStr :: properties)
+    List.foldl FNV1a.hashWithSeed hash (selectorStr :: properties)

src/ElmCssVendor/Murmur3.elm

@@ -1,22 +1,11 @@
-module Hash exposing (fromString, hash, initialSeed)
+module Hash exposing (fromString)
 
-import ElmCssVendor.Murmur3 as Murmur3
+import FNV1a
 import Hex
 
 
-hash : String -> Int -> Int
-hash str seed =
-    Murmur3.hashString seed str
-
-
 fromString : String -> String
 fromString str =
-    str
-        |> Murmur3.hashString initialSeed
+    FNV1a.hash str
         |> Hex.toString
         |> String.cons '_'
-
-
-initialSeed : Int
-initialSeed =
-    15739

src/Hash.elm

@@ -32,7 +32,6 @@ import Css.Preprocess as Preprocess exposing (Style)
 import Css.Preprocess.Resolve as Resolve
 import Css.Structure as Structure
 import Dict exposing (Dict)
-import ElmCssVendor.Murmur3 as Murmur3
 import Hex
 import Json.Decode
 import Json.Encode

src/VirtualDom/Styled.elm

@@ -35,7 +35,7 @@ suite =
 
             output =
                 """
-            @keyframes _a56b5063 {
+            @keyframes _f8c0e7dc {
                 0% {background-color:#00FF00;background-size:2px;}
 
                 50% {opacity:0;}
@@ -54,12 +54,12 @@ suite =
             p {
                 color:#FF0000;
                 display:inline;
-                animation-name:_a56b5063;
+                animation-name:_f8c0e7dc;
                 background-color:rgb(11, 11, 11);
             }
 
             i {
-                animation-name:_a56b5063;
+                animation-name:_f8c0e7dc;
             }
             """
           in
@@ -97,11 +97,11 @@ suite =
 
             output =
                 """
-            @keyframes _23526425 {
+            @keyframes _70a5b6a0 {
                 10% {transform:translate(100px);}
             }
 
-            @keyframes _a56b5063 {
+            @keyframes _f8c0e7dc {
                 0% {background-color:#00FF00;background-size:2px;}
 
                 50% {opacity:0;}
@@ -115,14 +115,14 @@ suite =
 
             button {
                 margin:auto;
-                animation-name:_23526425;
+                animation-name:_70a5b6a0;
                 background-color:#0F0F0F;
             }
 
             p {
                 color:#FF0000;
                 display:inline;
-                animation-name:_a56b5063;
+                animation-name:_f8c0e7dc;
                 background-color:rgb(11, 11, 11);
             }
             """

tests/Keyframes.elm

@@ -99,28 +99,28 @@ all =
             (\_ ->
                 Query.fromHtml (toUnstyled <| view "BUY TICKETS")
                     |> Query.has
-                        [ Selector.text """._3de4d102 {
+                        [ Selector.text """._2e879635 {
     background-color:#333333;
     padding:20px;
 }"""
-                        , Selector.text """._e9904f07 {
+                        , Selector.text """._322e2311 {
     margin:12px;
     color:rgb(255, 255, 255);
 }"""
-                        , Selector.text """._3ac819d0 {
+                        , Selector.text """._c6e22f50 {
     display:inline-block;
     padding-bottom:12px;
 }"""
-                        , Selector.text """._c9b3bf47 {
+                        , Selector.text """._9c310192 {
     display:inline-block;
     margin-left:150px;
     margin-right:80px;
     vertical-align:middle;
 }"""
-                        , Selector.text """._b9f3f75d {
+                        , Selector.text """._5daeac28 {
     background-color:#222222;
 }"""
-                        , Selector.text """._33ecd3f8 {
+                        , Selector.text """._36e932ea {
     padding:16px;
     padding-left:24px;
     padding-right:24px;