Merge pull request #18 from aaronjensen/properties-hash

Properties and local properties are separate hashes

lib/messaging.rb

@@ -7,7 +7,6 @@
 
 require 'messaging/message'
 require 'messaging/message/metadata'
-require 'messaging/message/metadata/property'
 require 'messaging/message/copy'
 require 'messaging/message/follow'
 require 'messaging/message/sequence_accessor'

lib/messaging/controls.rb

@@ -8,6 +8,7 @@
 require 'messaging/controls/id'
 require 'messaging/controls/stream_name'
 require 'messaging/controls/properties'
+require 'messaging/controls/local_properties'
 require 'messaging/controls/metadata'
 require 'messaging/controls/message_data'
 require 'messaging/controls/message'

lib/messaging/controls/local_properties.rb

@@ -0,0 +1,39 @@
+module Messaging
+  module Controls
+    module LocalProperties
+      def self.example
+        {
+          SomeLocalProperty.name => SomeLocalProperty.value
+        }
+      end
+
+      module SomeLocalProperty
+        def self.name
+          :some_local_property
+        end
+
+        def self.value
+          'some local property value'
+        end
+      end
+
+      module Random
+        def self.example
+          {
+            SomeLocalProperty.name => SomeLocalProperty.value
+          }
+        end
+
+        module SomeLocalProperty
+          def self.name
+            :some_local_property
+          end
+
+          def self.value
+            SecureRandom.hex
+          end
+        end
+      end
+    end
+  end
+end

lib/messaging/controls/metadata.rb

@@ -5,6 +5,7 @@ def self.example
         data = self.data
 
         data[:properties] = properties
+        data[:local_properties] = local_properties
 
         Messaging::Message::Metadata.build(data)
       end
@@ -65,6 +66,10 @@ def self.properties
         Properties.example
       end
 
