turbot-runner 0.1.22 → 0.1.23

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWJlODcyODQyMDg3YzcyMDFmNjRkMTJmMjkzOWY2NDdjYWJkMmE0ZQ==
+    MDA3ZmUyYTExMzFhNjIxOGE1MjkwMDgzNWEwNjM2MzQzY2UwYWJlNw==
   data.tar.gz: !binary |-
-    MjI4ODIxYTgxNDg3MWNkOGIyYTdiOTMyMzUxOTE4YzYyMDA4ZmY4Yg==
+    Y2EwNGZmNTE2YzY2NjAwOWZjMzYxMGNiYzg5ZDdmOTA2NzQ5MDZhYw==
 SHA512:
   metadata.gz: !binary |-
-    ODlmN2FmZjEwMDBhOThhMGJkNDcxYjA5MzcwMDhhZmNiODgwYjJlNDc2NDEz
-    MDc3YTYwMjU2N2EzZTI2MTFlYjM2YjI1OWY5N2JjMzhhODcwM2I0ZGQ4NjY4
-    ODRlNTEyNzU2Y2IzYmE2ZTc2MzM2NTQ0OTFlY2FiMjhmNDdkNGY=
+    ODg4NGFlZTRmY2MwNjJhZDNiMjM3YWIwMGMyMTcyMWZmYjcyZjJhNDY5MTg1
+    MGUzNzE3M2RjZGMyZThjYTQ0ZTBkZmJkNzc4N2ZjYzY3ZWRhOWE0YzAwZDYy
+    MGUxNjU4MmY4ZGMxM2RjNzE1OTNmZmNiM2Y3YTM5MGQ2M2EwYTc=
   data.tar.gz: !binary |-
-    NTAyNjEwNDZjMTJmYTZhYzM1ZGRmMDMyZTJjNmVjZWU2NzIyZmYwMTY0ODYw
-    OTkyNTEwZDNmYTdiMTMzYmI2YzExYWIyZjM5N2JhY2U1NGU1N2Q5OTIzODJk
-    ZDM1Mjc2MjA2NmIyMzM2NTBhZDM4NTlmMWI0OTQwMWVmNzhjMWY=
+    MWYxZjZkYjA4MGU4ZTk2MzU2MDg4ZWFhMDQ0ZjA2OGJkODlmNDA1OWMxYmQy
+    NTcxYjQyYTBmZWI2NGY3YTYyOWNkMDRlNjc1MzAyMTY5MWJhYmE0OGY2Y2E3
+    ODE2MDU1MDI5Nzc1ZDQ3OGIxM2JlYTYwNWZmZTk3ZDcyOTllNGE=

data/lib/turbot_runner/processor.rb

@@ -143,7 +143,7 @@ module TurbotRunner
 
     def load_schema
       hyphenated_name = @data_type.to_s.gsub("_", "-").gsub(" ", "-")
-      path = File.expand_path("../../../schema/schemas/#{hyphenated_name}-schema.json", __FILE__)
+      path = File.join(SCHEMAS_PATH, "#{hyphenated_name}-schema.json")
       JSON.load(File.read(path))
     end
 

data/lib/turbot_runner/validator.rb

@@ -5,8 +5,11 @@ module TurbotRunner
     extend self
 
     def validate(schema, record)
-      errors = JSON::Validator.fully_validate(schema, record, :errors_as_objects => true)
-      
+      # We must change directory for the relative paths in schemas to make sense.
+      errors = Dir.chdir(SCHEMAS_PATH) do
+        JSON::Validator.fully_validate(schema, record, :errors_as_objects => true)
+      end
+
       # For now, we just handle the first error.
       error = errors[0]
       return if error.nil?

data/lib/turbot_runner/version.rb

@@ -1,3 +1,3 @@
 module TurbotRunner
-  VERSION = '0.1.22'
+  VERSION = '0.1.23'
 end

data/lib/turbot_runner.rb

@@ -7,3 +7,7 @@ require 'turbot_runner/utils'
 require 'turbot_runner/validator'
 require 'turbot_runner/validators'
 require 'turbot_runner/version'
+
+module TurbotRunner
+  SCHEMAS_PATH = File.expand_path('../../schema/schemas', __FILE__)
+end

data/spec/lib/processor_spec.rb

@@ -156,6 +156,37 @@ describe TurbotRunner::Processor do
         end
       end
     end
+
+    it 'can handle schemas with $refs' do
+      handler = TurbotRunner::BaseHandler.new
+      script_config = {
+        :data_type => 'rich-licence',
+        :identifying_fields => ['licence_number']
+      }
+
+      script_runner = instance_double('ScriptRunner')
+      allow(script_runner).to receive(:interrupt_and_mark_as_failed)
+      processor = TurbotRunner::Processor.new(script_runner, script_config, handler)
+
+      record = {
+        :licence_holder => {
+          :entity_type => 'company',
+          :entity_properties => {
+            :name => 'Hairy Goat Breeding Ltd',
+            :jurisdiction_code => 'gb',
+          }
+        },
+        :licence_number => '1234',
+        :permissions => ['Goat breeding'],
+        :licence_issuer => 'Sheep and Goat Board of Bermuda',
+        :jurisdiction_of_licence => 'bm',
+        :source_url => 'http://example.com',
+        :sample_date => '2015-01-01'
+      }
+
+      expect(handler).to receive(:handle_valid_record)
+      processor.process(record.to_json)
+    end
   end
 
   describe '#convert_record' do

data/spec/lib/runner_spec.rb

@@ -219,7 +219,7 @@ describe TurbotRunner::Runner do
 
     context 'with a bot that emits an invalid sample date' do
       before do
-        @runner = TurbotRunner::Runner.new('spec/bots/bot-with-invalid-sample-date')
+        @runner = test_runner('bot-with-invalid-sample-date')
       end
 
       it 'returns false' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: turbot-runner
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.23
 platform: ruby
 authors:
 - OpenCorporates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-27 00:00:00.000000000 Z
+date: 2015-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema