Merge pull request #4 from seomoz/myron/stop-supporting-nil

Remove support for `nil` input.
seomoz · Apr 18, 2016 · 0ff84c8 · 0ff84c8
2 parents bab7171 + 0cef763
commit 0ff84c8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/lib/public_suffix.ex b/lib/public_suffix.ex
@@ -24,11 +24,9 @@ defmodule PublicSuffix do
     iex> registrable_domain("foo.github.io")
     "foo.github.io"
   """
-  @spec registrable_domain(nil | String.t) :: nil | String.t
-  @spec registrable_domain(nil | String.t, ignore_private: boolean) :: nil | String.t
-  def registrable_domain(domain, options \\ [ignore_private: false])
-  def registrable_domain(nil, _), do: nil
-  def registrable_domain(domain, options) do
+  @spec registrable_domain(String.t) :: nil | String.t
+  @spec registrable_domain(String.t, ignore_private: boolean) :: nil | String.t
+  def registrable_domain(domain, options \\ [ignore_private: false]) when is_binary(domain) do
     domain
     # "The domain...must be canonicalized in the normal way for hostnames - lower-case"
     |> String.downcase

diff --git a/test/generated_cases_test.exs b/test/generated_cases_test.exs
@@ -49,7 +49,7 @@ defmodule PublicSuffixGeneratedCasesTest do
   use ExUnit.Case
   import PublicSuffix
 
-  for test_case <- PublicSuffix.TestCaseGenerator.test_cases do
+  for test_case <- PublicSuffix.TestCaseGenerator.test_cases, test_case.input do
     @test_case test_case
     expression = "registrable_domain(#{inspect test_case.input}) == #{inspect test_case.output}"
     description = "#{test_case.group_description} ##{test_case.group_case_number} -- line #{test_case.line_number}"