+      def self.local_properties
+        LocalProperties.example
+      end
+
       def self.data
         {
           stream_name: stream_name,
@@ -79,7 +84,8 @@ def self.data
 
           reply_stream_name: reply_stream_name,
 
-          properties: Properties.data,
+          properties: Properties.example,
+          local_properties: LocalProperties.example,
 
           time: time,
 
@@ -115,6 +121,7 @@ def self.example
           data = self.data
 
           data[:properties] = properties
+          data[:local_properties] = local_properties
 
           Messaging::Message::Metadata.build(data)
         end
@@ -171,6 +178,10 @@ def self.properties
           Properties::Random.example
         end
 
+        def self.local_properties
+          LocalProperties::Random.example
+        end
+
         def self.data
           {
             stream_name: stream_name,
@@ -185,7 +196,8 @@ def self.data
 
             reply_stream_name: reply_stream_name,
 
-            properties: Properties::Random.data,
+            properties: Properties::Random.example,
+            local_properties: LocalProperties::Random.example,
 
             time: time,
 

lib/messaging/controls/properties.rb

@@ -2,113 +2,31 @@ module Messaging
   module Controls
     module Properties
       def self.example
-        [
-          SomeProperty.example,
-          SomeLocalProperty.example
-        ]
-      end
-
-      def self.data
-        [
-          SomeProperty.data,
-          SomeLocalProperty.data
-        ]
+        {
+          SomeProperty.name => SomeProperty.value
+        }
       end
 
       module SomeProperty
-        def self.example
-          Messaging::Message::Metadata::Property.new(name, value)
-        end
-
-        def self.data
-          {
-            name: name,
-            value: value
-          }
-        end
-
         def self.name
-          'some_property'
+          :some_property
         end
 
         def self.value
           'some property value'
         end
       end
 
-      module SomeLocalProperty
+      module Random
         def self.example
-          Messaging::Message::Metadata::Property.new(name, value, true)
-        end
-
-        def self.data
           {
-            name: name,
-            value: value,
-            local: true
+            SomeProperty.name => SomeProperty.value
           }
         end
 
-        def self.name
-          'some_local_property'
-        end
-
-        def self.value
-          'some local property value'
-        end
-      end
-
-      module Random
-        def self.example
-          [
-            SomeProperty.example,
-            SomeLocalProperty.example
-          ]
-        end
-
-        def self.data
-          [
-            SomeProperty.data,
-            SomeLocalProperty.data
-          ]
-        end
-
         module SomeProperty
-          def self.example
-            Messaging::Message::Metadata::Property.new(name, value)
-          end
-
-          def self.data
-            {
-              name: name,
-              value: value
-            }
-          end
-
-          def self.name
-            'some_property'
-          end
-
-          def self.value
-            SecureRandom.hex
-          end
-        end
-
-        module SomeLocalProperty
-          def self.example
-            Messaging::Message::Metadata::Property.new(name, value, true)
-          end
-
-          def self.data
-            {
-              name: name,
-              value: value,
-              local: true
-            }
-          end
-
           def self.name
-            'some_local_property'
+            :some_property
           end
 
           def self.value

lib/messaging/message/copy.rb

@@ -32,13 +32,12 @@ def copy(source, receiver=nil, copy: nil, include: nil, exclude: nil, metadata:
         end
 
         if metadata
-          metadata_include = source.metadata.class.attribute_names - [:properties]
+          metadata_include = source.metadata.class.attribute_names - [:properties, :local_properties]
 
           SetAttributes.(receiver.metadata, source.metadata, include: metadata_include)
 
-          source.metadata.properties.each do |property|
-            receiver.metadata.properties << property.dup
-          end
+          receiver.metadata.properties = source.metadata.properties.dup
+          receiver.metadata.local_properties = source.metadata.local_properties.dup
         end
 
         receiver

lib/messaging/message/metadata.rb

@@ -33,7 +33,8 @@ class Error < RuntimeError; end
 
       attribute :reply_stream_name, String
 
-      attribute :properties, Array, default: -> { Array.new }
+      attribute :properties, Hash, default: -> { Hash.new }
+      attribute :local_properties, Hash, default: -> { Hash.new }
 
       attribute :time, Time
 
@@ -60,12 +61,8 @@ def follow(preceding_metadata)
 
         self.reply_stream_name = preceding_metadata.reply_stream_name
 
-        preceding_metadata.properties.each do |property|
-          if property.local?
-            next
-          end
-
-          properties << property.dup
+        preceding_metadata.properties.each do |name, value|
+          properties[name] = value
         end
       end
 
@@ -136,49 +133,64 @@ def correlated?(stream_name)
       end
       alias :correlates? :correlated?
 
-      def set_property(name, value, local: nil)
-        if not name.is_a?(String)
-          raise Error, "Property name must be a string: #{name.inspect}"
+      def set_property(name, value)
+        if not name.is_a?(Symbol)
+          raise Error, "Property name must be a symbol: #{name.inspect}"
         end
 
-        local ||= false
+        properties[name] = value
 
-        delete_property(name)
+        value
+      end
+
+      def get_property(name)
+        if not name.is_a?(Symbol)
+          raise Error, "Property name must be a symbol: #{name.inspect}"
+        end
 
-        property = Property.new(name, value, local)
+        properties[name]
+      end
 
-        properties << property
+      def delete_property(name)
+        if not name.is_a?(Symbol)
+          raise Error, "Property name must be a symbol: #{name.inspect}"
+        end
 
-        property
+        properties.delete(name)
       end
 
-      def set_local_property(name, value)
-        set_property(name, value, local: true)
+      def clear_properties
+        properties.clear
       end
 
-      def get_property(name)
-        if not name.is_a?(String)
-          raise Error, "Property name must be a string: #{name.inspect}"
+      def set_local_property(name, value)
+        if not name.is_a?(Symbol)
+          raise Error, "Local property name must be a symbol: #{name.inspect}"
         end
 
-        property = properties.find { |property| property.name == name }
-        property&.value
+        local_properties[name] = value
+
+        value
       end
 
-      def delete_property(name)
-        if not name.is_a?(String)
-          raise Error, "Property name must be a string: #{name.inspect}"
+      def get_local_property(name)
+        if not name.is_a?(Symbol)
+          raise Error, "Local property name must be a symbol: #{name.inspect}"
         end
 
-        i = properties.index { |property| property.name == name }
+        local_properties[name]
+      end
 
-        return nil if i.nil?
+      def delete_local_property(name)
+        if not name.is_a?(Symbol)
+          raise Error, "Local property name must be a symbol: #{name.inspect}"
+        end
 
-        properties.delete_at(i).value
+        local_properties.delete(name)
       end
 
-      def clear_properties
-        properties.clear
+      def clear_local_properties
+        local_properties.clear
       end
 
       def self.source_attribute_names