common_validators 1.0.0 → 1.0.1

data/README.md

@@ -7,13 +7,35 @@ Collection of common validators for Rails applications.
 
 [RubyDoc Documentation](http://rubydoc.info/github/gshaw/common_validators/master/frames)
 
-### Examples
-
-```
-validates :email,         email_format: true, presence: true
-validates :date,          date_format: true
-validates :amount,        money_format: { exclude_cents: true }
-validates :phone_number,  phone_number_format: true
-validates :slug,          slug_format: true
-validates :url,           url_format: true
-```
+## Usage
+
+In your ActiveRecord models include one more validations on your model's fields.
+
+    validates :email,         email_format: true, presence: true
+    validates :date,          date_format: true
+    validates :amount,        money_format: { exclude_cents: true }
+    validates :phone_number,  phone_number_format: true
+    validates :slug,          slug_format: true
+    validates :url,           url_format: true
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'venture_base'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install venture_base
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

data/app/validators/money_format_validator.rb

@@ -1,3 +1,5 @@
+require 'bigdecimal'
+
 # Validate fields to look like currency values
 #
 # NOTE: Currently limited to USD/CAD values.
@@ -10,9 +12,6 @@
 #   validates :amount, money_format: true                 # optional
 #   validates :amount, money_format: { exclude_cents: true }
 #   validates :amount, money_format: true, presence: true # required
-
-require 'bigdecimal'
-
 class MoneyFormatValidator < ActiveModel::EachValidator
   MONEY_REGEX = /\A[-+]?\d+(\.\d{1,2})?\z/
 
@@ -24,8 +23,20 @@ class MoneyFormatValidator < ActiveModel::EachValidator
     end
     return if value.blank?
 
+    # Need to first convert BigDecimal to floating point representation of string
+    if value.kind_of?(BigDecimal)
+      value = value.to_s("F")
+    end
+
+    # Finally convert any other types to string and clean off whitespace
+    value = value.to_s.strip
+
+    # Regex seems a bit odd to use here (vs converting to BigDeciaml) but we need
+    # to check for values that BigDecimal can't represent (e.g., "badvalue") so
+    # for now this works.
     record.errors.add(attr_name, :money_format, options) unless value =~ MONEY_REGEX
 
+    # Check if value has cents but shouldn't
     if options[:exclude_cents] && value_has_cents?(value)
       record.errors.add(attr_name, :money_format_whole_number)
     end

data/common_validators.gemspec

@@ -18,7 +18,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.required_ruby_version = ">= 1.9"
-  spec.add_dependency 'rails', '~> 3.2'
+
+  spec.add_dependency "rails", "~> 3.2"
+  spec.add_dependency "bigdecimal"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/lib/common_validators/version.rb

@@ -1,3 +1,3 @@
 module CommonValidators
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/test/money_format_validator_test.rb

@@ -27,6 +27,9 @@ class MoneyFormatValidatorTest < ActiveSupport::TestCase
     assert_invalid_amount "10 20"
     assert_invalid_amount "10.123"
     assert_invalid_amount "1,000.12"
+    assert_invalid_amount "1000000.999"
+    assert_invalid_amount 100.999
+    assert_invalid_amount BigDecimal.new("100.999")
 
     assert_invalid_amount "100.99", :whole_amount
     assert_invalid_amount "100.1", :whole_amount
@@ -34,13 +37,16 @@ class MoneyFormatValidatorTest < ActiveSupport::TestCase
 
   test "valid amount" do
     assert_valid_amount ""
+    assert_valid_amount "0"
     assert_valid_amount "1"
     assert_valid_amount "1.00"
     assert_valid_amount "1.99"
     assert_valid_amount "+1.99"
     assert_valid_amount "-1.99"
-    assert_valid_amount "100000.99"
-    assert_valid_amount "100000.99"
+    assert_valid_amount "100000000.99"
+    assert_valid_amount 100
+    assert_valid_amount 100.99
+    assert_valid_amount BigDecimal.new("100.99")
 
     assert_valid_amount "100.00", :whole_amount
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: common_validators
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -27,6 +27,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: bigdecimal
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -145,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2601123242860977824
+      hash: -922536056553976169
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23