maestrano-connector-rails 0.2.16 → 0.2.17

data/lib/generators/connector/templates/sychronizations_controller_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe SynchronizationsController, :type => :controller do
+  describe 'index' do
+    subject { get :index }
+
+    it { expect(subject).to be_success }
+
+    context 'when user is logged in' do
+      let(:organization) {  create(:organization) }
+      let(:synchronization) { create(:synchronization, organization: organization) }
+      before {
+        allow_any_instance_of(Maestrano::Connector::Rails::SessionHelper).to receive(:current_organization).and_return(organization)
+      }
+
+      it 'assigns the synchronizations' do
+        subject
+        expect(assigns(:synchronizations)).to eq([synchronization])
+      end
+    end
+  end
+end

data/lib/generators/connector/templates/synchronizations_controller.rb

@@ -0,0 +1,7 @@
+class SynchronizationsController < ApplicationController
+  def index
+    if current_organization
+      @synchronizations = Maestrano::Connector::Rails::Synchronization.where(organization_id: current_organization.id).order(updated_at: :desc).limit(40)
+    end
+  end
+end

data/lib/generators/connector/templates/synchronizations_index.haml

@@ -0,0 +1,42 @@
+.home
+  .banners
+    .container
+      - if current_user
+        .row
+          .col-md-3
+            %h3 Synchronization history
+          - if current_organization.oauth_uid && is_admin
+            .col-md-2
+              = link_to "Synchronize", home_synchronize_path, method: :post, class: "btn btn-warning btn-lg"
+
+        - if @synchronizations
+          %table.table.table-condensed
+            %th Synchronization date
+            %th Status
+            %th Message
+
+            - @synchronizations.each do |sync|
+              - if sync.status == 'ERROR'
+                %tr.warning
+                  %td= sync.updated_at
+                  %td= sync.status
+                  %td= sync.message
+              - elsif sync.status == 'SUCCESS'
+                %tr.success
+                  %td= sync.updated_at
+                  %td= sync.status
+                  %td= sync.message
+              - else
+                %tr.active
+                  %td= sync.updated_at
+                  %td= sync.status
+                  %td= sync.message
+        - else
+          .row
+            .col-md-12
+              %strong No synchronization yet
+
+      - else
+        .row.center
+          %h3 You need to be logged in to access this page
+          = button_to "Go back", home_index_path, method: :get, class: 'btn btn-warning'

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.16 ruby lib
+# stub: maestrano-connector-rails 0.2.17 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "maestrano-connector-rails"
-  s.version = "0.2.16"
+  s.version = "0.2.17"
 
   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-07"
+  s.date = "2016-03-08"
   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"]
@@ -62,8 +62,6 @@ Gem::Specification.new do |s|
     "lib/generators/connector/USAGE",
     "lib/generators/connector/complex_entity_generator.rb",
     "lib/generators/connector/install_generator.rb",
-    "lib/generators/connector/templates/admin_controller.rb",
-    "lib/generators/connector/templates/admin_index.html.erb",
     "lib/generators/connector/templates/complex_entity_example/contact.rb",
     "lib/generators/connector/templates/complex_entity_example/contact_and_lead.rb",
     "lib/generators/connector/templates/complex_entity_example/contact_mapper.rb",
@@ -75,13 +73,28 @@ Gem::Specification.new do |s|
     "lib/generators/connector/templates/example_entity.rb",
     "lib/generators/connector/templates/external.rb",
     "lib/generators/connector/templates/home_controller.rb",
-    "lib/generators/connector/templates/home_index.html.erb",
+    "lib/generators/connector/templates/home_controller_spec.rb",
+    "lib/generators/connector/templates/home_index.haml",
+    "lib/generators/connector/templates/layouts.haml",
     "lib/generators/connector/templates/oauth_controller.rb",
