turbot-runner 0.1.34 → 0.1.35

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzI3ZTllNDM1NTNhODEzMjI2ZjEyNTUwM2U5ZTU4OWFhYTBiMjEzOQ==
+    OTMzNzU2YTdjMjBkZTk0YTMwMjgwNWM5YjUxMDkyNTIwOTUyZDQxYQ==
   data.tar.gz: !binary |-
-    ZmQ0MTRjNGE4MjZjZDY2NmM3ZDAxZjk3YTA2MWM2NzUzZTJhZGIzMQ==
+    NmViMWIxZmRkM2QzM2MwZTk3Y2U0YjJkNDMwNTc4MzYyNWQ1YzkxNA==
 SHA512:
   metadata.gz: !binary |-
-    MDRlOWQyODAxMDE3YjU5Yjc3NTM2MTJhODA4NzczODMxYTRiYWY2NjZkOGRk
-    MjA2Mzk1Y2FlMWU5ODgzNzkzNmIwYWJmZTFlNGViNzFhNjcwMWI4ZmMyODkx
-    N2Y5ZTEyNmYzZDE3YmI5N2QyYmI1ZWYwZGRhMzRjZWI0N2YxZWM=
+    MTAzMzczMWY4YmE0MzRmMGQ5MzkzNjI3ZDU4MDI1ODc2MTNjNTA0MDE0NzI1
+    M2NkOGQ5OGU3ODBhZmYzYzI5OWUyYTcxMzgzZDdkNzIwZTQwMDU1YTdmMGQw
+    N2MyYjMwZjU2NmFiYWU0MTFlZDcyM2RkYjU2N2MyNjlmMWU3M2E=
   data.tar.gz: !binary |-
-    MTFmNmFhMTVhZjU3NDA2NjNlMzdiNzhlYTQ3ZjE4ZTg0ZmEyNzg2ZjI0YTY2
-    NjVhNDY4OGE1NjYwOTU4NDAyMTQ1ZDVhZjEzMWU2NDBlYmQwYjg2ZTkwNjky
-    Nzk4YzFiYTliNzk2YjgwMzBiZjI3NGQyNTMxMzY5NmQxMWI1NTA=
+    MGIyMzJhYmI5ZDdiNzAzYzY1OTMyOTFlNjZhYWI5MmViNzczOWVhYjY4OGQx
+    NmExOTY3NzkyNTg1MTg5NDFmNzUzNWNjNmFkZDM4NmFhY2ExZDJiMGEzM2Nl
+    MTdjMDViNjQxZDk4MjNkNTBiMmVhYjBhYTkxMGU5NDgyMjY4MjA=

data/lib/turbot_runner/processor.rb

@@ -17,7 +17,13 @@ module TurbotRunner
         else
           record = Openc::JsonSchema.convert_dates(schema_path, JSON.parse(line))
 
-          error_message = Validator.validate(@data_type, record, @identifying_fields)
+          record_to_validate = record.select {|k, v| k != 'retrieved_at'}
+
+          error_message = Validator.validate(
+            @data_type,
+            record_to_validate,
+            @identifying_fields
+          )
 
           if error_message.nil?
             begin

data/lib/turbot_runner/version.rb

@@ -1,3 +1,3 @@
 module TurbotRunner
-  VERSION = '0.1.34'
+  VERSION = '0.1.35'
 end

data/spec/lib/processor_spec.rb

@@ -111,20 +111,39 @@ describe TurbotRunner::Processor do
       end
 
       it 'converts date format' do
-          record = {
-            'sample_date' => '2014-06-01 12:34:56 +0000',
-            'source_url' => 'http://example.com/123',
-            'number' => 123
-          }
-
-          converted_record = {
-            'sample_date' => '2014-06-01',
-            'source_url' => 'http://example.com/123',
-            'number' => 123
-          }
+        record = {
+          'sample_date' => '2014-06-01 12:34:56 +0000',
+          'source_url' => 'http://example.com/123',
+          'number' => 123
+        }
+
+        converted_record = {
+          'sample_date' => '2014-06-01',
+          'source_url' => 'http://example.com/123',
+          'number' => 123
+        }
+
+        expect(@handler).to receive(:handle_valid_record).with(converted_record, @data_type)
+        @processor.process(record.to_json)
+      end
 
-          expect(@handler).to receive(:handle_valid_record).with(converted_record, @data_type)
-          @processor.process(record.to_json)
+      it 'does not pass retrieved_at to validator' do
+        record = {
+          'sample_date' => '2014-06-01',
+          'retrieved_at' => '2014-06-01 12:34:56 +0000',
+          'source_url' => 'http://example.com/123',
+          'number' => 123
+        }
+
+        expected_record_to_validate = {
+          'sample_date' => '2014-06-01',
+          'source_url' => 'http://example.com/123',
+          'number' => 123
+        }
+
+        expect(TurbotRunner::Validator).to receive(:validate).
+          with('primary data', expected_record_to_validate, ['number'])
+        @processor.process(record.to_json)
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: turbot-runner
 version: !ruby/object:Gem::Version
-  version: 0.1.34
+  version: 0.1.35
 platform: ruby
 authors:
 - OpenCorporates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: openc-json_schema