valigator-csv 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3603756bf634bc260cf48f545f60775106fd7dd5
-  data.tar.gz: 363ddd31daac8f72f47ba0b3db1f3a6db44df74b
+  metadata.gz: 1500ba49fcf43b33da16bf6fa4c1afc9b5cb3a09
+  data.tar.gz: 9f561c1980c74376fd7aaf403220425627bb74e3
 SHA512:
-  metadata.gz: c3886a84957480ad2169738266d259406e6f76083c3fda709d720746b59e351343f0423553cb3fbb8489fd17b1950b302682acae53a96e120926cb1e74383a79
-  data.tar.gz: 1ad3987358197d2362fe411dedb7102166973664063ec15f2e8256b70baba9925da2724f82213b99378a425c226fc1e55a43bade28ad7de8ff7abf66aa3cb48a
+  metadata.gz: 4b74a540d50691ebf09e7185872d7508ba57270e0d2a3b220537a4cd757c3341944dfe3df7f63fa9e2b17c736d9f0a22b2c1fe388da0400f05f3d5bf9b6717cf
+  data.tar.gz: 5d587bff1096e951c4c9acab9c7db9724dfc2216668571346b0abef50dc2ffb21595311d3dbde4ab329e23e8e1894ee6842566fff3b8c3f8de9e8909b6f19997

data/lib/valigator/csv/error.rb

@@ -1,5 +1,9 @@
 module Valigator
   module CSV
+    class ErrorsLimitReachedError < StandardError
+    end
+
+
     class UnhandledTypeError < StandardError
     end
 

data/lib/valigator/csv/field_validators/float.rb

@@ -4,9 +4,7 @@ module Valigator
       class Float < Integer
 
         def valid?(value)
-          formatted = formatted_value(value)
-
-          super || value.is_a?(::Float) || formatted.to_f.to_s == formatted
+          super || value.is_a?(::Float) || formatted_float?(value)
         end
 
 
@@ -31,11 +29,19 @@ module Valigator
 
 
 
+        def formatted_float?(value)
+          Float(formatted_value(value))
+          true
+        rescue ArgumentError, TypeError
+          false
+        end
+
+
+
         def formatted_value(value)
           decimal_mark ? value.to_s.gsub(decimal_mark, '.') : value
         end
 
-
       end
     end
   end

data/lib/valigator/csv/validator.rb

@@ -3,31 +3,42 @@ require 'csv'
 module Valigator
   module CSV
     class Validator
-      attr_reader :filename, :errors
+      attr_reader :filename, :errors, :config
 
 
 
       def initialize(filename)
         @filename = filename
         @errors = []
+        @config = default_config
       end
 
 
 
       def validate(options = {})
+        config.merge! options
+
         ::CSV.foreach(@filename, csv_options(options)) do |row|
           validate_fields row, options
         end
+      rescue ErrorsLimitReachedError
       rescue ::CSV::MalformedCSVError, ArgumentError => error
         raise if unrelated_error?(error)
 
-        @errors << CSV::Error.new(error)
+        errors << CSV::Error.new(error)
       end
 
 
 
       private
 
+
+      def default_config
+        {errors_limit: 1000}
+      end
+
+
+
       def csv_options(options = {})
         {
           col_sep: options[:col_sep] || ',',
@@ -54,6 +65,11 @@ module Valigator
 
           if field_validator and !field_validator.valid?(row[index])
             add_field_error(field, field_validator)
+
+            if config[:errors_limit] && errors.size >= config[:errors_limit]
+              errors << CSV::Error.new({type: 'too_many_errors', message: 'Too many errors were found'})
+              raise ErrorsLimitReachedError
+            end
           end
         end
       end
@@ -61,7 +77,7 @@ module Valigator
 
 
       def add_field_error(field, validator)
-        @errors << CSV::Error.new({
+        errors << CSV::Error.new({
           type: validator.error_type,
           message: validator.error_message,
           row: $INPUT_LINE_NUMBER,

data/lib/valigator/csv/version.rb

@@ -1,5 +1,5 @@
 module Valigator
   module CSV
-    VERSION = "1.3.1"
+    VERSION = "1.3.2"
   end
 end

data/lib/valigator/csv.rb

@@ -2,6 +2,7 @@ module Valigator
   module CSV
     autoload :Error, 'valigator/csv/error'
     autoload :UnhandledTypeError, 'valigator/csv/error'
+    autoload :ErrorsLimitReachedError, 'valigator/csv/error'
     autoload :Validator, 'valigator/csv/validator'
     autoload :FieldValidators, 'valigator/csv/field_validators'
     autoload :Version, 'valigator/csv/version'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: valigator-csv
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Daniel Nagy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-10 00:00:00.000000000 Z
+date: 2015-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler