Merge pull request #25 from jclem/3.3.3

v3.3.3
jclem · Jan 10, 2022 · e16da42 · e16da42
2 parents 2c977a4 + 076faf9
commit e16da42
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 21 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,19 +1,47 @@
 name: CI
 
 on:
-  push: {branches: master}
-  pull_request: {branches: master}
+  push: {branches: main}
+  pull_request: {branches: main}
 
 jobs:
   test:
     name: Run tests
     runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        include:
+          - otp: 21.x
+            elixir: 1.8.x
+          - otp: 21.x
+            elixir: 1.9.x
+          - otp: 21.x
+            elixir: 1.10.x
+          - otp: 21.x
+            elixir: 1.11.x
+          - otp: 22.x
+            elixir: 1.12.x
+          - otp: 22.x
+            elixir: 1.13.x
     steps:
-      - uses: actions/checkout@1.0.0
-      - uses: erlef/[email protected]
+      - uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # v2.4.0
+      - uses: actions/upload-artifact@82c141cc518b40d92cc801eee768e7aafc9c2fa2 # v2.3.1
         with:
-          otp-version: 21.x
-          elixir-version: 1.8.x
+          name: crash-logs
+          path: erl_crash.dump
+          if-no-files-found: ignore
+      - uses: erlef/setup-elixir@988e02bfe678367a02564f65ca2e37726dc0268f # v1.9.0
+        with:
+          otp-version: ${{ matrix.otp }}
+          elixir-version: ${{ matrix.elixir }}
+      - uses: actions/cache@67b6d52d50609f6166e3ea1d8872aca3a4763bd2 # v2.1.7
+        with:
+          path: |
+            deps
+            _build
+          key: ${{ runner.os }}-mix-${{ matrix.otp }}-${{ matrix.elixir }}-${{ hashFiles('**/mix.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-mix-${{ matrix.otp }}-${{ matrix.elixir }}-
       - run: mix deps.get
       - run: mix test --trace
       - run: mix format --check-formatted
diff --git a/lib/logfmt/decoder.ex b/lib/logfmt/decoder.ex
@@ -27,7 +27,6 @@ defmodule Logfmt.Decoder do
     parse_char(next_grapheme(rest), :key, char, map)
   end
 
-  @spec parse_char({String.t(), String.t()}, :garbage, map) :: map
   defp parse_char({_char, rest}, :garbage, map) do
     parse_char(next_grapheme(rest), :garbage, map)
   end
@@ -43,12 +42,10 @@ defmodule Logfmt.Decoder do
     parse_char(next_grapheme(rest), :key, key <> char, map)
   end
 
-  @spec parse_char({String.t(), String.t()}, :key, String.t(), map) :: map
   defp parse_char({"=", rest}, :key, key, map) do
     parse_char(next_grapheme(rest), :equals, key, map)
   end
 
-  @spec parse_char({String.t(), String.t()}, :key, String.t(), map) :: map
   defp parse_char({_char, rest}, :key, key, map) do
     parse_char(next_grapheme(rest), :garbage, map |> put_value(key, true))
   end
@@ -64,12 +61,10 @@ defmodule Logfmt.Decoder do
     parse_char(next_grapheme(rest), :ivalue, key, char, map)
   end
 
-  @spec parse_char({String.t(), String.t()}, :equals, String.t(), map) :: map
   defp parse_char({"\"", rest}, :equals, key, map) do
     parse_char(next_grapheme(rest), :qvalue, false, key, "", map)
   end
 
-  @spec parse_char({String.t(), String.t()}, :equals, String.t(), map) :: map
   defp parse_char({_char, rest}, :equals, key, map) do
     parse_char(next_grapheme(rest), :garbage, map |> put_value(key, true))
   end
@@ -85,7 +80,6 @@ defmodule Logfmt.Decoder do
     parse_char(next_grapheme(rest), :garbage, map |> put_value(key, value))
   end
 
-  @spec parse_char({String.t(), String.t()}, :ivalue, String.t(), String.t(), map) :: map
   defp parse_char({char, rest}, :ivalue, key, value, map) do
     parse_char(next_grapheme(rest), :ivalue, key, value <> char, map)
   end
@@ -105,12 +99,10 @@ defmodule Logfmt.Decoder do
     parse_char(next_grapheme(rest), :qvalue, false, key, value <> char, map)
   end
 
-  @spec parse_char({String.t(), String.t()}, :qvalue, false, String.t(), String.t(), map) :: map
   defp parse_char({"\"", rest}, :qvalue, false, key, value, map) do
     parse_char(next_grapheme(rest), :garbage, map |> put_value(key, value))
   end
 
-  @spec parse_char({String.t(), String.t()}, :qvalue, false, String.t(), String.t(), map) :: map
   defp parse_char({char, rest}, :qvalue, false, key, value, map) do
     parse_char(next_grapheme(rest), :qvalue, false, key, value <> char, map)
   end
@@ -130,16 +122,11 @@ defmodule Logfmt.Decoder do
     map |> Map.put(key, value |> coerce_value)
   end
 
-  @spec coerce_value(String.t()) :: true
+  @spec coerce_value(String.t()) :: boolean | number | String.t() | nil
   defp coerce_value("true"), do: true
-
-  @spec coerce_value(String.t()) :: false
   defp coerce_value("false"), do: false
-
-  @spec coerce_value(String.t()) :: nil
   defp coerce_value("nil"), do: nil
 
-  @spec coerce_value(String.t()) :: number | String.t()
   defp coerce_value(value) do
     integer =
       case Integer.parse(value) do

diff --git a/mix.exs b/mix.exs
@@ -2,7 +2,7 @@ defmodule Logfmt.MixProject do
   use Mix.Project
 
   @source_url "https://github.com/jclem/logfmt-elixir"
-  @version "3.3.2"
+  @version "3.3.3"
 
   def project do
     [