ohm-validations 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c0c77f31ae7a1bb376897b20d7d1a687d56a108
-  data.tar.gz: 80490b5f559546137c855c72c19dfa782543d924
+  metadata.gz: 950a2b29f2de8aa1220a81ce1cfba05769b28a0c
+  data.tar.gz: b7ff2f4d42ecbc8ea7bbebc4c9755f29bc877b6d
 SHA512:
-  metadata.gz: 3ab86c99a3f31566fefa6f8be9a3f26a9ce4af2f16ccd9f9042b62c842143958cd85ce68663fa8b155d94912477edc965049b31c913f00d255eaa6800ad844e2
-  data.tar.gz: 7bce45dae652d5bc97e3e8212fc6ddba41fd6778daead7b39ea38143d76b6b2e901def2931d3a56a557bfd241d2de11a421c122618193cbe998729d1b9163851
+  metadata.gz: 082cdc67e9c2a4bfe8f31c7c2d81f92f7229eef2f4e6821c43630efed664459895aa2c5a7586622f9c44475da688778502872170165cf3327b3a6ddd6eb9e791
+  data.tar.gz: 9b3a113912267add1197de423a6b99e56479004bbfd46979545c470b30bafb424e985f16f3fa9e720b7bbbbdebec1d387f6a741bff5561ce5f5fc6dee028f2c0

data/README.md

@@ -34,7 +34,7 @@ class User < Ohm::Model
   attribute :name
   attribute :email
 
-  attr :before, :after
+  attr_reader :before, :after
 
   protected
 

data/lib/ohm/validations.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "scrivener/validations"
 
 module Ohm
@@ -16,7 +18,8 @@ module Ohm
       end
 
       def save
-        return if not valid?
+        return unless valid?
+
         super
       end
 

data/test/validations_test.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
+
 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")
@@ -13,7 +14,7 @@ class User < Ohm::Model
 
   attribute :name
 
-  attr :before, :after
+  attr_reader :before, :after
 
   def validate
     assert_present(:name)
@@ -30,35 +31,11 @@ class User < Ohm::Model
   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
 
@@ -92,22 +69,4 @@ class ValidationsTest < Minitest::Test
     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,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: ohm-validations
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Francesco Rodríguez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-31 00:00:00.000000000 Z
+date: 2016-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ohm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: scrivener
   requirement: !ruby/object:Gem::Requirement
@@ -67,35 +73,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: ohm-contrib
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0.39'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0.39'
 description: Validations for Ohm models
-email: frodsan@protonmail.ch
+email: hello@frodsan.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -124,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Validations for Ohm models