Code review fixes

Author: Daniel Orner

lib/deimos/active_record_consumer.rb

@@ -85,14 +85,14 @@ def record_attributes(payload)
     def _coerce_field(column, val)
       return nil if val.nil?
 
-      is_integer = begin
-                     val.is_a?(Integer) || (val.is_a?(String) && Integer(val))
-                   rescue StandardError
-                     false
-                   end
+      if column.type == :datetime
+        int_val = begin
+                    val.is_a?(Integer) ? val : (val.is_a?(String) && Integer(val))
+                  rescue StandardError
+                    nil
+                  end
 
-      if column.type == :datetime && is_integer
-        return Time.zone.strptime(val.to_s, '%s')
+        return Time.zone.at(int_val) if int_val
       end
 
       val

lib/deimos/message.rb

@@ -18,7 +18,7 @@ def initialize(payload, producer, topic: nil, key: nil, partition_key: nil)
 
     # Add message_id and timestamp default values if they are in the
     # schema and don't already have values.
-    # @param fields [Array<Name>] existing fields in the schema.
+    # @param fields [Array<String>] existing name fields in the schema.
     def add_fields(fields)
       return if @payload.except(:payload_key, :partition_key).blank?
 

lib/deimos/schema_backends/avro_base.rb

@@ -75,7 +75,7 @@ def _generate_key_schema(key_id)
           'type' => 'record',
           'name' => name,
           'namespace' => @namespace,
-          'doc' => "Key for #{@namespace}.#{@schema}",
+          'doc' => "Key for #{@namespace}.#{@schema} - autogenerated by Deimos",
           'fields' => [
             {
               'name' => key_id,
@@ -101,7 +101,7 @@ def _field_name_from_schema(value_schema)
       # @param schema [String]
       # @return [String]
       def _key_schema_name(schema)
-        "#{schema.gsub('-value', '')}_key"
+        "#{schema}_key"
       end
     end
   end

lib/deimos/schema_backends/avro_schema_coercer.rb

@@ -67,10 +67,10 @@ def _is_integer_string?(val)
       return false unless val.is_a?(String)
 
       begin
-          true if Integer(val)
+        true if Integer(val)
       rescue StandardError
         false
-        end
+      end
     end
 
     # @param val [String]
@@ -79,10 +79,10 @@ def _is_float_string?(val)
       return false unless val.is_a?(String)
 
       begin
-          true if Float(val)
+        true if Float(val)
       rescue StandardError
         false
-        end
+      end
     end
 
     # @param val [Object]

lib/deimos/schema_backends/base.rb

@@ -110,7 +110,7 @@ def coerce_field(_field, _value)
       end
 
       # Encode a message key. To be defined by subclass.
-      # @param key [String] the value to use as the key.
+      # @param key [String|Hash] the value to use as the key.
       # @param key_id [Symbol|String] the field name of the key.
       # @param topic [String]
       # @return [String]

lib/deimos/test_helpers.rb

@@ -44,22 +44,22 @@ def sent_messages
       end
     end
 
-    # :nodoc:
+    # @deprecated
     def stub_producers_and_consumers!
       warn('stub_producers_and_consumers! is no longer necessary and this method will be removed in 3.0')
     end
 
-    # :nodoc:
+    # @deprecated
     def stub_producer(_klass)
       warn('Stubbing producers is no longer necessary and this method will be removed in 3.0')
     end
 
-    # :nodoc:
+    # @deprecated
     def stub_consumer(_klass)
       warn('Stubbing consumers is no longer necessary and this method will be removed in 3.0')
     end
 
-    # :nodoc:
+    # @deprecated
     def stub_batch_consumer(_klass)
       warn('Stubbing batch consumers is no longer necessary and this method will be removed in 3.0')
     end

spec/active_record_consumer_spec.rb

@@ -119,5 +119,12 @@ def fetch_record(klass, payload, _key)
       expect(Widget.find_by_test_id('id2').some_int).to eq(4)
     end
 
+    it 'should coerce int values to datetimes' do
+      column = Widget.columns.find { |c| c.name == 'some_datetime_int' }
+      expect(MyConsumer.new.send(:_coerce_field, column, 1_579_046_400)).to eq('2020-01-14 19:00:00 -0500')
+      expect(MyConsumer.new.send(:_coerce_field, column, '1579046400')).to eq('2020-01-14 19:00:00 -0500')
+      expect(MyConsumer.new.send(:_coerce_field, column, 'some-other-val')).to eq('some-other-val')
+    end
+
   end
 end

spec/publish_backend_spec.rb renamed to spec/backends/base_spec.rb

@@ -53,7 +53,7 @@
     expect(backend.encode_key('test_id', 1, topic: 'topic')).to eq('itsme')
     expect(backend.schema_store.find('MySchema_key', 'com.my-namespace').to_avro).
       to eq(
-        'doc' => 'Key for com.my-namespace.MySchema',
+        'doc' => 'Key for com.my-namespace.MySchema - autogenerated by Deimos',
         'fields' => [
           { 'name' => 'test_id', 'type' => 'string' }
         ],