csvlint 0.3.1 → 0.3.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDdiMTU5MDRkOWMzODllZGVjZTE1NWU0NzgyMjNkODgzYjlkNDE3NQ==
+    YWY4NmZlNTBlYjBlZWU2MjY5NmEzNGUzNWI1ZTkzN2Y1MDcyZjQ0ZA==
   data.tar.gz: !binary |-
-    MmY0YjQyZTM1ODBkOTA2OWQxOGRkOWYxYmI2ZDA2NWEyZjRjM2U2YQ==
+    YTI3ODc0NWFlMzAxMzJkZTJiZjZkNjBkNmI3YjkxMDFiMTlhM2JjMQ==
 SHA512:
   metadata.gz: !binary |-
-    NWM1OGNjNDk0MzgzY2MwZmY5NjJhOTBiNDFjYTA3YjBkYTAzN2IzNzUyYjg3
-    NDdlZjVlYzEzZTFkMmI2ODQzZjIwY2IwZDU1Mjk5Y2QwNzdjNTg3YjYxM2Zj
-    MzFkNWM5ZWUzOTY1NGUzZTgyMWZhYzRhNDI2ZWI0NmQyNWNjYzQ=
+    NTQwOGE2ZjdhMzg0OGJjYzFjNGQ2ZjFkMDQ0YTU1YjEzYmEyNzA4MzgyMjEw
+    ZmM4NGZjOWZkNWQ3YzVlNGI5ODlmMWY0Y2YwZWI4OTIwMDBiZWIxZDVlYzZh
+    Y2JhN2Q4MzY2ODQyYTBiMjBlZTU3OTEzZDU4NTZmOGU2ZWM3OGI=
   data.tar.gz: !binary |-
-    ODc3MjNlZDRmOGFmNmJiYWM4OWJmN2IzZGYzNTI5YWY1Zjg5YzZmMmYyYjhi
-    NWZhMjQ3ZTc4NGRhYTQ5ZjBlZjQ5ZjcwOThhYzQ5NjNhZDViZDVjYTFjYjlk
-    YzgwNGM3NjMxMWNkOTI4ODU1ZDM4YmIwODc4MTExOWUyZWJkYjA=
+    YzhiOGUzYjEwYTc1YWJhMDQ2MGY2MTk5Zjk2NjI0ZjQzNzEwYTE4ZTk1NTZh
+    Mjc2MzcyZmJmZmNjN2ZmMDcwYWU1OTgzYTU0NDJiNGNjM2E3NDcwNWU1YTMy
+    YjNiNzNjYzA0ZDgxODQ2ZjMyMDgyM2IzYmQxODY5ZGIzYjE2NDA=

data/.travis.yml

@@ -27,8 +27,7 @@ after_success:
 - '[ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && curl
   -v -X POST -d ''{"ref":"refs/tags/''$GEM_VERSION''","sha":"''$TRAVIS_COMMIT''"}''  --header
   "Content-Type:application/json" -u $GITHUB_USER:$GITHUB_PASSWORD "https://api.github.com/repos/$TRAVIS_REPO_SLUG/git/refs"'
-- gem install henry
-- henry deploy
+- bundle exec henry deploy
 env:
   global:
   - secure: hM8Pv/EAZoB4fGGEUwKQQ/2+mgKbUac+PH2cwud25l2MJ64eoKEMZzfy4TF6+XMIzXhlWpsg4s51y6K3+W8pUyRAuwo2MsN5Iee7HnLz+LlYTiT0//iQdAmxQ0JlOyh8vd2SEFBcVfwpp/iZFIHAfbBO73ZDXhtGMEieMk025I0=

data/csvlint.gemspec

@@ -44,5 +44,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "aruba"
   spec.add_development_dependency "rdf"
   spec.add_development_dependency "rdf-turtle"
+  spec.add_development_dependency "henry"
 
 end

data/features/cli.feature

