csvlint 1.0.0 → 1.1.0

data/spec/csvw/column_spec.rb

@@ -1,7 +1,6 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Csvlint::Csvw::Column do
-
   it "shouldn't generate errors for string values" do
     column = Csvlint::Csvw::Column.new(1, "foo")
     value = column.validate("bar", 2)
@@ -9,14 +8,14 @@ describe Csvlint::Csvw::Column do
   end
 
   it "should generate errors for string values that aren't long enough" do
-    column = Csvlint::Csvw::Column.new(1, "foo", datatype: { "base" => "http://www.w3.org/2001/XMLSchema#string", "minLength" => 4 })
+    column = Csvlint::Csvw::Column.new(1, "foo", datatype: {"base" => "http://www.w3.org/2001/XMLSchema#string", "minLength" => 4})
     value = column.validate("bar", 2)
-    expect(value).to eq({ :invalid => "bar" })
+    expect(value).to eq({invalid: "bar"})
     expect(column.errors.length).to eq(1)
   end
 
   it "shouldn't generate errors for string values that are long enough" do
-    column = Csvlint::Csvw::Column.new(1, "foo", datatype: { "base" => "http://www.w3.org/2001/XMLSchema#string", "minLength" => 4 })
+    column = Csvlint::Csvw::Column.new(1, "foo", datatype: {"base" => "http://www.w3.org/2001/XMLSchema#string", "minLength" => 4})
     value = column.validate("barn", 2)
     expect(value).to eq("barn")
     expect(column.errors.length).to eq(0)
@@ -24,19 +23,19 @@ describe Csvlint::Csvw::Column do
 
   context "when parsing CSVW column descriptions" do
     it "should provide appropriate default values" do
-      @desc=<<-EOL
+      @desc = <<-EOL
       {
         "name": "countryCode"
       }
       EOL
-      json = JSON.parse( @desc )
+      json = JSON.parse(@desc)
       column = Csvlint::Csvw::Column.from_json(1, json)
 
       expect(column).to be_a(Csvlint::Csvw::Column)
       expect(column.number).to eq(1)
       expect(column.name).to eq("countryCode")
       expect(column.about_url).to eq(nil)
-      expect(column.datatype).to eq({ "@id" => "http://www.w3.org/2001/XMLSchema#string" })
+      expect(column.datatype).to eq({"@id" => "http://www.w3.org/2001/XMLSchema#string"})
       expect(column.default).to eq("")
       expect(column.lang).to eq("und")
       expect(column.null).to eq([""])
@@ -54,21 +53,21 @@ describe Csvlint::Csvw::Column do
     end
 
     it "should override default values" do
-      @desc=<<-EOL
+      @desc = <<-EOL
       {
         "name": "countryCode",
         "titles": "countryCode",
         "propertyUrl": "http://www.geonames.org/ontology{#_name}"
       }
       EOL
-      json = JSON.parse( @desc )
+      json = JSON.parse(@desc)
       column = Csvlint::Csvw::Column.from_json(2, json)
 
       expect(column).to be_a(Csvlint::Csvw::Column)
       expect(column.number).to eq(2)
       expect(column.name).to eq("countryCode")
       expect(column.about_url).to eq(nil)
-      expect(column.datatype).to eq({ "@id" => "http://www.w3.org/2001/XMLSchema#string" })
+      expect(column.datatype).to eq({"@id" => "http://www.w3.org/2001/XMLSchema#string"})
       expect(column.default).to eq("")
       expect(column.lang).to eq("und")
       expect(column.null).to eq([""])
@@ -79,31 +78,31 @@ describe Csvlint::Csvw::Column do
       expect(column.source_number).to eq(2)
       expect(column.suppress_output).to eq(false)
       expect(column.text_direction).to eq(:inherit)
-      expect(column.titles).to eql({ "und" => [ "countryCode" ]})
+      expect(column.titles).to eql({"und" => ["countryCode"]})
       expect(column.value_url).to eq(nil)
       expect(column.virtual).to eq(false)
       expect(column.annotations).to eql({})
     end
 
     it "should include the datatype" do
-      @desc=<<-EOL
+      @desc = <<-EOL
       { "name": "Id", "required": true, "datatype": { "base": "string", "minLength": 3 } }
       EOL
       json = JSON.parse(@desc)
       column = Csvlint::Csvw::Column.from_json(1, json)
       expect(column.name).to eq("Id")
       expect(column.required).to eq(true)
