maestrano-connector-rails 0.2.12 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ede31586bf582ced3d9a9024968edc3ac1d1732
-  data.tar.gz: da7c491c555373c153650012442613b9edb8f6fb
+  metadata.gz: d892d2db085d00a255178b5c4f7ed07ef4c1c354
+  data.tar.gz: 80b21802042d7b4549e4c580bf6ad3ba990ae297
 SHA512:
-  metadata.gz: 00e346e7cc00061e7c3c5377f51afb23f78fc59904cdad730016e9b3b11d8c72eb9d40e0e7929fc4a5d81103d09a98b253894a1e714ed8467213b5ca1798aa63
-  data.tar.gz: 9078bb564275af62c3646b496e771c78777824f8d60b23c35b9ffc990a18ff9be881e7057fea0a1220890623352432ee61aea1cf4bfba70dfa166e14231cce7c
+  metadata.gz: 7e733367307412202e3a6f539fa8a03e62977b63d2e586d78bde6ac40c15d4db337aae60c6128759bc576518bb7276738df749ba9e50fd6d7d960514c63e46ce
+  data.tar.gz: c12a9abe28df122927cb134d01d9f3f0e9ade056b79b8b9a97e59bfe5041f118cba7e67c23faba951e59647471fa78dc142028863fb2f4eebac36b1fda3d52b1

data/VERSION

@@ -1 +1 @@
-0.2.12
+0.2.13

data/app/controllers/maestrano/connec_controller.rb

@@ -16,14 +16,12 @@ class Maestrano::ConnecController < Maestrano::Rails::WebHookController
 
                 # Build expected input for consolidate_and_map_data
                 if entity_instance_hash[:is_complex]
-                  entity = Hash[ *entity_instance.connec_entities_names.collect{|name| name == entity_name.singularize ? [name, [entity]] : [ name, []]}.flatten(1) ]
-                  entity_instance.consolidate_and_map_data(entity, Hash[ *entity_instance.external_entities_names.collect{|name| [ name, []]}.flatten(1) ], organization, {})
+                  mapped_entity = entity_instance.consolidate_and_map_data(Hash[ *entity_instance.connec_entities_names.collect{|name| name == entity_name.singularize ? [name, [entity]] : [ name, []]}.flatten(1) ], Hash[ *entity_instance.external_entities_names.collect{|name| [ name, []]}.flatten(1) ], organization, {})
                 else
-                  entity = [entity]
-                  entity_instance.consolidate_and_map_data(entity, [], organization, {})
+                  mapped_entity = entity_instance.consolidate_and_map_data([entity], [], organization, {})
                 end
 
-                entity_instance.push_entities_to_external(external_client, entity, organization)
+                entity_instance.push_entities_to_external(external_client, mapped_entity[:connec_entities], organization)
               end
 
             else
@@ -48,9 +46,9 @@ class Maestrano::ConnecController < Maestrano::Rails::WebHookController
       Maestrano::Connector::Rails::Entity.entities_list.each do |entity_name_from_list|
         instance = "Entities::#{entity_name_from_list.singularize.titleize.split.join}".constantize.new
         if instance.methods.include?('connec_entities_names'.to_sym)
-          return {instance: instance, is_complex: true, name: entity_name_from_list} if instance.connec_entities_names.include?(entity_name.singularize)
+          return {instance: instance, is_complex: true, name: entity_name_from_list} if instance.connec_entities_names.include?(entity_name.singularize.downcase)
         elsif instance.methods.include?('connec_entity_name'.to_sym)
-          return {instance: instance, is_complex: false, name: entity_name_from_list} if instance.connec_entity_name == entity_name.singularize
+          return {instance: instance, is_complex: false, name: entity_name_from_list} if instance.connec_entity_name == entity_name.singularize.downcase
         end
       end
       nil

data/app/jobs/maestrano/connector/rails/push_to_connec_job.rb

@@ -14,13 +14,12 @@ module Maestrano::Connector::Rails
           next unless organization.synchronized_entities[entity_instance_hash[:name].to_sym]
 
           if entity_instance_hash[:is_complex]
-            entities = Hash[ *entity_instance.external_entities_names.collect{|name| name == external_entity_name.singularize ? [name, entities] : [ name, []]}.flatten(1) ]
-            entity_instance.consolidate_and_map_data(Hash[ *entity_instance.connec_entities_names.collect{|name| [ name, []]}.flatten(1) ], entities, organization, {})
+            mapped_entities = entity_instance.consolidate_and_map_data(Hash[ *entity_instance.connec_entities_names.collect{|name| [ name, []]}.flatten(1) ], Hash[ *entity_instance.external_entities_names.collect{|name| name == external_entity_name.singularize ? [name, entities] : [ name, []]}.flatten(1) ], organization, {})
           else
-            entity_instance.consolidate_and_map_data([], entities, organization, {})
+            mapped_entities = entity_instance.consolidate_and_map_data([], entities, organization, {})
           end
 
-          entity_instance.push_entities_to_connec(connec_client, entities, organization)
+          entity_instance.push_entities_to_connec(connec_client, mapped_entities[:external_entities], organization)
         else
           Rails.logger.warn "Called push to connec job with unknow entity: #{external_entity_name}"
         end
@@ -32,9 +31,9 @@ module Maestrano::Connector::Rails
         Maestrano::Connector::Rails::Entity.entities_list.each do |entity_name_from_list|
           instance = "Entities::#{entity_name_from_list.singularize.titleize.split.join}".constantize.new
           if instance.methods.include?('external_entities_names'.to_sym)
-            return {instance: instance, is_complex: true, name: entity_name_from_list} if instance.external_entities_names.include?(entity_name.singularize)
+            return {instance: instance, is_complex: true, name: entity_name_from_list} if instance.external_entities_names.include?(entity_name.singularize.downcase)
           elsif instance.methods.include?('external_entity_name'.to_sym)
-            return {instance: instance, is_complex: false, name: entity_name_from_list} if instance.external_entity_name == entity_name.singularize
+            return {instance: instance, is_complex: false, name: entity_name_from_list} if instance.external_entity_name == entity_name.singularize.downcase
           end
         end
         nil

data/app/jobs/maestrano/connector/rails/synchronization_job.rb

@@ -46,14 +46,14 @@ module Maestrano::Connector::Rails
       end
     end
 
-    def sync_entity(entity, organization, connec_client, external_client, last_synchronization, opts)
-      entity_instance = "Entities::#{entity.titleize.split.join}".constantize.new
+    def sync_entity(entity_name, organization, connec_client, external_client, last_synchronization, opts)
+      entity_instance = "Entities::#{entity_name.titleize.split.join}".constantize.new
 
       external_entities = entity_instance.get_external_entities(external_client, last_synchronization, organization, opts)
       connec_entities = entity_instance.get_connec_entities(connec_client, last_synchronization, organization, opts)
-      entity_instance.consolidate_and_map_data(connec_entities, external_entities, organization, opts)
-      entity_instance.push_entities_to_external(external_client, connec_entities, organization)
-      entity_instance.push_entities_to_connec(connec_client, external_entities, organization)
+      mapped_entities = entity_instance.consolidate_and_map_data(connec_entities, external_entities, organization, opts)
+      entity_instance.push_entities_to_external(external_client, mapped_entities[:connec_entities], organization)
+      entity_instance.push_entities_to_connec(connec_client, mapped_entities[:external_entities], organization)
     end
   end
 end

data/app/models/maestrano/connector/rails/complex_entity.rb

@@ -28,7 +28,7 @@ module Maestrano::Connector::Rails
     #               external_entities_names[1]: [unmapped_connec_entitiy4]
     #             }
     #          }
-    def connec_model_to_external_model!(connec_hash_of_entities)
+    def connec_model_to_external_model(connec_hash_of_entities)
       raise "Not implemented"
     end
 
@@ -45,7 +45,7 @@ module Maestrano::Connector::Rails
     #               connec_entities_names[0]: [unmapped_external_entity3, unmapped_external_entity4]
     #             }
     #           }
-    def external_model_to_connec_model!(external_hash_of_entities)
+    def external_model_to_connec_model(external_hash_of_entities)
       raise "Not implemented"
     end
 
@@ -87,10 +87,10 @@ module Maestrano::Connector::Rails
     end
 
     def consolidate_and_map_data(connec_entities, external_entities, organization, opts)
-      external_model_to_connec_model!(external_entities)
-      connec_model_to_external_model!(connec_entities)
+      modeled_external_entities = external_model_to_connec_model(external_entities)
+      modeled_connec_entities = connec_model_to_external_model(connec_entities)
 
-      external_entities.each do |external_entity_name, entities_in_connec_model|
+      modeled_external_entities.each do |external_entity_name, entities_in_connec_model|
         entities_in_connec_model.each do |connec_entity_name, entities|
           sub_entity_instance = "Entities::SubEntities::#{external_entity_name.titleize.split.join}".constantize.new
 
@@ -134,7 +134,7 @@ module Maestrano::Connector::Rails
         end
       end
 
-      connec_entities.each do |connec_entity_name, entities_in_external_model|
+      modeled_connec_entities.each do |connec_entity_name, entities_in_external_model|
         entities_in_external_model.each do |external_entity_name, entities|
           sub_entity_instance = "Entities::SubEntities::#{connec_entity_name.titleize.split.join}".constantize.new
           entities.map!{|entity|
@@ -142,6 +142,8 @@ module Maestrano::Connector::Rails
           }.compact!
         end
       end
+
+      return {connec_entities: modeled_connec_entities, external_entities: modeled_external_entities}
     end
 
     # input : {

data/app/models/maestrano/connector/rails/concerns/entity.rb

@@ -183,10 +183,10 @@ module Maestrano::Connector::Rails::Concerns::Entity
   # * Discards entities that do not need to be pushed because they have not been updated since their last push
   # * Discards entities from one of the two source in case of conflict
   # * Maps not discarded entities and associates them with their idmap, or create one if there isn't any
+  # * Return a hash {connec_entities: [], external_entities: []}
   def consolidate_and_map_data(connec_entities, external_entities, organization, opts={})
-    external_entities.map!{|entity|
+    mapped_external_entities = external_entities.map{|entity|
       idmap = Maestrano::Connector::Rails::IdMap.find_by(external_id: self.get_id_from_external_entity_hash(entity), external_entity: self.external_entity_name.downcase, organization_id: organization.id)
-
       # No idmap: creating one, nothing else to do
       unless idmap
         next {entity: self.map_to_connec(entity, organization), idmap: Maestrano::Connector::Rails::IdMap.create(external_id: self.get_id_from_external_entity_hash(entity), external_entity: self.external_entity_name.downcase, organization_id: organization.id, name: self.object_name_from_external_entity_hash(entity))}
@@ -222,11 +222,15 @@ module Maestrano::Connector::Rails::Concerns::Entity
       else
         {entity: self.map_to_connec(entity, organization), idmap: idmap}
       end
-    }.compact!
+    }
+    mapped_external_entities.compact!
 
-    connec_entities.map!{|entity|
+    mapped_connec_entities = connec_entities.map{|entity|
       self.map_to_external_with_idmap(entity, organization)
-    }.compact!
+    }
+    mapped_connec_entities.compact!
+
+    return {connec_entities: mapped_connec_entities, external_entities: mapped_external_entities}
   end
 
 

data/lib/generators/connector/templates/complex_entity_example/contact_and_lead.rb

@@ -23,17 +23,18 @@
 #   #               external_entities_names[1]: [unmapped_connec_entitiy4]
 #   #             }
 #   #          }
-#   def connec_model_to_external_model!(connec_hash_of_entities)
+#   def connec_model_to_external_model(connec_hash_of_entities)
 #     people = connec_hash_of_entities['person']
-#     connec_hash_of_entities['person'] = { 'lead' => [], 'contact' => [] }
+#     modeled_connec_entities = {'person' => { 'lead' => [], 'contact' => [] }}
 
 #     people.each do |person|
 #       if person['is_lead']
-#         connec_hash_of_entities['person']['lead'] << person
+#         modeled_connec_entities['person']['lead'] << person
 #       else
-#         connec_hash_of_entities['person']['contact'] << person
+#         modeled_connec_entities['person']['contact'] << person
 #       end
 #     end
+#     return modeled_connec_entities
 #   end
 
 #   # input :  {
