tableschema 0.3.1 → 0.4.0

data/lib/tableschema/types/geojson.rb

@@ -9,6 +9,7 @@ module TableSchema
       def self.supported_constraints
         [
           'required',
+          'unique',
           'pattern',
           'enum'
         ]
@@ -19,18 +20,39 @@ module TableSchema
       end
 
       def cast_default(value)
-        value = JSON.parse(value) if !value.is_a?(type)
-        JSON::Validator.validate!(geojson_schema, value)
-        value
+        parsed_value = parse_value(value)
+        JSON::Validator.validate!(geojson_schema, parsed_value)
+        parsed_value
       rescue JSON::Schema::ValidationError, JSON::ParserError
         raise TableSchema::InvalidGeoJSONType.new("#{value} is not valid GeoJSON")
       end
 
+      def cast_topojson(value)
+        parsed_value = parse_value(value)
+        JSON::Validator.validate!(topojson_schema, parsed_value)
+        parsed_value
+      rescue JSON::Schema::ValidationError, JSON::ParserError
+        raise TableSchema::InvalidTopoJSONType.new("#{value} is not valid TopoJSON")
+      end
+
       private
 
+      def parse_value(value)
+        if value.is_a?(type)
+          value
+        else
+          JSON.parse(value, symbolize_names: true)
+        end
+      end
+
       def geojson_schema
-        path = File.join( File.dirname(__FILE__), "..", "..", "..", "etc", "schemas", "geojson.json" )
-        @geojson_schema ||= JSON.parse File.read(path)
+        path = File.join( File.dirname(__FILE__), "..", "..", "profiles", "geojson.json" )
+        JSON.parse(File.read(path), symbolize_names: true)
+      end
+
+      def topojson_schema
+        path = File.join( File.dirname(__FILE__), "..", "..", "profiles", "topojson.json" )
+        JSON.parse(File.read(path), symbolize_names: true)
       end
 
     end

data/lib/tableschema/types/geopoint.rb

@@ -9,6 +9,7 @@ module TableSchema
       def self.supported_constraints
         [
           'required',
+          'geopoint',
           'pattern',
           'enum'
         ]
@@ -24,14 +25,14 @@ module TableSchema
       end
 
       def cast_object(value)
-        value = JSON.parse(value) if value.is_a?(::String)
-        cast_array([value['longitude'], value['latitude']])
+        value = JSON.parse(value, symbolize_names: true) if value.is_a?(::String)
+        cast_array([value[:longitude], value[:latitude]])
       rescue JSON::ParserError
         raise TableSchema::InvalidGeoPointType.new("#{value} is not a valid geopoint")
       end
 
       def cast_array(value)
-        value = JSON.parse(value) if value.is_a?(::String)
+        value = JSON.parse(value, symbolize_names: true) if value.is_a?(::String)
         value = [Float(value[0]), Float(value[1])]
         check_latlng_range(value)
         value

data/lib/tableschema/types/integer.rb

