hatch 0.1.1 → 0.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTRmYTJkYmNkNDQ1Mzc4YmI0NTI1YTE2MWQ1MGMxNjQ4Y2QyZWY2YQ==
+    MDlkZmRlM2ViZDQxZDFiODVlNGY3ZTNmNzcyMTMzZTViZWQ5OTc1Mw==
   data.tar.gz: !binary |-
-    MzdhNGMzYzIxMGU5ZWZiMWM5MTkzZDAzYjc2M2U1NmU2MTU1ZmQ5ZQ==
+    YTk3Nzg0NDk0MGIzMzI4NWNmNzIzZjdkZWM3YjM3YjhkMGEyODA1ZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NDg3NzVlYTBmM2NlMjA4ZmUxOTFkZDM0ZTM1MDA3ZjM2NjViYzJlMmYzNjA0
-    MDM3NTkyYjE4ODFkZjhiMTYwNTA4OTdkZDY1YmU5MTY4OWNhNjViOTAzMGU5
-    NDAxMTJlNDNjMzJiMDBlM2ZiZGM4MGYyMTFlZTJkYjkxMmYxMGQ=
+    NGM4MjIyZmI2MzE3OTgzNmQ5YzI5YjI3OTkwN2I3NDRiNGQ1M2JiNTQzMzgw
+    NzAyYTc1ZmM0OTRiZTg3Y2RmMTNhYzA2OWU2NDBlYjE1MmRiYTMwZGFjYTY5
+    ODA2ZTk2YzA2ZDU2NDI4MDM4MzZhZTIyYTEwNDVmNjg5ZjBmZmU=
   data.tar.gz: !binary |-
-    MDRjMGNkMmI0ZDExMDBjY2Q0NWI0YzdjYmE5NGE1MDU5YjJlMTc1NjkxZGM5
-    MjM5OGQ1ZjU5ODk0ZmZlODY5NmU2OTA1NzdlYzZkNDUwYzA2YzBlM2FjZmFj
-    YmE4MDIyMTc1MmY2NWYxMzNhODc2OWFkZDRjMjA3Mjc5MDA3M2U=
+    Y2QyZDkyNjA2Y2Y5YzM5ZjkzNzdiOGU0MDYzNzlkNTJhMTY0NTA3MjE4YjIz
+    Yjc1NTdhYjBiZWMyYjJjYzRkN2I2ZmE0MWU5NjBiOWNjNDdiODBjMWRlOTc3
+    NmJkYzcwYTViZmVjMDFhYmU5YWE2YjFlODRiMzY4YjJmMTczZGY=

data/README.md

@@ -1,6 +1,8 @@
 Hatch
 =====
 