+    "lib/generators/connector/templates/shared_entities_controller.rb",
+    "lib/generators/connector/templates/shared_entities_controller_spec.rb",
+    "lib/generators/connector/templates/shared_entities_index.haml",
+    "lib/generators/connector/templates/stylesheets/application.sass",
+    "lib/generators/connector/templates/stylesheets/banners.sass",
+    "lib/generators/connector/templates/stylesheets/home.sass",
+    "lib/generators/connector/templates/stylesheets/layout.sass",
+    "lib/generators/connector/templates/stylesheets/spacers.sass",
+    "lib/generators/connector/templates/stylesheets/variables.sass",
+    "lib/generators/connector/templates/sychronizations_controller_spec.rb",
+    "lib/generators/connector/templates/synchronizations_controller.rb",
+    "lib/generators/connector/templates/synchronizations_index.haml",
     "lib/maestrano-connector-rails.rb",
     "lib/maestrano/connector/rails.rb",
     "maestrano-connector-rails.gemspec",
     "maestrano.png",
     "pkg/maestrano-connector-rails-0.0.1.gem",
+    "pkg/maestrano-connector-rails-0.2.16.gem",
     "pkg/maestrano-connector-rails-0.2.4.gem",
     "spec/controllers/connec_controller_spec.rb",
     "spec/dummy/README.md",
@@ -156,6 +169,7 @@ Gem::Specification.new do |s|
     "template/factories.rb",
     "template/gitignore",
     "template/maestrano-connector-template.rb",
+    "template/routes.rb",
     "template/spec_helper.rb"
   ]
   s.homepage = "http://github.com/maestrano/maestrano-connector-rails"
@@ -170,6 +184,9 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<maestrano-rails>, [">= 0"])
       s.add_runtime_dependency(%q<hash_mapper>, [">= 0"])
       s.add_runtime_dependency(%q<sidekiq>, [">= 0"])
+      s.add_runtime_dependency(%q<haml-rails>, [">= 0"])
+      s.add_runtime_dependency(%q<bootstrap-sass>, [">= 0"])
+      s.add_runtime_dependency(%q<autoprefixer-rails>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
@@ -183,6 +200,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<maestrano-rails>, [">= 0"])
       s.add_dependency(%q<hash_mapper>, [">= 0"])
       s.add_dependency(%q<sidekiq>, [">= 0"])
+      s.add_dependency(%q<haml-rails>, [">= 0"])
+      s.add_dependency(%q<bootstrap-sass>, [">= 0"])
+      s.add_dependency(%q<autoprefixer-rails>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
@@ -197,6 +217,9 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<maestrano-rails>, [">= 0"])
     s.add_dependency(%q<hash_mapper>, [">= 0"])
     s.add_dependency(%q<sidekiq>, [">= 0"])
+    s.add_dependency(%q<haml-rails>, [">= 0"])
+    s.add_dependency(%q<bootstrap-sass>, [">= 0"])
+    s.add_dependency(%q<autoprefixer-rails>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])

data/spec/models/complex_entity_spec.rb

@@ -31,26 +31,28 @@ describe Maestrano::Connector::Rails::ComplexEntity do
       let(:sub_instance) { Maestrano::Connector::Rails::SubEntityBase.new }
       let(:human_name) { 'ET' }
       before {
+        allow(sub_instance).to receive(:external?).and_return(false)
+        allow(sub_instance).to receive(:entity_name).and_return(connec_name)
         allow(sub_instance).to receive(:map_to).and_return(mapped_entity)
         allow(sub_instance).to receive(:object_name_from_connec_entity_hash).and_return(human_name)
       }
 
       context 'when entity has no idmap' do
         it 'creates one' do
-          expect{
-            subject.map_to_external_with_idmap(entity, organization, connec_name, external_name, sub_instance)
-            }.to change{ Maestrano::Connector::Rails::IdMap.count }.by(1)
+          expect {
+            subject.map_to_external_with_idmap(entity, organization, external_name, sub_instance)
+          }.to change{ Maestrano::Connector::Rails::IdMap.count }.by(1)
         end
       end
       it 'returns the mapped entity with its idmap' do
