mimi-messaging 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efb706ab9b5c7aabdc045daae8c0bc853ec90ee0
-  data.tar.gz: f2fea72a66862098269be871477f8944eee32057
+  metadata.gz: 99d219b26de0275984ae4a58a8ad2e87558db4a3
+  data.tar.gz: 2eb4e88a3bedabc884dd57eff6d9afe8971cbf45
 SHA512:
-  metadata.gz: 19175272ba5d1668275ae9393c57aeec3da1910c8cb26c7680337639d8735824396655cf5fe0d8497a92a62984f901c5a9c0cbea46c4f60aa7dcf879bede40ff
-  data.tar.gz: 53f9d5d8f5d5b74e96f8be48016a0ae693ba42fecd2d58550bf1ee25ee84e8cdfd711f434bae10b38c50a9442eaa0591b2da6fcfdb56aab62b2c34fcf4a09594
+  metadata.gz: 30b69c9b1945d0a65a3541d469034c36aac02769e95a276ade278bd26f9a1872d6e58ffbc0bd84c0387bd666f1fd293dda364fec73ee5d15b7f5c11b11f68b5e
+  data.tar.gz: 871493f0e32e1d2aeb488e875558ad192c065e105a785707180e67a76953680bcd68264e904fb9bfe77151e2733b907a423ef4851fae7d2c2bb1c338a6f428c4

data/lib/mimi/messaging/msgpack/msgpack_ext.rb

@@ -0,0 +1,14 @@
+#
+# MessagePack extensions for common types
+#
+Mimi::Messaging::TypePacker.register(
+  Time,
+  from_bytes: -> (b) { Time.at(b.unpack('D').first).utc },
+  to_bytes: -> (v) { [v.utc.to_f].pack('D') }
+)
+
+Mimi::Messaging::TypePacker.register(
+  BigDecimal,
+  from_bytes: -> (b) { BigDecimal.new(b) },
+  to_bytes: -> (v) { v.to_s }
+)

data/lib/mimi/messaging/msgpack/type_packer.rb

@@ -0,0 +1,104 @@
+require 'msgpack'
+
+module Mimi
+  module Messaging
+    class TypePacker
+      APPLICATION_TYPE_EXT = 0x00
+
+      # Registers a new type packer for msgpack.
+      #
+      # @example
+      #   TypePacker.register(
+      #     Time,
+      #     from_bytes: -> (b) { Time.at(b.unpack('D').first) },
+      #     to_bytes: -> (v) { [v.to_f].pack('D') }
+      #   )
+      #
+      def self.register(type, opts = {})
+        raise ArgumentError, 'Invalid :from_bytes, proc expected' unless opts[:from_bytes].is_a?(Proc)
+        raise ArgumentError, 'Invalid :to_bytes, proc expected' unless opts[:to_bytes].is_a?(Proc)
+        type_name = type.to_s
+        params = opts.dup.merge(type: type, type_name: type_name)
+        type_packers[type] = params
+        type.send(:define_method, :to_msgpack_ext) { Mimi::Messaging::TypePacker.pack(self) }
+        MessagePack::DefaultFactory.register_type(
+          APPLICATION_TYPE_EXT,
+          type,
+          packer: :to_msgpack_ext
+        )
+
+        MessagePack::DefaultFactory.register_type(
+          APPLICATION_TYPE_EXT,
+          self,
+          unpacker: :unpack
+        )
+      end
+
+      # Returns a set of registered type packers
+      #
+      def self.type_packers
+        @type_packers ||= {}
+      end
+
+      # Pack a value using a type packer, registered for the value class
+      #
+      def self.pack(value)
+        type_packer = type_packers.values.find { |p| value.is_a?(p[:type]) }
+        raise "No packer registered for type #{value.class}" unless type_packer
+        bytes = type_packer[:to_bytes].call(value)
+        "#{type_packer[:type_name]}=#{bytes}"
+      end
+
+      # Unpack a value, using a registered type packer
+      #
+      def self.unpack(value)
+        type_name, _, bytes = value.partition('=') # splits "Type=bytes" into ['Type', '=', 'bytes']
+        type_packer = type_packers.values.find { |p| p[:type_name] == type_name }
+        raise "No unpacker registered for type #{type_name}" unless type_packer
+        type_packer[:from_bytes].call(bytes)
+      end
+
+      # def self.register_type_packer!
+      #   return if @type_packer_registered
+      #   # pk = MessagePack::Packer.new
+      #   # pk.register_type(APPLICATION_TYPE_EXT) { |v| TypePacker.pack(v) }
+      #   uk = MessagePack::Unpacker.new
+      #   uk.register_type(APPLICATION_TYPE_EXT) { |b| TypePacker.unpack(b) }
+      #   @type_packer_registered = true
+      # end
+    end # class TypePacker
+  end # module Messaging
+
+end # module Mimi
+
+
+
+# class A
+#   class B
+#     attr_reader :value
+#     def initialize(value)
+#       @value = value
+#     end
+#   end # class B
+# end # class A
+
+# TypePacker.register(
+#   Time,
+#   from_bytes: -> (b) { Time.at(b.unpack('D').first) },
+#   to_bytes: -> (v) { [v.to_f].pack('D') }
+# )
+
+# TypePacker.register(
+#   A::B,
+#   from_bytes: -> (b) { A::B.new(b.unpack('D').first) },
+#   to_bytes: -> (v) { [v.value.to_f].pack('D') }
+# )
+
+# TypePacker.register(
+#   DateTime,
+#   from_bytes: -> (b) { Time.at(b.unpack('D').first).to_datetime },
+#   to_bytes: -> (v) { [v.to_time.to_f].pack('D') }
+# )
+
+# m = "\x83\xA1a\xC7\r\x00Time=\x1D@\x95\xC7\x80\xCA\xD5A\xA1b\x02\xA1c\xC7\x11\x00DateTime=X@\x95\xC7\x80\xCA\xD5A"
+