@@ -123,6 +123,32 @@ Feature: CSVlint CLI
     And the output should contain "1. Id: min_length. Row: 2,2. 5"
     And the output should contain "1. malformed_header. Row: 1. Bob,1234,bob@example.org"
 
+  Scenario: Schema errors with JSON
+    Given I have a CSV with the following content:
+    """
+"Bob","1234","bob@example.org"
+"Alice","5","alice@example.com"
+    """
+    And it is stored at the url "http://example.com/example1.csv"
+    And I have a schema with the following content:
+    """
+{
+  "fields": [
+          { "name": "Name", "constraints": { "required": true } },
+          { "name": "Id", "constraints": { "required": true, "minLength": 3 } },
+          { "name": "Email", "constraints": { "required": true } }
+    ]
+}
+    """
+    And the schema is stored at the url "http://example.com/schema.json"
+    When I run `csvlint http://example.com/example1.csv --schema http://example.com/schema.json --json`
+    Then the output should contain JSON
+    And the JSON should have a state of "invalid"
+    And the JSON should have 1 error
+    And error 1 should have the "type" "min_length"
+    And error 1 should have the "header" "Id"
+    And error 1 should have the constraint "min_length" "3"
+
   Scenario: Invalid schema
     Given I have a CSV with the following content:
     """

data/features/step_definitions/cli_steps.rb

@@ -19,7 +19,7 @@ Then(/^the JSON should have a state of "(.*?)"$/) do |state|
   expect(@json['validation']['state']).to eq(state)
 end
 
-Then(/^the JSON should have (\d+) error$/) do |count|
+Then(/^the JSON should have (\d+) errors?$/) do |count|
   @index = count.to_i - 1
   expect(@json['validation']['errors'].count).to eq(count.to_i)
 end
@@ -27,3 +27,11 @@ end
 Then(/^that error should have the "(.*?)" "(.*?)"$/) do |k, v|
   expect(@json['validation']['errors'][@index][k].to_s).to eq(v)
 end
+
+Then(/^error (\d+) should have the "(.*?)" "(.*?)"$/) do |index, k, v|
+  expect(@json['validation']['errors'][index.to_i - 1][k].to_s).to eq(v)
+end
+
+Then(/^error (\d+) should have the constraint "(.*?)" "(.*?)"$/) do |index, k, v|
+  expect(@json['validation']['errors'][index.to_i - 1]['constraints'][k].to_s).to eq(v)
+end

data/lib/csvlint/cli.rb

@@ -4,6 +4,8 @@ require 'json'
 require 'pp'
 require 'thor'
 
+require 'active_support/inflector'
+
 module Csvlint
   class Cli < Thor
 
@@ -93,7 +95,9 @@ module Csvlint
         end
         output_string = "#{index+1}. "
         if error.column && @schema && @schema.class == Csvlint::Schema
-          output_string += "#{@schema.fields[error.column - 1].name}: "
+          if @schema.fields[error.column - 1] != nil
+            output_string += "#{@schema.fields[error.column - 1].name}: "
+          end
         end
         output_string += "#{error.type}"
         output_string += ". #{location}" unless location.empty?
@@ -167,12 +171,20 @@ module Csvlint
       end
 
       def hashify(error)
-        {
+        h = {
           type: error.type,
           category: error.category,
           row: error.row,
-          col: error.column,
+          col: error.column
         }
+
+        if error.column && @schema && @schema.class == Csvlint::Schema && @schema.fields[error.column - 1] != nil
+          field = @schema.fields[error.column - 1]
+          h[:header] = field.name
+          h[:constraints] = Hash[field.constraints.map {|k,v| [k.underscore, v] }]
+        end
+
+        h
       end
 
       def report_lines

data/lib/csvlint/version.rb

@@ -1,3 +1,3 @@
 module Csvlint
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csvlint
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - pezholio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-23 00:00:00.000000000 Z
+date: 2016-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -360,6 +360,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: henry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: CSV Validator
 email:
 - pezholio@gmail.com