valigator-csv 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 170abf203c29a7cdf2543ced369e864844a8c2d8
-  data.tar.gz: d220e53500d76ab4ee8d4a63e38ffee6cf291c59
+  metadata.gz: 36b7a576342bf50503a9116df95032cb815a88e9
+  data.tar.gz: 55257cf5e9b02ea0c66820279fdbc2caad6270e6
 SHA512:
-  metadata.gz: 667130ce6748b198ee754439b7492d91f0e168d2fbeebb38a6fa7af4e06f6d7ba0597b22bc40a45f6bba2601b9ba4bf7dd01c4c52630eb6fbbf1d145e662231a
-  data.tar.gz: 4891810ae82bbe5428c1447b4d3149432994c05915e8f7808ef578402bb99c21b8c5aefddbf7aefcca9c42234f264f7510ce57f28b505ce7a3ffa93e6cc215db
+  metadata.gz: d41045648d6d141622f6d0b9bd4d48330af1e2e3e8a10c8d5dc141b8cb6047232443a4f3d62064bef15dd8e80ecfcda037d35bccadd050754ac7314ad6cd2240
+  data.tar.gz: 077b6fc2fc0bec290557ea9b2860cebef2cd2e94c3888ffcb3c0bd75dc2bc6e4003e611494b538a27ffe2cfb46117d7d180de0a6a8f73d7992907f4099bac6fa

data/lib/valigator/csv/error.rb

@@ -6,7 +6,7 @@ module Valigator
 
     class Error
 
-      attr_reader :row, :type, :message
+      attr_reader :row, :type, :message, :field
 
 
 
@@ -22,7 +22,7 @@ module Valigator
 
 
       def ==(other)
-        row == other.row && message == other.message && type == other.type
+        row == other.row && message == other.message && type == other.type && field == other.field
       end
 
 
@@ -31,7 +31,8 @@ module Valigator
         {
           row: row,
           type: type,
-          message: message
+          message: message,
+          field: field
         }
       end
 
@@ -40,7 +41,7 @@ module Valigator
       private
 
       def build_from_hash(error)
-        build error[:type], error[:message], error[:row]
+        build error[:type], error[:message], error[:row], error[:field]
       end
 
 
@@ -58,10 +59,11 @@ module Valigator
 
 
 
-      def build(type, message, row)
+      def build(type, message, row, field=nil)
         @type = type
         @row = row
         @message = message
+        @field = field
       end
 
 

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

@@ -0,0 +1,42 @@
+module Valigator
+  module CSV
+    module FieldValidators
+      class Date
+
+        def initialize(options={})
+          @options = options
+        end
+
+
+
+        def valid?(value)
+          format ? ::Date.strptime(value, format) : ::Date.parse(value)
+          true
+        rescue ArgumentError
+          false
+        end
+
+
+
+        def error_type
+          'invalid_date'
+        end
+
+
+
+        def error_message
+          'Invalid date field'
+        end
+
+
+
+        private
+
+        def format
+          @options[:format]
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,48 @@
+module Valigator
+  module CSV
+    module FieldValidators
+      class Float < Integer
+
+        def initialize(options = {})
+          @options = options
+        end
+
+
+
+        def valid?(value)
+          formatted = formatted_value(value)
+
+          formatted.to_f.to_s == formatted || super
+        end
+
+
+
+        def error_type
+          'invalid_float'
+        end
+
+
+
+        def error_message
+          'Invalid float field'
+        end
+
+
+
+        private
+
+        def decimal_mark
+          @options[:decimal_mark]
+        end
+
+
+
+        def formatted_value(value)
+          decimal_mark ? value.gsub(decimal_mark, '.') : value
+        end
+
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+module Valigator
+  module CSV
+    module FieldValidators
+      class Integer
+
+        def valid?(value)
+          return true if value.to_s.empty?
+
+          value.to_i.to_s == value.to_s
+        end
+
+
+
+        def error_type
+          'invalid_integer'
+        end
+
+
+
+        def error_message
+          'Invalid integer field'
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+module Valigator
+  module CSV
+    module FieldValidators
+      class Mandatory
+
+        def valid?(value)
+          !value.to_s.empty?
+        end
+
+
+
+        def error_type
+          'missing_field'
+        end
+
+
+
+        def error_message
+          'Missing mandatory field'
+        end
+      end
+    end
+  end
+end

data/lib/valigator/csv/field_validators.rb

@@ -0,0 +1,10 @@
+module Valigator
+  module CSV
+    module FieldValidators
+      autoload :Date, 'valigator/csv/field_validators/date'
+      autoload :Float, 'valigator/csv/field_validators/float'
+      autoload :Integer, 'valigator/csv/field_validators/integer'
+      autoload :Mandatory, 'valigator/csv/field_validators/mandatory'
+    end
+  end
+end

data/lib/valigator/csv/validator.rb

@@ -15,7 +15,9 @@ module Valigator
 
 
       def validate(options = {})
-        ::CSV.foreach(@filename, build_options(options)) { |_row|}
+        ::CSV.foreach(@filename, csv_options(options)) do |row|
+          validate_fields row, options
+        end
       rescue ::CSV::MalformedCSVError, ArgumentError => error
         raise if unrelated_error?(error)
 
@@ -26,11 +28,13 @@ module Valigator
 
       private
 
-      def build_options(options = {})
+      def csv_options(options = {})
         {
           col_sep: options[:col_sep] || ',',
           quote_char: options[:quote_char] || '"',
-          encoding: options[:encoding] || 'UTF-8'
+          encoding: options[:encoding] || 'UTF-8',
+          headers: options[:headers] || false,
+          return_headers: options[:return_headers] || false
         }
       end
 
@@ -40,6 +44,31 @@ module Valigator
         error.is_a?(ArgumentError) && error.message != 'invalid byte sequence in UTF-8'
       end
 
+
+
+      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)
+          end
+        end
+      end
+
+
+
+      def add_field_error(field, validator)
+        @errors << CSV::Error.new({
+          type: validator.error_type,
+          message: validator.error_message,
+          row: $INPUT_LINE_NUMBER,
+          field: field
+        })
+      end
+
     end
   end
 end

data/lib/valigator/csv/version.rb

@@ -1,5 +1,5 @@
 module Valigator
   module CSV
-    VERSION = "1.2.0"
+    VERSION = "1.3.0"
   end
 end

data/lib/valigator/csv.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: valigator-csv
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Daniel Nagy
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-03 00:00:00.000000000 Z
+date: 2015-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,6 +72,11 @@ files:
 - lib/valigator.rb
 - lib/valigator/csv.rb
 - lib/valigator/csv/error.rb
+- lib/valigator/csv/field_validators.rb
+- lib/valigator/csv/field_validators/date.rb
+- lib/valigator/csv/field_validators/float.rb
+- lib/valigator/csv/field_validators/integer.rb
+- lib/valigator/csv/field_validators/mandatory.rb
 - lib/valigator/csv/validator.rb
 - lib/valigator/csv/version.rb
 - valigator-csv.gemspec