avromatic 0.12.0 → 0.13.0.rc0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7486e17a66fe4b7450e882c2a20690101b29649b
-  data.tar.gz: 7ae8899bfd60939a3f2bda6c87eb09c5eaf4f188
+  metadata.gz: 6bb91ebe436010bcfd294833c9dcb9262d8e3a87
+  data.tar.gz: 526045c30e99b1a99cbcb1811245f68f80dab7ba
 SHA512:
-  metadata.gz: f8f43c783dfea0f33cd0f2b696a241e5756d5a74e552d6fe25f4372669d86b4c0977a808996b170d4d5b75e6ad25cb5887b9cc220aaa68bf64640e4857af18a3
-  data.tar.gz: 94a15788ff81fc4f065188d521813325b91c87e1f88a21bb536f786f32daf0dff3da3e5e290b28a65ea98e67f815f365fd3851134ec5165b5affca1e4dd0ac71
+  metadata.gz: 84cd59251cc8b0b28461532e9bc352680a5ecc6107f4debbc0de407e62fc889b7e245bc301c18230527e306520dea3cec0764f9e4145fc05ac32384df5ddc216
+  data.tar.gz: b81505c03ae2165854abcef2d31576cdb1f3cbcafaabcfa303999f3f9632dd1d4842632249c1ca1f43f80bae731ac1bb5b5b2f65e010974c6bfa8081cfdb42e5

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # avromatic changelog
 
+## v0.13.0
+- Add interfaces to deserialize as a hash of attributes instead of a model.
+
 ## v0.12.0
 - Clear the schema store, if it supports it, prior to code reloading in Rails
   applications. This allows schema changes to be picked up during code

data/lib/avromatic/model/message_decoder.rb

@@ -47,24 +47,42 @@ module Avromatic
           Avromatic.build_schema_registry
       end
 
-      # If two arguments are specified then the first is interpreted as the
-      # message key and the second is the message value. If there is only one
-      # arg then it is used as the message value.
       # @return [Avromatic model]
       def decode(*args)
-        message_key, message_value = args.size > 1 ? args : [nil, args.first]
-        value_schema_name = schema_name_for_data(message_value)
-        key_schema_name = schema_name_for_data(message_key) if message_key
-        deserialize([key_schema_name, value_schema_name], message_key, message_value)
+        with_decode_args(*args) do |model, message_key, message_value|
+          model.avro_message_decode(message_key, message_value)
+        end
+      end
+
+      # @return [Hash]
+      def decode_hash(*args)
+        with_decode_args(*args) do |model, message_key, message_value|
+          model.avro_message_attributes(message_key, message_value)
+        end
       end
 
       private
 
       attr_reader :schema_names_by_id, :model_map, :schema_registry
 
-      def deserialize(model_key, message_key, message_value)
+      def extract_key_and_value(*args)
+        args.size > 1 ? args.take(2) : [nil, args.first]
+      end
+
+      def model_key_for_message(message_key, message_value)
+        value_schema_name = schema_name_for_data(message_value)
+        key_schema_name = schema_name_for_data(message_key) if message_key
+        [key_schema_name, value_schema_name]
+      end
+
+      # If two arguments are specified then the first is interpreted as the
+      # message key and the second is the message value. If there is only one
+      # arg then it is used as the message value.
+      def with_decode_args(*args)
+        message_key, message_value = extract_key_and_value(*args)
+        model_key = model_key_for_message(message_key, message_value)
         raise UnexpectedKeyError.new(model_key) unless model_map.key?(model_key)
-        model_map[model_key].avro_message_decode(message_key, message_value)
+        yield(model_map[model_key], message_key, message_value)
       end
 
       def schema_name_for_data(data)

data/lib/avromatic/model/messaging_serialization.rb

@@ -38,13 +38,17 @@ module Avromatic
         # message key and the second is the message value. If there is only one
         # arg then it is used as the message value.
         def avro_message_decode(*args)
+          new(avro_message_attributes(*args))
+        end
+
+        def avro_message_attributes(*args)
           message_key, message_value = args.size > 1 ? args : [nil, args.first]
           key_attributes = message_key &&
             avro_messaging.decode(message_key, schema_name: key_avro_schema.fullname)
           value_attributes = avro_messaging
             .decode(message_value, schema_name: avro_schema.fullname)
 
-          new(value_attributes.merge!(key_attributes || {}))
+          value_attributes.merge!(key_attributes || {})
         end
       end
 

data/lib/avromatic/version.rb

@@ -1,3 +1,3 @@
 module Avromatic
-  VERSION = '0.12.0'.freeze
+  VERSION = '0.13.0.rc0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avromatic
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0.rc0
 platform: ruby
 authors:
 - Salsify Engineering
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-10 00:00:00.000000000 Z
+date: 2017-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avro
@@ -287,12 +287,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Generate Ruby models from Avro schemas