common_validators 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 145d58318d64d1dec90cf8fa41516755d8278822
-  data.tar.gz: 52cc2f970a43d5044cd089be6eb4ec9664037f61
+  metadata.gz: d988741f639f92a4b78583e01e4be5c63ad55bd1
+  data.tar.gz: bd01cb9d66ad674994afa62b96465033fff88608
 SHA512:
-  metadata.gz: 41d2cf19ed249f8b7650d8ab972b43688f3af3deaafb9e2357c245d922a48cf806b9c9525d7d1aa249b6e873f7dfbf305f0c0bf429e761fa3da3e9448ff8f2c0
-  data.tar.gz: e1cd1f860c38cccc9461d2552fcf7b9e3364cb0dc0c7875d08d17b39c542fbbcd67e9c873763047d5a014c13fa0a63d51d49a639923c076855dd5f51c2e238dd
+  metadata.gz: 7ba5d948547f2052aa1b1a7ef5895c1fc993a20be7bcd4234288f924c2b326806ee80e01e597aa8158762297c5977af46bac9f472d955c652f310eb286549578
+  data.tar.gz: 527d1f8d6d86eccdfc1f7385e42cea26a98b1a3be8bf5a5b6951483f5b3dfdb3eb2ae0f9cc169d8989945cdc0a1484e20bea2f3a22885eb5e10f04ffa2d2b2f4

data/.travis.yml

@@ -1,5 +1,4 @@
 language: ruby
 
 rvm:
-  - 1.9.3
-
+  - 2.0.0

data/app/validators/money_format_validator.rb

@@ -4,13 +4,16 @@ require 'bigdecimal'
 #
 # NOTE: Currently limited to USD/CAD values.
 #
-# Includes an option to limit value to only whole dollar amounts.
+# Options:
+#
+# * `exclude_cents = true|false` determines if amount can have cents (default false)
+# * `allow_negative = true|false` determines if amount can be negative (default false)
 #
 # A blank value is considered valid (use presence validator to check for that)
 #
 # Examples
 #   validates :amount, money_format: true                 # optional
-#   validates :amount, money_format: { exclude_cents: true }
+#   validates :amount, money_format: { exclude_cents: true, allow_negative: true }
 #   validates :amount, money_format: true, presence: true # required
 class MoneyFormatValidator < ActiveModel::EachValidator
   MONEY_REGEX = /\A[-+]?\d+(\.\d{1,2})?\z/
@@ -40,9 +43,18 @@ class MoneyFormatValidator < ActiveModel::EachValidator
     if options[:exclude_cents] && value_has_cents?(value)
       record.errors.add(attr_name, :money_format_has_cents)
     end
+
+    # Check if value is negative but shouldn't
+    if value_is_negative?(value)
+      record.errors.add(attr_name, :money_format_is_negative) unless options[:allow_negative]
+    end
   end
 
   def value_has_cents?(value)
     BigDecimal.new(value.to_i) != BigDecimal.new(value)
   end
+
+  def value_is_negative?(value)
+    value.to_i < 0
+  end
 end

data/config/locales/en.yml

@@ -5,6 +5,7 @@ en:
       email_format: "is invalid"
       money_format: "is invalid"
       money_format_has_cents: "must not include cents"
+      money_format_is_negative: "must not be negative"
       phone_number_format: "is invalid"
       slug_format: "is invalid, only lowercase letters and numbers allowed"
       url_format: "is invalid"

data/lib/common_validators/version.rb

@@ -1,3 +1,3 @@
 module CommonValidators
-  VERSION = "1.0.3"
+  VERSION = "1.1.0"
 end

data/test/models/money_format_validator_test.rb

@@ -3,10 +3,11 @@ require File.expand_path("../../../app/validators/money_format_validator",  __FI
 
 class TestModel
   include ActiveModel::Validations
-  attr_accessor :amount, :whole_amount
+  attr_accessor :amount, :whole_amount, :negative_amount
 
   validates :amount, money_format: true
   validates :whole_amount, money_format: { exclude_cents: true }
+  validates :negative_amount, money_format: { allow_negative: true }
 end
 
 class MoneyFormatValidatorTest < ActiveSupport::TestCase
@@ -29,6 +30,7 @@ class MoneyFormatValidatorTest < ActiveSupport::TestCase
     assert_invalid_amount "1,000.12"
     assert_invalid_amount "1000000.999"
     assert_invalid_amount 100.999
+    assert_invalid_amount -1
     assert_invalid_amount BigDecimal.new("100.999")
 
     assert_invalid_amount "100.99", :whole_amount
@@ -42,7 +44,7 @@ class MoneyFormatValidatorTest < ActiveSupport::TestCase
     assert_valid_amount "1.00"
     assert_valid_amount "1.99"
     assert_valid_amount "+1.99"
-    assert_valid_amount "-1.99"
+    assert_valid_amount "-1.99", :negative_amount
     assert_valid_amount "100000000.99"
     assert_valid_amount 100
     assert_valid_amount 100.99

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: common_validators
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Gerry Shaw
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-19 00:00:00.000000000 Z
+date: 2014-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -200,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Common validators for Rails applications