turbot-runner 0.1.43 → 0.1.44

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjQ3YzdmNDgwN2M1NmZlOWZjZjI0M2FkYjMyZDMxOTFhNWZhMTY1Mw==
+    ZjhmY2MyYTAzMTZiYmExNGY3NGVjZDJiMWU1OGYzZWM2ZjZlYmE4Ng==
   data.tar.gz: !binary |-
-    MTFjY2E2M2EzZjZlOTZjZGUxMTU4Mjg4MjdhNTdkZTlmZTNiNzExOA==
+    YmEzZDBhOGY3NmM4MDQ3MWU4NWUyYWVkMzU2MTZjZjJjYzE5OGVkMQ==
 SHA512:
   metadata.gz: !binary |-
-    MmI0ODkxZDhjMWZiZmFkYzViYTg3OTQ4ZjkyNWY3YTdkN2M0ODcwYzRkNTNh
-    MzgwMWJiM2Q3NTgxNzIxZTA3ZTJiYTMxNmU4ZjM1ZTFhN2ZmYjlmY2JlNTBi
-    MTdmZmVjM2NiNTdjODk4YmUxMzY5YWJlOGNhMjJhNjg1YjU2Yjg=
+    YzFmNjc0NjViNzEwOTgyN2RjZTgxMTcxYjBkZjllY2UyN2RjYjhlNTUwYzZj
+    MzcyZDA5YjkzMTY2NDlmM2ZlNDg2MDg0ZGFkMTc3MDlmNTVmZGVjMmE4Y2Iy
+    NTBkZGNiYjg3OGRlMzliMzYxYWRmOWRlYjJiYjQwMmQ2ZjYwYjc=
   data.tar.gz: !binary |-
-    ZmQ3OTU5ZjY4NmQ5NmJmZWFkZjUyZjAzYjcxMTY4NjEzZTU3YTIyZjg0MGQ2
-    Y2MyYzk1N2JkNzc0NzBjMzhiMTllMjE4Y2ZjZTIxZTU5MjNlZDE1ZDVmMDNm
-    ODNmYTdiNDM3MjE5MmMzNWMyYTZlMzJkZGJjNjBmOTZkOGVjYjM=
+    M2VhZjdmYTI2Y2U5YTVmZGFiMTdhZjExYWI4YjMxZmU4OTlkYzRlMGMxZjBh
+    NTNmMjQwNjU2ZGNkZTI4ZWUyNmI4NzA5YWFjNjY2MWQ0ZWQzM2M3ZjcyM2Rl
+    NmE1NDNmMDNjYzZlNGI2YjFlZTJjYjk3ZGE4YTk2OWZjZDNiOWM=

data/lib/turbot_runner/validator.rb

@@ -9,30 +9,40 @@ module TurbotRunner
       schema_path = TurbotRunner.schema_path(data_type)
       error = Openc::JsonSchema.validate(schema_path, record)
 
-      message = error.nil? ? nil : error[:message]
+      if error
+        return error[:message]
+      end
 
-      if message.nil?
-        identifying_hash = identifying_hash(record, identifying_fields)
-        identifying_attributes = identifying_hash.reject {|k, v| v.nil? || v == ''}
-        if identifying_attributes.empty?
-          message = "There were no values provided for any of the identifying fields: #{identifying_fields.join(', ')}"
-        end
+      identifying_hash = identifying_hash(record, identifying_fields)
+      if identifying_hash.nil?
+        return 'The value of an identifying field may not be a hash'
+      end
+
+      identifying_attributes = identifying_hash.reject {|k, v| v.nil? || v == ''}
+      if identifying_attributes.empty?
+        return "There were no values provided for any of the identifying fields: #{identifying_fields.join(', ')}"
       end
 
-      if message.nil? && !seen_uids.nil?
+      if !seen_uids.nil?
         record_uid = record_uid(identifying_hash)
         if seen_uids.include?(record_uid)
-          message = "Already seen record with these identifying fields: #{identifying_hash}"
+          return "Already seen record with these identifying fields: #{identifying_hash}"
         else
           seen_uids.add(record_uid)
         end
       end
 
-      message
+      return nil
     end
 
     def identifying_hash(record, identifying_fields)
-      TurbotRunner::Utils.flatten(record).slice(*identifying_fields)
+      flattened = TurbotRunner::Utils.flatten(record)
+      flattened.each do |k, v|
+        identifying_fields.each do |field|
+          return nil if k.start_with?("#{field}.")
+        end
+      end
+      flattened.slice(*identifying_fields)
     end
 
     def record_uid(identifying_hash)

data/lib/turbot_runner/version.rb

@@ -1,3 +1,3 @@
 module TurbotRunner
-  VERSION = '0.1.43'
+  VERSION = '0.1.44'
 end

data/spec/lib/validator_spec.rb

@@ -94,11 +94,34 @@ describe TurbotRunner::Validator do
       }
 
       seen_uids = Set.new
-      error = TurbotRunner::Validator.validate('primary-data', record, 'number', seen_uids)
+      error = TurbotRunner::Validator.validate('primary-data', record, ['number'], seen_uids)
       expect(error).to eq(nil)
 
-      error = TurbotRunner::Validator.validate('primary-data', record, 'number', seen_uids)
+      error = TurbotRunner::Validator.validate('primary-data', record, ['number'], seen_uids)
       expect(error).to eq('Already seen record with these identifying fields: {"number"=>123}')
     end
   end
+
+  describe '.identifying_hash' do
+    specify 'returns expected hash' do
+      record = {'aaa' => 'bbb', 'yyy' => 'zzz'}
+      expect(TurbotRunner::Validator.identifying_hash(record, ['aaa'])).to eq({'aaa' => 'bbb'})
+
+      record = {'aaa' => {'bbb' => 'ccc'}, 'yyy' => 'zzz'}
+      expect(TurbotRunner::Validator.identifying_hash(record, ['aaa.bbb'])).to eq({'aaa.bbb' => 'ccc'})
+    end
+
+    specify 'returns empty hash for records with no values for identifying fields' do
+      record = {'yyy' => 'zzz'}
+      expect(TurbotRunner::Validator.identifying_hash(record, ['aaa'])).to eq({})
+    end
+
+    specify 'returns nil for records where value of identifying field is a hash' do
+      record = {'aaa' => {'bbb' => 'ccc'}, 'yyy' => 'zzz'}
+      expect(TurbotRunner::Validator.identifying_hash(record, ['aaa'])).to be(nil)
+
+      record = {'aaa' => {'bbb' => {'ccc' => 'ddd'}}, 'yyy' => 'zzz'}
+      expect(TurbotRunner::Validator.identifying_hash(record, ['aaa.bbb'])).to be(nil)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: turbot-runner
 version: !ruby/object:Gem::Version
-  version: 0.1.43
+  version: 0.1.44
 platform: ruby
 authors:
 - OpenCorporates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-27 00:00:00.000000000 Z
+date: 2015-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport