Adding Styler + PNM format improvement (#10)

* feat: applying styler

* refact+fix+test(pnm): do not parse size if signature is not fully formed (pnm) + applying styler to pnm

* chore: bump VERSION

* lint(pnm): enabling nesting exception for credo

* chore: bumping styler version (stable)

Author: rNoz

.formatter.exs

@@ -1,5 +1,6 @@
 # Used by "mix format"
 [
+  plugins: [Styler],
   inputs: [
     "{mix,.formatter}.exs",
     "{lib,test,bench}/**/*.{ex,exs}"

VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

lib/ex_image_info.ex

@@ -1,6 +1,4 @@
 defmodule ExImageInfo do
-  alias ExImageInfo.Types.{BMP, GIF, ICO, JP2, JPEG, PNG, PNM, PSD, TIFF, WEBP}
-
   @moduledoc """
   ExImageInfo is an Elixir library to parse images (binaries) and get the dimensions (size), detected mime-type and overall validity for a set of image formats. Main module to parse a binary and get if it seems to be an image (validity), the mime-type (and variant detected) and the dimensions of the image, based on a specific image format.
 
@@ -69,6 +67,16 @@ defmodule ExImageInfo do
   The guessing functions try to detect the format of the binary by testing every available type based on its global usage (popularity, [usage of image file formats](https://w3techs.com/technologies/overview/image_format/all), but still keeping the `:png` as the first one):
   - `:png`, `:jpeg`, `:gif`, `:bmp`, `:ico`, `:tiff`, `:webp`, `:psd`, `:jp2`, `:pnm`
   """
+  alias ExImageInfo.Types.BMP
+  alias ExImageInfo.Types.GIF
+  alias ExImageInfo.Types.ICO
+  alias ExImageInfo.Types.JP2
+  alias ExImageInfo.Types.JPEG
+  alias ExImageInfo.Types.PNG
+  alias ExImageInfo.Types.PNM
+  alias ExImageInfo.Types.PSD
+  alias ExImageInfo.Types.TIFF
+  alias ExImageInfo.Types.WEBP
 
   # Guessing function ordered by global usage
   # https://w3techs.com/technologies/overview/image_format/all

lib/ex_image_info/types/pnm.ex

@@ -28,7 +28,7 @@ defmodule ExImageInfo.Types.PNM do
 
   def info(<<@signature, char::size(8), split, rest::binary>>)
       when split in [@nl, @space, @sharp] do
-    with type <- signature_pnm(char),
+    with type when not is_nil(type) <- signature_pnm(char),
          {w, h} <- parse(rest, nil) do
       {@mime, String.to_integer(w), String.to_integer(h), type}
     else
@@ -61,30 +61,34 @@ defmodule ExImageInfo.Types.PNM do
 
   defp parse(rest, pre) do
     # no global
-    with [line, next] <- :binary.split(rest, "\n"),
-         # comments
-         valid <- hd(:binary.split(line, "#")),
-         ret <- Regex.run(~r/^\s*(\d+)(?:[\s]|)(?:(\d+)(?:[\s]|))?/, valid) do
-      case ret do
-        [_, w, h] ->
-          if pre != nil do
-            {pre, w}
-          else
-            {w, h}
-          end
-
-        [_, w] ->
-          if pre != nil do
-            {pre, w}
-          else
-            parse(next, w)
-          end
-
-        _ ->
-          parse(next, pre)
-      end
-    else
-      _ -> nil
+    case :binary.split(rest, "\n") do
+      [line, next] ->
+        # comments
+        valid = hd(:binary.split(line, "#"))
+        ret = Regex.run(~r/^\s*(\d+)(?:[\s]|)(?:(\d+)(?:[\s]|))?/, valid)
+
+        case ret do
+          [_, w, h] ->
+            if pre == nil do
+              {w, h}
+            else
+              {pre, w}
+            end
+
+          [_, w] ->
+            # credo:disable-for-next-line Credo.Check.Refactor.Nesting
+            if pre == nil do
+              parse(next, w)
+            else
+              {pre, w}
+            end
+
+          _ ->
+            parse(next, pre)
+        end
+
+      _ ->
+        nil
     end
   end
 end

lib/ex_image_info/types/tiff.ex

@@ -59,7 +59,7 @@ defmodule ExImageInfo.Types.TIFF do
         ftype = if b_e == false, do: @ftype_ii, else: @ftype_mm
         w = Map.get(tags, 256)
         h = Map.get(tags, 257)
-        if w != nil and h != nil, do: {@mime, w, h, ftype}, else: nil
+        if w != nil and h != nil, do: {@mime, w, h, ftype}
 
       _ ->
         nil

mix.exs

@@ -6,7 +6,7 @@ defmodule ExImageInfo.Mixfile do
       app: :ex_image_info,
       description:
         "ExImageInfo is an Elixir library to parse images (binaries) and get the dimensions (size), detected mime-type and overall validity for a set of image formats. It is the fastest and supports multiple formats.",
-      version: File.read!("VERSION") |> String.trim(),
+      version: "VERSION" |> File.read!() |> String.trim(),
       elixir: "~> 1.3",
       name: "ExImageInfo",
       package: package(),
@@ -35,7 +35,8 @@ defmodule ExImageInfo.Mixfile do
       {:excoveralls, "~> 0.18", only: :test},
       {:ex_doc, "~> 0.30", only: :dev},
       {:inch_ex, "~> 2.0", only: [:dev, :test]},
-      {:credo, "~> 1.7", only: [:dev, :test], runtime: false}
+      {:credo, "~> 1.7", only: [:dev, :test], runtime: false},
+      {:styler, "~> 1.3", only: [:dev, :test], runtime: false}
     ]
   end
 

mix.lock

@@ -11,4 +11,5 @@
   "makeup_elixir": {:hex, :makeup_elixir, "0.16.1", "cc9e3ca312f1cfeccc572b37a09980287e243648108384b97ff2b76e505c3555", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.2.3 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "e127a341ad1b209bd80f7bd1620a15693a9908ed780c3b763bccf7d200c767c6"},
   "makeup_erlang": {:hex, :makeup_erlang, "0.1.2", "ad87296a092a46e03b7e9b0be7631ddcf64c790fa68a9ef5323b6cbb36affc72", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "f3f5a1ca93ce6e092d92b6d9c049bcda58a3b617a8d888f8e7231c85630e8108"},
   "nimble_parsec": {:hex, :nimble_parsec, "1.4.0", "51f9b613ea62cfa97b25ccc2c1b4216e81df970acd8e16e8d1bdc58fef21370d", [:mix], [], "hexpm", "9c565862810fb383e9838c1dd2d7d2c437b3d13b267414ba6af33e50d2d1cf28"},
+  "styler": {:hex, :styler, "1.3.2", "895910c05f26447db1aec83cfc84868b4793ce4ded74646cbdacb6600cad65f6", [:mix], [], "hexpm", "4bc3577b44f8dfd828fe323852a6c0f6a47a477e65e29ba29af1c5a7f1b54432"},
 }

test/ex_image_info_test.exs

@@ -1,4 +1,5 @@
 defmodule ExImageInfoTest do
   use ExUnit.Case
+
   doctest ExImageInfo
 end

test/ex_image_info_test/images/bmp_test.exs

@@ -1,5 +1,6 @@
 defmodule ExImageInfoTest.Images.BMPTest do
   use ExUnit.Case, async: true
+
   import ExImageInfo
 
   setup_all do

test/ex_image_info_test/images/gif_test.exs

@@ -1,5 +1,6 @@
 defmodule ExImageInfoTest.Images.GIFTest do
   use ExUnit.Case, async: true
+
   import ExImageInfo
 
   setup_all do