Fix value normalization in strict mode

Author: alco

lib/elixir/lib/option_parser.ex

@@ -174,7 +174,7 @@ defmodule OptionParser do
       {:error, {:undefined, opt_name, value}, rest}
     else
       {opt_name, kinds, value} = normalize_option(opt, value, switches)
-      {value, kinds, rest} = normalize_value(value, kinds, rest)
+      {value, kinds, rest} = normalize_value(value, kinds, rest, strict)
       case validate_option(opt_name, value, kinds) do
         {:ok, new_value} -> {:ok, opt_name, new_value, rest}
         :invalid         -> {:error, {:value, opt_name, value}, rest}
@@ -286,21 +286,22 @@ defmodule OptionParser do
     {option, List.wrap(switches[option]), value}
   end
 
-  defp normalize_value(nil, kinds, t) do
+  defp normalize_value(nil, kinds, t, strict) do
+    null = if strict, do: nil, else: true
     cond do
       :boolean in kinds ->
         {true, kinds, t}
       value_in_tail?(t) ->
         [h|t] = t
         {h, kinds, t}
       kinds == [] ->
-        {true, kinds, t}
+        {null, kinds, t}
       true ->
-        {true, [:invalid], t}
+        {null, [:invalid], t}
     end
   end
 
-  defp normalize_value(value, kinds, t) do
+  defp normalize_value(value, kinds, t, _) do
     {value, kinds, t}
   end
 

lib/elixir/test/elixir/option_parser_test.exs

@@ -171,4 +171,50 @@ defmodule OptionParserTest do
     assert OptionParser.parse(args)
            == {[source: "from_docs/", verbose: true], ["test/enum_test.exs"], []}
   end
+
+  test "next strict: good options" do
+    config = [switches: [str: :string, int: :integer, bool: :boolean], strict: true]
+    assert OptionParser.next(["--str", "hello", "..."], config)
+           == {:ok, :str, "hello", ["..."]}
+    assert OptionParser.next(["--int=13", "..."], config)
+           == {:ok, :int, 13, ["..."]}
+    assert OptionParser.next(["--bool=false", "..."], config)
+           == {:ok, :bool, false, ["..."]}
+    assert OptionParser.next(["--no-bool", "..."], config)
+           == {:ok, :bool, false, ["..."]}
+    assert OptionParser.next(["--bool", "..."], config)
+           == {:ok, :bool, true, ["..."]}
+    assert OptionParser.next(["..."], config)
+           == {:error, ["..."]}
+  end
+
+  test "next strict: unknown options" do
+    config = [switches: [bool: :boolean], strict: true]
+    assert OptionParser.next(["--str", "13", "..."], config)
+           == {:error, {:undefined, :str, nil}, ["13", "..."]}
+    assert OptionParser.next(["--int=hello", "..."], config)
+           == {:error, {:undefined, :int, "hello"}, ["..."]}
+  end
+
+  test "next strict: bad type" do
+    config = [switches: [str: :string, int: :integer, bool: :boolean], strict: true]
+    assert OptionParser.next(["--str", "13", "..."], config)
+           == {:ok, :str, "13", ["..."]}
+    assert OptionParser.next(["--int=hello", "..."], config)
+           == {:error, {:value, :int, "hello"}, ["..."]}
+    assert OptionParser.next(["--int", "hello", "..."], config)
+           == {:error, {:value, :int, "hello"}, ["..."]}
+    assert OptionParser.next(["--bool=other", "..."], config)
+           == {:error, {:value, :bool, "other"}, ["..."]}
+  end
+
+  test "next strict: missing value" do
+    config = [switches: [str: :string, int: :integer, bool: :boolean], strict: true]
+    assert OptionParser.next(["--str"], config)
+           == {:error, {:value, :str, nil}, []}
+    assert OptionParser.next(["--int"], config)
+           == {:error, {:value, :int, nil}, []}
+    assert OptionParser.next(["--bool=", "..."], config)
+           == {:error, {:value, :bool, ""}, ["..."]}
+  end
 end