implement extract for structs and other fixes

Author: benwilson512

.travis.yml

@@ -3,9 +3,9 @@ notifications:
   recipients:
     - [email protected]
 otp_release:
-  - R16B
+  - 17.1
 before_install:
   - git clone https://github.com/elixir-lang/elixir
   - cd elixir && make && cd ..
 before_script: "export PATH=`pwd`/elixir/bin:$PATH"
-script: "MIX_ENV=test mix do deps.get, test"
+script: "MIX_ENV=test mix do deps.get, test"

LICENSE

@@ -16,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.

lib/vex.ex

@@ -82,7 +82,7 @@ defmodule Vex do
   end
 
   defp sources do
-    Mix.project |> Keyword.get(:vex, []) |> Keyword.get(:sources, [Vex.Validators])
+    Mix.Project.get.project |> Keyword.get(:vex, []) |> Keyword.get(:sources, [Vex.Validators])
   end
 
   defp extract(data, attribute, :confirmation) do

lib/vex/blank.ex

@@ -1,5 +1,5 @@
 defprotocol Vex.Blank do
-  @only [Atom, Tuple, List, BitString, Any]
+  @only [Atom, Tuple, List, BitString, Map, Any]
   @doc "Whether an item is blank"
   def blank?(value)
 end
@@ -29,6 +29,10 @@ defimpl Vex.Blank, for: Atom do
   def blank?(_),     do: false
 end
 
+defimpl Vex.Blank, for: Map do
+  def blank?(map), do: map_size(map) == 0
+end
+
 defimpl Vex.Blank, for: Any do
   def blank?(_), do: false
-end
+end

lib/vex/extract.ex

@@ -17,6 +17,26 @@ defimpl Vex.Extract, for: List do
   end
 end
 
+defmodule Vex.Extract.Struct do
+  defmacro for_struct do
+    quote do
+      defimpl Vex.Blank, for: __MODULE__ do
+        def blank?(struct), do: (struct |> Map.from_struct |> map_size) == 0
+      end
+
+      defimpl Vex.Extract, for: __MODULE__ do
+        def settings(%{__struct__: module}) do
+          module.__vex_validations__
+        end
+
+        def attribute(map, name) do
+          Map.get(map, name)
+        end
+      end
+    end
+  end
+end
+
 defimpl Vex.Extract, for: Tuple do
   def settings(record) do
     [name | _tail] = Tuple.to_list(record)

lib/vex/struct.ex

@@ -11,7 +11,10 @@ defmodule Vex.Struct do
 
   defmacro __before_compile__(_) do
     quote do
-      def __record__(:vex_validations), do: @vex_validations
+      def __vex_validations__(), do: @vex_validations
+
+      require Vex.Extract.Struct
+      Vex.Extract.Struct.for_struct
     end
   end
 

lib/vex/validator.ex

@@ -43,7 +43,7 @@ defmodule Vex.Validator do
     iex> Vex.Validator.validate?([name: "foo"], if: &(&1[:name] != "foo"))
     false
     iex> Vex.Validator.validate?([name: "foo"], unless: &(&1[:name] != "foo"))
-    true    
+    true
   """
   def validate?(data, options) when is_list(options) do
     cond do
@@ -62,11 +62,11 @@ defmodule Vex.Validator do
   end
   defp validate_if(data, condition) when is_function(condition) do
     !!condition.(data)
-  end  
+  end
 
   defp do_validate_if_condition(data, {name, value}) when is_atom(name) do
     Vex.Extract.attribute(data, name) == value
-  end  
+  end
   defp do_validate_if_condition(data, condition) when is_atom(condition) do
     !Vex.Blank.blank?(Vex.Extract.attribute(data, condition))
   end

lib/vex/validator/source.ex

@@ -20,7 +20,7 @@ defimpl Vex.Validator.Source, for: Atom do
   end
 
   defp validator_by_structure(source, name) do
-    check Module.concat(source, camelize(String.to_atom(name)))
+    check Module.concat(source, camelize(Atom.to_string(name)))
   end
 
   defp check(validator) do

lib/vex/validators/acceptance.ex

@@ -21,7 +21,7 @@ defmodule Vex.Validators.Acceptance do
     iex> Vex.Validators.Acceptance.validate(nil, message: "must be accepted!")
     {:error, "must be accepted!"}    
     iex> Vex.Validators.Acceptance.validate(1, [as: "yes"])
-    {:error, %s(must be accepted with `"yes"`)}
+    {:error, ~S(must be accepted with `"yes"`)}
     iex> Vex.Validators.Acceptance.validate("verily", [as: "verily"])
     :ok
 

lib/vex/validators/by.ex

@@ -29,7 +29,7 @@ defmodule Vex.Validators.By do
     iex> Vex.Validators.By.validate({}, [function: &is_list/1, allow_blank: true])
     :ok
     iex> Vex.Validators.By.validate([1], [function: &is_list/1, message: "must be a list"])
-    :ok    
+    :ok
     iex> Vex.Validators.By.validate("a", [function: &is_list/1, message: "must be a list"])
     {:error, "must be a list"}
 
@@ -43,10 +43,10 @@ defmodule Vex.Validators.By do
   An example:
 
     iex> Vex.Validators.By.validate("blah", [function: &is_list/1, message: "<%= inspect value %> isn't a list"])
-    {:error, %s("blah" isn't a list)}
+    {:error, ~S("blah" isn't a list)}
   """
   use Vex.Validator
