valigator-csv 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1500ba49fcf43b33da16bf6fa4c1afc9b5cb3a09
-  data.tar.gz: 9f561c1980c74376fd7aaf403220425627bb74e3
+  metadata.gz: 9790896dcecf7ab173199ebe493c2f568e0c0993
+  data.tar.gz: c19072ad47075f87e2679797fef326aa1de06289
 SHA512:
-  metadata.gz: 4b74a540d50691ebf09e7185872d7508ba57270e0d2a3b220537a4cd757c3341944dfe3df7f63fa9e2b17c736d9f0a22b2c1fe388da0400f05f3d5bf9b6717cf
-  data.tar.gz: 5d587bff1096e951c4c9acab9c7db9724dfc2216668571346b0abef50dc2ffb21595311d3dbde4ab329e23e8e1894ee6842566fff3b8c3f8de9e8909b6f19997
+  metadata.gz: 35b73a4021a28aa0f87940e5e145fbd4193df80836632285bdb707e4fe28c954d0e3c7c3848425060728fc35ca85ca874baf29d822df561179049020007025e0
+  data.tar.gz: 763289f77dcabb13230e89563a901d8b8b43c76b3278ecb333becc062a45427d9a3459972509ecfd11227dd74e68cc259206e828380ef2625a62f3a7dda4cbd9

data/lib/valigator/csv.rb

@@ -5,6 +5,7 @@ module Valigator
     autoload :ErrorsLimitReachedError, 'valigator/csv/error'
     autoload :Validator, 'valigator/csv/validator'
     autoload :FieldValidators, 'valigator/csv/field_validators'
+    autoload :RowValidators, 'valigator/csv/row_validators'
     autoload :Version, 'valigator/csv/version'
   end
 end

data/lib/valigator/csv/row_validators.rb

@@ -0,0 +1,7 @@
+module Valigator
+  module CSV
+    module RowValidators
+      autoload :Ragged, 'valigator/csv/row_validators/ragged'
+    end
+  end
+end

data/lib/valigator/csv/row_validators/ragged.rb

@@ -0,0 +1,50 @@
+module Valigator
+  module CSV
+    module RowValidators
+      class Ragged
+        attr_reader :options
+
+
+
+        def initialize(options = {})
+          @options = options
+        end
+
+
+
+        def valid?(row)
+          return true unless fields
+
+          row.size >= fields.size
+        end
+
+
+
+        def error_type
+          'ragged_row'
+        end
+
+
+
+        def error_message
+          'Ragged or empty row'
+        end
+
+
+
+        def ==(other)
+          self.class == other.class && options == other.options
+        end
+
+
+
+        private
+
+        def fields
+          options[:fields]
+        end
+
+      end
+    end
+  end
+end

data/lib/valigator/csv/validator.rb

@@ -18,8 +18,11 @@ module Valigator
       def validate(options = {})
         config.merge! options
 
-        ::CSV.foreach(@filename, csv_options(options)) do |row|
+        ::CSV.foreach(filename, csv_options(options)) do |row|
           validate_fields row, options
+          validate_row row, options
+
+          stop_if_error_limit_reached
         end
       rescue ErrorsLimitReachedError
       rescue ::CSV::MalformedCSVError, ArgumentError => error
@@ -57,26 +60,43 @@ module Valigator
 
 
 
-      def validate_fields(row, options={})
+      def validate_fields(row, options = {})
         return unless options[:fields] && options[:field_validators]
 
         options[:fields].each_with_index do |field, index|
-          field_validator = options[:field_validators][field]
-
-          if field_validator and !field_validator.valid?(row[index])
-            add_field_error(field, field_validator)
+          validator = options[:field_validators][field]
 
-            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
+          if validator && !validator.valid?(row[index])
+            add_error_for(validator, field)
           end
         end
       end
 
 
 
-      def add_field_error(field, validator)
+      def stop_if_error_limit_reached
+        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
+
+
+
+      def validate_row(row, options = {})
+        return unless options[:fields] && options[:row_validators]
+
+        options[:row_validators].each do |validator_class|
+          validator = validator_class.new(options)
+          next if validator.valid?(row)
+
+          add_error_for validator
+        end
+      end
+
+
+
+      def add_error_for(validator, field = nil)
         errors << CSV::Error.new({
           type: validator.error_type,
           message: validator.error_message,

data/lib/valigator/csv/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: valigator-csv
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Daniel Nagy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-12 00:00:00.000000000 Z
+date: 2015-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,8 @@ files:
 - lib/valigator/csv/field_validators/float.rb
 - lib/valigator/csv/field_validators/integer.rb
 - lib/valigator/csv/field_validators/mandatory.rb
+- lib/valigator/csv/row_validators.rb
+- lib/valigator/csv/row_validators/ragged.rb
 - lib/valigator/csv/validator.rb
 - lib/valigator/csv/version.rb
 - valigator-csv.gemspec