+An address without a street? A person without a name? Those are not valid objects!  Why should you have them hanging around your system? [![Build Status](https://travis-ci.org/tonchis/hatch.png?branch=master)](https://travis-ci.org/tonchis/hatch) [![Code Climate](https://codeclimate.com/github/tonchis/hatch.png)](https://codeclimate.com/github/tonchis/hatch)
+
 Installation
 ------------
 
@@ -9,8 +11,6 @@ Installation
 Usage
 -----
 
-An address without a street? A person without a name? Those are not valid objects!
-Why should you have them hanging around your system?
 
 Tell `Hatch` how to certify the attributes of your models, and it will give you the appropriate object.
 
@@ -55,15 +55,16 @@ In case you're wondering, the `Model::InvalidModel` is polymorphic with your `Mo
 class Address
   include Hatch
 
-  certifies(:street, :presence, "This is an error! Where's my street?!")
+  certifies(:street, :not_empty, 'This is an error! Where's my street?!')
   certifies(:number, :positive_number)
 end
 ```
 
 Common validations come in the following flavours (along with default error messages)
 
-  * `:presence` - `"must be present"`
-  * `:positive_number` - `"must be a positive number"`
+  * `:not_nil` - `'must not be nil'`
+  * `:positive_number` - `'must be a positive number'`
+  * `:not_empty` - `'must not be empty'`
 
 Aaand that's it for the moment. I'll keep on adding more as they come to my mind. If they come to yours first, feel free to add them and PR.
 

data/hatch.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'hatch'
-  s.version     = '0.1.1'
+  s.version     = '0.1.2'
   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

@@ -61,12 +61,12 @@ module Hatch
     private
 
       def respond_to_instance_methods
-        attributes_with_reader.each do |attribute|
+        attributes_with_reader_method.each do |attribute|
           self.class.send :define_method, attribute.attr, -> {attribute.value}
         end
       end
 
-      def attributes_with_reader
+      def attributes_with_reader_method
         extended_klass = Kernel.const_get(self.class.to_s.split("Invalid").last)
         instance_methods = extended_klass.instance_methods(false)
 
@@ -79,7 +79,7 @@ module Hatch
   private
 
     def build(validated_attributes)
-      if all_attributes_valid?(validated_attributes)
+      if validated_attributes.all? {|validated_attribute| validated_attribute.valid?}
         set_instance_variables(new, *validated_attributes)
       else
         const_get("Invalid#{self}").new(*validated_attributes)
@@ -92,10 +92,6 @@ module Hatch
       end
       instance
     end
-
-    def all_attributes_valid?(validated_attributes)
-      validated_attributes.map(&:valid?).reduce(true, :&)
-    end
   end
 
   class ValidatedAttribute
@@ -125,12 +121,16 @@ module Hatch
       @error, @block = error, block
     end
 
-    def self.presence(error)
-      new(error || "must be present") {|value| !value.nil? && !value.empty?}
+    def self.not_nil(error)
+      new(error || 'must not be nil') {|value| !value.nil?}
     end
 
     def self.positive_number(error)
-      new(error || "must be a positive number") {|value| !value.nil? && value > 0}
+      new(error || 'must be a positive number') {|value| !value.nil? && value > 0}
+    end
+
+    def self.not_empty(error)
+      new(error || 'must not be empty') {|value| !value.nil? && !value.empty?}
     end
   end
 

data/test/common_validations_test.rb

@@ -1,21 +1,27 @@
-require_relative 'support/helper'
+require 'minitest/autorun'
 require_relative '../lib/hatch'
 
 class CommonStuff
   include Hatch
 
-  certifies :present, :presence
+  certifies :not_nil, :not_nil
   certifies :positive, :positive_number
+  certifies :not_empty, :not_empty
 end
 
-class CommonValidationsTest < Test::Unit::TestCase
-  def test_presence
-    common_stuff = CommonStuff.hatch(present: nil, positive: 1)
-    assert_equal 'must be present', common_stuff.errors.on(:present)
+class CommonValidationsTest < MiniTest::Unit::TestCase
+  def test_not_nil
+    common_stuff = CommonStuff.hatch(present: nil)
+    assert_equal 'must not be nil', common_stuff.errors.on(:not_nil)
   end
 
   def test_positive_number
-    common_stuff = CommonStuff.hatch(present: 'here', positive: -1)
+    common_stuff = CommonStuff.hatch(positive: -1)
     assert_equal 'must be a positive number', common_stuff.errors.on(:positive)
   end
+
+  def test_not_empty
+    common_stuff = CommonStuff.hatch(not_empty: [])
+    assert_equal 'must not be empty', common_stuff.errors.on(:not_empty)
+  end
 end

data/test/errors_test.rb

@@ -1,27 +1,26 @@
-require_relative 'support/helper'
+require 'minitest/autorun'
 require_relative 'support/address'
 
-class ErrorsTest < Test::Unit::TestCase
-  def initialize(*args)
+class ErrorsTest < MiniTest::Unit::TestCase
+  def setup
     @address = Address.hatch(city: 'Buenos Aires', street: '', number: -1)
-    super
   end
 
   def test_errors_on
-    assert @address.errors.on(:city).empty?
+    assert_empty @address.errors.on(:city)
     assert_equal 'Address must have a street', @address.errors.on(:street)
     assert_equal 'Address must have a positive number', @address.errors.on(:number)
   end
 
   def test_hash_accessor
-    assert @address.errors[:city].empty?
+    assert_empty @address.errors[:city]
     assert_equal 'Address must have a street', @address.errors[:street]
     assert_equal 'Address must have a positive number', @address.errors[:number]
   end
 
   def test_errors_full_messages
-    assert @address.errors.full_messages.include?('Address must have a street')
-    assert @address.errors.full_messages.include?('Address must have a positive number')
+    assert_includes @address.errors.full_messages, 'Address must have a street'
+    assert_includes @address.errors.full_messages, 'Address must have a positive number'
   end
 end
 

data/test/polymorphism_test.rb

@@ -1,19 +1,19 @@
-require_relative 'support/helper'
+require 'minitest/autorun'
 require_relative 'support/address'
 
-class PolymorphismTest < Test::Unit::TestCase
+class PolymorphismTest < MiniTest::Unit::TestCase
   def test_polymorphism
-    address = Address.hatch(street: "Fake St", number: 1234, city: "Buenos Aires")
-    assert address.is_a?(Address)
-    assert_equal address.street, "Fake St"
-    assert_equal address.number, 1234
-    assert_equal address.city,   "Buenos Aires"
+    address = Address.hatch(street: 'Fake St', number: 1234, city: 'Buenos Aires')
+    assert_instance_of Address, address
+    assert_equal 'Fake St', address.street
+    assert_equal 1234, address.number
+    assert_equal 'Buenos Aires', address.city
 
-    address = Address.hatch(street: "Fake St", number: -1, city: "Buenos Aires")
-    assert address.is_a?(Address::InvalidAddress)
-    assert_equal address.street, "Fake St"
-    assert_equal address.number, -1
-    assert_equal address.city,   "Buenos Aires"
+    address = Address.hatch(street: 'Fake St', number: -1, city: 'Buenos Aires')
+    assert_instance_of Address::InvalidAddress, address
+    assert_equal 'Fake St', address.street
+    assert_equal -1, address.number
+    assert_equal 'Buenos Aires', address.city
   end
 end
 

data/test/validation_test.rb

@@ -1,24 +1,24 @@
-require_relative 'support/helper'
+require 'minitest/autorun'
 require_relative 'support/address'
 
-class ValidationTest < Test::Unit::TestCase
+class ValidationTest < MiniTest::Unit::TestCase
   def test_valid
     address = Address.hatch(street: 'Fake St', city: 'Buenos Aires', number: 1234)
-    assert address.is_a?(Address)
-    assert address.respond_to?(:valid?)
+    assert_instance_of Address, address
+    assert_respond_to address, :valid?
     assert address.valid?
   end
 
   def test_invalid
     address = Address.hatch(city: 'Buenos Aires', street: '', number: 1234)
-    assert address.is_a?(Address::InvalidAddress)
-    assert address.respond_to?(:valid?)
-    assert !address.valid?
+    assert_instance_of Address::InvalidAddress, address
+    assert_respond_to address, :valid?
+    refute address.valid?
   end
 
   def test_ignore_attributes
     address = Address.hatch(street: 'Fake St', city: 'Buenos Aires', number: 1234, sorry: :oops)
-    assert address.is_a?(Address)
+    assert_instance_of Address, address
     assert address.valid?
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hatch
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Lucas Tolchinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2013-08-07 00:00:00.000000000 Z
 dependencies: []
 description: An address without a street? A person without a name? You don't need
   no invalid objects!