poro_validator 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ee244b3419abaf9da6d989f4f2ee3aa85438808
-  data.tar.gz: d8ab4bf0e662566812d6f587f91be927c2d5f2e5
+  metadata.gz: 7ab2a0ee9dbb6cacf404dd00408207233968b22c
+  data.tar.gz: 5c43eeef7b7be9250b85f3c632648ff9f6cf8ffb
 SHA512:
-  metadata.gz: e2badd5a79da6691e5e9c5a19cf879166690f01306630e90f424b6644a9a9c6e4818ac3d613a3b10e46dfee753ab302de912c918139d53f278edc6671ba9fbd5
-  data.tar.gz: be0f9fd1d0b8f56a6bc100e94883330a0456ce3962277603fcbbf67b5b6c7b29e0f518bd4f35f834fc61b74c1d0e2f7e9d5825890335beeb879a83070e10e2ee
+  metadata.gz: d7bd91417be08c22f3a2bedecd8d932ada2e23f3dc6f5b9890a16fbaf2c81ee2cd9d252bece9b0aa4381aa941f70beb4a74d4220c8982cb35a5e4ae56fa24f4c
+  data.tar.gz: b3967f199b60e1778c94fb5e481532858ce451457d7afe4067dae966df0d645c60ea28b6c4e5f1a71afc4ee0cb498103d911d04d2410f086eba10009c3b5a95a

data/lib/poro_validator.rb

@@ -53,10 +53,10 @@ require "poro_validator/validators/with_validator"
 require "poro_validator/validators/range_array_validator"
 require "poro_validator/validators/inclusion_validator"
 require "poro_validator/validators/exclusion_validator"
+require "poro_validator/validators/numeric_validator"
 require "poro_validator/validators/integer_validator"
 require "poro_validator/validators/float_validator"
 require "poro_validator/validators/length_validator"
-require "poro_validator/validators/numeric_validator"
 
 
 # Modules

data/lib/poro_validator/configuration.rb

@@ -8,6 +8,10 @@ module PoroValidator
         integer:  lambda { "is not an integer" },
         float:    lambda { "is not a float" },
 
+        integer_or_float: lambda do
+          "is not an integer or float type"
+        end,
+
         inclusion: lambda do |range|
           "is not within the range of #{range.inspect}"
         end,

data/lib/poro_validator/validators/float_validator.rb

@@ -1,17 +1,14 @@
 module PoroValidator
   module Validators
-    class FloatValidator < BaseClass
+    class FloatValidator < NumericValidator
       def validate(attribute, value, options)
-        message = options.fetch(:message, :float)
-
-        begin
-          Kernel.Float(value.to_s)
-          nil
-        rescue
-          errors.add(attribute, message)
+        if is_numeric?(value.to_s, FLOAT_MATCHER)
+          return
         end
+
+        message = options[:message] || :float
+        errors.add(attribute, message)
       end
     end
   end
 end
-

data/lib/poro_validator/validators/integer_validator.rb

@@ -1,15 +1,13 @@
 module PoroValidator
   module Validators
-    class IntegerValidator < BaseClass
+    class IntegerValidator < NumericValidator
       def validate(attribute, value, options)
-        message = options.fetch(:message, :integer)
-
-        begin
-          Kernel.Integer(value.to_s)
-          nil
-        rescue
-          errors.add(attribute, message)
+        if is_numeric?(value.to_s, INTEGER_MATCHER)
+          return nil
         end
+
+        message = options[:message] || :integer
+        errors.add(attribute, message)
       end
 
     end

data/lib/poro_validator/validators/numeric_validator.rb

@@ -1,47 +1,77 @@
 module PoroValidator
   module Validators
     class NumericValidator < BaseClass
-      def validate(attribute, value, options)
-        message = options.fetch(:message, :numeric)
+      INTEGER_MATCHER = /\A[-+]?(\d+|\d{1,3}(,\d{3})*)\z/.freeze
+      FLOAT_MATCHER   = /\A[-+]?(\d+|\d{1,3}(,\d{3})*)(\.\d+)\z/.freeze
+
+      VALID_OPTIONS = [
+        :extremum, :max, :min, :in
+      ].freeze
 
