deimos-ruby 1.13.2 → 1.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f51b89a9bf8a619db4c9294092b5e7b4f78c075c35f4aa2bc39c547da99ec67c
-  data.tar.gz: e4da7d718fff36bb28ca249a788fbf78ad5f980e9fa32983ecf019cd53cd40b8
+  metadata.gz: 59719a901339d9ebf5806a71e960fc68a7e75a1a217e6003215a42db04edb261
+  data.tar.gz: f9e8f274825a78298779061cf279b563d7ec40948e34ceff4458a51f51dea6b2
 SHA512:
-  metadata.gz: 7ac325f814c79a29985cba298ef0cde7daa4b0c561ce155eee22dab15470b2c1a933f5baa0181fd9375500062fa89fc846dcb01504d10466645275fa3644ec53
-  data.tar.gz: 021dd749b7040b136f84fcc7142a207847a982e2ab889439486af4b5dc4267ed4eed25f4d71c9a6496c51d8e84f3bedc6220e3dbd1f0a0133bca8c8cc1fe24e5
+  metadata.gz: 62489d41c135b8141b45cf2a3b71717fc41bed0a22b26cfadd5ad22635d1f3a4ca770f7321cf5205159dd0a1f879ea6a9628623b3c5c3d9205a533d179ba7b52
+  data.tar.gz: 689f66152efe31e6b65c0eea5db5471c2a927708ca2bdcad9a859b32b85ecf1f789efefbee71059d9351c2b7a332b90be093330fd3e5be375d3c0a92b44c7837

data/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## UNRELEASED
 
+- Some cleanup on the active_record generator
+- Fix crash with `test_consume_message` when using schema classes
+- Add `[]=` and `merge` methods on the base schema class
+
 # 1.13.2 - 2022-04-07
 
 - Fix an issue with generating schema classes for schemas containing an enum with default value 

data/lib/deimos/schema_class/base.rb

@@ -29,6 +29,23 @@ module Deimos
         raise NotImplementedError
       end
 
+      # @param key [String|Symbol]
+      # @param val [Object]
+      def []=(key, val)
+        self.send("#{key}=", val)
+      end
+
+      # Merge a hash or an identical schema object with this one and return a new object.
+      # @param other_hash [Hash|SchemaClasses::Base]
+      # @return [SchemaClasses::Base]
+      def merge(other_hash)
+        obj = self.class.new(**self.to_h.symbolize_keys)
+        other_hash.to_h.each do |k, v|
+          obj.send("#{k}=", v)
+        end
+        obj
+      end
+
       # :nodoc:
       def ==(other)
         comparison = other

data/lib/deimos/test_helpers.rb

@@ -188,7 +188,7 @@ module Deimos
                              &block)
       raise 'Cannot have both call_original and be given a block!' if call_original && block_given?
 
-      payload&.stringify_keys!
+      payload.stringify_keys! if payload.respond_to?(:stringify_keys!)
       handler_class = if handler_class_or_topic.is_a?(String)
                         _get_handler_class_from_topic(handler_class_or_topic)
                       else

data/lib/deimos/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Deimos
-  VERSION = '1.13.2'
+  VERSION = '1.13.3'
 end

data/lib/generators/deimos/active_record/templates/migration.rb.tt

@@ -6,7 +6,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration<%= migration_version
     end
     create_table :<%= table_name %> do |t|
       <%- fields.each do |key| -%>
-      <%- next if %w(id message_id timestamp).include?(key.name) -%>
+      <%- next if %w(id message_id timestamp updated_at created_at).include?(key.name) -%>
       <%- sql_type = schema_base.sql_type(key)
          if %w(record array map).include?(sql_type)
            conn = ActiveRecord::Base.connection
@@ -15,9 +15,11 @@ class <%= migration_class_name %> < ActiveRecord::Migration<%= migration_version
       -%>
       t.<%= sql_type %> :<%= key.name %>
       <%- end -%>
-    end
 
-    # TODO add indexes as necessary
+      t.timestamps
+
+      # TODO add indexes as necessary
+    end
   end
 
   def down

data/lib/generators/deimos/active_record_generator.rb

@@ -72,7 +72,7 @@ module Deimos
       # :nodoc:
       def generate
         migration_template('migration.rb', "db/migrate/create_#{table_name.underscore}.rb")
-        template('model.rb', "app/models/#{table_name.underscore}.rb")
+        template('model.rb', "app/models/#{table_name.underscore.singularize}.rb")
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deimos-ruby
 version: !ruby/object:Gem::Version
-  version: 1.13.2
+  version: 1.13.3
 platform: ruby
 authors:
 - Daniel Orner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-07 00:00:00.000000000 Z
+date: 2022-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avro_turf