vladimerb 0.0.1 → 0.0.2

data/src/pattern.rb

@@ -1,20 +1,29 @@
 require_relative "namespace"
 
 class Vladimerb::Pattern
-  def initialize field_name, regex, options=nil
+  def initialize field_name, regex, options = nil
     @field_name = field_name
     @regex = regex
     @custom_message = options[:message] unless options.nil?
   end
 
   def validate record
-    record.send(@field_name).match(@regex).nil? ?
-      [error_message] :
-      []
+    check_nil(record.send(@field_name))
   end
 
   private
 
+  # TODO: Not happy with this method name
+  def check_nil(value)
+    value.nil? ?
+      [] : check_match(value)
+  end
+
+  def check_match(value)
+    value.match(@regex).nil? ?
+      [error_message] : []
+  end
+
   def error_message
     @custom_message.nil? ?
       @field_name.to_s + " is not formatted correctly." :

data/src/required.rb

@@ -1,7 +1,7 @@
 require_relative "namespace"
 
 class Vladimerb::Required
-  def initialize field_name, options=nil
+  def initialize field_name, options = nil
     @field_name = field_name
     @custom_message = options[:message] unless options.nil?
   end

data/src/vladimerb.rb

@@ -17,8 +17,8 @@ module Vladimerb
       Chain.new tree, validation }
   end
 
-  def required field_name
-    Required.new field_name
+  def required field_name, options = nil
+    Required.new field_name, options
   end
 
   def greater_than field_name, minimum
@@ -29,8 +29,8 @@ module Vladimerb
     LambdaValidation.new &block
   end
 
-  def pattern field_name, regex
-    Pattern.new field_name, regex
+  def pattern field_name, regex, options = nil
+    Pattern.new field_name, regex, options
   end
 
   def predicate field_name, method, msg

data/test/helpers.rb

@@ -1,7 +1,7 @@
 require_relative "test_helper.rb"
 
 class HelpersTest < Test::Unit::TestCase
-  include Helpers
+  include Vladimerb
 
   def test_join_can_compose_multiple_validations
     assert_errors Candidate.new("Fred", 50),

data/test/pattern.rb

@@ -19,5 +19,11 @@ class PatternTest < Test::Unit::TestCase
                   ["Name is insufficiently ill"]
   end
 
+  def tests_a_value_can_be_blank
+    assert_errors Candidate.new(nil, 24),
+                  pattern(:name, /ill/, message: "Name is insufficiently ill"),
+                  []
+  end
+
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vladimerb
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors: