cony 1.3.0 → 1.4.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cony (1.3.0)
+    cony (1.4.0)
       activesupport (>= 3)
       bunny (~> 1.1.7)
 

data/README.md

@@ -98,7 +98,9 @@ The sent JSON structure will look like this:
 ```json
 {
   "id": 1337,
-  "changes": [],
+  "changes": [
+    { "name": { "old": "value", "new": null } }
+  ],
   "event": "destroyed",
   "model": "Example::Model",
 }

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.4.0

data/lib/cony/active_record.rb

@@ -9,48 +9,46 @@ module Cony
     extend ActiveSupport::Concern
 
     included do
-      after_create :cony_send_create_notify
-      after_update :cony_send_update_notify
-      after_destroy :cony_send_destroy_notify
+      after_create :cony_save_create_notify_data
+      after_update :cony_save_update_notify_data
+      after_destroy :cony_save_destroy_notify_data
+      after_commit :cony_publish
     end
 
-    def cony_send_create_notify
-      publish(:created, cony_changes_created)
+    def cony_save_create_notify_data
+      cony_prepare_notify :created, cony_changes_created
     end
 
-    def cony_send_update_notify
-      publish(:updated, cony_changes_updated)
+    def cony_save_update_notify_data
+      cony_prepare_notify :updated, cony_changes_updated
     end
 
-    def cony_send_destroy_notify
-      publish(:destroyed, cony_changes_destroyed)
+    def cony_save_destroy_notify_data
+      cony_prepare_notify :destroyed, cony_changes_destroyed
     end
 
-
-    private
-    def publish(type, cony_changes)
+    def cony_publish
       return if Cony.config.test_mode
-      amqp_connection.publish(
-        {id: self.id, changes: cony_changes, model: self.class.name, event: type},
-        "#{self.class.name.underscore}.mutation.#{type}")
+      cony_amqp_connection.publish(cony_notify_hash, cony_notify_routing_key)
     end
 
-    def amqp_connection
-      @amqp_connection ||= Cony::AMQPConnectionHandler.new(Cony.config.amqp)
+    private
+    def cony_amqp_connection
+      @cony_amqp_connection ||= Cony::AMQPConnectionHandler.new(Cony.config.amqp)
     end
 
-    def mapped_changes
+    def cony_mapped_changes
       changes.map do |name, change|
         {name => {old: change.first, new: change.last}}
       end
     end
 
     def cony_changes_created
-      mapped_changes
+      cony_mapped_changes
     end
 
     def cony_changes_updated
-      mapped_changes
+      cony_mapped_changes
     end
 
     def cony_changes_destroyed
@@ -58,5 +56,17 @@ module Cony
         {name => {old: value, new: nil}}
       end
     end
+    
+    def cony_notify_hash
+      {id: self.id, changes: @cony_notify[:changes], model: self.class.name, event: @cony_notify[:event]}
+    end
+    
+    def cony_notify_routing_key
+      "#{self.class.name.underscore}.mutation.#{@cony_notify[:event]}"
+    end
+    
+    def cony_prepare_notify(event, changes)
+      @cony_notify = { event: event, changes: changes }
+    end
   end
 end

data/spec/cony/active_record_spec.rb

@@ -24,6 +24,7 @@ describe Cony::ActiveRecord do
         def self.after_create(callback); end
         def self.after_update(callback); end
         def self.after_destroy(callback); end
+        def self.after_commit(callback); end
         def self.name; "Anonymaus::Klass"; end
         def id; #{id}; end
         def changes; #{active_record_changes}; end
@@ -44,7 +45,8 @@ describe Cony::ActiveRecord do
     let(:event) { :created }
     it 'uses the amqp connection to send the notify' do
       amqp_connection.should_receive(:publish).with(expected_payload, 'anonymaus/klass.mutation.created')
-      subject.cony_send_create_notify
+      subject.cony_save_create_notify_data
+      subject.cony_publish
     end
   end
 
@@ -52,7 +54,8 @@ describe Cony::ActiveRecord do
     let(:event) { :updated }
     it 'uses the amqp connection to send the notify' do
       amqp_connection.should_receive(:publish).with(expected_payload, 'anonymaus/klass.mutation.updated')
-      subject.cony_send_update_notify
+      subject.cony_save_update_notify_data
+      subject.cony_publish
     end
   end
 
@@ -61,7 +64,8 @@ describe Cony::ActiveRecord do
     let(:cony_changes) { [{name: {old: 'value', new: nil}}] }
     it 'uses the amqp connection to send the notify' do
       amqp_connection.should_receive(:publish).with(expected_payload, 'anonymaus/klass.mutation.destroyed')
-      subject.cony_send_destroy_notify
+      subject.cony_save_destroy_notify_data
+      subject.cony_publish
     end
   end
 
@@ -71,7 +75,8 @@ describe Cony::ActiveRecord do
     end
     it 'does not send the message' do
       expect(Cony::AMQPConnectionHandler).to_not receive(:new)
-      subject.cony_send_create_notify
+      subject.cony_save_create_notify_data
+      subject.cony_publish
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cony
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-22 00:00:00.000000000 Z
+date: 2014-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -120,7 +120,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -395064848044904818
+      hash: 1642476899976507358
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -395064848044904818
+      hash: 1642476899976507358
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23