bi-frost 0.2.3 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d92c6ad28d58300dc0d87fa0461b00cffd9319b2
-  data.tar.gz: 72998caea23e6a28bbd2f2f996ca305f284788d0
+  metadata.gz: 411dc7aed154c803362268cf06d0f14b26754adf
+  data.tar.gz: c5ce6bd8a38fc2040972ca3b3debf56d1aaf150f
 SHA512:
-  metadata.gz: 7dc98b221e3de6afa5e53478c9cc1915cdc50806dc08bf986a6a11d17651fad584f11f06985cf89092c9023bc1d56222b486de18d7ac313f77fecbe873b92c0c
-  data.tar.gz: 7408d17a8785c8e0d563de1c194fce19dd29b3b0357cb9c3dac2709b10f5efdda58db2152cfd99212ff27cd0d84aec7cc972c18959438046d8cc8554acd4d482
+  metadata.gz: 2adc9df5efee3768aad4704ae356fb32c4154146dcce4845928d02ec57ac52b171d97258c393f2f1eb7fa2b2d3ac500d7fb7ad2fabe6cb9916d399ef12674171
+  data.tar.gz: 43c9e7c276de096a0de5c392e462761e8147d915457f3c30b74fb55608440b4a462c689c02847c463698b692daa38662d4f33a1eab3a43502a6a412c9ca0aa6f

data/lib/bifrost/message.rb

@@ -7,12 +7,18 @@ module Bifrost
   class Message < Entity
     attr_reader :subject, :body, :status, :message_id
 
+    alias_method :resource_id, :message_id
+
     # A message must have a valid subject and body. The service
     # bus is initialised in the Entity class
     def initialize(body, subject = nil)
       @subject = subject || SecureRandom.base64
-      @body ||= body
-      @status ||= :undelivered
+      if body.is_a?(Azure::ServiceBus::BrokeredMessage)
+        merge(body)
+      else
+        @body ||= body
+        @status ||= :undelivered
+      end
       super()
     end
 
@@ -39,6 +45,18 @@ module Bifrost
 
     private
 
+    # Merges this message with the required properties of the raw Azure brokered message
+    # The sender might send a message other than JSON in which case we just send the raw data along
+    def merge(raw_message)
+      @status = :delivered
+      begin
+        @body = JSON.parse(raw_message.properties['message'])
+      rescue JSON::ParserError
+        @body = raw_message.properties['message']
+      end
+      @message_id = raw_message.correlation_id
+    end
+
     # Create the message and attempt to deliver It
     def send_message(topic, message)
       @bus.interface.send_topic_message(topic.name, message)

data/lib/bifrost/version.rb

@@ -5,11 +5,11 @@ module Bifrost
   MAJOR_VERSION = 0
 
   # The minor version of Bifrost, updated for new feature releases.
-  MINOR_VERSION = 2
+  MINOR_VERSION = 3
 
   # The patch version of Bifrost, updated only for bug fixes from the last
   # feature release.
-  PATCH_VERSION = 3
+  PATCH_VERSION = 1
 
   # The full version as a string.
   VERSION = "#{MAJOR_VERSION}.#{MINOR_VERSION}.#{PATCH_VERSION}".freeze

data/lib/bifrost/worker.rb

@@ -55,10 +55,11 @@ module Bifrost
 
     # Actual processing of the message
     def read_message
-      message = @bus.interface.receive_subscription_message(topic, subscriber, timeout: ENV['TIMEOUT'] || 10)
-      if message
-        callback.call(message.properties['message'])
-        @bus.interface.delete_subscription_message(message)
+      raw_message = @bus.interface.receive_subscription_message(topic, subscriber, timeout: ENV['TIMEOUT'] || 10)
+      if raw_message
+        message = Bifrost::Message.new(raw_message)
+        callback.call(message)
+        @bus.interface.delete_subscription_message(raw_message)
       end
     end
   end

data/spec/bifrost/message_spec.rb

@@ -7,6 +7,7 @@ describe Bifrost::Message do
   it { is_expected.to respond_to(:subject) }
   it { is_expected.to respond_to(:status) }
   it { is_expected.to respond_to(:message_id) }
+  it { is_expected.to respond_to(:resource_id) }
   it { is_expected.to respond_to(:body) }
   it { is_expected.to respond_to(:publish) }
   it { is_expected.to respond_to(:publish!) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bi-frost
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.1
 platform: ruby
 authors:
 - Shirren Premaratne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-14 00:00:00.000000000 Z
+date: 2016-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: azure
@@ -200,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Bifrost is a pub/sub wrapper library which uses the Azure message bus and