-  
+
   @message_fields [value: "The bad value"]
   def validate(value, func) when is_function(func), do: validate(value, function: func)
   def validate(value, options) when is_list(options) do
@@ -59,4 +59,4 @@ defmodule Vex.Validators.By do
       end
     end
   end
-end
+end

lib/vex/validators/confirmation.ex

@@ -40,7 +40,7 @@ defmodule Vex.Validators.Confirmation do
   An example:
 
     iex> Vex.Validators.Confirmation.validate(["foo", nil], message: "<%= inspect confirmation %> doesn't match <%= inspect value %>")
-    {:error, %s(nil doesn't match "foo")}
+    {:error, ~S(nil doesn't match "foo")}
 
   """
   use Vex.Validator

lib/vex/validators/exclusion.ex

@@ -17,11 +17,11 @@ defmodule Vex.Validators.Exclusion do
     iex> Vex.Validators.Exclusion.validate(1, [in: [1, 2, 3]])
     {:error, "must not be one of [1, 2, 3]"}
     iex> Vex.Validators.Exclusion.validate(1, [in: [1, 2, 3], message: "<%= value %> shouldn't be in <%= inspect list %>"])
-    {:error, "1 shouldn't be in [1, 2, 3]"}    
+    {:error, "1 shouldn't be in [1, 2, 3]"}
     iex> Vex.Validators.Exclusion.validate(4, [1, 2, 3])
     :ok
     iex> Vex.Validators.Exclusion.validate("a", %w(a b c))
-    {:error, %s(must not be one of ["a", "b", "c"])}
+    {:error, ~S(must not be one of ["a", "b", "c"])}
     iex> Vex.Validators.Exclusion.validate("a", in: %w(a b c), message: "must not be abc, talkin' 'bout 123")
     {:error, "must not be abc, talkin' 'bout 123"}
 
@@ -35,7 +35,7 @@ defmodule Vex.Validators.Exclusion do
   An example:
 
     iex> Vex.Validators.Exclusion.validate("a", in: %w(a b c), message: "<%= inspect value %> is a disallowed value")
-    {:error, %s("a" is a disallowed value)}
+    {:error, ~S("a" is a disallowed value)}
   """
 
   use Vex.Validator
@@ -56,4 +56,4 @@ defmodule Vex.Validators.Exclusion do
   defp result(true, _), do: :ok
   defp result(false, message), do: {:error, message}
 
-end
+end

lib/vex/validators/format.ex

@@ -13,17 +13,17 @@ defmodule Vex.Validators.Format do
 
   ## Examples
 
-    iex> Vex.Validators.Format.validate("foo", ~r/"^f"/)
+    iex> Vex.Validators.Format.validate("foo", ~r/^f/)
     :ok
-    iex> Vex.Validators.Format.validate("foo", ~r/"o{3,}"/)
+    iex> Vex.Validators.Format.validate("foo", ~r/o{3,}/)
     {:error, "must have the correct format"}
-    iex> Vex.Validators.Format.validate("foo", [with: ~r/"^f"/])
+    iex> Vex.Validators.Format.validate("foo", [with: ~r/^f/])
     :ok
-    iex> Vex.Validators.Format.validate("bar", [with: ~r/"^f"/, message: "must start with an f"])
+    iex> Vex.Validators.Format.validate("bar", [with: ~r/^f/, message: "must start with an f"])
     {:error, "must start with an f"}
-    iex> Vex.Validators.Format.validate("", [with: ~r/"^f"/, allow_blank: true])
+    iex> Vex.Validators.Format.validate("", [with: ~r/^f/, allow_blank: true])
     :ok
-    iex> Vex.Validators.Format.validate(nil, [with: ~r/"^f"/, allow_nil: true])
+    iex> Vex.Validators.Format.validate(nil, [with: ~r/^f/, allow_nil: true])
     :ok
 
   ## Custom Error Messages

lib/vex/validators/inclusion.ex

@@ -21,7 +21,7 @@ defmodule Vex.Validators.Inclusion do
     iex> Vex.Validators.Inclusion.validate("a", %w(a b c))
     :ok
     iex> Vex.Validators.Inclusion.validate(nil, %w(a b c))
-    {:error, %s(must be one of ["a", "b", "c"])}
+    {:error, ~S(must be one of ["a", "b", "c"])}
     iex> Vex.Validators.Inclusion.validate(nil, [in: %w(a b c), allow_nil: true])
     :ok
     iex> Vex.Validators.Inclusion.validate("", [in: %w(a b c), allow_blank: true])
@@ -37,7 +37,7 @@ defmodule Vex.Validators.Inclusion do
   An example:
 
     iex> Vex.Validators.Inclusion.validate("a", in: [1, 2, 3], message: "<%= inspect value %> is not an allowed value")
-    {:error, %s("a" is not an allowed value)}
+    {:error, ~S("a" is not an allowed value)}
 
   """
   use Vex.Validator

test/validations/absence_test.exs

@@ -23,11 +23,11 @@ defmodule AbsenceTest do
   end
 
   test "record, included absence validation" do
-    assert !Vex.valid?(AbsenceTestRecord.new name: "I have a name")
-    assert  Vex.valid?(AbsenceTestRecord.new name: nil)
-    assert  Vex.valid?(AbsenceTestRecord.new name: [])
-    assert  Vex.valid?(AbsenceTestRecord.new name: "")
-    assert  Vex.valid?(AbsenceTestRecord.new name: {})
+    assert !Vex.valid?(%AbsenceTestRecord{name: "I have a name"})
+    assert  Vex.valid?(%AbsenceTestRecord{name: nil})
+    assert  Vex.valid?(%AbsenceTestRecord{name: []})
+    assert  Vex.valid?(%AbsenceTestRecord{name: ""})
+    assert  Vex.valid?(%AbsenceTestRecord{name: {}})
   end
 
 end

test/validations/acceptance_test.exs

@@ -40,14 +40,14 @@ defmodule AcceptanceTest do
   end
 
   test "record, included basic presence validation" do
-    assert Vex.valid?(AcceptanceTestRecord.new accepts_terms: "yes")
-    assert Vex.valid?(AcceptanceTestRecord.new accepts_terms: true)
+    assert Vex.valid?(%AcceptanceTestRecord{accepts_terms: "yes"})
+    assert Vex.valid?(%AcceptanceTestRecord{accepts_terms: true})
   end
 
   test "record, included custom presence validation" do
-    assert  Vex.valid?(CustomAcceptanceTestRecord.new accepts_terms: "yes")
-    assert !Vex.valid?(CustomAcceptanceTestRecord.new accepts_terms: true)
-    assert !Vex.valid?(CustomAcceptanceTestRecord.new accepts_terms: false)
+    assert  Vex.valid?(%CustomAcceptanceTestRecord{accepts_terms: "yes"})
+    assert !Vex.valid?(%CustomAcceptanceTestRecord{accepts_terms: true})
+    assert !Vex.valid?(%CustomAcceptanceTestRecord{accepts_terms: false})
   end
 
 end

test/vex_test.exs

@@ -15,7 +15,7 @@ defmodule VexTest do
   end
 
   test "record, included complex validation" do
-    user = UserTest.new username: "actualuser", password: "abcdefghi", password_confirmation: "abcdefghi"
+    user = %UserTest{username: "actualuser", password: "abcdefghi", password_confirmation: "abcdefghi"}
     assert Vex.valid?(user)
     assert length(Vex.results(user)) > 0
     assert length(Vex.errors(user)) == 0