-        expect(subject.map_to_external_with_idmap(entity, organization, connec_name, external_name, sub_instance)).to eql({entity: mapped_entity, idmap: Maestrano::Connector::Rails::IdMap.last})
+        expect(subject.map_to_external_with_idmap(entity, organization, external_name, sub_instance)).to eql({entity: mapped_entity, idmap: Maestrano::Connector::Rails::IdMap.last})
       end
 
       context 'when entity has an idmap without last_push_to_external' do
         let!(:idmap) { create(:idmap, organization: organization, connec_id: id, connec_entity: connec_name, last_push_to_external: nil, external_entity: external_name) }
 
         it 'returns the mapped entity with its idmap' do
-          expect(subject.map_to_external_with_idmap(entity, organization, connec_name, external_name, sub_instance)).to eql({entity: mapped_entity, idmap: idmap})
+          expect(subject.map_to_external_with_idmap(entity, organization, external_name, sub_instance)).to eql({entity: mapped_entity, idmap: idmap})
         end
       end
 
@@ -58,7 +60,7 @@ describe Maestrano::Connector::Rails::ComplexEntity do
         let!(:idmap) { create(:idmap, organization: organization, connec_id: id, connec_entity: connec_name, last_push_to_external: 1.year.ago, external_entity: external_name) }
 
         it 'returns the mapped entity with its idmap' do
-          expect(subject.map_to_external_with_idmap(entity, organization, connec_name, external_name, sub_instance)).to eql({entity: mapped_entity, idmap: idmap})
+          expect(subject.map_to_external_with_idmap(entity, organization, external_name, sub_instance)).to eql({entity: mapped_entity, idmap: idmap})
         end
       end
 
@@ -66,7 +68,15 @@ describe Maestrano::Connector::Rails::ComplexEntity do
         let!(:idmap) { create(:idmap, organization: organization, connec_id: id, connec_entity: connec_name, last_push_to_external: 1.second.ago, external_entity: external_name) }
 
         it 'discards the entity' do
-          expect(subject.map_to_external_with_idmap(entity, organization, connec_name, external_name, sub_instance)).to be_nil
+          expect(subject.map_to_external_with_idmap(entity, organization, external_name, sub_instance)).to be_nil
+        end
+      end
+
+      context 'when entity has an idmap with to_external set to false' do
+        let!(:idmap) { create(:idmap, organization: organization, connec_id: id, connec_entity: connec_name, to_external: false, external_entity: external_name) }
+
+        it 'discards the entity' do
+          expect(subject.map_to_external_with_idmap(entity, organization, external_name, sub_instance)).to be_nil
         end
       end
     end
@@ -177,9 +187,13 @@ describe Maestrano::Connector::Rails::ComplexEntity do
         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)
+          allow_any_instance_of(Entities::SubEntities::ScE1).to receive(:external?).and_return(true)
+          allow_any_instance_of(Entities::SubEntities::ScE1).to receive(:entity_name).and_return('sc_e1')
           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)
+          allow_any_instance_of(Entities::SubEntities::ScE2).to receive(:external?).and_return(true)
+          allow_any_instance_of(Entities::SubEntities::ScE2).to receive(:entity_name).and_return('Sce2')
           allow_any_instance_of(Entities::SubEntities::ScE2).to receive(:get_id_from_external_entity_hash).with(entity1).and_return(id1)
           allow_any_instance_of(Entities::SubEntities::ScE2).to receive(:get_id_from_external_entity_hash).with(entity2).and_return(id2)
           allow_any_instance_of(Entities::SubEntities::ScE2).to receive(:get_last_update_date_from_external_entity_hash).and_return(1.minute.ago)
@@ -213,6 +227,24 @@ describe Maestrano::Connector::Rails::ComplexEntity do
           end
         end
 
