philotic 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9801556e2c18c1147b0de999eeef96c1b3b00cf4
-  data.tar.gz: d43caf8f1c8aa98e67aec1b0ed11edee9aea22e2
+  metadata.gz: 839559e1f390f9d5630b32dc07f3ed01c36156c5
+  data.tar.gz: 3e096414cf3ae1a59b30eeb9620a3832858dd44f
 SHA512:
-  metadata.gz: 3acc57d92689ff4dd1de133e968c26d7321391aab11ff532a1cd3d997f483302ae7920f387cbb7dd351a10516ccee67c596375e485d3188f5feccdf4bf8ae0e0
-  data.tar.gz: 2101fd35dceb87a98ef72e9327bec7497d271428bda282f8c7e58fc61dc2644362f5ebf293f847dd4b649bf58f7f340d94b2f2672bb45af6d5f85642c7e0680c
+  metadata.gz: fc124cc549906ae789b422d0fc65b6eb2575e0e349b420da051db9f6e387d534fa3450d36429871d41f6e88512e00e9563404b933f01dbc3818fd1688edeccc0
+  data.tar.gz: 69108c3e0b3d30839f61ffdd2c8bf6bf32ef8878e6781605b73eba9c0fc359dd990d3caca074ad7a59400bb8af52b54e502075d1f51361d68af6300445a476e3

data/lib/philotic/message.rb

@@ -3,6 +3,7 @@ require 'philotic/singleton'
 
 module Philotic
   class Message
+    NotInstantiableError = Class.new(RuntimeError)
 
     attr_accessor :connection, :publish_error, :delivery_info
     attr_writer :published
@@ -28,6 +29,7 @@ module Philotic
     end
 
     def initialize(routables={}, payloads={}, connection=nil)
+      raise NotInstantiableError if self.class == Philotic::Message
       self.timestamp         = Time.now.to_i
       self.philotic_firehose = true
       self.connection        = connection
@@ -71,7 +73,8 @@ module Philotic
     end
 
     def self.publish(*args)
-      self.new(*args).publish
+      message_class = self == Philotic::Message ? Class.new(self) : self
+      message_class.new(*args).publish
     end
 
     def delivery_tag
@@ -101,6 +104,10 @@ module Philotic
 
     private
 
+    def _is_anonymous_message?
+      self.is_a?(Philotic::Message) && self.class.name.nil?
+    end
+
     def _payload_or_headers(payload_or_headers)
       attribute_hash = {}
       self.class.send("attr_#{payload_or_headers}_accessors").each do |attr|
@@ -114,7 +121,7 @@ module Philotic
       attrs.each do |key, value|
         if self.respond_to?(:"#{key}=")
           send(:"#{key}=", value)
-        elsif self.class == Philotic::Message
+        elsif _is_anonymous_message?
           _set_message_attribute(type, key, value)
         end
       end

data/lib/philotic/version.rb

@@ -1,3 +1,3 @@
 module Philotic
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

data/spec/philotic/message_spec.rb

@@ -11,6 +11,11 @@ class TestEvent < TestEventParent
 end
 
 describe Philotic::Message do
+
+  it 'is not instantiable' do
+    expect { Philotic::Message.new }.to raise_error(Philotic::Message::NotInstantiableError)
+  end
+
   let(:message) { TestEvent.new }
   subject { message }
 
@@ -39,15 +44,6 @@ describe Philotic::Message do
     expect(subject.metadata.keys).to eq([:timestamp])
   end
 
-  context 'overriding a value with metadata=' do
-    before do
-      subject.metadata = {mandatory: false}
-    end
-    it 'should work' do
-      expect(subject.metadata).to include({mandatory: false})
-    end
-  end
-
   Philotic::Message.methods.sort.each do |method_name|
     specify { expect(subject.class.methods).to include method_name.to_sym }
   end
@@ -63,6 +59,16 @@ describe Philotic::Message do
   end
 
   describe 'metadata' do
+
+    context 'overriding a value with metadata=' do
+      before do
+        subject.metadata = {mandatory: false}
+      end
+      it 'should work' do
+        expect(subject.metadata).to include({mandatory: false})
+      end
+    end
+
     it 'should have a timestamp' do
       Timecop.freeze
       expect(subject.metadata).to eq(timestamp: Time.now.to_i)
@@ -80,7 +86,7 @@ describe Philotic::Message do
     end
   end
 
-  context 'generic message' do
+  describe 'generic messages' do
     let(:headers) do
       {
         header1: 'h1',
@@ -96,23 +102,105 @@ describe Philotic::Message do
         payload3: 'h3',
       }
     end
-    it 'builds an message with dynamic headers and payloads' do
-      message = Philotic::Message.new(headers, payloads)
 
-      expect(message.headers).to include(headers)
-      expect(message.payload).to eq payloads
+    describe 'publishing messages' do
+      let(:message_1_headers) { {message_1_header_1: 1, message_1_header_2: 2} }
+      let(:message_1_payload) { {message_1_payload_1: 1, message_1_payload_2: 2} }
+
+      let(:message_2_headers) { {message_2_header_1: 1, message_2_header_2: 2} }
+      let(:message_2_payload) { {message_2_payload_1: 1, message_2_payload_2: 2} }
+
+      it 'builds the proper routable accessors' do
+        expect(Philotic.connection).to receive(:publish) do |message|
+          expect(message.class.attr_routable_accessors).to include(*message_1_headers.keys)
+        end
+        Philotic::Message.publish message_1_headers, message_1_payload
+      end
+
+      it 'builds the proper payload accessors' do
+        expect(Philotic.connection).to receive(:publish) do |message|
+          expect(message.class.attr_payload_accessors).to include(*message_1_payload.keys)
+        end
+        Philotic::Message.publish message_1_headers, message_1_payload
+      end
+
+      it 'builds the proper headers' do
+        expect(Philotic.connection).to receive(:publish) do |message|
+          expect(message.headers).to include(message_1_headers)
+        end
+        Philotic::Message.publish message_1_headers, message_1_payload
+      end
+
+      it 'builds the proper payload' do
+        expect(Philotic.connection).to receive(:publish) do |message|
+          expect(message.payload).to include(message_1_payload)
+        end
+        Philotic::Message.publish message_1_headers, message_1_payload
+      end
+
+      describe 'in succession' do
+        it 'builds the proper routable accessors on succesive calls' do
+          allow(Philotic.connection).to receive(:publish)
+          Philotic::Message.publish message_1_headers, message_1_payload
+
+          expect(Philotic.connection).to receive(:publish) do |message|
+            expect(message.class.attr_routable_accessors).not_to include(*message_1_headers.keys)
+            expect(message.class.attr_routable_accessors).to include(*message_2_headers.keys)
+          end
+
+          Philotic::Message.publish message_2_headers, message_2_payload
+
+        end
+
+        it 'builds the proper payload accessors on succesive calls' do
+          allow(Philotic.connection).to receive(:publish)
+          Philotic::Message.publish message_1_headers, message_1_payload
+
+          expect(Philotic.connection).to receive(:publish) do |message|
+            expect(message.class.attr_payload_accessors).not_to include(*message_1_payload.keys)
+            expect(message.class.attr_payload_accessors).to include(*message_2_payload.keys)
+          end
+
+          Philotic::Message.publish message_2_headers, message_2_payload
+
+        end
 
+        it 'builds the proper headers on succesive calls' do
+          allow(Philotic.connection).to receive(:publish)
+          Philotic::Message.publish message_1_headers, message_1_payload
+
+          expect(Philotic.connection).to receive(:publish) do |message|
+            expect(message.headers).not_to include(message_1_headers)
+            expect(message.headers).to include(message_2_headers)
+          end
+
+          Philotic::Message.publish message_2_headers, message_2_payload
+
+        end
+
+        it 'builds the proper payload on succesive calls' do
+          allow(Philotic.connection).to receive(:publish)
+          Philotic::Message.publish message_1_headers, message_1_payload
+
+          expect(Philotic.connection).to receive(:publish) do |message|
+            expect(message.payload).not_to include(message_1_payload)
+            expect(message.payload).to include(message_2_payload)
+          end
+
+          Philotic::Message.publish message_2_headers, message_2_payload
+
+        end
+      end
     end
   end
 
   describe '#publish' do
-    subject { Philotic::Message.new }
+    subject { Class.new(Philotic::Message).new }
     specify do
       expect(subject.connection).to receive(:publish).with(subject)
 
       subject.publish
     end
-
   end
 
   describe '.publish' do

data/spec/philotic/subscriber_spec.rb

@@ -92,7 +92,7 @@ describe Philotic::Subscriber do
     let(:channel) { double }
     let(:delivery_tag) { double }
     let(:delivery_info) { double }
-    let(:message) { Philotic::Message.new }
+    let(:message) { Class.new(Philotic::Message).new }
     subject { Philotic::Connection.new.subscriber }
 
     specify do
@@ -108,7 +108,7 @@ describe Philotic::Subscriber do
     let(:channel) { double }
     let(:delivery_tag) { double }
     let(:delivery_info) { double }
-    let(:message) { Philotic::Message.new }
+    let(:message) { Class.new(Philotic::Message).new }
     subject { Philotic::Connection.new.subscriber }
 
     specify do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: philotic
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Nathan Keyes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-06 00:00:00.000000000 Z
+date: 2015-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
@@ -252,7 +252,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Lightweight, opinionated wrapper for using RabbitMQ headers exchanges