@@ -9,6 +9,7 @@ module TableSchema
       def self.supported_constraints
         [
           'required',
+          'unique',
           'pattern',
           'enum',
           'minimum',

data/lib/tableschema/types/number.rb

@@ -9,6 +9,7 @@ module TableSchema
       def self.supported_constraints
         [
           'required',
+          'unique',
           'pattern',
           'enum',
           'minimum',
@@ -20,41 +21,55 @@ module TableSchema
         ::Float
       end
 
-      def currency_symbols
-        ISO4217::Currency.currencies.to_a.map { |c| Regexp.escape(c.last.symbol) rescue nil }.delete_if { |s| s.nil? }
-      end
 
       def cast_default(value)
-        return value if value.class == type
-        return Float(value) if value.class == ::Fixnum
-
-        value = preprocess_value(value)
-        return Float(value)
+        case value
+        when type
+          value
+        when ::Integer
+          Float(value)
+        when ::String
+          process_string(value)
+        end
       rescue ArgumentError
         raise TableSchema::InvalidCast.new("#{value} is not a #{name}")
       end
 
-      def cast_currency(value)
-        cast_default(value)
-      rescue TableSchema::InvalidCast
-        value = preprocess_value(value)
-        re = Regexp.new currency_symbols.join('|')
-        value.gsub!(re, '')
-        cast_default(value)
-      end
-
       private
 
-        def preprocess_value(value)
-          group_char = @field.fetch('groupChar', ',')
-          decimal_char = @field.fetch('decimalChar', '.')
-          percent_char = /%|‰|‱|％|﹪|٪/
-          value.gsub(group_char, '')
-               .gsub(decimal_char, '.')
-               .gsub(percent_char, '')
-               .gsub(Regexp.new(currency_symbols.join '|'), '')
+        def process_string(value)
+          case value
+          when 'NaN'
+            Float::NAN
+          when '-INF'
+            -Float::INFINITY
+          when 'INF'
+            Float::INFINITY
+          else
+            group_char = @field.fetch(:groupChar, TableSchema::DEFAULTS[:group_char])
+            decimal_char = @field.fetch(:decimalChar, TableSchema::DEFAULTS[:decimal_char])
+            formatted_value = value.gsub(group_char, '').gsub(decimal_char, '.')
+            if formatted_value.match(percent_chars)
+              process_percent(formatted_value)
+            elsif @field.fetch(:currency, nil)
+              process_currency(formatted_value)
+            else
+              Float(formatted_value)
+            end
+          end
         end
 
+        def process_percent(value)
+          Float(value.gsub(percent_chars, '')) / 100
+        end
+
+        def process_currency(value)
+          Float(value.gsub(@field[:currency], ''))
+        end
+
+        def percent_chars
+          /%|‰|‱|％|﹪|٪/
+        end
     end
   end
 end

data/lib/tableschema/types/object.rb

@@ -9,6 +9,7 @@ module TableSchema
       def self.supported_constraints
         [
           'required',
+          'unique',
           'pattern',
           'enum',
           'minLength',
@@ -22,7 +23,7 @@ module TableSchema
 
       def cast_default(value)
         return value if value.is_a?(type)
-        parsed = JSON.parse(value)
+        parsed = JSON.parse(value, symbolize_names: true)
         if parsed.is_a?(Hash)
           return parsed
         else

data/lib/tableschema/types/string.rb

@@ -9,6 +9,7 @@ module TableSchema
       def self.supported_constraints
         [
           'required',
+          'unique',
           'pattern',
           'enum',
           'minLength',
@@ -59,6 +60,13 @@ module TableSchema
         end
       end
 
+      def cast_binary(value)
+        value = cast_default(value)
+        Base64.strict_decode64(value)
+      rescue ArgumentError
+        raise TableSchema::InvalidBinary.new("#{value} is not a valid binary string")
+      end
+
     end
   end
 end

data/lib/tableschema/types/time.rb

@@ -9,6 +9,7 @@ module TableSchema
       def self.supported_constraints
         [
           'required',
+          'unique',
           'pattern',
           'enum',
           'minimum',

data/lib/tableschema/types/year.rb

@@ -0,0 +1,34 @@
+module TableSchema
+  module Types
+    class Year < Base
+
+      def name
+        'year'
+      end
+
+      def self.supported_constraints
+        [
+          'required',
+          'unique',
+          'enum',
+          'minimum',
+          'maximum',
+        ]
+      end
+
+      def type
+        ::Integer
+      end
+
+      def cast_default(value)
+        cast = ::Date._strptime(value.to_s, '%Y')
+        unless cast.nil? || cast.include?(:leftover)
+          cast[:year]
+        else
+          raise TableSchema::InvalidYearType.new("#{value} is not a valid year")
+        end
+      end
+
+    end
+  end
+end

data/lib/tableschema/types/yearmonth.rb

@@ -0,0 +1,52 @@
+module TableSchema
+  module Types
+    class YearMonth < Base
+
+      def name
+        'yearmonth'
+      end
+
+      def self.supported_constraints
+        [
+          'required',
+          'unique',
+          'pattern',
+          'enum',
+          'minimum',
+          'maximum',
+        ]
+      end
+
+      def type
+        ::Hash
+      end
+
+      def cast_default(value)
+        value = array_to_yearmonth_string(value) if value.class == ::Array
+        cast = ::Date._strptime(value, '%Y-%m')
+        unless cast.nil? || cast.include?(:leftover)
+          array_to_yearmonth(cast.values)
+        else
+          raise TableSchema::InvalidYearMonthType.new("#{value} is not a valid yearmonth")
+        end
+      end
+
+      private
+
+        def array_to_yearmonth(value_array)
+          {
+            year: value_array[0],
+            month: value_array[1],
+          }.freeze
+        end
+
+        def array_to_yearmonth_string(value)
+          if value.length != 2
+            raise TableSchema::InvalidYearMonthType.new("#{value} is not a valid yearmonth")
+          end
+          "#{value[0]}-#{value[1]}"
+        end
+
+    end
+  end
+end

data/lib/tableschema/validate.rb

@@ -1,54 +1,70 @@
 module TableSchema
   module Validate
 
-    attr_reader :messages
+    attr_reader :errors
 
     def load_validator!
-      filepath = File.join(File.dirname(__FILE__), '..', '..', 'etc', 'schemas', 'json-table-schema.json')
-      @validator ||= JSON.parse(File.read filepath)
-    end
-
-    def valid?
-      validate
-      @messages.count == 0
+      filepath = File.join(File.dirname(__FILE__), '..', 'profiles', 'table-schema.json')
+      @profile ||= JSON.parse(File.read(filepath), symbolize_names: true)
     end
 
     def validate
-      @messages = JSON::Validator.fully_validate(@validator, self)
+      @errors = Set.new(JSON::Validator.fully_validate(@profile, self))
       check_primary_keys
       check_foreign_keys
+      @errors.empty?
+    end
+
+    def validate!
+      validate
+      raise SchemaException.new(@errors.first) unless @errors.empty?
+      true
     end
 
     private
 
-      def check_primary_keys
-        return if self['primaryKey'].nil?
-        primary_keys.each { |pk| check_field_value(pk, 'primaryKey') }
-      end
+    def check_primary_keys
+      return if self[:primaryKey].nil?
+      primary_keys.each { |pk| check_field_value(pk, 'primaryKey') }
+    end
 
-      def check_foreign_keys
-        return if self['foreignKeys'].nil?
-        self['foreignKeys'].each do |keys|
-          foreign_key_fields(keys).each { |fk| check_field_value(fk, 'foreignKey.fields') }
-          add_error("A JSON Table Schema foreignKey.fields must contain the same number entries as foreignKey.reference.fields.") if field_count_mismatch?(keys)
+    def check_foreign_keys
+      return if self[:foreignKeys].nil?
+      self[:foreignKeys].each do |key|
+        if field_type_mismatch?(key)
+          add_error("A TableSchema `foreignKey.fields` value must be the same type as `foreignKey.reference.fields`")
+        end
+        if field_count_mismatch?(key)
+          add_error("A TableSchema `foreignKey.fields` must contain the same number of entries as `foreignKey.reference.fields`")
+        end
+        foreign_key_fields(key).each { |fk| check_field_value(fk, 'foreignKey.fields') }
+        if key.fetch(:reference).fetch(:resource).empty?
+          foreign_key_fields(key.fetch(:reference)).each { |fk| check_field_value(fk, 'foreignKey.reference.fields')}
         end
       end
+    end
 
-      def check_field_value(key, type)
-        add_error("The JSON Table Schema #{type} value `#{key}` is not found in any of the schema's field names") if headers.select { |f| key == f }.count == 0
+    def check_field_value(key, type)
+      if headers.select { |f| key == f }.count == 0
+        add_error("The TableSchema #{type} value `#{key}` is not found in any of the schema's field names")
       end
+    end
 
-      def foreign_key_fields(keys)
-        [keys['fields']].flatten
-      end
+    def foreign_key_fields(key)
+      [key.fetch(:fields)].flatten
+    end
 
-      def field_count_mismatch?(keys)
-        keys['reference'] &&([keys['fields']].flatten.count != [keys['reference']['fields']].flatten.count)
-      end
+    def field_count_mismatch?(key)
+      foreign_key_fields(key).count != foreign_key_fields(key.fetch(:reference)).count
+    end
 
-      def add_error(error)
-        @messages << error
-      end
+    def field_type_mismatch?(key)
+      key.fetch(:fields).class.name != key.fetch(:reference).fetch(:fields).class.name
+    end
+
+    def add_error(error)
+      @errors << error
+    end
 
   end
 end

data/lib/tableschema/version.rb

@@ -1,3 +1,3 @@
 module TableSchema
-  VERSION = "0.3.1"
+  VERSION = "0.4.0".freeze
 end

data/tableschema.gemspec

@@ -24,9 +24,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry", "~> 0.10.0"
   spec.add_development_dependency "webmock", "~> 2.3.0"
   spec.add_development_dependency "coveralls", "~> 0.8.13"
+  spec.add_development_dependency "rubocop", "~> 0.49.1"
 
   spec.add_dependency "json-schema", "~> 2.6.0"
   spec.add_dependency "uuid", "~> 2.3.8"
-  spec.add_dependency "currencies", "~> 0.4.2"
   spec.add_dependency "tod", "~> 2.1.0"
+  spec.add_dependency "activesupport", "~> 5.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tableschema
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Open Knowledge Foundation
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-21 00:00:00.000000000 Z
+date: 2017-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.13
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.49.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.49.1
 - !ruby/object:Gem::Dependency
   name: json-schema
   requirement: !ruby/object:Gem::Requirement
@@ -123,33 +137,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.3.8
 - !ruby/object:Gem::Dependency
-  name: currencies
+  name: tod
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
-  name: tod
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 5.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 5.1.0
 description: 
 email:
 - info@okfn.org
@@ -159,6 +173,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -168,8 +183,9 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- etc/schemas/geojson.json
-- etc/schemas/json-table-schema.json
+- lib/profiles/geojson.json
+- lib/profiles/table-schema.json
+- lib/profiles/topojson.json
 - lib/tableschema.rb
 - lib/tableschema/constraints/constraints.rb
 - lib/tableschema/constraints/enum.rb
@@ -179,7 +195,8 @@ files:
 - lib/tableschema/constraints/minimum.rb
 - lib/tableschema/constraints/pattern.rb
 - lib/tableschema/constraints/required.rb
-- lib/tableschema/data.rb
+- lib/tableschema/constraints/unique.rb
+- lib/tableschema/defaults.rb
 - lib/tableschema/exceptions.rb
 - lib/tableschema/field.rb
 - lib/tableschema/helpers.rb
@@ -193,14 +210,16 @@ files:
 - lib/tableschema/types/boolean.rb
 - lib/tableschema/types/date.rb
 - lib/tableschema/types/datetime.rb
+- lib/tableschema/types/duration.rb
 - lib/tableschema/types/geojson.rb
 - lib/tableschema/types/geopoint.rb
 - lib/tableschema/types/integer.rb
-- lib/tableschema/types/null.rb
 - lib/tableschema/types/number.rb
 - lib/tableschema/types/object.rb
 - lib/tableschema/types/string.rb
 - lib/tableschema/types/time.rb
+- lib/tableschema/types/year.rb
+- lib/tableschema/types/yearmonth.rb
 - lib/tableschema/validate.rb
 - lib/tableschema/version.rb
 - tableschema.gemspec