ohm-validations 0.0.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29390f46741b4fc83c1f95ac1ca33ad6b1b09e90
-  data.tar.gz: c177830ca00d41b14de8cd001f8c871be2f90061
+  metadata.gz: 0c0c77f31ae7a1bb376897b20d7d1a687d56a108
+  data.tar.gz: 80490b5f559546137c855c72c19dfa782543d924
 SHA512:
-  metadata.gz: cfbecaf70848d8c13e41e41e32fbfb66e88335e4af50df1596e42706cb4198a1fcf19fe1b3001ef4210778413c3955dd31dae2ec090865e40463ab4083f0f981
-  data.tar.gz: 91e23aa0fe0ad9e3986064c4dbbebf1206f929590ec71ab165ceb5452f8acee3a79d162a62cc5bb8111320ec7dc93ebe619a17cd6750e5ed6ed8c9e67ab6d5b1
+  metadata.gz: 3ab86c99a3f31566fefa6f8be9a3f26a9ce4af2f16ccd9f9042b62c842143958cd85ce68663fa8b155d94912477edc965049b31c913f00d255eaa6800ad844e2
+  data.tar.gz: 7bce45dae652d5bc97e3e8212fc6ddba41fd6778daead7b39ea38143d76b6b2e901def2931d3a56a557bfd241d2de11a421c122618193cbe998729d1b9163851

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014 Francesco Rodriguez
+Copyright (c) 2014-2016 Francesco Rodríguez
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,12 +1,33 @@
-ohm-validations
+ohm-validations [![Build Status](https://travis-ci.org/frodsan/ohm-validations.svg)](https://travis-ci.org/frodsan/ohm-validations)
 ===============
 
 Validations for Ohm::Model.
 
+Installation
+------------
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem "ohm-validations"
+```
+
+And then execute:
+
+```
+$ bundle
+```
+
+Or install it yourself as:
+
+```
+$ gem install ohm-validations
+```
+
 Usage
 -----
 
-```
+```ruby
 class User < Ohm::Model
   include Ohm::Validations
 
@@ -22,20 +43,24 @@ class User < Ohm::Model
     assert_email(:email)
   end
 
-  def before_validation
+  def before_validate
     @before = true
   end
 
-  def after_validation
+  def after_validate
     @after = true
   end
 end
 
-user = User.new({})
+User.create
+# => nil
+
+user = User.new
 user.valid? # => false
 
 user.update_attributes(name: "jhon", email: "jhon@doe.com")
 user.valid? # => true
+user.save   # => user
 
 user.before # => true
 user.after  # => true
@@ -44,11 +69,34 @@ user.after  # => true
 Check [scrivener][scrivener] project for more information
 about the available validations.
 
-Installation
+Contributing
 ------------
 
+Fork the project with:
+
 ```
-$ gem install ohm-validations
+$ git clone git@github.com:frodsan/ohm-validations.git
+```
+
+To install dependencies, use:
+
+```
+$ bundle install
 ```
 
+To run the test suite, do:
+
+```
+$ rake test
+```
+
+For bug reports and pull requests use [GitHub][issues].
+
+License
+-------
+
+This gem is released under the [MIT License][mit].
+
+[mit]: http://www.opensource.org/licenses/MIT
+[issues]: https://github.com/frodsan/ohm-validations/issues
 [scrivener]: https://github.com/soveran/scrivener

data/lib/ohm/validations.rb

@@ -6,21 +6,26 @@ module Ohm
 
     module Callbacks
       def valid?
-        before_validation
+        before_validate
 
         result = super
 
-        after_validation
+        after_validate
 
         result
       end
 
+      def save
+        return if not valid?
+        super
+      end
+
       protected
 
-      def before_validation
+      def before_validate
       end
 
-      def after_validation
+      def after_validate
       end
     end
 

data/test/validations_test.rb

@@ -0,0 +1,113 @@
+require "bundler/setup"
+require "minitest/autorun"
+require "minitest/pride"
+require "minitest/sugar"
+require "ohm"
+require "ohm/contrib"
+require_relative "../lib/ohm/validations"
+
+Ohm.redis = Redic.new("redis://127.0.0.1:6379/15")
+
+class User < Ohm::Model
+  include Ohm::Validations
+
+  attribute :name
+
+  attr :before, :after
+
+  def validate
+    assert_present(:name)
+  end
+
+  protected
+
+  def before_validate
+    @before = true
+  end
+
+  def after_validate
+    @after = true
+  end
+end
+
+class Person < Ohm::Model
+  include Ohm::Callbacks
+  include Ohm::Validations
+
+  attribute :name
+
+  attr :did_before_validate
+  attr :did_before_create
+  attr :did_after_validate
+  attr :did_after_create
+
+  protected
+
+  def validate
+    assert_present(:name)
+  end
+
+  def before_validate; @did_before_validate = true end
+  def before_create; @did_before_create = true; end
+  def after_validate; @did_after_validate = true end
+  def after_create; @did_after_create = true; end
+end
+
+class ValidationsTest < Minitest::Test
+  setup do
+    Ohm.flush
+  end
+
+
+  test "validations" do
+    user = User.new
+
+    assert !user.valid?
+
+    user.name = "jhon"
+
+    assert user.valid?
+  end
+
+  test "callbacks" do
+    user = User.new({})
+
+    user.valid?
+
+    assert user.before
+    assert user.after
+  end
+
+  test "save" do
+    assert User.create.nil?
+
+    user = User.new
+    assert user.save.nil?
+
+    user.name = "jhon"
+    user.save
+
+    assert user.id
+
+    assert user.update(name: "").nil?
+    assert user.update(name: "jhon")
+  end
+
+  test "compatibility" do
+    person = Person.new
+
+    assert !person.valid?
+
+    assert person.did_before_validate
+    assert person.did_after_validate
+    assert !person.did_before_create
+    assert !person.did_after_create
+
+    person = Person.create(name: "jhon")
+
+    assert person.did_before_validate
+    assert person.did_after_validate
+    assert person.did_before_create
+    assert person.did_after_create
+  end
+end

metadata

@@ -1,70 +1,109 @@
 --- !ruby/object:Gem::Specification
 name: ohm-validations
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Francesco Rodríguez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2015-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ohm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: scrivener
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: cutest
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: Validation for Ohm::Model.
-email:
-- frodsan@me.com
+        version: '5.8'
+- !ruby/object:Gem::Dependency
+  name: minitest-sugar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: ohm-contrib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+description: Validations for Ohm models
+email: frodsan@protonmail.ch
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gems"
 - LICENSE
 - README.md
 - lib/ohm/validations.rb
-- ohm-validations.gemspec
-- test/validations.rb
+- test/validations_test.rb
 homepage: https://github.com/frodsan/ohm-validations
 licenses:
 - MIT
@@ -85,8 +124,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
-summary: Validation for Ohm::Model.
-test_files: []
+summary: Validations for Ohm models
+test_files:
+- test/validations_test.rb

data/.gems

@@ -1,3 +0,0 @@
-ohm -v 2.0.0.rc1
-scrivener -v 0.2.0
-cutest -v 1.2.1

data/ohm-validations.gemspec

@@ -1,16 +0,0 @@
-Gem::Specification.new do |s|
-  s.name        = "ohm-validations"
-  s.version     = "0.0.1"
-  s.summary     = "Validation for Ohm::Model."
-  s.description = s.summary
-  s.authors     = ["Francesco Rodríguez"]
-  s.email       = ["frodsan@me.com"]
-  s.homepage    = "https://github.com/frodsan/ohm-validations"
-  s.license     = "MIT"
-
-  s.files = `git ls-files`.split("\n")
-
-  s.add_dependency "ohm"
-  s.add_dependency "scrivener"
-  s.add_development_dependency "cutest"
-end

data/test/validations.rb

@@ -1,48 +0,0 @@
-require "cutest"
-require "ohm"
-require_relative "../lib/ohm/validations"
-
-Ohm.redis = Redic.new("redis://127.0.0.1:6379/15")
-
-setup do
-  Ohm.flush
-end
-
-class User < Ohm::Model
-  include Ohm::Validations
-
-  attribute :name
-
-  attr :before, :after
-
-  def validate
-    assert_present(:name)
-  end
-
-  def before_validation
-    @before = true
-  end
-
-  def after_validation
-    @after = true
-  end
-end
-
-test "validations" do
-  user = User.new({})
-
-  assert !user.valid?
-
-  user.name = "jhon"
-
-  assert user.valid?
-end
-
-test "callbacks" do
-  user = User.new({})
-
-  user.valid?
-
-  assert user.before
-  assert user.after
-end