-        begin
-          Kernel.Integer(value.to_s)
-          nil
-        rescue
-          errors.add(attribute, :integer)
+      VALID_OPTION_VALUES = [
+        ::Range, ::Array, ::Fixnum, ::Numeric
+      ].freeze
+
+      def validate(attribute, value, options)
+        unless is_numeric?(value.to_s, INTEGER_MATCHER) ||
+            is_numeric?(value.to_s, FLOAT_MATCHER)
+          errors.add(attribute, :integer_or_float)
           return
         end
 
-        options.keys.each do |key|
-          matcher = matchers(key)
-          next if matcher.nil?
-          unless matchers(key).call(value, options[key])
-            errors.add(attribute, message, key => options[key])
+        message = options[:message] || :numeric
+
+        validate_numeric_options(options.keys)
+
+        options.each do |k, v|
+          unless VALID_OPTION_VALUES.include?(v.class)
+            raise ::PoroValidator::InvalidValidator.new(
+              "Invalid option: #{k} => #{v}"
+            )
+          end
+
+          unless matchers(k).call(value, v)
+            errors.add(attribute, message, k => v)
           end
         end
       end
 
       private
 
+      def validate_numeric_options(options_keys)
+        opts = options_keys - VALID_OPTIONS
+
+        return if opts.length <= 0
+
+        unless VALID_OPTIONS.include?(opts)
+          raise ::PoroValidator::InvalidValidator.new(
+            "Invalid options: #{opts.inspect} passed for numeric validator."
+          )
+        end
+      end
+
       def matchers(key)
-        m = {
-          extremum: lambda do |value, length|
+        {
+          extremum: proc do |value, length|
             value == length
           end,
 
-          max: lambda do |value, length|
+          max: proc do |value, length|
             value <= length
           end,
 
-          min: lambda do |value, length|
+          min: proc do |value, length|
             value >= length
           end,
 
-          in: lambda do |value, length|
+          in: proc do |value, length|
             length.cover?(value)
           end
-        }
-        m.fetch(key, nil)
+        }[key] || nil
+      end
+
+      def is_numeric?(v, regex_match)
+        v =~ regex_match
       end
     end
   end

data/lib/poro_validator/version.rb

@@ -1,3 +1,3 @@
 module PoroValidator
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/lib/poro_validator/validators/float_validator_spec.rb

@@ -13,30 +13,36 @@ RSpec.describe PoroValidator::Validators::FloatValidator do
       end.new
     end
 
-    expect_validator_to_be_invalid do
-      let(:entity) do
-        OpenStruct.new(
-          amount: 'aaa',
-          rate: 'aaa'
-        )
-      end
+    [5, "500", -1, "+3,000", ".5",
+     "-300", "+400", "aaa"].each do |value|
+      expect_validator_to_be_invalid("value invalid: #{value}") do
+        let(:entity) do
+          OpenStruct.new(
+            amount: value,
+            rate: value
+          )
+        end
 
-      let(:expected_errors) do
-        {
-          "amount" => ["is not a float"]
-        }
-      end
+        let(:expected_errors) do
+          {
+            "amount" => ["is not a float"]
+          }
+        end
 
-      skip_attr_unmet_condition do
-        let(:attr) { :rate }
+        skip_attr_unmet_condition do
+          let(:attr) { :rate }
+        end
       end
     end
 
-    expect_validator_to_be_valid do
-      let(:entity) do
-        OpenStruct.new(
-          amount: 5
-        )
+    [5.00, "500.00", -1.00, "+3,000.000", 0.5, "0.5",
+     "-300.00", "+400.00"].each do |value|
+      expect_validator_to_be_valid("value value: #{value}") do
+        let(:entity) do
+          OpenStruct.new(
+            amount: value
+          )
+        end
       end
     end
   end