+        context 'when entities have idmaps with to_connec set to false' do
+          let!(:idmap1) { create(:idmap, organization: organization, external_id: id1, external_entity: 'sc_e1', connec_entity: 'connec1', to_connec: false) }
+          let!(:idmap21) { create(:idmap, organization: organization, external_id: id1, external_entity: 'sce2', connec_entity: 'connec1', to_connec: false) }
+          let!(:idmap22) { create(:idmap, organization: organization, external_id: id2, external_entity: 'sce2', connec_entity: 'connec2', to_connec: false) }
+
+          it 'discards the entities' do
+            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
+
         context 'when entities have idmaps with more recent last_push_to_connec' do
           let!(:idmap1) { create(:idmap, organization: organization, external_id: id1, external_entity: 'sc_e1', connec_entity: 'connec1', last_push_to_connec: 1.second.ago) }
           let!(:idmap21) { create(:idmap, organization: organization, external_id: id1, external_entity: 'sce2', connec_entity: 'connec1', last_push_to_connec: 1.second.ago) }
@@ -238,6 +270,8 @@ describe Maestrano::Connector::Rails::ComplexEntity do
             class Entities::SubEntities::Connec2 < Maestrano::Connector::Rails::SubEntityBase
             end
             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')
           }
           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) }
@@ -247,7 +281,7 @@ describe Maestrano::Connector::Rails::ComplexEntity do
 
           context 'without conflict' do
             it 'returns the entity with their idmaps' do
