Bump version to 1.0.8

ed-ilyin · May 3, 2017 · 48ed547 · 48ed547
1 parent 1cb3056
commit 48ed547
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 13 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,4 +1,7 @@
-### 1.0.7 - May 02 2017
+### 1.0.8 - May 03 2017
+* Trying to fix Decode error message
+
+#### 1.0.7 - May 02 2017
 * Renames EdIlyin.Elm.Core to EdIlyin.FSharp.Elm.Core
 
 #### 1.0.6 - May 02 2017

diff --git a/src/EdIlyin.FSharp.Elm.Core/AssemblyInfo.fs b/src/EdIlyin.FSharp.Elm.Core/AssemblyInfo.fs
@@ -5,15 +5,15 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("EdIlyin.FSharp.Elm.Core")>]
 [<assembly: AssemblyProductAttribute("EdIlyin.FSharp.Elm.Core")>]
 [<assembly: AssemblyDescriptionAttribute("Brings to the F# Elm language core package modules like Json.Encode, Json.Decode, Basics, Debug, Result, Tuple, etc")>]
-[<assembly: AssemblyVersionAttribute("1.0.7")>]
-[<assembly: AssemblyFileVersionAttribute("1.0.7")>]
+[<assembly: AssemblyVersionAttribute("1.0.8")>]
+[<assembly: AssemblyFileVersionAttribute("1.0.8")>]
 [<assembly: AssemblyConfigurationAttribute("Release")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "EdIlyin.FSharp.Elm.Core"
     let [<Literal>] AssemblyProduct = "EdIlyin.FSharp.Elm.Core"
     let [<Literal>] AssemblyDescription = "Brings to the F# Elm language core package modules like Json.Encode, Json.Decode, Basics, Debug, Result, Tuple, etc"
-    let [<Literal>] AssemblyVersion = "1.0.7"
-    let [<Literal>] AssemblyFileVersion = "1.0.7"
+    let [<Literal>] AssemblyVersion = "1.0.8"
+    let [<Literal>] AssemblyFileVersion = "1.0.8"
     let [<Literal>] AssemblyConfiguration = "Release"
diff --git a/src/EdIlyin.FSharp.Elm.Core/Decode.fs b/src/EdIlyin.FSharp.Elm.Core/Decode.fs
@@ -8,7 +8,7 @@ type DecoderError = string
 
 
 type Decoder<'a,'b> = {
-    decoder : ('a -> Result<DecoderError, 'b>)
+    decoder : ('a -> Result<DecoderLabel * DecoderError, 'b>)
     label:  DecoderLabel
 }
 
@@ -23,10 +23,8 @@ module Decode =
 
 
     let decodeValue decoder value =
-        let label = getLabel decoder
-
         match run decoder value with
-            | Err error ->
+            | Err (label, error) ->
                 sprintf "Expecting %s. %s" label error |> Err
 
             | Ok value' -> Ok value'
@@ -62,15 +60,12 @@ module Decode =
 
 
     let andThen func decoder =
-        let label = getLabel decoder |> sprintf "%s and then"
-
         primitive
             (fun input ->
                 match run decoder input with
-                    | Err error -> Err error
+                    | Err (label, error) -> Err (label, error)
                     | Ok value -> run (func value) input
             )
-            <?> label
 
 
     let (>>=) decoder func = andThen func decoder