deimos-ruby 1.15.1 → 1.16.0

data/spec/schemas/my_schema_with_complex_type.rb

@@ -31,7 +31,7 @@ module Schemas
       end
 
       # @override
-      def to_h
+      def as_json(_opts={})
         {
           'a_record_field' => @a_record_field
         }
@@ -43,21 +43,10 @@ module Schemas
       # @return ['sym1', 'sym2']
       attr_accessor :an_enum
 
-      # :nodoc:
-      def initialize(an_enum)
-        super
-        self.an_enum = an_enum
-      end
-
       # @override
       def symbols
         %w(sym1 sym2)
       end
-
-      # @override
-      def to_h
-        @an_enum
-      end
     end
 
     # Autogenerated Schema for Enum at com.my-namespace.AnotherEnum
@@ -77,7 +66,7 @@ module Schemas
       end
 
       # @override
-      def to_h
+      def as_json(_opts={})
         @another_enum
       end
     end
@@ -99,7 +88,7 @@ module Schemas
       end
 
       # @override
-      def to_h
+      def as_json(_opts={})
         @yet_another_enum
       end
     end
@@ -218,7 +207,7 @@ module Schemas
     end
 
     # @override
-    def to_h
+    def as_json(_opts={})
       {
         'test_id' => @test_id,
         'test_float' => @test_float,
@@ -226,13 +215,13 @@ module Schemas
         'test_int_array' => @test_int_array,
         'test_optional_int' => @test_optional_int,
         'some_integer_map' => @some_integer_map,
-        'some_record' => @some_record&.to_h,
-        'some_optional_record' => @some_optional_record&.to_h,
-        'some_record_array' => @some_record_array.map { |v| v&.to_h },
-        'some_record_map' => @some_record_map.transform_values { |v| v&.to_h },
-        'some_enum_array' => @some_enum_array.map { |v| v&.to_h },
-        'some_optional_enum' => @some_optional_enum&.to_h,
-        'some_enum_with_default' => @some_enum_with_default&.to_h
+        'some_record' => @some_record&.as_json,
+        'some_optional_record' => @some_optional_record&.as_json,
+        'some_record_array' => @some_record_array.map { |v| v&.as_json },
+        'some_record_map' => @some_record_map.transform_values { |v| v&.as_json },
+        'some_enum_array' => @some_enum_array.map { |v| v&.as_json },
+        'some_optional_enum' => @some_optional_enum&.as_json,
+        'some_enum_with_default' => @some_enum_with_default&.as_json
       }
     end
   end

data/spec/snapshots/consumers-no-nest.snap

@@ -28,7 +28,7 @@ module Schemas
     end
 
     # @override
-    def to_h
+    def as_json(_opts={})
       {
         'a_record_field' => @a_record_field
       }
@@ -48,21 +48,10 @@ module Schemas
     # @return ['sym1', 'sym2']
     attr_accessor :an_enum
 
-    # :nodoc:
-    def initialize(an_enum)
-      super
-      self.an_enum = an_enum
-    end
-
     # @override
     def symbols
       %w(sym1 sym2)
     end
-
-    # @override
-    def to_h
-      @an_enum
-    end
   end
 end
 
@@ -78,21 +67,10 @@ module Schemas
     # @return ['sym3', 'sym4']
     attr_accessor :another_enum
 
-    # :nodoc:
-    def initialize(another_enum)
-      super
-      self.another_enum = another_enum
-    end
-
     # @override
     def symbols
       %w(sym3 sym4)
     end
-
-    # @override
-    def to_h
-      @another_enum
-    end
   end
 end
 
@@ -127,7 +105,7 @@ module Schemas
     end
 
     # @override
-    def to_h
+    def as_json(_opts={})
       {
         'response_id' => @response_id
       }
@@ -223,7 +201,7 @@ module Schemas
     end
 
     # @override
-    def to_h
+    def as_json(_opts={})
       {
         'a_string' => @a_string,
         'a_int' => @a_int,
@@ -231,12 +209,12 @@ module Schemas
         'a_float' => @a_float,
         'a_double' => @a_double,
         'an_optional_int' => @an_optional_int,
-        'an_enum' => @an_enum&.to_h,
+        'an_enum' => @an_enum&.as_json,
         'an_array' => @an_array,
         'a_map' => @a_map,
         'timestamp' => @timestamp,
         'message_id' => @message_id,
-        'a_record' => @a_record&.to_h
+        'a_record' => @a_record&.as_json
       }
     end
   end
@@ -273,7 +251,7 @@ module Schemas
     end
 
     # @override
-    def to_h
+    def as_json(_opts={})
       {
         'response_id' => @response_id
       }
@@ -324,7 +302,7 @@ module Schemas
     end
 
     # @override
-    def to_h
+    def as_json(_opts={})
       {
         'some_int' => @some_int,
         'some_float' => @some_float,
@@ -395,13 +373,13 @@ module Schemas
     end
 
     # @override
-    def to_h
+    def as_json(_opts={})
       {
         'test_id' => @test_id,
         'test_float' => @test_float,
         'test_array' => @test_array,
-        'some_nested_record' => @some_nested_record&.to_h,
-        'some_optional_record' => @some_optional_record&.to_h
+        'some_nested_record' => @some_nested_record&.as_json,
+        'some_optional_record' => @some_optional_record&.as_json
       }
     end
   end
@@ -442,7 +420,7 @@ module Schemas
     end
 
     # @override
-    def to_h
+    def as_json(_opts={})
       {
         'test_id' => @test_id,
         'some_int' => @some_int
@@ -486,7 +464,7 @@ module Schemas
     end
 
     # @override
-    def to_h
+    def as_json(_opts={})
       {
         'part_one' => @part_one,
         'part_two' => @part_two
@@ -526,7 +504,7 @@ module Schemas
     end
 
     # @override
-    def to_h
+    def as_json(_opts={})
       {
         'id' => @id
       }
@@ -565,7 +543,7 @@ module Schemas
     end
 
     # @override
-    def to_h
+    def as_json(_opts={})
       {
         'test_id' => @test_id
       }
@@ -608,7 +586,7 @@ module Schemas
     end
 
     # @override
-    def to_h
+    def as_json(_opts={})
       {
         'test_id' => @test_id,
         'some_bool' => @some_bool
@@ -656,9 +634,9 @@ module Schemas
     end
 
     # @override
-    def to_h
+    def as_json(_opts={})
       {
-        'properties' => @properties.transform_values { |v| v&.to_h }
+        'properties' => @properties.transform_values { |v| v&.as_json }
       }
     end
   end
@@ -787,7 +765,7 @@ module Schemas
     end
 
     # @override
-    def to_h
+    def as_json(_opts={})
       {
         'test_id' => @test_id,
         'test_float' => @test_float,
@@ -795,13 +773,13 @@ module Schemas
         'test_int_array' => @test_int_array,
         'test_optional_int' => @test_optional_int,
         'some_integer_map' => @some_integer_map,
-        'some_record' => @some_record&.to_h,
-        'some_optional_record' => @some_optional_record&.to_h,
-        'some_record_array' => @some_record_array.map { |v| v&.to_h },
-        'some_record_map' => @some_record_map.transform_values { |v| v&.to_h },
-        'some_enum_array' => @some_enum_array.map { |v| v&.to_h },
-        'some_optional_enum' => @some_optional_enum&.to_h,
-        'some_enum_with_default' => @some_enum_with_default&.to_h
+        'some_record' => @some_record&.as_json,
+        'some_optional_record' => @some_optional_record&.as_json,
+        'some_record_array' => @some_record_array.map { |v| v&.as_json },
+        'some_record_map' => @some_record_map.transform_values { |v| v&.as_json },
+        'some_enum_array' => @some_enum_array.map { |v| v&.as_json },
+        'some_optional_enum' => @some_optional_enum&.as_json,
+        'some_enum_with_default' => @some_enum_with_default&.as_json
       }
     end
   end
@@ -854,7 +832,7 @@ module Schemas
     end
 
     # @override
-    def to_h
+    def as_json(_opts={})
       {
         'test_id' => @test_id,
         'updated_at' => @updated_at,
@@ -909,7 +887,7 @@ module Schemas
     end
 
     # @override
-    def to_h
+    def as_json(_opts={})
       {
         'test_id' => @test_id,
         'some_int' => @some_int,
@@ -967,7 +945,7 @@ module Schemas
     end
 
     # @override
-    def to_h
+    def as_json(_opts={})
       {
         'id' => @id,
         'test_id' => @test_id,
@@ -1010,7 +988,7 @@ module Schemas
     end
 
     # @override
-    def to_h
+    def as_json(_opts={})
       {
         'property' => @property
       }
@@ -1049,7 +1027,7 @@ module Schemas
     end
 
     # @override
-    def to_h
+    def as_json(_opts={})
       {
         'update_request_id' => @update_request_id
       }
@@ -1088,7 +1066,7 @@ module Schemas
     end
 
     # @override
-    def to_h
+    def as_json(_opts={})
       {
         'update_response_id' => @update_response_id
       }
@@ -1159,7 +1137,7 @@ module Schemas
     end
 
     # @override
-    def to_h
+    def as_json(_opts={})
       {
         'id' => @id,
         'wibble_id' => @wibble_id,
@@ -1222,7 +1200,7 @@ module Schemas
     end
 
     # @override
-    def to_h
+    def as_json(_opts={})
       {
         'id' => @id,
         'widget_id' => @widget_id,
@@ -1281,7 +1259,7 @@ module Schemas
     end
 
     # @override
-    def to_h
+    def as_json(_opts={})
       {
         'id' => @id,
         'widget_id' => @widget_id,
@@ -1305,21 +1283,10 @@ module Schemas
     # @return ['sym5', 'sym6']
     attr_accessor :yet_another_enum
 
-    # :nodoc:
-    def initialize(yet_another_enum)
-      super
-      self.yet_another_enum = yet_another_enum
-    end
-
     # @override
     def symbols
       %w(sym5 sym6)
     end
-
-    # @override
-    def to_h
-      @yet_another_enum
-    end
   end
 end
 

data/spec/snapshots/consumers.snap

@@ -28,7 +28,7 @@ module Schemas
     end
 
     # @override
-    def to_h
+    def as_json(_opts={})
       {
         'response_id' => @response_id
       }
@@ -71,7 +71,7 @@ module Schemas
       end
   
       # @override
-      def to_h
+      def as_json(_opts={})
         {
           'a_record_field' => @a_record_field
         }
@@ -83,21 +83,10 @@ module Schemas
       # @return ['sym1', 'sym2']
       attr_accessor :an_enum
   
-      # :nodoc:
-      def initialize(an_enum)
-        super
-        self.an_enum = an_enum
-      end
-  
       # @override
       def symbols
         %w(sym1 sym2)
       end
-  
-      # @override
-      def to_h
-        @an_enum
-      end
     end
 
 
@@ -179,7 +168,7 @@ module Schemas
     end
 
     # @override
-    def to_h
+    def as_json(_opts={})
       {
         'a_string' => @a_string,
         'a_int' => @a_int,
@@ -187,12 +176,12 @@ module Schemas
         'a_float' => @a_float,
         'a_double' => @a_double,
         'an_optional_int' => @an_optional_int,
-        'an_enum' => @an_enum&.to_h,
+        'an_enum' => @an_enum&.as_json,
         'an_array' => @an_array,
         'a_map' => @a_map,
         'timestamp' => @timestamp,
         'message_id' => @message_id,
-        'a_record' => @a_record&.to_h
+        'a_record' => @a_record&.as_json
       }
     end
   end
@@ -229,7 +218,7 @@ module Schemas
     end
 
     # @override
-    def to_h
+    def as_json(_opts={})
       {
         'response_id' => @response_id
       }
@@ -284,7 +273,7 @@ module Schemas
       end
   
       # @override
-      def to_h
+      def as_json(_opts={})
         {
           'some_int' => @some_int,
           'some_float' => @some_float,
@@ -345,13 +334,13 @@ module Schemas
     end
 
     # @override
-    def to_h
+    def as_json(_opts={})
       {
         'test_id' => @test_id,
         'test_float' => @test_float,
         'test_array' => @test_array,
-        'some_nested_record' => @some_nested_record&.to_h,
-        'some_optional_record' => @some_optional_record&.to_h
+        'some_nested_record' => @some_nested_record&.as_json,
+        'some_optional_record' => @some_optional_record&.as_json
       }
     end
   end
@@ -392,7 +381,7 @@ module Schemas
     end
 
     # @override
-    def to_h
+    def as_json(_opts={})
       {
         'test_id' => @test_id,
         'some_int' => @some_int
@@ -436,7 +425,7 @@ module Schemas
     end
 
     # @override
-    def to_h
+    def as_json(_opts={})
       {
         'part_one' => @part_one,
         'part_two' => @part_two
@@ -476,7 +465,7 @@ module Schemas
     end
 
     # @override
-    def to_h
+    def as_json(_opts={})
       {
         'id' => @id
       }
@@ -515,7 +504,7 @@ module Schemas
     end
 
     # @override
-    def to_h
+    def as_json(_opts={})
       {
         'test_id' => @test_id
       }
@@ -558,7 +547,7 @@ module Schemas
     end
 
     # @override
-    def to_h
+    def as_json(_opts={})
       {
         'test_id' => @test_id,
         'some_bool' => @some_bool
@@ -602,7 +591,7 @@ module Schemas
       end
   
       # @override
-      def to_h
+      def as_json(_opts={})
         {
           'property' => @property
         }
@@ -639,9 +628,9 @@ module Schemas
     end
 
     # @override
-    def to_h
+    def as_json(_opts={})
       {
-        'properties' => @properties.transform_values { |v| v&.to_h }
+        'properties' => @properties.transform_values { |v| v&.as_json }
       }
     end
   end
@@ -682,7 +671,7 @@ module Schemas
       end
   
       # @override
-      def to_h
+      def as_json(_opts={})
         {
           'a_record_field' => @a_record_field
         }
@@ -694,21 +683,10 @@ module Schemas
       # @return ['sym1', 'sym2']
       attr_accessor :an_enum
   
-      # :nodoc:
-      def initialize(an_enum)
-        super
-        self.an_enum = an_enum
-      end
-  
       # @override
       def symbols
         %w(sym1 sym2)
       end
-  
-      # @override
-      def to_h
-        @an_enum
-      end
     end
 
     # Autogenerated Schema for Enum at com.my-namespace.AnotherEnum
@@ -716,21 +694,10 @@ module Schemas
       # @return ['sym3', 'sym4']
       attr_accessor :another_enum
   
-      # :nodoc:
-      def initialize(another_enum)
-        super
-        self.another_enum = another_enum
-      end
-  
       # @override
       def symbols
         %w(sym3 sym4)
       end
-  
-      # @override
-      def to_h
-        @another_enum
-      end
     end
 
     # Autogenerated Schema for Enum at com.my-namespace.YetAnotherEnum
@@ -738,21 +705,10 @@ module Schemas
       # @return ['sym5', 'sym6']
       attr_accessor :yet_another_enum
   
-      # :nodoc:
-      def initialize(yet_another_enum)
-        super
-        self.yet_another_enum = yet_another_enum
-      end
-  
       # @override
       def symbols
         %w(sym5 sym6)
       end
-  
-      # @override
-      def to_h
-        @yet_another_enum
-      end
     end
 
 
@@ -869,7 +825,7 @@ module Schemas
     end
 
     # @override
-    def to_h
+    def as_json(_opts={})
       {
         'test_id' => @test_id,
         'test_float' => @test_float,
@@ -877,13 +833,13 @@ module Schemas
         'test_int_array' => @test_int_array,
         'test_optional_int' => @test_optional_int,
         'some_integer_map' => @some_integer_map,
-        'some_record' => @some_record&.to_h,
-        'some_optional_record' => @some_optional_record&.to_h,
-        'some_record_array' => @some_record_array.map { |v| v&.to_h },
-        'some_record_map' => @some_record_map.transform_values { |v| v&.to_h },
-        'some_enum_array' => @some_enum_array.map { |v| v&.to_h },
-        'some_optional_enum' => @some_optional_enum&.to_h,
-        'some_enum_with_default' => @some_enum_with_default&.to_h
+        'some_record' => @some_record&.as_json,
+        'some_optional_record' => @some_optional_record&.as_json,
+        'some_record_array' => @some_record_array.map { |v| v&.as_json },
+        'some_record_map' => @some_record_map.transform_values { |v| v&.as_json },
+        'some_enum_array' => @some_enum_array.map { |v| v&.as_json },
+        'some_optional_enum' => @some_optional_enum&.as_json,
+        'some_enum_with_default' => @some_enum_with_default&.as_json
       }
     end
   end
@@ -936,7 +892,7 @@ module Schemas
     end
 
     # @override
-    def to_h
+    def as_json(_opts={})
       {
         'test_id' => @test_id,
         'updated_at' => @updated_at,
@@ -991,7 +947,7 @@ module Schemas
     end
 
     # @override
-    def to_h
+    def as_json(_opts={})
       {
         'test_id' => @test_id,
         'some_int' => @some_int,
@@ -1049,7 +1005,7 @@ module Schemas
     end
 
     # @override
-    def to_h
+    def as_json(_opts={})
       {
         'id' => @id,
         'test_id' => @test_id,
@@ -1092,7 +1048,7 @@ module Schemas
     end
 
     # @override
-    def to_h
+    def as_json(_opts={})
       {
         'update_request_id' => @update_request_id
       }
@@ -1131,7 +1087,7 @@ module Schemas
     end
 
     # @override
-    def to_h
+    def as_json(_opts={})
       {
         'update_response_id' => @update_response_id
       }
@@ -1202,7 +1158,7 @@ module Schemas
     end
 
     # @override
-    def to_h
+    def as_json(_opts={})
       {
         'id' => @id,
         'wibble_id' => @wibble_id,
@@ -1265,7 +1221,7 @@ module Schemas
     end
 
     # @override
-    def to_h
+    def as_json(_opts={})
       {
         'id' => @id,
         'widget_id' => @widget_id,
@@ -1324,7 +1280,7 @@ module Schemas
     end
 
     # @override
-    def to_h
+    def as_json(_opts={})
       {
         'id' => @id,
         'widget_id' => @widget_id,