tiny_validations 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d18679f078afeb4b6a651297b270735f70e2fa1
-  data.tar.gz: 7a05aca0063dc2bc09601e9d306b6a0468b93045
+  metadata.gz: 67be0ece0a1ae6f81acfad8c591a9594f34ab071
+  data.tar.gz: dbd018f0301d78b8f5f240bc57727932861fa90e
 SHA512:
-  metadata.gz: 74743f076bc27cb88816f80172a0905228b4e92ed698b3ae6c5cda0823a1af2e6c3111d20302b481d8c19b8d2fb082c678462b9f893ce2ad8b07a09b8a80baef
-  data.tar.gz: 4517371a447ca864f18cf125b90559699c9d07660cd617be5c840ae50a9f09b1bd346baa4e9559298d612ceeab3dd822675225aca70dc38e149590d979ee7865
+  metadata.gz: b419b10dff4154c1896b040dfe2bb69cb3c389727cd388693a2cb94d5076973619266b521c95cc0b4049fef4e5b40a0480449cd7a6ef13822fb14678ee3d499b
+  data.tar.gz: ef9321bfc502dbd8314d7ad8de12d3fab2689b99e495b74673e73a64a3f02141a9a2a05fbfd52cba3bfc8289aaa254006bb5dfaaf1e2dba8c7c19e69f645798c

data/.gitignore

@@ -1,3 +1,4 @@
+*.gem
 *.rbc
 *.sassc
 .sass-cache

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tiny_validations (0.1)
+    tiny_validations (0.2)
 
 GEM
   remote: https://rubygems.org/

data/lib/tiny_validations.rb

@@ -5,10 +5,6 @@ require 'active_record'
 module TinyValidations
   extend ActiveSupport::Concern
 
-  included do
-    attr_accessor :context_validation
-  end
-
   def validations_when(key , &block)
     validations_base(key, &block)
   end
@@ -17,22 +13,25 @@ module TinyValidations
     validations_base(key, :unless, &block)
   end
 
-  def validations_base( key, condition = :if, &block)
+  def validations_base(rule, condition = :if, &block)
+    if rule.is_a?(Array)
+      keys = rule.map { |r| context_key(r) }
+    else
+      keys = Array(context_key(rule))
+    end
+
     options = {}
-    options[condition] = -> { context_key(key) == context_key(context_validation) }
+    options[condition] = -> { keys.include?(context_key(validation_context)) }
 
     instance_eval do
-      attr_accessor context_key(key)
-
-      with_options(options) do |validations|
-        yield validations
-      end
+      keys.each { |k| attr_accessor k }
+      with_options(options) { |validations| yield validations }
     end
   end
 
   def context=(key)
     if self.respond_to?(context_key(key))
-      self.send("context_validation=", key)
+      self.validation_context = key
     else
       raise 'Context not found'
     end

data/lib/tiny_validations/version.rb

@@ -1,3 +1,3 @@
 module TinyValidations
-  VERSION = 0.1
+  VERSION = 0.2
 end

data/test/test_helper.rb

@@ -34,7 +34,7 @@ class User < ActiveRecord::Base
 
   validates :name, :email, presence: true
 
-  validations_when_not :password_reset do |m|
+  validations_when_not [:password_reset, :user_subscription] do |m|
     m.validates :city, :state, presence: true
     m.validates_inclusion_of :state, in: ['NY']
   end
@@ -46,7 +46,6 @@ class User < ActiveRecord::Base
   validations_when :password_reset do |m|
     m.validates :password, presence: true
   end
-
 end
 
 
@@ -57,5 +56,13 @@ class Minitest::Unit::TestCase
                      email: 'nandosousafr@gmail.com')
 
   end
+
+  def asserts_when_not
+    refute_includes @user.errors, :city,
+      'city is validating to :password_reset_context'
+
+    refute_includes @user.errors, :state,
+      'state is validating to :password_reset_context'
+  end
 end
 

data/test/validations_test.rb

@@ -5,23 +5,28 @@ class ValidationsTest < Minitest::Unit::TestCase
   def test_set_contexts
     assert @user.respond_to?(:context_validations_password_reset)
     assert @user.respond_to?(:context_validations_facebook_auth)
-
-    assert @user.respond_to?(:context_validation)
+    assert @user.respond_to?(:context_validations_user_subscription)
   end
 
-  def test_validatios_when
-    # context :password_reset
-    @user.context = :password_reset
-    @user.password = 'pass19822'
-    assert @user.valid?
+  def test_validations_when
+    # context: :password_reset
+    @user.valid?(:password_reset)
+    assert_includes @user.errors, :password,
+      'password is not validating to :password_reset context'
+
+    # context: :facebook_auth
+    @user.valid?(:facebook_auth)
+    assert_includes @user.errors, :fb_token_secret,
+      'fb_token_secredt is not validating to :facebook_auth context'
+  end
 
-    #context :facebook_auth
-    @user.context = :facebook_auth
-    @user.fb_token_secret = 'fff22111fff'
-    assert_equal false, @user.valid?
+  def test_validations_when_not
+    # context: :password_reset
+    @user.valid?(:password_reset)
+    asserts_when_not
 
-    @user.city = 'New York'
-    @user.state = 'NY'
-    assert @user.valid?
+    # context: :user_subscription
+    @user.valid?(:user_subscription)
+    asserts_when_not
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiny_validations
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Nando Sousa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler