hatch 0.0.5 → 0.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmMxN2EyNTUzN2M2NWMyMmNiOWI3NzY0NDZkZTZmN2NmMGJiNWE0Mw==
+    NWM5Y2NiNzZiYjYzYWQ5MWVhOWJkMjYyYTZjMWYyOThkY2JkNzg4Yg==
   data.tar.gz: !binary |-
-    YjEzZmZlMWRlNDkwNGZmMDg5MDc5NGU5ZjZjN2U4ZTU3NGI0MzlhZA==
+    YmVkMjEwZjRhZTEwMDY1MmRjMzNjZWUxZmJiYTdlOWZlMTgzNjFhMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MzYxOTA2YzRlYjNiY2FhZTVkYTZkMTJmMWVlOTNiMjM3NWI3NWQ2MzlmNjVm
-    YzFjNDhlYjZkZTc2Y2IyNTViY2VhOGQ4YmUwMGFiY2U4YWNjMTE0MzU1MzZi
-    ZWFiODk3ZmY0MjQ4YjhkMDEwZTI0YmFhNGZkNmQwZTc2MDVkOGM=
+    ZDYxZTI3ODQ5MzZmNjBhNTczNjdkMzgwZWY4MGU0ZThkNzdmNzFmMDc1MmRm
+    NzNjNWEwYTU3YjZhNGY5ZjM0OGE1NDU4NjlmNzRmOTIyZTE4NWY4Mjc5ZTI1
+    Y2U3NDk5OTJlM2ZjYjQ3MjkzMzFjZmIxOWRmYzc2MTk3MTE5M2Q=
   data.tar.gz: !binary |-
-    MWUwNjNjZDZlOWNmMjJiN2M0NDhhZDgzYzY0NjYzN2U4ZjE5MDZjOTI0Zjc1
-    OWFjOTA0Y2FiNTMxOGU5Mjg3MjE0ZDU3OGJiYWY1MmE0NjAzNjUzY2YyZTEz
-    YjUzYzM1YWE4YzQ4MTNkNzU1MTg5YWMwNmZiNjJjMjY2M2QwOWU=
+    MTI3ZjFmNWQwY2Q3MmU3ZDAwMjM4ZDNlMDZjNGIxZmQxZTRhZDMzYTY0N2Zm
+    N2FmNzM4ZjVmZjY1NmI1ZjI3OTM2MDI2NTY2MjU0ZDhhNTgwYWZjYzY3N2Uz
+    NTllYjk0OTBkYzhmMmYxZjA0MTE1OTRmZTQ2ZjI1OTM4MDNmOGQ=

data/hatch.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'hatch'
-  s.version     = '0.0.5'
+  s.version     = '0.0.6'
   s.date        = Time.now.strftime('%Y-%m-%d')
   s.summary     = 'Keep valid objects only'
   s.description = "An address without a street? A person without a name? You don't need no invalid objects!"

data/lib/hatch.rb

@@ -32,7 +32,11 @@ module Hatch
     end
 
     def certify(attribute, error, &block)
-      @@validations[self.to_s.to_sym][attribute] = {error: error, validation: block}
+      @@validations[self.to_s.to_sym][attribute] = Validation.new(error, &block)
+    end
+
+    def certifies(attribute, validation, error = nil)
+      @@validations[self.to_s.to_sym][attribute] = Validation.send(validation, error)
     end
 
     def hatch(args = {})
@@ -42,8 +46,8 @@ module Hatch
         validation = @@validations[klass_symbol][attribute]
         validated_attributes << Validator.validate(attribute,
                                                    args[attribute],
-                                                   validation[:error],
-                                                   &validation[:validation])
+                                                   validation.error,
+                                                   &validation.block)
       end
 
       build(validated_attributes)
@@ -130,5 +134,22 @@ module Hatch
       !@valid
     end
   end
+
+  class Validation
+    attr_reader :error, :block
+
+    def initialize(error, &block)
+      @error = error
+      @block = block
+    end
+
+    def self.presence(error)
+      new(error || "must be present") {|value| !value.nil? && !value.empty?}
+    end
+
+    def self.positive_number(error)
+      new(error || "must be a positive number") {|value| !value.nil? && value > 0}
+    end
+  end
 end
 

data/test/common_validations_test.rb

@@ -0,0 +1,25 @@
+require_relative 'support/helper'
+require_relative '../lib/hatch'
+
+class CommonStuff
+  include Hatch
+
+  attributes :present, :positive
+
+  certifies :present, :presence
+  certifies :positive, :positive_number
+end
+
+class CommonValidationsTest < Test::Unit::TestCase
+  def test_presence
+    common_stuff = CommonStuff.hatch(present: nil, positive: 1)
+    assert common_stuff.is_a?(CommonStuff::InvalidCommonStuff)
+    assert common_stuff.errors.include?("must be present")
+  end
+
+  def test_positive_number
+    common_stuff = CommonStuff.hatch(present: "here", positive: -1)
+    assert common_stuff.is_a?(CommonStuff::InvalidCommonStuff)
+    assert common_stuff.errors.include?("must be a positive number")
+  end
+end

data/test/polymorphism_test.rb

@@ -1,4 +1,5 @@
-require_relative 'helper'
+require_relative 'support/helper'
+require_relative 'support/address'
 
 class PolymorphismTest < Test::Unit::TestCase
   def test_polymorphism

data/test/validation_test.rb

@@ -1,4 +1,5 @@
-require_relative 'helper'
+require_relative 'support/helper'
+require_relative 'support/address'
 
 class ValidTest < Test::Unit::TestCase
   def test_valid

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hatch
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Lucas Tolchinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-20 00:00:00.000000000 Z
+date: 2013-05-21 00:00:00.000000000 Z
 dependencies: []
 description: An address without a street? A person without a name? You don't need
   no invalid objects!
@@ -21,7 +21,7 @@ files:
 - README.md
 - hatch.gemspec
 - Rakefile
-- test/helper.rb
+- test/common_validations_test.rb
 - test/polymorphism_test.rb
 - test/validation_test.rb
 - lib/hatch.rb

data/test/helper.rb

@@ -1,23 +0,0 @@
-require 'test/unit'
-require 'pry'
-require_relative '../lib/hatch'
-
-class Address
-  attr_reader :city, :street, :number
-
-  include Hatch
-  attributes :city, :street, :number
-
-  certify(:street, "Address must have a street") do |street|
-    !street.nil? && !street.empty?
-  end
-
-  certify(:number, "Address must have a positive number") do |number|
-    !number.nil? && number > 0
-  end
-
-  certify(:city, "Address must have a city") do |city|
-    !city.nil? && !city.empty?
-  end
-end
-