@@ -49,8 +50,7 @@
 #   #               connec_entity_names[0]: [unmapped_external_entity3, unmapped_external_entity4]
 #   #             }
 #   #           }
-#   def external_model_to_connec_model!(external_hash_of_entities)
-#     external_hash_of_entities['lead'] = { 'person' => external_hash_of_entities['lead'] }
-#     external_hash_of_entities['contact'] = { 'person' => external_hash_of_entities['contact'] }
+#   def external_model_to_connec_model(external_hash_of_entities)
+#     return {'lead' => {'person' => external_hash_of_entities['lead']}, 'contact' => {'person' => external_hash_of_entities['contact']}}
 #   end
 # end

data/maestrano-connector-rails.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: maestrano-connector-rails 0.2.12 ruby lib
+# stub: maestrano-connector-rails 0.2.13 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "maestrano-connector-rails"
-  s.version = "0.2.12"
+  s.version = "0.2.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

data/spec/controllers/connec_controller_spec.rb

@@ -70,7 +70,7 @@ describe Maestrano::ConnecController, type: :controller do
           let!(:organization) { create(:organization, uid: group_id, oauth_uid: 'lala', sync_enabled: true, synchronized_entities: {contact_and_lead: true}) }
 
           it 'process the data and push them' do
-            expect_any_instance_of(Entities::ContactAndLead).to receive(:consolidate_and_map_data).with({"lead"=>[entity]}, {}, organization, {})
+            expect_any_instance_of(Entities::ContactAndLead).to receive(:consolidate_and_map_data).with({"lead"=>[entity]}, {}, organization, {}).and_return({})
             expect_any_instance_of(Entities::ContactAndLead).to receive(:push_entities_to_external)
             subject
           end
@@ -135,7 +135,7 @@ describe Maestrano::ConnecController, type: :controller do
             let!(:organization) { create(:organization, uid: group_id, oauth_uid: 'lala', sync_enabled: true, synchronized_entities: {person: true}) }
 
             it 'process the data and push them' do
-              expect_any_instance_of(Entities::Person).to receive(:consolidate_and_map_data).with([entity], [], organization, {})
+              expect_any_instance_of(Entities::Person).to receive(:consolidate_and_map_data).with([entity], [], organization, {}).and_return({})
               expect_any_instance_of(Entities::Person).to receive(:push_entities_to_external)
               subject
             end

data/spec/jobs/push_to_connec_job_spec.rb

@@ -14,7 +14,7 @@ describe Maestrano::Connector::Rails::PushToConnecJob do
     allow_any_instance_of(Entities::Entity1).to receive(:external_entity_name).and_return('ext_entity1')
     class Entities::Entity2 < Maestrano::Connector::Rails::ComplexEntity
     end
-    allow_any_instance_of(Entities::Entity2).to receive(:consolidate_and_map_data)
+    allow_any_instance_of(Entities::Entity2).to receive(:consolidate_and_map_data).and_return({})
     allow_any_instance_of(Entities::Entity2).to receive(:push_entities_to_connec)
     allow_any_instance_of(Entities::Entity2).to receive(:connec_entities_names).and_return(%w())
     allow_any_instance_of(Entities::Entity2).to receive(:external_entities_names).and_return(%w(sub ll))
@@ -81,7 +81,7 @@ describe Maestrano::Connector::Rails::PushToConnecJob do
         before { organization.update(synchronized_entities: {:"#{entity_name1}" => true, :"#{entity_name2}" => false})}
 
         it 'calls consolidate_and_map_data on the non complex entity with the right arguments' do
-          expect_any_instance_of(Entities::Entity1).to receive(:consolidate_and_map_data).with([], [entity11, entity12], organization, {})
+          expect_any_instance_of(Entities::Entity1).to receive(:consolidate_and_map_data).with([], [entity11, entity12], organization, {}).and_return({})
           expect_any_instance_of(Entities::Entity1).to receive(:push_entities_to_connec)
           subject
         end

data/spec/jobs/syncrhonization_job_spec.rb

@@ -49,7 +49,6 @@ describe Maestrano::Connector::Rails::SynchronizationJob do
     end
   end
 
-  # def sync_entity(entity, organization, connec_client, external_client, last_synchronization, opts)
   describe 'sync_entity' do
     before {
       class Entities::Person < Maestrano::Connector::Rails::Entity
@@ -61,7 +60,7 @@ describe Maestrano::Connector::Rails::SynchronizationJob do
     it 'calls the five methods' do
       expect_any_instance_of(Entities::Person).to receive(:get_connec_entities)
       expect_any_instance_of(Entities::Person).to receive(:get_external_entities)
-      expect_any_instance_of(Entities::Person).to receive(:consolidate_and_map_data)
+      expect_any_instance_of(Entities::Person).to receive(:consolidate_and_map_data).and_return({})
       expect_any_instance_of(Entities::Person).to receive(:push_entities_to_external)
       expect_any_instance_of(Entities::Person).to receive(:push_entities_to_connec)
       subject.sync_entity('person', organization, nil, nil, nil, {})

data/spec/models/complex_entity_spec.rb

@@ -10,11 +10,11 @@ describe Maestrano::Connector::Rails::ComplexEntity do
     describe 'external_entities_names' do
       it { expect{ subject.external_entities_names }.to raise_error('Not implemented') }
     end
-    describe 'connec_model_to_external_model!' do
-      it { expect{ subject.connec_model_to_external_model!({}) }.to raise_error('Not implemented') }
+    describe 'connec_model_to_external_model' do
+      it { expect{ subject.connec_model_to_external_model({}) }.to raise_error('Not implemented') }
     end
-    describe 'external_model_to_connec_model!' do
-      it { expect{ subject.external_model_to_connec_model!({}) }.to raise_error('Not implemented') }
+    describe 'external_model_to_connec_model' do
+      it { expect{ subject.external_model_to_connec_model({}) }.to raise_error('Not implemented') }
     end
   end
 
@@ -128,20 +128,20 @@ describe Maestrano::Connector::Rails::ComplexEntity do
       let(:opt) { {opt: true} }
       let(:organization) { create(:organization) }
 
-      it 'calls external_model_to_connec_model!' do
-        allow(subject).to receive(:connec_model_to_external_model!)
-        expect(subject).to receive(:external_model_to_connec_model!).with({a: {}})
+      it 'calls external_model_to_connec_model' do
+        allow(subject).to receive(:connec_model_to_external_model).and_return({})
+        expect(subject).to receive(:external_model_to_connec_model).with({a: {}}).and_return({})
         subject.consolidate_and_map_data({}, {a: {}}, organization, opt)
       end
 
       it 'calls connec_model_to_external_model' do
-        allow(subject).to receive(:external_model_to_connec_model!)
-        expect(subject).to receive(:connec_model_to_external_model!).with({a: {}})
+        allow(subject).to receive(:external_model_to_connec_model).and_return({})
+        expect(subject).to receive(:connec_model_to_external_model).with({a: {}}).and_return({})
         subject.consolidate_and_map_data({a: {}}, {}, organization, opt)
       end
 
       describe 'connec_entities treatment' do
-        #hash as it should be after connec_model_to_external_model!
+        #hash as it should be after connec_model_to_external_model
         let(:connec_hash) {
           {
             'sc_e1' => {'ext1' => [{'name' => 'John'}, {'name' => 'Jane'}]},
@@ -149,18 +149,18 @@ describe Maestrano::Connector::Rails::ComplexEntity do
           }
         }
         before{
-          allow(subject).to receive(:external_model_to_connec_model!)
-          allow(subject).to receive(:connec_model_to_external_model!)
+          allow(subject).to receive(:external_model_to_connec_model).and_return({})
+          allow(subject).to receive(:connec_model_to_external_model).and_return(connec_hash)
         }
 
         it 'calls map_to_external_with_idmap on each entity' do
           expect(subject).to receive(:map_to_external_with_idmap).exactly(4).times
-          subject.consolidate_and_map_data(connec_hash, {}, organization, opt)
+          subject.consolidate_and_map_data({}, {}, organization, opt)
         end
       end
 
       describe 'external_entities treatment' do
-        #hash as it should be after external_model_to_connec_model!
+        #hash as it should be after external_model_to_connec_model
         let(:id1) { '5678ttd3' }
         let(:id2) { '5678taa3' }
         let(:entity1) { {'id' => id1, 'name' => 'Robert'} }
@@ -173,9 +173,10 @@ describe Maestrano::Connector::Rails::ComplexEntity do
             'ScE2' => {'connec1' => [entity1], 'connec2' => [entity2]}
           }
         }
+        let(:connec_hash) { {} }
         before{
-          allow(subject).to receive(:external_model_to_connec_model!)
-          allow(subject).to receive(:connec_model_to_external_model!)
+          allow(subject).to receive(:external_model_to_connec_model).and_return(external_hash)
+          allow(subject).to receive(:connec_model_to_external_model).and_return(connec_hash)
           allow_any_instance_of(Entities::SubEntities::ScE1).to receive(:get_id_from_external_entity_hash).with(entity1).and_return(id1)
           allow_any_instance_of(Entities::SubEntities::ScE1).to receive(:get_last_update_date_from_external_entity_hash).and_return(1.minute.ago)
           allow_any_instance_of(Entities::SubEntities::ScE1).to receive(:map_to).with('connec1', entity1, organization).and_return(mapped_entity1)
@@ -195,19 +196,20 @@ describe Maestrano::Connector::Rails::ComplexEntity do
 
           it 'creates an idmap for each entity' do
             expect{
-              subject.consolidate_and_map_data({}, external_hash, organization, opt)
+              subject.consolidate_and_map_data({}, {}, organization, opt)
             }.to change{ Maestrano::Connector::Rails::IdMap.count }.by(3)
           end
 
           it 'returns the entity with their new idmaps' do
-            subject.consolidate_and_map_data({}, external_hash, organization, opt)
-            expect(external_hash).to eql(            {
+            mapped_entities = subject.consolidate_and_map_data({}, external_hash, organization, opt)
+            expect(mapped_entities).to eql(external_entities: {
               'sc_e1' => {'connec1' => [{entity: mapped_entity1, idmap: Maestrano::Connector::Rails::IdMap.first}]},
               'ScE2' => {
                 'connec1' => [{entity: mapped_entity1, idmap: Maestrano::Connector::Rails::IdMap.all[1]}],
                 'connec2' => [{entity: mapped_entity2, idmap: Maestrano::Connector::Rails::IdMap.last}],
               }
-            })
+            },
+            connec_entities: {})
           end
         end
 
@@ -217,14 +219,15 @@ describe Maestrano::Connector::Rails::ComplexEntity do
           let!(:idmap22) { create(:idmap, organization: organization, external_id: id2, external_entity: 'sce2', connec_entity: 'connec2', last_push_to_connec: 1.second.ago) }
 
           it 'discards the entities' do
-            subject.consolidate_and_map_data({}, external_hash, organization, opt)
-            expect(external_hash).to eql(            {
+            mapped_entities = subject.consolidate_and_map_data({}, external_hash, organization, opt)
+            expect(mapped_entities).to eql(external_entities: {
               'sc_e1' => {'connec1' => []},
               'ScE2' => {
                 'connec1' => [],
                 'connec2' => [],
               }
-            })
+            },
+            connec_entities: {})
           end
         end
 
@@ -261,9 +264,9 @@ describe Maestrano::Connector::Rails::ComplexEntity do
                 let(:opt) { {connec_preemption: true} }
 
                 it 'keeps the connec entities' do
-                  subject.consolidate_and_map_data(connec_hash, external_hash, organization, opt)
-                  expect(connec_hash).to eq({'connec1' => {'sc_e1' => [{entity: {'name' => 'Jacob'}, idmap: idmap1}]}, 'connec2' => {'sc_e1' => [], 'ScE2' => []}})
-                  expect(external_hash).to eql({
+                  mapped_entities = subject.consolidate_and_map_data(connec_hash, external_hash, organization, opt)
+                  expect(mapped_entities[:connec_entities]).to eq({'connec1' => {'sc_e1' => [{entity: {'name' => 'Jacob'}, idmap: idmap1}]}, 'connec2' => {'sc_e1' => [], 'ScE2' => []}})
+                  expect(mapped_entities[:external_entities]).to eql({
                     'sc_e1' => {'connec1' => []},
                     'ScE2' => {
                       'connec1' => [{entity: mapped_entity1, idmap: idmap21}],
@@ -272,13 +275,14 @@ describe Maestrano::Connector::Rails::ComplexEntity do
                   })
                 end
               end
+
               context 'set to false' do
                 let(:opt) { {connec_preemption: false} }
 
                 it 'keeps the external entities' do
-                  subject.consolidate_and_map_data(connec_hash, external_hash, organization, opt)
-                  expect(connec_hash).to eq({'connec1' => {'sc_e1' => []}, 'connec2' => {'sc_e1' => [], 'ScE2' => []}})
-                  expect(external_hash).to eql({
+                  mapped_entities = subject.consolidate_and_map_data(connec_hash, external_hash, organization, opt)
+                  expect(mapped_entities[:connec_entities]).to eq({'connec1' => {'sc_e1' => []}, 'connec2' => {'sc_e1' => [], 'ScE2' => []}})
+                  expect(mapped_entities[:external_entities]).to eql({
                     'sc_e1' => {'connec1' => [{entity: mapped_entity1, idmap: idmap1}]},
                     'ScE2' => {
                       'connec1' => [{entity: mapped_entity1, idmap: idmap21}],
@@ -292,9 +296,9 @@ describe Maestrano::Connector::Rails::ComplexEntity do
             context 'without option' do
               context 'with a more recently updated external entity' do
                 it 'keeps the external entity' do
-                  subject.consolidate_and_map_data(connec_hash, external_hash, organization, opt)
-                  expect(connec_hash).to eq({'connec1' => {'sc_e1' => []}, 'connec2' => {'sc_e1' => [], 'ScE2' => []}})
-                  expect(external_hash).to eql({
+                  mapped_entities = subject.consolidate_and_map_data(connec_hash, external_hash, organization, opt)
+                  expect(mapped_entities[:connec_entities]).to eq({'connec1' => {'sc_e1' => []}, 'connec2' => {'sc_e1' => [], 'ScE2' => []}})
+                  expect(mapped_entities[:external_entities]).to eql({
                     'sc_e1' => {'connec1' => [{entity: mapped_entity1, idmap: idmap1}]},
                     'ScE2' => {
                       'connec1' => [{entity: mapped_entity1, idmap: idmap21}],
@@ -308,9 +312,9 @@ describe Maestrano::Connector::Rails::ComplexEntity do
                 let(:connec_hash) { {'connec1' => {'sc_e1' => [{'id' => connec_id1, 'first_name' => 'Jacob', 'updated_at' => 1.second.ago}]}, 'connec2' => {'sc_e1' => [], 'ScE2' => []}} }
 
                 it 'keeps the connec entities' do
-                  subject.consolidate_and_map_data(connec_hash, external_hash, organization, opt)
-                  expect(connec_hash).to eq({'connec1' => {'sc_e1' => [{entity: {'name' => 'Jacob'}, idmap: idmap1}]}, 'connec2' => {'sc_e1' => [], 'ScE2' => []}})
-                  expect(external_hash).to eql({
+                  mapped_entities = subject.consolidate_and_map_data(connec_hash, external_hash, organization, opt)
+                  expect(mapped_entities[:connec_entities]).to eq({'connec1' => {'sc_e1' => [{entity: {'name' => 'Jacob'}, idmap: idmap1}]}, 'connec2' => {'sc_e1' => [], 'ScE2' => []}})
+                  expect(mapped_entities[:external_entities]).to eql({
                     'sc_e1' => {'connec1' => []},
                     'ScE2' => {
                       'connec1' => [{entity: mapped_entity1, idmap: idmap21}],

data/spec/models/entity_spec.rb

@@ -374,8 +374,8 @@ describe Maestrano::Connector::Rails::Entity do
           }
 
           it 'creates an idmap and returns the mapped entity with its new idmap' do
-            subject.consolidate_and_map_data([], entities, organization)
-            expect(entities).to eql([{entity: mapped_entity, idmap: Maestrano::Connector::Rails::IdMap.last}])
+            mapped_entities = subject.consolidate_and_map_data([], entities, organization)
+            expect(mapped_entities).to eql({connec_entities: [], external_entities: [{entity: mapped_entity, idmap: Maestrano::Connector::Rails::IdMap.last}]})
           end
 
           it 'save the name in the idmap' do
@@ -388,8 +388,8 @@ describe Maestrano::Connector::Rails::Entity do
           let!(:idmap) { create(:idmap, external_entity: external_name, external_id: id, organization: organization, last_push_to_connec: 2.minute.ago) }
 
           it 'discards the entity' do
-            subject.consolidate_and_map_data([], entities, organization)
-            expect(entities).to eql([])
+            mapped_entities = subject.consolidate_and_map_data([], entities, organization)
+            expect(mapped_entities).to eql({connec_entities: [], external_entities: []})
           end
         end
 
@@ -399,8 +399,8 @@ describe Maestrano::Connector::Rails::Entity do
             let!(:idmap) { create(:idmap, external_entity: external_name, external_id: id, organization: organization, last_push_to_connec: 2.day.ago) }
 
             it 'returns the mapped entity with its idmap' do
-              subject.consolidate_and_map_data([], entities, organization)
-              expect(entities).to eql([{entity: mapped_entity, idmap: idmap}])
+              mapped_entities = subject.consolidate_and_map_data([], entities, organization)
+              expect(mapped_entities).to eql({connec_entities: [], external_entities: [{entity: mapped_entity, idmap: idmap}]})
             end
           end
 
@@ -416,16 +416,16 @@ describe Maestrano::Connector::Rails::Entity do
               context 'set to true' do
                 let(:connec_entity) { {'id' => connec_id, 'first_name' => 'Richard', 'updated_at' => 1.day.ago} }
                 it 'discards the entity' do
-                  subject.consolidate_and_map_data([connec_entity], entities, organization, {connec_preemption: true})
-                  expect(entities).to eql([])
+                  mapped_entities = subject.consolidate_and_map_data([connec_entity], entities, organization, {connec_preemption: true})
+                  expect(mapped_entities).to eql({connec_entities: [], external_entities: []})
                 end
               end
 
               context 'set to false' do
                 let(:connec_entity) { {'id' => connec_id, 'first_name' => 'Richard', 'updated_at' => 1.second.ago} }
                 it 'returns the mapped entity with its idmap' do
-                  subject.consolidate_and_map_data([connec_entity], entities, organization, {connec_preemption: false})
-                  expect(entities).to eql([{entity: mapped_entity, idmap: idmap}])
+                  mapped_entities = subject.consolidate_and_map_data([connec_entity], entities, organization, {connec_preemption: false})
+                  expect(mapped_entities).to eql({connec_entities: [], external_entities: [{entity: mapped_entity, idmap: idmap}]})
                 end
               end
             end
@@ -435,8 +435,8 @@ describe Maestrano::Connector::Rails::Entity do
                 let(:connec_entity) { {'id' => connec_id, 'first_name' => 'Richard', 'updated_at' => 1.second.ago} }
 
                 it 'discards the entity' do
-                  subject.consolidate_and_map_data([connec_entity], entities, organization, {connec_preemption: true})
-                  expect(entities).to eql([])
+                  mapped_entities = subject.consolidate_and_map_data([connec_entity], entities, organization, {connec_preemption: true})
+                  expect(mapped_entities).to eql({connec_entities: [], external_entities: []})
                 end
               end
 
@@ -444,8 +444,8 @@ describe Maestrano::Connector::Rails::Entity do
                 let(:connec_entity) { {'id' => connec_id, 'first_name' => 'Richard', 'updated_at' => 1.year.ago} }
 
                 it 'returns the mapped entity with its idmap' do
-                  subject.consolidate_and_map_data([connec_entity], entities, organization, {connec_preemption: false})
-                  expect(entities).to eql([{entity: mapped_entity, idmap: idmap}])
+                  mapped_entities = subject.consolidate_and_map_data([connec_entity], entities, organization, {connec_preemption: false})
+                  expect(mapped_entities).to eql({connec_entities: [], external_entities: [{entity: mapped_entity, idmap: idmap}]})
                 end
               end
             end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maestrano-connector-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.13
 platform: ruby
 authors:
 - Pierre Berard