-              subject.consolidate_and_map_data(connec_hash, external_hash, organization, opt)
+              subject.consolidate_and_map_data({'connec1' => []}, {'sc_e1' => []}, organization, opt)
               expect(external_hash).to eql({
                 'sc_e1' => {'connec1' => [{entity: mapped_entity1, idmap: idmap1}]},
                 'ScE2' => {
@@ -264,7 +298,7 @@ describe Maestrano::Connector::Rails::ComplexEntity do
                 let(:opt) { {connec_preemption: true} }
 
                 it 'keeps the connec entities' do
-                  mapped_entities = subject.consolidate_and_map_data(connec_hash, external_hash, organization, opt)
+                  mapped_entities = subject.consolidate_and_map_data({'connec1' => []}, {'sc_e1' => []}, 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' => []},
@@ -280,7 +314,7 @@ describe Maestrano::Connector::Rails::ComplexEntity do
                 let(:opt) { {connec_preemption: false} }
 
                 it 'keeps the external entities' do
-                  mapped_entities = subject.consolidate_and_map_data(connec_hash, external_hash, organization, opt)
+                  mapped_entities = subject.consolidate_and_map_data({'connec1' => []}, {'sc_e1' => []}, 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}]},
@@ -296,7 +330,7 @@ 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
-                  mapped_entities = subject.consolidate_and_map_data(connec_hash, external_hash, organization, opt)
+                  mapped_entities = subject.consolidate_and_map_data({'connec1' => []}, {'sc_e1' => []}, 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}]},
@@ -312,7 +346,7 @@ 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
-                  mapped_entities = subject.consolidate_and_map_data(connec_hash, external_hash, organization, opt)
+                  mapped_entities = subject.consolidate_and_map_data({'connec1' => []}, {'sc_e1' => []}, 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' => []},

data/spec/models/entity_spec.rb

@@ -38,6 +38,43 @@ describe Maestrano::Connector::Rails::Entity do
       end
     end
 
+    # IdMap methods
+    describe 'idmaps mehtods' do
+      before {
+        allow(subject).to receive(:connec_entity_name).and_return('Ab')
+        allow(subject).to receive(:external_entity_name).and_return('Ab')
+      }
+      let(:n_hash) { {connec_entity: 'ab', external_entity: 'ab'} }
+
+      it { expect(subject.names_hash).to eql(n_hash) }
+      it {
+        expect(Maestrano::Connector::Rails::IdMap).to receive(:find_or_create_by).with(n_hash.merge(id: 'lala'))
+        subject.find_or_create_idmap({id: 'lala'})
+      }
+      it {
+        expect(Maestrano::Connector::Rails::IdMap).to receive(:find_by).with(n_hash.merge(id: 'lala'))
+        subject.find_idmap({id: 'lala'})
+      }
+      describe 'creates' do
+        let(:organization) { create(:organization) }
+        let(:connec_entity) { {'id' => 'lala'} }
+        before {
+          allow(subject).to receive(:object_name_from_external_entity_hash).and_return('name_e')
+          allow(subject).to receive(:object_name_from_connec_entity_hash).and_return('name_c')
+          allow(subject).to receive(:get_id_from_external_entity_hash).and_return('id')
+        }
+
+        it {
+          expect(Maestrano::Connector::Rails::IdMap).to receive(:create).with(n_hash.merge(connec_id: 'lala', name: 'name_c', organization_id: organization.id))
+          subject.create_idmap_from_connec_entity(connec_entity, organization)
+        }
+        it {
+          expect(Maestrano::Connector::Rails::IdMap).to receive(:create).with(n_hash.merge(external_id: 'id', name: 'name_e', organization_id: organization.id))
+          subject.create_idmap_from_external_entity({}, organization)
+        }
+      end
+
+    end
 
     # Connec! methods
     describe 'connec_methods' do
@@ -181,26 +218,17 @@ describe Maestrano::Connector::Rails::Entity do
       describe 'create_connec_entity' do
         let(:entity) { {name: 'John'} }
 
-        describe 'with a response' do
-          before {
-            allow(client).to receive(:post).and_return(ActionDispatch::Response.new(200, {}, {people: entity}.to_json, {}))
-          }
-
-          it 'sends a post to connec' do
-            expect(client).to receive(:post).with("/#{connec_name.downcase.pluralize}", {"#{connec_name.downcase.pluralize}".to_sym => entity})
-            subject.create_connec_entity(client, entity, connec_name, organization)
-          end
+        before {
+          allow(client).to receive(:post).and_return(ActionDispatch::Response.new(200, {}, {people: entity}.to_json, {}))
+        }
 
-          it 'returns the created entity' do
-            expect(subject.create_connec_entity(client, entity, connec_name, organization)).to eql(JSON.parse(entity.to_json))
-          end
+        it 'sends a post to connec' do
+          expect(client).to receive(:post).with("/#{connec_name.downcase.pluralize}", {"#{connec_name.downcase.pluralize}".to_sym => entity})
+          subject.create_connec_entity(client, entity, connec_name, organization)
         end
 
-        describe 'without response' do
-          before {
-            allow(client).to receive(:post).and_return(nil)
-          }
-          it { expect{ subject.create_connec_entity(client, entity, connec_name, organization) }.to raise_error("No response received from Connec! when trying to create a #{connec_name}") }
+        it 'returns the created entity' do
+          expect(subject.create_connec_entity(client, entity, connec_name, organization)).to eql(JSON.parse(entity.to_json))
         end
       end
 
@@ -208,23 +236,13 @@ describe Maestrano::Connector::Rails::Entity do
         let(:organization) { create(:organization) }
         let(:entity) { {name: 'John'} }
         let(:id) { '88ye-777ab' }
+        before {
+          allow(client).to receive(:put).and_return(ActionDispatch::Response.new(200, {}, {}.to_json, {}))
+        }
 
-        describe 'with a response' do
-          before {
-            allow(client).to receive(:put).and_return(ActionDispatch::Response.new(200, {}, {}.to_json, {}))
-          }
-
-          it 'sends a put to connec' do
-            expect(client).to receive(:put).with("/#{connec_name.downcase.pluralize}/#{id}", {"#{connec_name.downcase.pluralize}".to_sym => entity})
-            subject.update_connec_entity(client, entity, id, connec_name, organization)
-          end
-        end
-
-        describe 'without response' do
-          before {
-            allow(client).to receive(:put).and_return(nil)
-          }
-          it { expect{ subject.update_connec_entity(client, entity, id, connec_name, organization) }.to raise_error("No response received from Connec! when trying to update a #{connec_name}") }
+        it 'sends a put to connec' do
+          expect(client).to receive(:put).with("/#{connec_name.downcase.pluralize}/#{id}", {"#{connec_name.downcase.pluralize}".to_sym => entity})
+          subject.update_connec_entity(client, entity, id, connec_name, organization)
         end
       end
 
@@ -234,11 +252,14 @@ describe Maestrano::Connector::Rails::Entity do
         let(:mapped_entity) { {'first_name' => 'John'} }
         before {
           allow(subject).to receive(:connec_entity_name).and_return(connec_name)
+          allow(subject).to receive(:external_entity_name).and_return(external_name)
           allow(subject).to receive(:map_to_external).and_return(mapped_entity)
+          allow(subject).to receive(:object_name_from_connec_entity_hash).and_return('name')
+          allow(subject).to receive(:object_name_from_external_entity_hash).and_return('name')
         }
 
         context 'when entity has an idmap' do
-          let!(:idmap) { create(:idmap, organization: organization, connec_entity: connec_name.downcase, connec_id: id, last_push_to_external: 3.hour.ago)}
+          let!(:idmap) { create(:idmap, organization: organization, external_entity: external_name.downcase, connec_entity: connec_name.downcase, connec_id: id, last_push_to_external: 3.hour.ago)}
 
           context 'when updated_at field is most recent than idmap last_push_to_external' do
             let(:entity) { {'id' => id, 'name' => 'John', 'updated_at' => 2.hour.ago } }
@@ -255,6 +276,17 @@ describe Maestrano::Connector::Rails::Entity do
               expect(subject.map_to_external_with_idmap(entity, organization)).to be_nil
             end
           end
+
+          context 'when to_external is set to false' do
+            let(:entity) { {'id' => id, 'name' => 'John' } }
+            before {
+              idmap.update(to_external: false)
+            }
+
+            it 'discards the entity' do
+              expect(subject.map_to_external_with_idmap(entity, organization)).to be_nil
+            end
+          end
         end
 
         context 'when entity has no idmap' do
@@ -368,125 +400,192 @@ describe Maestrano::Connector::Rails::Entity do
 
     # General methods
     describe 'consolidate_and_map_data' do
-      # subject.consolidate_and_map_data(connec_entities, external_entities, organization, opts)
       let(:organization) { create(:organization) }
+      let(:external_name) { 'External_name' }
+      let(:connec_name) { 'Connec_name' }
+      let(:id) { '56882' }
+      let(:date) { 2.hour.ago }
+      before {
+        allow(subject).to receive(:get_id_from_external_entity_hash).and_return(id)
+        allow(subject).to receive(:get_last_update_date_from_external_entity_hash).and_return(date)
+        allow(subject).to receive(:external_entity_name).and_return(external_name)
+        allow(subject).to receive(:connec_entity_name).and_return(connec_name)
+      }
 
-      describe 'connec_entities treatment' do
-        let(:entity1) { {name: 'John'} }
-        let(:entity2) { {name: 'Jane'} }
+      context 'for a singleton method' do
+        before {
+          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'})
+        }
 
-        it 'calls map_to_external_with_idmap for each entity' do
-          expect(subject).to receive(:map_to_external_with_idmap).with(entity1, organization)
-          expect(subject).to receive(:map_to_external_with_idmap).with(entity2, organization)
-          subject.consolidate_and_map_data([entity1, entity2], [], organization)
+        it { expect(subject.consolidate_and_map_data([], [], organization)).to eql({connec_entities: [], external_entities: []}) }
+
+        context 'with no idmap' do
+          it 'creates one for connec' do
+            subject.consolidate_and_map_data([{'id' => 'lala'}], [], organization)
+            idmap = Maestrano::Connector::Rails::IdMap.last
+            expect(idmap.connec_entity).to eql(connec_name.downcase)
+            expect(idmap.external_entity).to eql(external_name.downcase)
+            expect(idmap.connec_id).to eql('lala')
+          end
+
+          it 'creates one for external' do
+            subject.consolidate_and_map_data([], [{}], organization)
+            idmap = Maestrano::Connector::Rails::IdMap.last
+            expect(idmap.connec_entity).to eql(connec_name.downcase)
+            expect(idmap.external_entity).to eql(external_name.downcase)
+            expect(idmap.external_id).to eql(id)
+          end
         end
-      end
 
-      describe 'external_entities treatment' do
-        let(:external_name) { 'external_name' }
-        let(:connec_name) { 'connec_name' }
-        let(:id) { '56882' }
-        let(:date) { 2.hour.ago }
-        let(:entity) { {id: id, name: 'John', modifiedDate: date} }
-        let(:mapped_entity) { {first_name: 'John'} }
-        let(:entities) { [entity] }
-
-        before{
-          allow(subject).to receive(:get_id_from_external_entity_hash).and_return(id)
-          allow(subject).to receive(:get_last_update_date_from_external_entity_hash).and_return(date)
-          allow(subject).to receive(:external_entity_name).and_return(external_name)
-          allow(subject).to receive(:connec_entity_name).and_return(connec_name)
-          allow(subject).to receive(:map_to_connec).and_return(mapped_entity)
-        }
+        context 'with an idmap' do
+          let!(:idmap) { create(:idmap, connec_entity: connec_name.downcase, external_entity: external_name.downcase, organization: organization) }
 
-        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 { expect{ subject.consolidate_and_map_data([{}], [], organization) }.to_not change{ Maestrano::Connector::Rails::IdMap } }
+        end
+
+        context 'with conflict' do
+          let!(:idmap) { create(:idmap, connec_entity: connec_name.downcase, external_entity: external_name.downcase, organization: organization, external_id: id, connec_id: 'lala') }
+          let(:updated) { 3.hour.ago }
+          let(:connec_entity) { {'id' => 'lala', 'updated_at' => updated} }
 
-          it 'creates an idmap and returns the mapped entity with its new idmap' do
-            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}]})
+          context 'with options' do
+            it { expect(subject.consolidate_and_map_data([connec_entity], [{}], organization, connec_preemption: true)).to eql({connec_entities: [{entity: {map: 'external'}, idmap: idmap}], external_entities: []}) }
+            it { expect(subject.consolidate_and_map_data([connec_entity], [{}], organization, connec_preemption: false)).to eql({connec_entities: [], external_entities: [{entity: {map: 'connec'}, idmap: idmap}]}) }
           end
 
