turbot-runner 0.1.8 → 0.1.9

data/lib/turbot_runner/processor.rb

@@ -14,7 +14,7 @@ module TurbotRunner
       begin
         if line.strip == "RUN ENDED"
           @record_handler.handle_run_ended
-          @runner.interrupt
+          @runner.interrupt if @runner
         else
           record = JSON.parse(line)
           errors = validate(record)
@@ -23,16 +23,16 @@ module TurbotRunner
             begin
               @record_handler.handle_valid_record(record, @data_type)
             rescue InterruptRun
-              @runner.interrupt
+              @runner.interrupt if @runner
             end
           else
             @record_handler.handle_invalid_record(record, @data_type, errors)
-            @runner.interrupt_and_mark_as_failed
+            @runner.interrupt_and_mark_as_failed if @runner
           end
         end
       rescue JSON::ParserError
         @record_handler.handle_invalid_json(line)
-        @runner.interrupt_and_mark_as_failed
+        @runner.interrupt_and_mark_as_failed if @runner
       end
     end
 

data/lib/turbot_runner/runner.rb

@@ -65,6 +65,10 @@ module TurbotRunner
     end
 
     def process_script_output(script_config)
+      # The first argument to the Processor constructor is a nil
+      # Runner. This is because no running behaviour
+      # (e.g. interruptions etc) is required; we just want to do
+      # record handling.
       processor = Processor.new(nil, script_config, @record_handler)
 
       File.open(output_file(script_config[:file])) do |f|

data/lib/turbot_runner/version.rb

@@ -1,3 +1,3 @@
 module TurbotRunner
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
 end

data/schema/schemas/company-schema.json

@@ -130,9 +130,11 @@
           "minLength": 1
         },
         "number_of_employees": {
-          "type": "number",
-          "description": "The number of employees",
-          "minimum": 0
+          "anyOf": [
+            {"type":"string","minLength": 1},
+            {"type":"number","minimum": 0}
+          ],
+          "description": "The number of employees"
         },
         "merged_into": {
           "type": "object",

data/spec/lib/processor_spec.rb

@@ -6,64 +6,91 @@ describe TurbotRunner::Processor do
     before do
       @handler = TurbotRunner::BaseHandler.new
       @data_type = 'primary data'
-      script_config = {
+      @script_config = {
         :data_type => @data_type,
         :identifying_fields => ['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)
     end
 
-    context 'with valid record' do
-      it 'calls Handler#handle_valid_record' do
-        record = {
-          'sample_date' => '2014-06-01',
-          'source_url' => 'http://example.com/123',
-          'number' => 123
-        }
-        expect(@handler).to receive(:handle_valid_record).with(record, @data_type)
-        @processor.process(record.to_json)
+    context 'with a nil runner passed in' do
+      before do
+        @processor = TurbotRunner::Processor.new(nil, @script_config, @handler)
+      end
+
+      context 'with record missing required field' do
+        before do
+          @record = {
+            'sample_date' => '2014-06-01',
+            'number' => 123
+          }
+        end
+
+        it 'calls Handler#handle_invalid_record' do
+          expected_errors = ['Missing required attribute: source_url']
+          expect(@handler).to receive(:handle_invalid_record).
+            with(@record, @data_type, expected_errors)
+          @processor.process(@record.to_json)
+        end
       end
     end
 
-    context 'with record missing required field' do
+    context 'with a runner passed in' do
       before do
-        @record = {
-          'sample_date' => '2014-06-01',
-          'number' => 123
-        }
+        script_runner = instance_double('ScriptRunner')
+        allow(script_runner).to receive(:interrupt_and_mark_as_failed)
+        @processor = TurbotRunner::Processor.new(script_runner, @script_config, @handler)
       end
 
-      it 'calls Handler#handle_invalid_record' do
-        expected_errors = ['Missing required attribute: source_url']
-        expect(@handler).to receive(:handle_invalid_record).
-          with(@record, @data_type, expected_errors)
-        @processor.process(@record.to_json)
+      context 'with valid record' do
+        it 'calls Handler#handle_valid_record' do
+          record = {
+            'sample_date' => '2014-06-01',
+            'source_url' => 'http://example.com/123',
+            'number' => 123
+          }
+          expect(@handler).to receive(:handle_valid_record).with(record, @data_type)
+          @processor.process(record.to_json)
+        end
       end
-    end
 
-    context 'with record missing all identifying fields' do
-      before do
-        @record = {
-          'sample_date' => '2014-06-01',
-          'source_url' => 'http://example.com/123'
-        }
+      context 'with record missing required field' do
+        before do
+          @record = {
+            'sample_date' => '2014-06-01',
+            'number' => 123
+          }
+        end
+
+        it 'calls Handler#handle_invalid_record' do
+          expected_errors = ['Missing required attribute: source_url']
+          expect(@handler).to receive(:handle_invalid_record).
+            with(@record, @data_type, expected_errors)
+          @processor.process(@record.to_json)
+        end
       end
 
-      it 'calls Handler#handle_invalid_record' do
-        expected_errors = ['There were no values provided for any of the identifying fields: number']
-        expect(@handler).to receive(:handle_invalid_record).
-          with(@record, @data_type, expected_errors)
-        @processor.process(@record.to_json)
+      context 'with record missing all identifying fields' do
+        before do
+          @record = {
+            'sample_date' => '2014-06-01',
+            'source_url' => 'http://example.com/123'
+          }
+        end
+
+        it 'calls Handler#handle_invalid_record' do
+          expected_errors = ['There were no values provided for any of the identifying fields: number']
+          expect(@handler).to receive(:handle_invalid_record).
+            with(@record, @data_type, expected_errors)
+          @processor.process(@record.to_json)
+        end
       end
-    end
 
-    context 'with invalid JSON' do
-      it 'calls Handler#handle_invalid_json' do
-        line = 'this is not JSON'
-        expect(@handler).to receive(:handle_invalid_json).with(line)
-        @processor.process(line)
+      context 'with invalid JSON' do
+        it 'calls Handler#handle_invalid_json' do
+          line = 'this is not JSON'
+          expect(@handler).to receive(:handle_invalid_json).with(line)
+          @processor.process(line)
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: turbot-runner
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-17 00:00:00.000000000 Z
+date: 2014-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema