maestrano-connector-rails 0.2.19 → 0.2.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84ed969991a93b3632339f112511a4baa3848ae9
-  data.tar.gz: 133ac31a7b246b0d5f7f7aa096fdd859ab2b7e19
+  metadata.gz: 641c5c4a44a4f83f3c44ed2c5e23a474eba48abb
+  data.tar.gz: 9912810a2b3d6986e68ba89d19d5068e12daaade
 SHA512:
-  metadata.gz: 14cbd5436d31186f909ce2c66b01b10e027a5b31fb6f932e2387eabb754aa349f170679d523af24327c79e659a4fad5333e4dd51bbf43a74c468ec0f938add90
-  data.tar.gz: 5befbf8603f56588e5501bc16594266d3a592ac775c27ebc3c39b4647ce26fb409e96b4fd7dbb384f26e00575c8628217cc79c9d52e6b0ed4d189416993497a4
+  metadata.gz: 3ad9efcebceb9e3506693ae02d101ee61efdd103d5f04c62ab97b9764c890da72410d9440b8bcc84235beef2bd9431926d3e13cab6e021e524158f8a54a75698
+  data.tar.gz: cdd4bc5ac76e057c4b4249c66f18e88c6c4eba76b020e1fe211563c1074f64b0e61a4ed575fe881aff49cfbca1ed69d9bd7c74f07ea467d49c39ced3c87f8a09

data/VERSION

@@ -1 +1 @@
-0.2.19
+0.2.20

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

@@ -55,11 +55,16 @@ module Maestrano::Connector::Rails::Concerns::ComplexEntity
   def map_to_external_with_idmap(entity, organization, external_entity_name, sub_entity_instance)
     idmap = sub_entity_instance.find_idmap({connec_id: entity['id'], external_entity: external_entity_name, organization_id: organization.id})
 
-    if idmap && ((!idmap.to_external) || idmap.last_push_to_external && idmap.last_push_to_external > entity['updated_at'])
-      Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Discard Connec! #{sub_entity_instance.entity_name} : #{entity}")
-      nil
+    if idmap
+      idmap.update(name: sub_entity_instance.object_name_from_connec_entity_hash(entity))
+      if (!idmap.to_external) || idmap.last_push_to_external && idmap.last_push_to_external > entity['updated_at']
+        Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Discard Connec! #{sub_entity_instance.entity_name} : #{entity}")
+        nil
+      else
+        {entity: sub_entity_instance.map_to(external_entity_name, entity, organization), idmap: idmap}
+      end
     else
-      {entity: sub_entity_instance.map_to(external_entity_name, entity, organization), idmap: idmap || sub_entity_instance.create_idmap_from_connec_entity(entity, external_entity_name, organization)}
+      {entity: sub_entity_instance.map_to(external_entity_name, entity, organization), idmap: sub_entity_instance.create_idmap_from_connec_entity(entity, external_entity_name, organization)}
     end
   end
 
@@ -98,7 +103,9 @@ module Maestrano::Connector::Rails::Concerns::ComplexEntity
           idmap = sub_entity_instance.find_idmap(external_id: sub_entity_instance.get_id_from_external_entity_hash(entity), connec_entity: connec_entity_name, organization_id: organization.id)
 
           # No idmap: creating one, nothing else to do
-          unless idmap
+          if idmap
+            idmap.update(name: sub_entity_instance.object_name_from_external_entity_hash(entity))
+          else
             next {entity: sub_entity_instance.map_to(connec_entity_name, entity, organization), idmap: sub_entity_instance.create_idmap_from_external_entity(entity, connec_entity_name, organization)}
           end
 

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

@@ -169,11 +169,16 @@ module Maestrano::Connector::Rails::Concerns::Entity
   def map_to_external_with_idmap(entity, organization)
     idmap = find_idmap({connec_id: entity['id'], organization_id: organization.id})
 
-    if idmap && ((!idmap.to_external) || (idmap.last_push_to_external && idmap.last_push_to_external > entity['updated_at']))
-      Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Discard Connec! #{connec_entity_name} : #{entity}")
-      nil
+    if idmap
+      idmap.update(name: object_name_from_connec_entity_hash(entity))
+      if (!idmap.to_external) || (idmap.last_push_to_external && idmap.last_push_to_external > entity['updated_at'])
+        Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Discard Connec! #{connec_entity_name} : #{entity}")
+        nil
+      else
+        {entity: map_to_external(entity, organization), idmap: idmap}
+      end
     else
-      {entity: map_to_external(entity, organization), idmap: idmap || create_idmap_from_connec_entity(entity, organization)}
+      {entity: map_to_external(entity, organization), idmap: create_idmap_from_connec_entity(entity, organization)}
     end
   end
 
@@ -245,7 +250,9 @@ module Maestrano::Connector::Rails::Concerns::Entity
     mapped_external_entities = external_entities.map{|entity|
       idmap = find_idmap({external_id: get_id_from_external_entity_hash(entity), organization_id: organization.id})
       # No idmap: creating one, nothing else to do
-      unless idmap
+      if idmap
+        idmap.update(name: object_name_from_external_entity_hash(entity))
+      else
         next {entity: map_to_connec(entity, organization), idmap: create_idmap_from_external_entity(entity, organization)}
       end
 
@@ -283,10 +290,10 @@ module Maestrano::Connector::Rails::Concerns::Entity
       keep_external = self.class.is_external_more_recent?(connec_entities.first, external_entities.first, self)
     end
     if keep_external
-      idmap.update(external_id: get_id_from_external_entity_hash(external_entities.first))
+      idmap.update(external_id: get_id_from_external_entity_hash(external_entities.first), name: object_name_from_external_entity_hash(external_entities.first))
       return {connec_entities: [], external_entities: [{entity: map_to_connec(external_entities.first, organization), idmap: idmap}]}
     else
-      idmap.update(connec_id: connec_entities.first['id'])
+      idmap.update(connec_id: connec_entities.first['id'], name: object_name_from_connec_entity_hash(connec_entities.first))
       return {connec_entities: [{entity: map_to_external(connec_entities.first, organization), idmap: idmap}], external_entities: []}
     end
   end

data/maestrano-connector-rails.gemspec

@@ -2,16 +2,16 @@
 # 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.19 ruby lib
+# stub: maestrano-connector-rails 0.2.20 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "maestrano-connector-rails"
-  s.version = "0.2.19"
+  s.version = "0.2.20"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Pierre Berard"]
-  s.date = "2016-03-10"
+  s.date = "2016-03-11"
   s.description = "Maestrano is the next generation marketplace for SME applications. See https://maestrano.com for details."
   s.email = "pierre.berard@maestrano.com"
   s.executables = ["rails"]

data/spec/models/complex_entity_spec.rb

@@ -184,6 +184,7 @@ describe Maestrano::Connector::Rails::ComplexEntity do
           }
         }
         let(:connec_hash) { {} }
+        let(:human_name) { 'Jabba' }
         before{
           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)
@@ -199,14 +200,11 @@ describe Maestrano::Connector::Rails::ComplexEntity do
           allow_any_instance_of(Entities::SubEntities::ScE2).to receive(:get_last_update_date_from_external_entity_hash).and_return(1.minute.ago)
           allow_any_instance_of(Entities::SubEntities::ScE2).to receive(:map_to).with('connec1', entity1, organization).and_return(mapped_entity1)
           allow_any_instance_of(Entities::SubEntities::ScE2).to receive(:map_to).with('connec2', entity2, organization).and_return(mapped_entity2)
+          allow_any_instance_of(Entities::SubEntities::ScE1).to receive(:object_name_from_external_entity_hash).and_return(human_name)
+          allow_any_instance_of(Entities::SubEntities::ScE2).to receive(:object_name_from_external_entity_hash).and_return(human_name)
         }
 
         context 'when entities have no idmaps' do
-          let(:human_name) { 'Jabba' }
-          before {
-            allow_any_instance_of(Entities::SubEntities::ScE1).to receive(:object_name_from_external_entity_hash).and_return(human_name)
-            allow_any_instance_of(Entities::SubEntities::ScE2).to receive(:object_name_from_external_entity_hash).and_return(human_name)
-          }
 
           it 'creates an idmap for each entity' do
             expect{
@@ -272,6 +270,7 @@ describe Maestrano::Connector::Rails::ComplexEntity do
             allow_any_instance_of(Entities::SubEntities::Connec1).to receive(:map_to).and_return({'name' => 'Jacob'})
             allow_any_instance_of(Entities::SubEntities::Connec1).to receive(:external?).and_return(false)
             allow_any_instance_of(Entities::SubEntities::Connec1).to receive(:entity_name).and_return('connec1')
+            allow_any_instance_of(Entities::SubEntities::Connec1).to receive(:object_name_from_connec_entity_hash).and_return('human name')
           }
           let(:connec_id1) { '67ttf-5rr4d' }
           let!(:idmap1) { create(:idmap, organization: organization, external_id: id1, external_entity: 'sc_e1', connec_entity: 'connec1', last_push_to_connec: 1.year.ago, connec_id: connec_id1) }

data/spec/models/entity_spec.rb

@@ -417,6 +417,8 @@ describe Maestrano::Connector::Rails::Entity do
           allow(subject).to receive(:singleton?).and_return(true)
           allow(subject).to receive(:map_to_connec).and_return({map: 'connec'})
           allow(subject).to receive(:map_to_external).and_return({map: 'external'})
+          allow(subject).to receive(:object_name_from_connec_entity_hash).and_return('connec human name')
+          allow(subject).to receive(:object_name_from_external_entity_hash).and_return('external human name')
         }
 
         it { expect(subject.consolidate_and_map_data([], [], organization)).to eql({connec_entities: [], external_entities: []}) }
@@ -484,16 +486,14 @@ describe Maestrano::Connector::Rails::Entity do
           let(:entity) { {id: id, name: 'John', modifiedDate: date} }
           let(:mapped_entity) { {first_name: 'John'} }
           let(:entities) { [entity] }
+          let(:human_name) { 'alien' }
 
           before {
             allow(subject).to receive(:map_to_connec).and_return(mapped_entity)
+            allow(subject).to receive(:object_name_from_external_entity_hash).and_return(human_name)
           }
 
           context 'when entity has no idmap' do
-            let(:human_name) { 'alien' }
-            before {
-              allow(subject).to receive(:object_name_from_external_entity_hash).and_return(human_name)
-            }
 
             it 'creates an idmap and returns the mapped entity with its new idmap' do
               mapped_entities = subject.consolidate_and_map_data([], entities, organization)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maestrano-connector-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.19
+  version: 0.2.20
 platform: ruby
 authors:
 - Pierre Berard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2016-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maestrano-rails