-          it 'save the name in the idmap' do
-            subject.consolidate_and_map_data([], entities, organization)
-            expect(Maestrano::Connector::Rails::IdMap.last.name).to eql(human_name)
+          context 'without options' do
+            context 'with a more recent external one' do
+              it { expect(subject.consolidate_and_map_data([connec_entity], [{}], organization)).to eql({connec_entities: [], external_entities: [{entity: {map: 'connec'}, idmap: idmap}]}) }
+            end
+            context 'with a more recent connec one' do
+              let(:updated) { 2.minute.ago }
+              it { expect(subject.consolidate_and_map_data([connec_entity], [{}], organization)).to eql({connec_entities: [{entity: {map: 'external'}, idmap: idmap}], external_entities: []}) }
+            end
           end
         end
+      end
+
+      context 'for a non singleton method' do
 
-        context 'when entity has an idmap with a last_push_to_connec more recent than date' do
-          let!(:idmap) { create(:idmap, external_entity: external_name, external_id: id, organization: organization, last_push_to_connec: 2.minute.ago) }
+        describe 'connec_entities treatment' do
+          let(:entity1) { {name: 'John'} }
+          let(:entity2) { {name: 'Jane'} }
 
-          it 'discards the entity' do
-            mapped_entities = subject.consolidate_and_map_data([], entities, organization)
-            expect(mapped_entities).to eql({connec_entities: [], external_entities: []})
+          it 'calls map_to_external_with_idmap for each entity' do
+            expect(subject).to receive(:map_to_external_with_idmap).with(entity1, organization)
+            expect(subject).to receive(:map_to_external_with_idmap).with(entity2, organization)
+            subject.consolidate_and_map_data([entity1, entity2], [], organization)
           end
         end
 
-        context 'when entity has an idmap with a last_push_to_connec older than date' do
+        describe 'external_entities treatment' do
+          let(:entity) { {id: id, name: 'John', modifiedDate: date} }
+          let(:mapped_entity) { {first_name: 'John'} }
+          let(:entities) { [entity] }
 
-          context 'with no conflict' do
-            let!(:idmap) { create(:idmap, external_entity: external_name, external_id: id, organization: organization, last_push_to_connec: 2.day.ago) }
+          before {
+            allow(subject).to receive(:map_to_connec).and_return(mapped_entity)
+          }
 
-            it 'returns the mapped entity with its idmap' do
+          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)
-              expect(mapped_entities).to eql({connec_entities: [], external_entities: [{entity: mapped_entity, idmap: idmap}]})
+              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
+              subject.consolidate_and_map_data([], entities, organization)
+              expect(Maestrano::Connector::Rails::IdMap.last.name).to eql(human_name)
             end
           end
 
-          context 'with conflict' do
-            let(:connec_id) { '34uuu-778aa' }
-            let!(:idmap) { create(:idmap, connec_id: connec_id, external_entity: external_name, external_id: id, organization: organization, last_push_to_connec: 2.day.ago) }
-            before {
-              allow(subject).to receive(:map_to_external_with_idmap)
-            }
+          context 'when entity has an idmap with to_connec set to false' do
+            let!(:idmap) { create(:idmap, external_entity: external_name.downcase, connec_entity: connec_name.downcase, external_id: id, organization: organization, to_connec: false) }
+            it 'discards the entity' do
+              mapped_entities = subject.consolidate_and_map_data([], entities, organization)
+              expect(mapped_entities).to eql({connec_entities: [], external_entities: []})
+            end
+          end
 
-            context 'with connec_preemption opt' do
+          context 'when entity has an idmap with a last_push_to_connec more recent than date' do
+            let!(:idmap) { create(:idmap, connec_entity: connec_name.downcase, external_entity: external_name.downcase, external_id: id, organization: organization, last_push_to_connec: 2.minute.ago) }
 
-              context 'set to true' do
-                let(:connec_entity) { {'id' => connec_id, 'first_name' => 'Richard', 'updated_at' => 1.day.ago} }
-                it 'discards the entity' do
-                  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
+            it 'discards the entity' do
+              mapped_entities = subject.consolidate_and_map_data([], entities, organization)
+              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
-                  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
+          context 'when entity has an idmap with a last_push_to_connec older than date' do
+
+            context 'with no conflict' do
+              let!(:idmap) { create(:idmap, connec_entity: connec_name.downcase, external_entity: external_name.downcase, external_id: id, organization: organization, last_push_to_connec: 2.day.ago) }
+
+              it 'returns the mapped entity with its idmap' do
+                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
 
-            context 'without opt' do
-              context 'with a more recent connec entity' do
-                let(:connec_entity) { {'id' => connec_id, 'first_name' => 'Richard', 'updated_at' => 1.second.ago} }
+            context 'with conflict' do
+              let(:connec_id) { '34uuu-778aa' }
+              let!(:idmap) { create(:idmap, connec_id: connec_id, connec_entity: connec_name.downcase, external_entity: external_name.downcase, external_id: id, organization: organization, last_push_to_connec: 2.day.ago) }
+              before {
+                allow(subject).to receive(:map_to_external_with_idmap)
+              }
+
+              context 'with connec_preemption opt' do
 
-                it 'discards the entity' do
-                  mapped_entities = subject.consolidate_and_map_data([connec_entity], entities, organization, {connec_preemption: true})
-                  expect(mapped_entities).to eql({connec_entities: [], external_entities: []})
+                context 'set to true' do
+                  let(:connec_entity) { {'id' => connec_id, 'first_name' => 'Richard', 'updated_at' => 1.day.ago} }
+                  it 'discards the entity' do
+                    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
+                    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
 
-              context 'with a more recent external_entity' do
-                let(:connec_entity) { {'id' => connec_id, 'first_name' => 'Richard', 'updated_at' => 1.year.ago} }
+              context 'without opt' do
+                context 'with a more recent connec entity' do
+                  let(:connec_entity) { {'id' => connec_id, 'first_name' => 'Richard', 'updated_at' => 1.second.ago} }
+
+                  it 'discards the entity' do
+                    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 'with a more recent external_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
-                  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}]})
+                  it 'returns the mapped entity with its idmap' do
+                    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
-            end
 
+            end
           end
+
         end
 
       end
-
     end