valigator-csv 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1efa995498cf14a8bf892006e140abb02e3aee2e
-  data.tar.gz: 5b26ffad290e8334a508381d8709c15d07c31f19
+  metadata.gz: 325bd8b898cc324095f85b90956285b9fd49eb1c
+  data.tar.gz: dc833a514d767425f97077301ccb0addb3841335
 SHA512:
-  metadata.gz: ec34eacd57451041c1e2121387becb196fd3e0f3201008ecfaec658801de839c1f0678a770d27a3aa3984a88485a0b4d7831caa1f4200894c6a39c2493c805b4
-  data.tar.gz: 83a1ce0eafcad4816753b4c06929e949e655fd18b3a0f999d4d27f0b5c57a7c097976e28f13f6616a81fbb2493ee583380e02844e012d9c054318e508f50e6f8
+  metadata.gz: 5f30e36ff1d0158203df6907dd192915dc07e65ec193a267ac17176727a8dca6d1aaa6b8e0b5cc52f2d99e32d892a3969c1798454297789b03f6f0f9970d9e25
+  data.tar.gz: 5ed312f29eba227c354f9bcd6e3897227330aca19f6fc4d3b9197f514143269aceaaa53dd0cef59fe9163a697dcc0babf3f0867335b54a0f19074d23bb2d2e37

data/lib/valigator/csv/error.rb

@@ -0,0 +1,77 @@
+module Valigator
+  module CSV
+    class Error
+
+      attr_reader :row, :type, :message
+
+
+
+      def initialize(error)
+        case error
+          when Hash
+            build_from_hash error
+          when StandardError
+            build_from_error error
+        end
+      end
+
+
+
+      def ==(other)
+        row == other.row && message == other.message && type == other.type
+      end
+
+
+
+      private
+
+      def build_from_hash(error)
+        build error[:type], error[:message], error[:row]
+      end
+
+
+
+      def build_from_error(error)
+        build map_to_type(error.message), error.message, determine_row(error.message)
+      end
+
+
+
+      def determine_row(message)
+        matches = /line (?<lineno>\d+)/.match(message)
+        matches[:lineno].to_i if matches
+      end
+
+
+
+      def build(type, message, row)
+        @type = type
+        @row = row
+        @message = message
+      end
+
+
+
+      def map_to_type(message)
+        case message
+          when /Missing or stray quote/
+            'stray_quote'
+          when /Unquoted fields do not allow/
+            'line_breaks'
+          when /Illegal quoting/
+            'illegal_quoting'
+          when /Field size exceeded/
+            'field_size'
+          when /Unclosed quoted field/
+            'unclosed_quote'
+          when /invalid byte sequence/
+            'invalid_encoding'
+          else
+            raise ArgumentError, 'unknown type'
+        end
+      end
+
+
+    end
+  end
+end

data/lib/valigator/csv/validator.rb

@@ -1,5 +1,4 @@
-require 'csvlint'
-require 'active_support/core_ext/string/filters'
+require 'csv'
 
 module Valigator
   module CSV
@@ -10,74 +9,15 @@ module Valigator
 
       def initialize(filename)
         @filename = filename
-      end
-
-
-
-      def validate(options = {})
         @errors = []
-
-        check_with_csvlint(options)
-      end
-
-
-
-      private
-
-      def check_with_csvlint(options = {})
-        File.open(filename, "r:#{options[:encoding] || 'UTF-8'}") do |file|
-          validator = ::Csvlint::Validator.new(file, build_dialect(options), build_schema(options))
-
-          validator.errors.each { |error| add_to_errors error }
-          validator.warnings.each { |warning| add_to_errors warning }
-        end
-      end
-
-
-
-      def build_dialect(options = {})
-        return {} unless options[:dialect]
-
-        stringify_keys options[:dialect]
       end
 
 
 
-      def build_schema(options = {})
-        return unless options[:headers]
-
-        ::Csvlint::Schema.new("", build_header_fields(options))
-      end
-
-
-
-      def build_header_fields(options = {})
-        options[:headers].map do |header|
-          header_definition = stringify_keys(header)
-
-          ::Csvlint::Field.new(header_definition["name"], header_definition["constraints"])
-        end
-      end
-
-
-
-      def stringify_keys(hash)
-        JSON.parse JSON.dump(hash)
-      end
-
-
-
-      def add_to_errors(original_error)
-        return if original_error.type == :encoding
-
-        error = {
-          row: original_error.row,
-          column: original_error.column,
-          type: original_error.type.to_s,
-          content: original_error.content.to_s.truncate(80)
-        }
-
-        @errors << error.reject { |_, v| v.blank? }
+      def validate(options = {})
+        ::CSV.foreach(@filename, "r:#{options[:encoding] || 'UTF-8'}") { |_row| }
+      rescue ::CSV::MalformedCSVError, ArgumentError => error
+        @errors << CSV::Error.new(error)
       end
 
     end

data/lib/valigator/csv/version.rb

@@ -1,5 +1,5 @@
 module Valigator
   module CSV
-    VERSION = "1.0.1"
+    VERSION = "1.1.0"
   end
 end

data/lib/valigator.rb

@@ -1 +1,2 @@
 require 'valigator/csv'
+require 'valigator/csv/error'

data/valigator-csv.gemspec

@@ -13,13 +13,11 @@ Gem::Specification.new do |spec|
   spec.description   = %q{Yet another CSV validator library. Just better.}
   spec.homepage      = 'https://github.com/emartech/valigator-csv'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|bin)/}) }
+  spec.bindir        = "bin"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "csvlint"
-
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"

metadata

@@ -1,30 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: valigator-csv
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Daniel Nagy
 - Istvan Demeter
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2015-11-17 00:00:00.000000000 Z
+date: 2015-12-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: csvlint
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -82,10 +68,9 @@ files:
 - Gemfile
 - README.md
 - Rakefile
-- bin/console
-- bin/setup
 - lib/valigator.rb
 - lib/valigator/csv.rb
+- lib/valigator/csv/error.rb
 - lib/valigator/csv/validator.rb
 - lib/valigator/csv/version.rb
 - valigator-csv.gemspec

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "valigator/csv"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start

data/bin/setup

@@ -1,7 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-bundle install
-
-# Do any other automated setup that you need to do here