turbot-runner 0.0.10 → 0.0.11

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGNkNjczYTY5MjA4M2RjYTFhOGFhMWIxY2UxZjhiZDg0M2U2Mzg2YQ==
+    OTEyMjJkMGUzZDg1ODFkZmYzNDM1MzUwMDk0MmY2ZTJiYTQ5OGUyOQ==
   data.tar.gz: !binary |-
-    MmVkZmZlYTI3ZDhmNGI3MWRmMThkNGQwZWE2NWVhMDYxOGEyZmU4Nw==
+    ZTYwYWE1MmUwMjExNjA1ZGU4NzQ4Njg2YjU0NWQ3ODBlZTc0YTZkMw==
 SHA512:
   metadata.gz: !binary |-
-    NmFlYzdkOGQ4N2FmNWU3MTA1MGYwNDZmN2NlZTEwZDhiMWIyNThiOTkzYWYw
-    OTNiZDM0NzQ3ZDQ3ZjA5YmQwYjliODgyMzcyOWE4ZDE2OTViY2RlNjEzNGEz
-    NGZmMGJhNDM2NTA3NGU5NDFiZjIxMjhmNzUwOTY4ZmMxM2RjMmY=
+    ODM5Njk5YTc5YzMyZDFiMmFkZDEzNzczOTVhMjQ4NzUyZWFiYTI2ZDU4ZmU4
+    M2RjM2U0NTMwNzZjMWRiZjRkNjJlMmZmMTEyODM3MzI5NDM5NTQ2YjkzZGZh
+    MWI2NWVlZjQ1ZTRjNmNjMDkxZjBlOTA5N2ZiNmNkYWQyNjMyNzU=
   data.tar.gz: !binary |-
-    NzkxMTBiM2UwM2IyZjY2MWMyNGMxYjBlZWU4NDBlMTVlMTA1OGRjOTQxYmRh
-    MWM1Y2M5MmNlM2U4OTg1NWUzMzg3YTlkMTVlMjdhMmU5MmM4MTY2Mzk2Y2U1
-    MjRiNjk5NGY1MDk4MTE0OTdjZGU1ZWRkOTYwN2NlYTA2ZjQ2ZDc=
+    MTlkODMwMjVhNDkwZTgyZTdhMTVhNGYyOGNhNzk5OWIyZTFkNTgwNjZlYjVi
+    N2M4OWEyNTk0NGM0MTNhM2FmYjVkNDc1ZjY4ZWY2M2Q5ZWIzOWE2MmNkZmE2
+    OTg0YzVjNWUzOTE2YjRhZjU1MDA4MDRlNmI3ZmJkYmJkNzMzZTU=

data/lib/turbot_runner/version.rb

@@ -1,3 +1,3 @@
 module TurbotRunner
-  VERSION = '0.0.10'
+  VERSION = '0.0.11'
 end

data/lib/turbot_runner.rb

@@ -126,7 +126,7 @@ module TurbotRunner
     def validate(record, data_type)
       schema = get_schema(data_type)
       errors = JSON::Validator.fully_validate(schema, record, :errors_as_objects => true)
-      errors.map do |error|
+      messages = errors.map do |error|
         case error[:message]
         when /The property '#\/' did not contain a required property of '(\w+)'/
           "Missing required attribute: #{Regexp.last_match(1)}"
@@ -134,6 +134,25 @@ module TurbotRunner
           error[:message]
         end
       end
+
+      if messages.empty?
+        identifying_fields = identifying_fields_for_data_type(data_type)
+        if record.slice(*identifying_fields).empty?
+          messages << ["Missing attributes for identifying fields: #{identifying_fields}"]
+        end
+      end
+
+      messages
+    end
+
+    def identifying_fields_for_data_type(data_type)
+      if data_type == config['data_type']
+        @config['identifying_fields']
+      else
+        transformers = @config['transformers'].select {|transformer| transformer['data_type'] == data_type}
+        raise "Expected to find precisely 1 transformer matching #{data_type} in manifest.json" unless transformers.size == 1
+        transformers[0]['identifying_fields']
+      end
     end
 
     def get_schema(data_type)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: turbot-runner
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - OpenCorporates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-09 00:00:00.000000000 Z
+date: 2014-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema