turbot-runner 0.1.25 → 0.1.26

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWI1YjU1NDhkMjg2ZDkzNDJmNGYzNmU3NTg1OGRlMWExZGY5NDI0NA==
+    ZmZhZTI1N2ZkMWFlODhiOGEwNjlhMGE4MzkwMjk1MmQ5OTc2YjcyNg==
   data.tar.gz: !binary |-
-    ZDkyNTcxMDhmZjA5NDRjMjczNzdhMTA2MGJlNGJlZTQ3ZjM4NWZkOA==
+    NDU1MTY4Yzk1ZDJkMmEwYjM0N2YxMDI3N2IxYjVlYTg0MDE0MTU1Mw==
 SHA512:
   metadata.gz: !binary |-
-    Y2Y5NjYyY2ExOWY1ZTg2OWFmMmUyMjlkNmMwZTI4N2NkYjEzZDY4YWY2Njlh
-    OTJlNWY2N2VjMDQzMDhmMTBjODM5NmI5ZDFjODc3YWQxMjc3ZjAxMjczN2U0
-    MjZmZmY2ODNiOTIxZmZiYTIyZGE2MDliMDMxNTk3NTQ1MTIxMTA=
+    OGI4ZjgyOTJjZGI3ZTVhZWY4YWQ3YzE4Y2I0MjIwZjU3ZDZjZWZjYjk4OTYy
+    N2ViZWM2ZTlkMTcxYWUxZjQ1ZTBkNjBjMjc3MWRhYjhiZThkZWZkYTljMjlh
+    YTkwZjY1OTNiYzBjNWE3N2NlODcyNjFkMjkzNWM3NzI1YjFjYTQ=
   data.tar.gz: !binary |-
-    ODE2N2ZhN2M2MWFjMzJhNDgyNGQzNDBlNGM2OGU2NmEyYjBkNDUyNTkyNzZh
-    MTU1OGM1YjM3YjJiZmE2OWEzNTNmODJlNTEzNGIxZjc5NmRiN2E3YmVmNWQy
-    OTFlODIwNGZhOWRlYjliYjJlZjBlMmIwYzhkNGNlOTlhOTFkZDE=
+    ODdjNTI1YWNjOWUyOGEzY2ZlYWZhOWFmM2Y5MDNiMWE1Mzc4MDE3YmE2ZTU3
+    YTg1NDFiZGNmOWZkNDY3N2IyOWY5YTAwNzc5NDFjYWQ1Y2U4YWUyMDFmZWJm
+    ZmU5NWJmMjU0MzJlN2Q0MzQ0NGFkMzhiNDZkYWRlMTNlZjY4OTk=

data/lib/turbot_runner.rb

@@ -9,4 +9,9 @@ require 'turbot_runner/version'
 
 module TurbotRunner
   SCHEMAS_PATH = File.expand_path('../../schema/schemas', __FILE__)
+
+  def self.schema_path(data_type)
+    hyphenated_name = data_type.to_s.gsub("_", "-").gsub(" ", "-")
+    File.join(SCHEMAS_PATH, "#{hyphenated_name}-schema.json")
+  end
 end

data/lib/turbot_runner/processor.rb

@@ -17,7 +17,7 @@ module TurbotRunner
         else
           record = Openc::JsonSchema.convert_dates(schema_path, JSON.parse(line))
 
-          error_message = Validator.validate(schema_path, record, @identifying_fields)
+          error_message = Validator.validate(@data_type, record, @identifying_fields)
 
           if error_message.nil?
             begin
@@ -41,8 +41,7 @@ module TurbotRunner
     end
 
     def schema_path
-      hyphenated_name = @data_type.to_s.gsub("_", "-").gsub(" ", "-")
-      File.join(SCHEMAS_PATH, "#{hyphenated_name}-schema.json")
+      TurbotRunner.schema_path(@data_type)
     end
   end
 end

data/lib/turbot_runner/validator.rb

@@ -2,7 +2,8 @@ module TurbotRunner
   module Validator
     extend self
 
-    def validate(schema_path, record, identifying_fields)
+    def validate(data_type, record, identifying_fields)
+      schema_path = TurbotRunner.schema_path(data_type)
       error = Openc::JsonSchema.validate(schema_path, record)
 
       message = nil

data/lib/turbot_runner/version.rb

@@ -1,3 +1,3 @@
 module TurbotRunner
-  VERSION = '0.1.25'
+  VERSION = '0.1.26'
 end

data/spec/spec_helper.rb

@@ -2,16 +2,14 @@ require 'turbot_runner'
 
 RSpec::Matchers.define(:fail_validation_with) do |expected_error|
   match do |record|
-    schema_path = File.join(TurbotRunner::SCHEMAS_PATH, 'primary-data-schema.json')
     identifying_fields = ['number']
-    expect(TurbotRunner::Validator.validate(schema_path, record, identifying_fields)).to eq(expected_error)
+    expect(TurbotRunner::Validator.validate('primary-data', record, identifying_fields)).to eq(expected_error)
   end
 end
 
 RSpec::Matchers.define(:be_valid) do
   match do |record|
-    schema_path = File.join(TurbotRunner::SCHEMAS_PATH, 'primary-data-schema.json')
     identifying_fields = ['number']
-    expect(TurbotRunner::Validator.validate(schema_path, record, identifying_fields)).to eq(nil)
+    expect(TurbotRunner::Validator.validate('primary-data', record, identifying_fields)).to eq(nil)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: turbot-runner
 version: !ruby/object:Gem::Version
-  version: 0.1.25
+  version: 0.1.26
 platform: ruby
 authors:
 - OpenCorporates