-      expect(column.datatype).to eql({ "base" => "http://www.w3.org/2001/XMLSchema#string", "minLength" => 3 })
+      expect(column.datatype).to eql({"base" => "http://www.w3.org/2001/XMLSchema#string", "minLength" => 3})
     end
 
     it "should generate warnings for invalid null values" do
-      @desc=<<-EOL
+      @desc = <<-EOL
       {
         "name": "countryCode",
         "null": true
       }
       EOL
-      json = JSON.parse( @desc )
+      json = JSON.parse(@desc)
       column = Csvlint::Csvw::Column.from_json(1, json)
       expect(column.warnings.length).to eq(1)
       expect(column.warnings[0].type).to eq(:invalid_value)

data/spec/csvw/date_format_spec.rb

@@ -1,7 +1,6 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Csvlint::Csvw::DateFormat do
-
   it "should parse dates that match yyyy-MM-dd correctly" do
     format = Csvlint::Csvw::DateFormat.new("yyyy-MM-dd")
     expect(format.parse("2015-03-22")[:dateTime]).to eql(Date.new(2015, 3, 22))
@@ -11,15 +10,15 @@ describe Csvlint::Csvw::DateFormat do
 
   it "should parse times that match HH:mm:ss correctly" do
     format = Csvlint::Csvw::DateFormat.new("HH:mm:ss")
-    expect(format.parse("12:34:56")).to eql({ :hour => 12, :minute => 34, :second => 56.0, :string => "12:34:56", :dateTime => DateTime.new(0,1,1,12,34,56.0,"+00:00") })
+    expect(format.parse("12:34:56")).to eql({hour: 12, minute: 34, second: 56.0, string: "12:34:56", dateTime: DateTime.new(0, 1, 1, 12, 34, 56.0, "+00:00")})
     expect(format.parse("22/03/2015")).to eq(nil)
   end
 
   it "should parse times that match HH:mm:ss.SSS correctly" do
     format = Csvlint::Csvw::DateFormat.new("HH:mm:ss.SSS")
-    expect(format.parse("12:34:56")).to eql({ :hour => 12, :minute => 34, :second => 56.0, :string => "12:34:56", :dateTime => DateTime.new(0,1,1,12,34,56.0,"+00:00") })
-    expect(format.parse("12:34:56.78")).to eql({ :hour => 12, :minute => 34, :second => 56.78, :string => "12:34:56.78", :dateTime => DateTime.new(0,1,1,12,34,56.78,"+00:00") })
-    expect(format.parse("12:34:56.789")).to eql({ :hour => 12, :minute => 34, :second => 56.789, :string => "12:34:56.789", :dateTime => DateTime.new(0,1,1,12,34,56.789,"+00:00") })
+    expect(format.parse("12:34:56")).to eql({hour: 12, minute: 34, second: 56.0, string: "12:34:56", dateTime: DateTime.new(0, 1, 1, 12, 34, 56.0, "+00:00")})
+    expect(format.parse("12:34:56.78")).to eql({hour: 12, minute: 34, second: 56.78, string: "12:34:56.78", dateTime: DateTime.new(0, 1, 1, 12, 34, 56.78, "+00:00")})
+    expect(format.parse("12:34:56.789")).to eql({hour: 12, minute: 34, second: 56.789, string: "12:34:56.789", dateTime: DateTime.new(0, 1, 1, 12, 34, 56.789, "+00:00")})
     expect(format.parse("12:34:56.7890")).to eql(nil)
     expect(format.parse("22/03/2015")).to eq(nil)
   end
@@ -45,5 +44,4 @@ describe Csvlint::Csvw::DateFormat do
     expect(format.parse("2015-03-15T15:02:37")).to eql(nil)
     expect(format.parse("3/15/2015 15:02")[:dateTime]).to eql(DateTime.new(2015, 3, 15, 15, 2))
   end
-
 end

data/spec/csvw/number_format_spec.rb

@@ -1,7 +1,6 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Csvlint::Csvw::NumberFormat do
-
   it "should correctly parse #,##0.##" do
     format = Csvlint::Csvw::NumberFormat.new("#,##0.##")
     expect(format.pattern).to eq("#,##0.##")
@@ -397,7 +396,7 @@ describe Csvlint::Csvw::NumberFormat do
   end
 
   it "should parse numbers normally when there is no pattern" do