data/spec/lib/poro_validator/validators/integer_validator_spec.rb

@@ -13,30 +13,34 @@ RSpec.describe PoroValidator::Validators::IntegerValidator do
       end.new
     end
 
-    expect_validator_to_be_invalid do
-      let(:entity) do
-        OpenStruct.new(
-          amount: "aaa",
-          rate: "aaa"
-        )
-      end
+    ["aa", 5.00, "+500.00", -1.0, +30.00, "-300.00", "+400.00"].each do |value|
+      expect_validator_to_be_invalid("invalid value: #{value}") do
+        let(:entity) do
+          OpenStruct.new(
+            amount: value,
+            rate: value
+          )
+        end
 
-      let(:expected_errors) do
-        {
-          "amount" => ["is not an integer"]
-        }
-      end
+        let(:expected_errors) do
+          {
+            "amount" => ["is not an integer"]
+          }
+        end
 
-      skip_attr_unmet_condition do
-        let(:attr) { :rate }
+        skip_attr_unmet_condition do
+          let(:attr) { :rate }
+        end
       end
     end
 
-    expect_validator_to_be_valid do
-      let(:entity) do
-        OpenStruct.new(
-          amount: 5
-        )
+    [5, "500", -1, +3000000, "-300", "+400"].each do |value|
+      expect_validator_to_be_valid("valid value: #{value}") do
+        let(:entity) do
+          OpenStruct.new(
+            amount: value
+          )
+        end
       end
     end
   end

data/spec/lib/poro_validator/validators/numeric_validator_spec.rb

@@ -33,7 +33,7 @@ RSpec.describe PoroValidator::Validators::NumericValidator do
 
       let(:expected_errors) do
         {
-          "section"  => ["is not an integer"],
+          "section"  => ["is not an integer or float type"],
           "amount"   => ["does not match the numeric options: {:in=>1..10}"],
           "cap"      => ["does not match the numeric options: {:extremum=>5}"],
           "bonus"    => ["does not match the numeric options: {:max=>20}"],
@@ -64,5 +64,37 @@ RSpec.describe PoroValidator::Validators::NumericValidator do
         )
       end
     end
+
+    context "invalid option" do
+      subject(:validator) do
+        Class.new do
+          include PoroValidator.validator
+
+          validates :section, numeric: { mama: 1..10, in: 5..10 }
+        end.new
+      end
+
+      it "raises a ::PoroValidator::Exceptions" do
+        expect { subject.valid?({ section: 12 }) }.to raise_error(
+          ::PoroValidator::InvalidValidator
+        )
+      end
+    end
+
+    context "invalid option value" do
+      subject(:validator) do
+        Class.new do
+          include PoroValidator.validator
+
+          validates :section, numeric: { in: "a" }
+        end.new
+      end
+
+      it "raises a ::PoroValidator::Exceptions" do
+        expect { subject.valid?({ section: 12 }) }.to raise_error(
+          ::PoroValidator::InvalidValidator
+        )
+      end
+    end
   end
 end

data/spec/support/spec_helpers/validator_test_macros.rb

@@ -12,8 +12,8 @@ module SpecHelpers
     end
 
     module ClassMethods
-      def expect_validator_to_be_valid(&block)
-        example_group = context("valid entity", caller: caller) do
+      def expect_validator_to_be_valid(desc = "valid entity", &block)
+        example_group = context(desc, caller: caller) do
           it "returns false for #valid?" do
             expect(validator.valid?(entity)).to be_truthy
           end
@@ -32,8 +32,8 @@ module SpecHelpers
         example_group.class_eval(&block) if block_given?
       end
 
-      def expect_validator_to_be_invalid(&block)
-        example_group = context("invalid entity", caller: caller) do
+      def expect_validator_to_be_invalid(desc = "invalid entity", &block)
+        example_group = context(desc, caller: caller) do
           it "returns false for #valid?" do
             expect(validator.valid?(entity)).to be_falsey
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poro_validator
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Kareem Gan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -198,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A PORO (Plain Old Ruby Object) validator.