data/lib/mimi/messaging/version.rb

@@ -1,5 +1,5 @@
 module Mimi
   module Messaging
-    VERSION = '0.1.2'.freeze
+    VERSION = '0.1.3'.freeze
   end
 end

data/lib/mimi/messaging.rb

@@ -107,8 +107,6 @@ module Mimi
 end # module Mimi
 
 require_relative 'messaging/version'
-require_relative 'messaging/packer'
-
 require_relative 'messaging/errors'
 require_relative 'messaging/connection'
 require_relative 'messaging/message'
@@ -119,3 +117,5 @@ require_relative 'messaging/model'
 require_relative 'messaging/model_provider'
 require_relative 'messaging/notification'
 require_relative 'messaging/listener'
+require_relative 'messaging/msgpack/type_packer'
+require_relative 'messaging/msgpack/msgpack_ext'

data/mimi-messaging.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'mimi-core', '~> 0.1'
+  spec.add_dependency 'mimi-logger', '~> 0.1'
   spec.add_dependency 'bunny', '~> 2.3'
   spec.add_dependency 'msgpack', '~> 0.7'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mimi-messaging
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Alex Kukushkin
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: mimi-logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: bunny
   requirement: !ruby/object:Gem::Requirement
@@ -132,8 +146,9 @@ files:
 - lib/mimi/messaging/message.rb
 - lib/mimi/messaging/model.rb
 - lib/mimi/messaging/model_provider.rb
+- lib/mimi/messaging/msgpack/msgpack_ext.rb
+- lib/mimi/messaging/msgpack/type_packer.rb
 - lib/mimi/messaging/notification.rb
-- lib/mimi/messaging/packer.rb
 - lib/mimi/messaging/provider.rb
 - lib/mimi/messaging/request.rb
 - lib/mimi/messaging/request_processor.rb

data/lib/mimi/messaging/packer.rb

@@ -1,92 +0,0 @@
-require 'msgpack'
-
-class TypePacker
-  APPLICATION_TYPE_EXT = 0x00
-
-  def self.register(type, opts = {})
-    raise ArgumentError, 'Invalid :from_bytes, proc expected' unless opts[:from_bytes].is_a?(Proc)
-    raise ArgumentError, 'Invalid :to_bytes, proc expected' unless opts[:to_bytes].is_a?(Proc)
-    type_name = type.to_s
-    params = opts.dup.merge(type: type, type_name: type_name)
-    type_packers[type] = params
-    type.send(:define_method, :to_msgpack_ext) { TypePacker.pack(self) }
-    MessagePack::DefaultFactory.register_type(
-      APPLICATION_TYPE_EXT,
-      type,
-      packer: :to_msgpack_ext,
-      # unpacker: :from_msgpack_ext
-    )
-
-    MessagePack::DefaultFactory.register_type(
-      APPLICATION_TYPE_EXT,
-      self,
-      unpacker: :unpack,
-      # unpacker: :from_msgpack_ext
-    )
-
-    # pk = MessagePack::Packer.new
-    # pk.register_type(APPLICATION_TYPE_EXT, type, :to_msgpack_ext) # { |v| TypePacker.pack(v) }
-
-    # register_type_packer!
-  end
-
-  def self.type_packers
-    @type_packers ||= {}
-  end
-
-  def self.pack(value)
-    type_packer = type_packers.values.find { |p| value.is_a?(p[:type]) }
-    raise "No packer registered for type #{value.class}" unless type_packer
-    bytes = type_packer[:to_bytes].call(value)
-    "#{type_packer[:type_name]}=#{bytes}"
-  end
-
-  def self.unpack(value)
-    vp = value.partition('=') # splits "Type=bytes" into ['Type', '=', 'bytes']
-    type_name = vp.first
-    bytes = vp.last
-    type_packer = type_packers.values.find { |p| p[:type_name] == type_name }
-    raise "No unpacker registered for type #{type_name}" unless type_packer
-    type_packer[:from_bytes].call(bytes)
-  end
-
-  def self.register_type_packer!
-    return if @type_packer_registered
-    # pk = MessagePack::Packer.new
-    # pk.register_type(APPLICATION_TYPE_EXT) { |v| TypePacker.pack(v) }
-    uk = MessagePack::Unpacker.new
-    uk.register_type(APPLICATION_TYPE_EXT) { |b| TypePacker.unpack(b) }
-    @type_packer_registered = true
-  end
-end # class TypePacker
-
-
-class A
-  class B
-    attr_reader :value
-    def initialize(value)
-      @value = value
-    end
-  end # class B
-end # class A
-
-TypePacker.register(
-  Time,
-  from_bytes: -> (b) { Time.at(b.unpack('D').first) },
-  to_bytes: -> (v) { [v.to_f].pack('D') }
-)
-
-TypePacker.register(
-  A::B,
-  from_bytes: -> (b) { A::B.new(b.unpack('D').first) },
-  to_bytes: -> (v) { [v.value.to_f].pack('D') }
-)
-
-# TypePacker.register(
-#   DateTime,
-#   from_bytes: -> (b) { Time.at(b.unpack('D').first).to_datetime },
-#   to_bytes: -> (v) { [v.to_time.to_f].pack('D') }
-# )
-
-# m = "\x83\xA1a\xC7\r\x00Time=\x1D@\x95\xC7\x80\xCA\xD5A\xA1b\x02\xA1c\xC7\x11\x00DateTime=X@\x95\xC7\x80\xCA\xD5A"
-