-    format = Csvlint::Csvw::NumberFormat.new()
+    format = Csvlint::Csvw::NumberFormat.new
     expect(format.parse("1")).to eql(1)
     expect(format.parse("-1")).to eql(-1)
     expect(format.parse("12.3")).to eql(12.3)
@@ -442,5 +441,4 @@ describe Csvlint::Csvw::NumberFormat do
     expect(format.parse("1 234 567")).to eql(1234567)
     expect(format.parse("1  234")).to eq(nil)
   end
-
 end

data/spec/csvw/table_group_spec.rb

@@ -1,41 +1,40 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Csvlint::Csvw::TableGroup do
-
   it "should inherit null to all columns" do
-    @metadata=<<-EOL
-{
-  "@context": "http://www.w3.org/ns/csvw",
-  "null": true,
-  "tables": [{
-    "url": "test040.csv",
-    "tableSchema": {
-      "columns": [{
-        "titles": "null"
-      }, {
-        "titles": "lang"
-      }, {
-        "titles": "textDirection"
-      }, {
-        "titles": "separator"
-      }, {
-        "titles": "ordered"
-      }, {
-        "titles": "default"
-      }, {
-        "titles": "datatype"
-      }, {
-        "titles": "aboutUrl"
-      }, {
-        "titles": "propertyUrl"
-      }, {
-        "titles": "valueUrl"
-      }]
-    }
-  }]
-}
+    @metadata = <<~EOL
+      {
+        "@context": "http://www.w3.org/ns/csvw",
+        "null": true,
+        "tables": [{
+          "url": "test040.csv",
+          "tableSchema": {
+            "columns": [{
+              "titles": "null"
+            }, {
+              "titles": "lang"
+            }, {
+              "titles": "textDirection"
+            }, {
+              "titles": "separator"
+            }, {
+              "titles": "ordered"
+            }, {
+              "titles": "default"
+            }, {
+              "titles": "datatype"
+            }, {
+              "titles": "aboutUrl"
+            }, {
+              "titles": "propertyUrl"
+            }, {
+              "titles": "valueUrl"
+            }]
+          }
+        }]
+      }
     EOL
-    json = JSON.parse( @metadata )
+    json = JSON.parse(@metadata)
     table_group = Csvlint::Csvw::TableGroup.from_json("http://w3c.github.io/csvw/tests/test040-metadata.json", json)
 
     expect(table_group.class).to eq(Csvlint::Csvw::TableGroup)
@@ -54,82 +53,81 @@ describe Csvlint::Csvw::TableGroup do
   end
 
   context "when parsing CSVW table group metadata" do
-
     before(:each) do
-      @metadata=<<-EOL
-{
-  "@context": "http://www.w3.org/ns/csvw",
-  "tables": [{
-    "url": "countries.csv",
-    "tableSchema": {
-      "columns": [{
-        "name": "countryCode",
-        "titles": "countryCode",
-        "datatype": "string",
-        "propertyUrl": "http://www.geonames.org/ontology{#_name}"
-      }, {
-        "name": "latitude",
-        "titles": "latitude",
-        "datatype": "number"
-      }, {
-        "name": "longitude",
-        "titles": "longitude",
-        "datatype": "number"
-      }, {
-        "name": "name",
-        "titles": "name",
-        "datatype": "string"
-      }],
-      "aboutUrl": "http://example.org/countries.csv{#countryCode}",
-      "propertyUrl": "http://schema.org/{_name}",
-      "primaryKey": "countryCode"
-    }
-  }, {
-    "url": "country_slice.csv",
-    "tableSchema": {
-      "columns": [{
-        "name": "countryRef",
-        "titles": "countryRef",
-        "valueUrl": "http://example.org/countries.csv{#countryRef}"
-      }, {
-        "name": "year",
-        "titles": "year",
-        "datatype": "gYear"
-      }, {
-        "name": "population",
-        "titles": "population",
-        "datatype": "integer"
-      }],
-      "foreignKeys": [{
-        "columnReference": "countryRef",
-        "reference": {
-          "resource": "countries.csv",
-          "columnReference": "countryCode"
+      @metadata = <<~EOL
+        {
+          "@context": "http://www.w3.org/ns/csvw",
+          "tables": [{
+            "url": "countries.csv",
+            "tableSchema": {
+              "columns": [{
+                "name": "countryCode",
+                "titles": "countryCode",
+                "datatype": "string",
+                "propertyUrl": "http://www.geonames.org/ontology{#_name}"
+              }, {
+                "name": "latitude",
+                "titles": "latitude",
+                "datatype": "number"
+              }, {
+                "name": "longitude",
+                "titles": "longitude",
+                "datatype": "number"
+              }, {
+                "name": "name",
+                "titles": "name",
+                "datatype": "string"
+              }],
+              "aboutUrl": "http://example.org/countries.csv{#countryCode}",
+              "propertyUrl": "http://schema.org/{_name}",
+              "primaryKey": "countryCode"
+            }
+          }, {
+            "url": "country_slice.csv",
+            "tableSchema": {
+              "columns": [{
+                "name": "countryRef",
+                "titles": "countryRef",
+                "valueUrl": "http://example.org/countries.csv{#countryRef}"
+              }, {
+                "name": "year",
+                "titles": "year",
+                "datatype": "gYear"
+              }, {
+                "name": "population",
+                "titles": "population",
+                "datatype": "integer"
+              }],
+              "foreignKeys": [{
+                "columnReference": "countryRef",
+                "reference": {
+                  "resource": "countries.csv",
+                  "columnReference": "countryCode"
+                }
+              }]
+            }
+          }]
         }
-      }]
-    }
-  }]
-}
-  EOL
-      stub_request(:get, "http://w3c.github.io/csvw/tests/countries.json").to_return(:status => 200, :body => @metadata)
-      @countries=<<-EOL
-countryCode,latitude,longitude,name
-AD,42.546245,1.601554,Andorra
-AE,23.424076,53.847818,"United Arab Emirates"
-AF,33.93911,67.709953,Afghanistan
-  EOL
-      stub_request(:get, "http://w3c.github.io/csvw/tests/countries.csv").to_return(:status => 200, :body => @countries)
-      @country_slice=<<-EOL
-countryRef,year,population
-AF,1960,9616353
-AF,1961,9799379
-AF,1962,9989846
-  EOL
-      stub_request(:get, "http://w3c.github.io/csvw/tests/country_slice.csv").to_return(:status => 200, :body => @country_slice)
+      EOL
+      stub_request(:get, "http://w3c.github.io/csvw/tests/countries.json").to_return(status: 200, body: @metadata)
+      @countries = <<~EOL
+        countryCode,latitude,longitude,name
+        AD,42.546245,1.601554,Andorra
+        AE,23.424076,53.847818,"United Arab Emirates"
+        AF,33.93911,67.709953,Afghanistan
+      EOL
+      stub_request(:get, "http://w3c.github.io/csvw/tests/countries.csv").to_return(status: 200, body: @countries)
+      @country_slice = <<~EOL
+        countryRef,year,population
+        AF,1960,9616353
+        AF,1961,9799379
+        AF,1962,9989846
+      EOL
+      stub_request(:get, "http://w3c.github.io/csvw/tests/country_slice.csv").to_return(status: 200, body: @country_slice)
     end
 
     it "should create a table group from pre-parsed CSVW metadata" do
-      json = JSON.parse( @metadata )
+      json = JSON.parse(@metadata)
       table_group = Csvlint::Csvw::TableGroup.from_json("http://w3c.github.io/csvw/tests/countries.json", json)
 
       expect(table_group.class).to eq(Csvlint::Csvw::TableGroup)

data/spec/csvw/table_spec.rb

@@ -1,84 +1,82 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Csvlint::Csvw::Table do
-
   context "when parsing CSVW table metadata" do
-
     before(:each) do
-      @metadata=<<-EOL
-{
-  "@context": "http://www.w3.org/ns/csvw",
-  "tables": [{
-    "url": "countries.csv",
-    "tableSchema": {
-      "columns": [{
-        "name": "countryCode",
-        "titles": "countryCode",
-        "datatype": "string",
-        "propertyUrl": "http://www.geonames.org/ontology{#_name}"
-      }, {
-        "name": "latitude",
-        "titles": "latitude",
-        "datatype": "number"
-      }, {
-        "name": "longitude",
-        "titles": "longitude",
-        "datatype": "number"
-      }, {
-        "name": "name",
-        "titles": "name",
-        "datatype": "string"
-      }],
-      "aboutUrl": "http://example.org/countries.csv{#countryCode}",
-      "propertyUrl": "http://schema.org/{_name}",
-      "primaryKey": "countryCode"
-    }
-  }, {
-    "url": "country_slice.csv",
-    "tableSchema": {
-      "columns": [{
-        "name": "countryRef",
-        "titles": "countryRef",
-        "valueUrl": "http://example.org/countries.csv{#countryRef}"
-      }, {
-        "name": "year",
-        "titles": "year",
-        "datatype": "gYear"
-      }, {
-        "name": "population",
-        "titles": "population",
-        "datatype": "integer"
-      }],
-      "foreignKeys": [{
-        "columnReference": "countryRef",
-        "reference": {
-          "resource": "countries.csv",
-          "columnReference": "countryCode"
+      @metadata = <<~EOL
+        {
+          "@context": "http://www.w3.org/ns/csvw",
+          "tables": [{
+            "url": "countries.csv",
+            "tableSchema": {
+              "columns": [{
+                "name": "countryCode",
+                "titles": "countryCode",
+                "datatype": "string",
+                "propertyUrl": "http://www.geonames.org/ontology{#_name}"
+              }, {
+                "name": "latitude",
+                "titles": "latitude",
+                "datatype": "number"
+              }, {
+                "name": "longitude",
+                "titles": "longitude",
+                "datatype": "number"
+              }, {
+                "name": "name",
+                "titles": "name",
+                "datatype": "string"
+              }],
+              "aboutUrl": "http://example.org/countries.csv{#countryCode}",
+              "propertyUrl": "http://schema.org/{_name}",
+              "primaryKey": "countryCode"
+            }
+          }, {
+            "url": "country_slice.csv",
+            "tableSchema": {
+              "columns": [{
+                "name": "countryRef",
+                "titles": "countryRef",
+                "valueUrl": "http://example.org/countries.csv{#countryRef}"
+              }, {
+                "name": "year",
+                "titles": "year",
+                "datatype": "gYear"
+              }, {
+                "name": "population",
+                "titles": "population",
+                "datatype": "integer"
+              }],
+              "foreignKeys": [{
+                "columnReference": "countryRef",
+                "reference": {
+                  "resource": "countries.csv",
+                  "columnReference": "countryCode"
+                }
+              }]
+            }
+          }]
         }
-      }]
-    }
-  }]
-}
-  EOL
-      stub_request(:get, "http://w3c.github.io/csvw/tests/countries.json").to_return(:status => 200, :body => @metadata)
-      @countries=<<-EOL
-countryCode,latitude,longitude,name
-AD,42.546245,1.601554,Andorra
-AE,23.424076,53.847818,"United Arab Emirates"
-AF,33.93911,67.709953,Afghanistan
-  EOL
-      stub_request(:get, "http://w3c.github.io/csvw/tests/countries.csv").to_return(:status => 200, :body => @countries)
-      @country_slice=<<-EOL
-countryRef,year,population
-AF,1960,9616353
-AF,1961,9799379
-AF,1962,9989846
-  EOL
-      stub_request(:get, "http://w3c.github.io/csvw/tests/country_slice.csv").to_return(:status => 200, :body => @country_slice)
+      EOL
+      stub_request(:get, "http://w3c.github.io/csvw/tests/countries.json").to_return(status: 200, body: @metadata)
+      @countries = <<~EOL
+        countryCode,latitude,longitude,name
+        AD,42.546245,1.601554,Andorra
+        AE,23.424076,53.847818,"United Arab Emirates"
+        AF,33.93911,67.709953,Afghanistan
+      EOL
+      stub_request(:get, "http://w3c.github.io/csvw/tests/countries.csv").to_return(status: 200, body: @countries)
+      @country_slice = <<~EOL
+        countryRef,year,population
+        AF,1960,9616353
+        AF,1961,9799379
+        AF,1962,9989846
+      EOL
+      stub_request(:get, "http://w3c.github.io/csvw/tests/country_slice.csv").to_return(status: 200, body: @country_slice)
     end
 
     it "should create a table from pre-parsed CSVW metadata" do
-      json = JSON.parse( @metadata )
+      json = JSON.parse(@metadata)
       table = Csvlint::Csvw::Table.from_json(json["tables"][0], "http://w3c.github.io/csvw/tests/countries.json")
 
       expect(table).to be_a(Csvlint::Csvw::Table)