maestrano-connector-rails 2.0.1 → 2.0.2.pre.RC1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f98ffd30f0c9e18fb5ad95d5a52849bba5e437d0
-  data.tar.gz: 9864988bffd82f6ce6d66aec534f5822b59c36db
+  metadata.gz: 74dbb8e9c430a2e596fdd639adffb4c5ffe72b00
+  data.tar.gz: 2d7d7e742c74765d315728913e846bc31268bb2b
 SHA512:
-  metadata.gz: 303ce74c7bd93ad0874971fd5faec32ffd2e65db3581a255725fde10a7db198471ef2f76ac6c340a14c8c08bc1276e59c640c86ca1385b3f5cccd492ec4dea8c
-  data.tar.gz: 9f369354a387999193b660096617465b41549acd6123e58ec4590cda4ade4ad7a10c74a552e061862bd5467fd92347c27fa84071d367ef8441b508de9bc06225
+  metadata.gz: fc6c45a3e8b39444508ec0430fe001907135ff52591d44c4914a74aeb763e8a3ff3f905eb4438063a3d1bd5201e90c6962b82d570e045698514d394c71006b80
+  data.tar.gz: 72cfe2b906911c29480de3420934921e66a07495db4d89e5195883ecd8c6e33de95b50cbfdbe8a683961d51ab1b45fb133a1e08ac6a730d14b85b8269262e71f

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.0.2.pre.RC1

data/app/controllers/maestrano/connec_controller.rb

@@ -49,7 +49,7 @@ class Maestrano::ConnecController < Maestrano::Rails::WebHookController
         return false
       end
 
-      unless organization.sync_enabled && organization.synchronized_entities[entity_class_hash[:name].to_sym]
+      unless organization.sync_enabled && organization.synchronized_entities[entity_class_hash[:name].to_sym][:can_push_to_external]
         Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Skipping notification from Connec! webhook, entity_name=\"#{entity_name}\"")
         return false
       end
@@ -58,12 +58,13 @@ class Maestrano::ConnecController < Maestrano::Rails::WebHookController
     end
 
     def find_entity_class(entity_name)
+      parametrised_entity_name = entity_name.parameterize('_').pluralize
       Maestrano::Connector::Rails::External.entities_list.each do |entity_name_from_list|
         clazz = "Entities::#{entity_name_from_list.singularize.titleize.split.join}".constantize
         if clazz.methods.include?('connec_entities_names'.to_sym)
           formatted_entities_names = clazz.connec_entities_names.map { |n| n.parameterize('_').pluralize }
-          return {class: clazz, is_complex: true, name: entity_name_from_list} if formatted_entities_names.include?(entity_name)
-        elsif clazz.methods.include?('connec_entity_name'.to_sym) && clazz.normalized_connec_entity_name == entity_name
+          return {class: clazz, is_complex: true, name: entity_name_from_list} if formatted_entities_names.include?(parametrised_entity_name)
+        elsif clazz.methods.include?('connec_entity_name'.to_sym) && clazz.normalized_connec_entity_name == parametrised_entity_name
           return {class: clazz, is_complex: false, name: entity_name_from_list}
         end
       end

data/app/controllers/maestrano/synchronizations_controller.rb

@@ -27,6 +27,17 @@ class Maestrano::SynchronizationsController < Maestrano::Rails::WebHookControlle
     render_organization_sync(organization, status, 201)
   end
 
+  def update_metadata 
+    tenant = params[:tenant]
+    uid = params[:group_id]
+    organization = Maestrano::Connector::Rails::Organization.find_by(uid: uid, tenant: tenant)
+    return render json: {errors: [{message: 'Organization not found', code: 404}]}, status: :not_found unless organization
+
+    organization.set_instance_metadata
+    organization.reset_synchronized_entities
+    render_organization_sync(organization, status, 200)
+  end
+
   def toggle_sync
     tenant = params[:tenant]
     uid = params[:group_id]

data/app/helpers/maestrano/connector/rails/entity_helper.rb

@@ -0,0 +1,22 @@
+module Maestrano::Connector::Rails
+  module EntityHelper
+    def self.snake_name(entity)
+      class_name = entity.class.name.underscore.split('/').last
+      if entity.is_a?(Maestrano::Connector::Rails::SubEntityBase)
+        name = ''
+        Entities.constants&.each do |c|
+          klass = Entities.const_get(c)
+          next unless klass.respond_to?(:formatted_external_entities_names)
+          if klass.formatted_external_entities_names.values.include?(class_name.camelize) ||
+             klass.formatted_connec_entities_names.values.include?(class_name.camelize)
+            name = c
+            break
+          end
+        end
+        name.to_s.underscore.to_sym
+      else
+        class_name.to_sym
+      end
+    end
+  end
+end

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

@@ -12,7 +12,7 @@ module Maestrano::Connector::Rails
 
       entities_hash.each do |external_entity_name, entities|
         if entity_instance_hash = find_entity_instance(external_entity_name, organization, connec_client, external_client, opts)
-          next unless organization.synchronized_entities[entity_instance_hash[:name].to_sym]
+          next unless organization.synchronized_entities[entity_instance_hash[:name].to_sym][:can_push_to_connec]
 
           entity_instance = entity_instance_hash[:instance]
 

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

@@ -38,7 +38,8 @@ module Maestrano::Connector::Rails
         # We also do batched sync as the first one can be quite huge
         if last_synchronization.nil?
           ConnectorLogger.log('info', organization, 'First synchronization ever. Doing two half syncs to allow smart merging to work its magic.')
-          organization.synchronized_entities.select { |k, v| v }.keys.each do |entity|
+          organization.synchronized_entities.each do |entity, settings|
+            next unless settings[:can_push_to_connec] || settings[:can_push_to_external]
             ConnectorLogger.log('info', organization, "First synchronization ever. Doing half sync from external for #{entity}.")
             first_sync_entity(entity.to_s, organization, connec_client, external_client, last_synchronization_date, opts, true)
             ConnectorLogger.log('info', organization, "First synchronization ever. Doing half sync from Connec! for #{entity}.")
@@ -52,7 +53,8 @@ module Maestrano::Connector::Rails
             sync_entity(entity, organization, connec_client, external_client, last_synchronization_date, opts)
           end
         else
-          organization.synchronized_entities.select { |_k, v| v }.keys.each do |entity|
+          organization.synchronized_entities.each do |entity, settings|
+            next unless settings[:can_push_to_connec] || settings[:can_push_to_external]
             sync_entity(entity.to_s, organization, connec_client, external_client, last_synchronization_date, opts)
           end
         end

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

@@ -253,7 +253,7 @@ module Maestrano::Connector::Rails::Concerns::Entity
   # * connec_id and push timestamp
   # * error message
   def push_entities_to_connec_to(mapped_external_entities_with_idmaps, connec_entity_name)
-    return unless self.class.can_write_connec?
+    return unless @organization.push_to_connec_enabled?(self)
 
     Maestrano::Connector::Rails::ConnectorLogger.log('info', @organization, "Sending #{Maestrano::Connector::Rails::External.external_name} #{self.class.external_entity_name.pluralize} to Connec! #{connec_entity_name.pluralize}")
 
@@ -304,7 +304,7 @@ module Maestrano::Connector::Rails::Concerns::Entity
   # Pushes connec entities to the external application
   # Sends new external ids to Connec! (either only the id, or the id + the id references)
   def push_entities_to_external_to(mapped_connec_entities_with_idmaps, external_entity_name)
-    return unless self.class.can_write_external?
+    return unless @organization.push_to_external_enabled?(self)
 
     Maestrano::Connector::Rails::ConnectorLogger.log('info', @organization, "Sending Connec! #{self.class.connec_entity_name.pluralize} to #{Maestrano::Connector::Rails::External.external_name} #{external_entity_name.pluralize}")
 

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

@@ -15,7 +15,7 @@ module Maestrano::Connector::Rails
       super
       self.synchronized_entities = {}
       External.entities_list.each do |entity|
-        self.synchronized_entities[entity.to_sym] = true
+        self.synchronized_entities[entity.to_sym] = {can_push_to_connec: true, can_push_to_external: true}
       end
     end
 
@@ -49,13 +49,13 @@ module Maestrano::Connector::Rails
 
     def displayable_synchronized_entities
       result = {}
-      synchronized_entities.each do |entity, boolean|
+      synchronized_entities.each do |entity, hash|
         begin
           clazz = "Entities::#{entity.to_s.titleize.split.join}".constantize
         rescue
           next
         end
-        result[entity] = {value: boolean, connec_name: clazz.public_connec_entity_name, external_name: clazz.public_external_entity_name}
+        result[entity] = {connec_name: clazz.public_connec_entity_name, external_name: clazz.public_external_entity_name}.merge(hash)
       end
       result
     end
@@ -115,10 +115,37 @@ module Maestrano::Connector::Rails
       last_successful_synchronization&.updated_at || date_filtering_limit
     end
 
-    def reset_synchronized_entities
+    def reset_synchronized_entities(default = false)
       synchronized_entities.slice!(*External.entities_list.map(&:to_sym))
-      External.entities_list.each { |entity| synchronized_entities[entity.to_sym] ||= false }
+      External.entities_list.each do |entity|
+        if synchronized_entities[entity.to_sym].is_a?(Hash)
+          can_push_to_external = synchronized_entities[entity.to_sym][:can_push_to_external]
+          can_push_to_connec = synchronized_entities[entity.to_sym][:can_push_to_connec]
+        else
+          can_push_to_external = synchronized_entities[entity.to_sym]
+          can_push_to_connec = synchronized_entities[entity.to_sym]
+        end
+        synchronized_entities[entity.to_sym] = {can_push_to_connec: (can_push_to_connec || default) && !pull_disabled, can_push_to_external: (can_push_to_external || default) && !push_disabled}
+      end
       save
     end
+
+    def push_to_connec_enabled?(entity)
+      synchronized_entities.dig(EntityHelper.snake_name(entity), :can_push_to_connec) && entity&.class.can_write_connec?
+    end
+
+    def push_to_external_enabled?(entity)
+      synchronized_entities.dig(EntityHelper.snake_name(entity), :can_push_to_external) && entity&.class.can_write_external?
+    end
+
+    def set_instance_metadata
+      auth = {:username => Maestrano[tenant].param('api.id'), :password => Maestrano[tenant].param('api.key')}
+      res = HTTParty.get("#{ENV['HUB_HOST']}/api/v1/account/groups/#{uid}", :basic_auth => auth)
+
+      self.push_disabled = res.dig('data', 'metadata', 'push_disabled')
+      self.pull_disabled = res.dig('data', 'metadata', 'pull_disabled')
+
+      self.save
+    end
   end
 end

data/config/routes.rb

@@ -13,6 +13,7 @@ Maestrano::Connector::Rails::Engine.routes.draw do
       resources :synchronizations, only: [:show, :create] do
         collection do
           put :toggle_sync
+          put :update_metadata
         end
       end
     end

data/db/migrate/20170202033323_update_organization_metadata.rb

@@ -0,0 +1,15 @@
+class UpdateOrganizationMetadata < ActiveRecord::Migration
+  def change
+  	add_column :organizations, :push_disabled, :boolean
+  	add_column :organizations, :pull_disabled, :boolean
+  	# Migration to update the way we handle synchronized_entities for data sharing.
+	  # Before : synchronized_entities = {company: true}
+	  # After: synchronized_entities = {company: {can_push_to_connec: true, can_push_to_external: true}}
+
+	  #We also add metadata from MnoHub
+    Maestrano::Connector::Rails::Organization.all.each do |o|
+      o.set_instance_metadata
+      o.reset_synchronized_entities
+    end
+  end
+end

data/lib/generators/connector/templates/home.js

@@ -12,4 +12,4 @@ function historicalDataDisplay()
 
 $(function () {
   $('[data-toggle="tooltip"]').tooltip()
-})
+})

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

@@ -5,15 +5,18 @@ class HomeController < ApplicationController
 
     # Update list of entities to synchronize
     current_organization.synchronized_entities.keys.each do |entity|
-      current_organization.synchronized_entities[entity] = params[entity.to_s].present?
+      current_organization.synchronized_entities[entity][:can_push_to_connec] = params[entity.to_s]["to_connec"] == "1"
+      current_organization.synchronized_entities[entity][:can_push_to_external] = params[entity.to_s]["to_external"] == "1"
     end
+    full_sync = params['historical-data'].present? && !current_organization.historical_data
+    opts = {full_sync: full_sync}
     current_organization.sync_enabled = current_organization.synchronized_entities.values.any?
     current_organization.enable_historical_data(params['historical-data'].present?)
-    trigger_sync = current_organization.sync_enabled && current_organization.sync_enabled_changed?
+    trigger_sync = current_organization.sync_enabled
     current_organization.save
 
     # Trigger sync only if the sync has been enabled
-    start_synchronization if trigger_sync
+    start_synchronization(opts) if trigger_sync
 
     redirect_to(:back)
   end
@@ -32,8 +35,8 @@ class HomeController < ApplicationController
 
   private
 
-    def start_synchronization
-      Maestrano::Connector::Rails::SynchronizationJob.perform_later(current_organization.id, {})
-      flash[:info] = 'Congrats, you\'re all set up! Your data are now being synced'
+    def start_synchronization(opts)
+      Maestrano::Connector::Rails::SynchronizationJob.perform_later(current_organization.id, opts)
+      flash[:info] = 'Congrats, you\'re all set up! Your data are now being synced' if current_organization.sync_enabled_changed?
     end
 end

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

@@ -4,7 +4,7 @@
   .banners
     .row
       .col-md-10.col-md-offset-2
-        %h2 ApplicationName Connector
+        %h1 ApplicationName Connector
         %p
           -if current_organization
             Link your company <strong>#{current_organization.name} (#{current_organization.uid})</strong> to ApplicationName to get your business in synch. Check the status of your connection on this screen.
@@ -23,7 +23,7 @@
           %span.badge.link-step-badge
             1
         .col-md-6.link-step-description
-          %h
+          %p
             - if current_organization.oauth_uid
               Your ApplicationName account <strong>#{current_organization.oauth_name} (#{current_organization.oauth_uid})</strong> is currently linked
             - else
@@ -44,22 +44,30 @@
           .col-md-1.text-center.link-step-number
             %span.badge.link-step-badge 2
           .col-md-9.link-step-description
-            %h You can customize which entities are synchronized by the connector:
+            %p You can customize which entities are synchronized by the connector:
+            %p (#{image_tag "logos/to_connec.png", class: "small-image"} : from ApplicationName to Connec! and #{image_tag "logos/to_external.png", class: "small-image"} : from Connec! to ApplicationName)
             .spacer1
             .row
               .col-md-11.col-md-offset-1.center
-                .col-md-4.col-md-offset-1
-                  ApplicationName wording
-                .col-md-4
-                  Universal wording
+                .row
+                  .col-md-1
+                    =image_tag "logos/to_connec.png", class: "image"
+                  .col-md-1
+                    =image_tag "logos/to_external.png", class: "image"
+                  .col-md-4
+                    Vend wording
+                  .col-md-3
+                    Universal wording
             .spacer1
             .row
               .col-md-11.col-md-offset-1
                 - current_organization.displayable_synchronized_entities.each do |k, v|
                   .row.sync-entity
                     .col-md-1.link-step-action
-                      %input{type: "checkbox", id: "#{k}", name: "#{k}", checked: v[:value]}
-                    %label.col-md-8{:for => "#{k}", style: 'padding-top: 5px;'}
+                      #{check_box("#{k}", "to_connec", {checked: (v[:can_push_to_connec] || v[:can_push_to_external]) && !current_organization.pull_disabled, onclick: "return !#{k}_to_external.checked;", disabled: current_organization.pull_disabled})}
+                    .col-md-1.link-step-action
+                      #{check_box("#{k}", "to_external", {checked: v[:can_push_to_external] && !current_organization.push_disabled, onchange: "#{k}_to_connec.checked = #{!current_organization.pull_disabled};", disabled: current_organization.push_disabled})}
+                    %label.col-md-7{:for => "#{k}", style: 'padding-top: 5px;'}
                       .col-md-6
                         #{v[:external_name]}
                       .col-md-6

data/lib/generators/connector/templates/stylesheets/layout.sass

@@ -69,6 +69,13 @@ html, body
 .logo
   height: 51px
 
+.image
+  height: 30px
+  margin-left: -25px
+
+.small-image
+  height: 20px
+
 .center
   text-align: center
 

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 2.0.1 ruby lib
+# stub: maestrano-connector-rails 2.0.2.pre.RC1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "maestrano-connector-rails".freeze
-  s.version = "2.0.1"
+  s.version = "2.0.2.pre.RC1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Maestrano".freeze]
-  s.date = "2017-01-04"
+  s.date = "2017-02-02"
   s.description = "Maestrano is the next generation marketplace for SME applications. See https://sme.maestrano.com for details.".freeze
   s.email = "developers@maestrano.com".freeze
   s.executables = ["rails".freeze, "rake".freeze]
@@ -41,6 +41,7 @@ Gem::Specification.new do |s|
     "app/controllers/maestrano/sessions_controller.rb",
     "app/controllers/maestrano/synchronizations_controller.rb",
     "app/controllers/version_controller.rb",
+    "app/helpers/maestrano/connector/rails/entity_helper.rb",
     "app/helpers/maestrano/connector/rails/session_helper.rb",
     "app/jobs/maestrano/connector/rails/all_synchronizations_job.rb",
     "app/jobs/maestrano/connector/rails/push_to_connec_job.rb",
@@ -82,6 +83,7 @@ Gem::Specification.new do |s|
     "db/migrate/20160614160654_add_encryption_on_oauth_keys.rb",
     "db/migrate/20161011005751_add_unique_index_on_organization_oauth_uid.rb",
     "db/migrate/20161018155513_add_org_uid_to_organization.rb",
+    "db/migrate/20170202033323_update_organization_metadata.rb",
     "lib/generators/connector/USAGE",
     "lib/generators/connector/complex_entity_generator.rb",
     "lib/generators/connector/install_generator.rb",

data/spec/controllers/connec_controller_spec.rb

@@ -76,7 +76,7 @@ describe Maestrano::ConnecController, type: :controller do
           before {
             allow(Entities::ContactAndLead).to receive(:external_entities_names).and_return(%w())
           }
-          let!(:organization) { create(:organization, uid: group_id, oauth_uid: 'lala', sync_enabled: true, synchronized_entities: {contact_and_lead: true}) }
+          let!(:organization) { create(:organization, uid: group_id, oauth_uid: 'lala', sync_enabled: true) }
 
           it 'process the data and push them' do
             expect_any_instance_of(Entities::ContactAndLead).to receive(:before_sync)
@@ -130,7 +130,7 @@ describe Maestrano::ConnecController, type: :controller do
 
         context 'with a valid organization' do
           context 'with sync disabled' do
-            let!(:organization) { create(:organization, uid: group_id, oauth_uid: 'lala', sync_enabled: false, synchronized_entities: {person: true}) }
+            let!(:organization) { create(:organization, uid: group_id, oauth_uid: 'lala', sync_enabled: false) }
 
             it 'does nothing' do
               expect(Maestrano::Connector::Rails::External).to_not receive(:get_client).with(organization)
@@ -139,7 +139,7 @@ describe Maestrano::ConnecController, type: :controller do
           end
 
           context 'with sync disabled for this entity' do
-            let!(:organization) { create(:organization, uid: group_id, oauth_uid: 'lala', sync_enabled: true, synchronized_entities: {person: false}) }
+            let!(:organization) { create(:organization, uid: group_id, oauth_uid: 'lala', sync_enabled: true, synchronized_entities: {person: {can_push_to_connec: false}}) }
 
             it 'does nothing' do
               expect(Maestrano::Connector::Rails::External).to_not receive(:get_client).with(organization)
@@ -148,7 +148,7 @@ describe Maestrano::ConnecController, type: :controller do
           end
 
           context "when syncing" do
-            let!(:organization) { create(:organization, uid: group_id, oauth_uid: 'lala', sync_enabled: true, synchronized_entities: {person: true}) }
+            let!(:organization) { create(:organization, uid: group_id, oauth_uid: 'lala', sync_enabled: true) }
 
             it 'process the data and push them' do
               expect_any_instance_of(Entities::Person).to receive(:before_sync)
@@ -158,6 +158,19 @@ describe Maestrano::ConnecController, type: :controller do
               expect_any_instance_of(Entities::Person).to receive(:after_sync)
               subject
             end
+
+            context 'with different entity name case and singular' do
+              let(:notifications) { {'Person' => [entity]} }
+
+              it 'process the data and push them' do
+                expect_any_instance_of(Entities::Person).to receive(:before_sync)
+                expect_any_instance_of(Entities::Person).to receive(:filter_connec_entities).and_return([entity])
+                expect_any_instance_of(Entities::Person).to receive(:consolidate_and_map_data).with([entity], []).and_return({})
+                expect_any_instance_of(Entities::Person).to receive(:push_entities_to_external)
+                expect_any_instance_of(Entities::Person).to receive(:after_sync)
+                subject
+              end
+            end
           end
         end
       end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20161018155513) do
+ActiveRecord::Schema.define(version: 20170202033323) do
 
   create_table "id_maps", force: :cascade do |t|
     t.string   "connec_id"
@@ -56,6 +56,8 @@ ActiveRecord::Schema.define(version: 20161018155513) do
     t.string   "encrypted_refresh_token_iv"
     t.string   "encrypted_refresh_token_salt"
     t.string   "org_uid"
+    t.boolean  "push_disabled"
+    t.boolean  "pull_disabled"
   end
 
   add_index "organizations", ["oauth_uid"], name: "index_organizations_on_oauth_uid", unique: true

data/spec/integration/complex_id_references_spec.rb

@@ -90,6 +90,7 @@ describe 'complex id references' do
 
   before {
     allow(Maestrano::Connector::Rails::External).to receive(:entities_list).and_return(%w(id_payment))
+    organization.reset_synchronized_entities(true)
 
     allow(connec_client).to receive(:get).and_return(ActionDispatch::Response.new(200, {}, {idpayments: [connec_payment]}.to_json, {}))
     allow(connec_client).to receive(:batch).and_return(ActionDispatch::Response.new(200, {}, {results: [{status: 200, body: {payments: {}}}]}.to_json, {}))

data/spec/integration/complex_naming_spec.rb

@@ -87,6 +87,7 @@ describe 'complex entity subentities naming conflict' do
 
   before {
     allow(Maestrano::Connector::Rails::External).to receive(:entities_list).and_return(%w(name_payment))
+    organization.reset_synchronized_entities(true)
   }
 
   subject { Maestrano::Connector::Rails::SynchronizationJob.new.sync_entity('name_payment', organization, connec_client, external_client, organization.last_synchronization_date, {}) }

data/spec/integration/complex_spec.rb

@@ -212,14 +212,17 @@ describe 'complex entities workflow' do
     }
   }
   let!(:supplier_idmap) { Entities::SubEntities::CompSupplier.create_idmap(organization_id: organization.id, external_id: ext_supplier_id, connec_entity: 'comporganization') }
+  let(:entity_name) { 'customer_and_supplier' }
 
   before do
     allow(connec_client).to receive(:get).and_return(ActionDispatch::Response.new(200, {}, {comporganizations: connec_orgs}.to_json, {}))
     allow_any_instance_of(Entities::SubEntities::CompCustomer).to receive(:get_external_entities).and_return([ext_customer])
     allow_any_instance_of(Entities::SubEntities::CompSupplier).to receive(:get_external_entities).and_return([ext_supplier])
+    allow(Maestrano::Connector::Rails::External).to receive(:entities_list).and_return([entity_name])
+    organization.reset_synchronized_entities(true)
   end
 
-  subject { Maestrano::Connector::Rails::SynchronizationJob.new.sync_entity('customer_and_supplier', organization, connec_client, external_client, nil, {}) }
+  subject { Maestrano::Connector::Rails::SynchronizationJob.new.sync_entity(entity_name, organization, connec_client, external_client, nil, {}) }
 
   it 'handles the fetching correctly' do
     expect_any_instance_of(Entities::CustomerAndSupplier).to receive(:consolidate_and_map_data).with({'CompOrganization' => connec_orgs}, {'CompCustomer' => [ext_customer], 'CompSupplier' => [ext_supplier]}).and_return({connec_entities: [], external_entities: []})

data/spec/integration/connec_to_external_spec.rb

@@ -88,15 +88,18 @@ describe 'connec to the external application' do
     }
   }
   let(:person) { person1 }
+  let(:entity_name) { 'connec_to_external' }
 
   before do
     allow(connec_client).to receive(:get).and_return(ActionDispatch::Response.new(200, {}, {people: [person]}.to_json, {}))
     allow(connec_client).to receive(:batch).and_return(ActionDispatch::Response.new(200, {}, {results: [{status: 200, body: {people: {}}}]}.to_json, {}))
 
     allow_any_instance_of(Entities::ConnecToExternal).to receive(:get_external_entities).and_return([])
+    allow(Maestrano::Connector::Rails::External).to receive(:entities_list).and_return([entity_name])
+    organization.reset_synchronized_entities(true)
   end
 
-  subject { Maestrano::Connector::Rails::SynchronizationJob.new.sync_entity('connec_to_external', organization, connec_client, external_client, organization.last_synchronization_date, {}) }
+  subject { Maestrano::Connector::Rails::SynchronizationJob.new.sync_entity(entity_name, organization, connec_client, external_client, organization.last_synchronization_date, {}) }
 
   describe 'a new record created in connec with all references known' do
     before {
@@ -228,11 +231,14 @@ describe 'connec to the external application' do
 
   describe 'a creation from connec where the creation_only_mapper has to be used' do
     #idmap.last_push_to_external is nil
+    let(:entity_name) { 'connec_to_external_missing_field' }
     before do
       allow_any_instance_of(Entities::ConnecToExternalMissingField).to receive(:get_external_entities).and_return([])
+      allow(Maestrano::Connector::Rails::External).to receive(:entities_list).and_return([entity_name])
+      organization.reset_synchronized_entities(true)
     end
 
-    subject { Maestrano::Connector::Rails::SynchronizationJob.new.sync_entity('connec_to_external_missing_field', organization, connec_client, external_client, organization.last_synchronization_date, {}) }
+    subject { Maestrano::Connector::Rails::SynchronizationJob.new.sync_entity(entity_name, organization, connec_client, external_client, organization.last_synchronization_date, {}) }
 
     class Entities::ConnecToExternalMissingField < Entities::ConnecToExternal
 

data/spec/integration/external_to_connec_spec.rb

@@ -88,12 +88,16 @@ describe 'external application to connec' do
     }
   }
 
+  let(:entity_name) { 'external_to_connec' }
+
   before {
     allow_any_instance_of(Entities::ExternalToConnec).to receive(:get_connec_entities).and_return([])
     allow_any_instance_of(Entities::ExternalToConnec).to receive(:get_external_entities).and_return([contact])
+    allow(Maestrano::Connector::Rails::External).to receive(:entities_list).and_return([entity_name])
+    organization.reset_synchronized_entities(true)
   }
 
-  subject { Maestrano::Connector::Rails::SynchronizationJob.new.sync_entity('external_to_connec', organization, connec_client, external_client, nil, {}) }
+  subject { Maestrano::Connector::Rails::SynchronizationJob.new.sync_entity(entity_name, organization, connec_client, external_client, nil, {}) }
 
   describe 'creating an record in connec' do
     before {

data/spec/integration/id_references_spec.rb

@@ -58,6 +58,7 @@ describe 'id references' do
   let(:ext_line_id2) { 'ext line id2' }
 
   let(:payment_title) { 'This is a payment' }
+  let(:entity_name) { 'id_reference' }
  
 
   before {
@@ -65,9 +66,11 @@ describe 'id references' do
     allow(connec_client).to receive(:batch).and_return(ActionDispatch::Response.new(200, {}, {results: [{status: 200, body: {payments: {}}}]}.to_json, {}))
 
     allow_any_instance_of(Entities::IdReference).to receive(:get_external_entities).and_return([])
+    allow(Maestrano::Connector::Rails::External).to receive(:entities_list).and_return([entity_name])
+    organization.reset_synchronized_entities(true)
   }
 
-  subject { Maestrano::Connector::Rails::SynchronizationJob.new.sync_entity('id_reference', organization, connec_client, external_client, organization.last_synchronization_date, {}) }
+  subject { Maestrano::Connector::Rails::SynchronizationJob.new.sync_entity(entity_name, organization, connec_client, external_client, organization.last_synchronization_date, {}) }
 
   describe 'a creation from connec' do
     before {

data/spec/integration/singleton_spec.rb

@@ -85,15 +85,19 @@ describe 'singleton workflow' do
     }
   }
 
+  let(:synchronized_entity) { "singleton_integration" }
+
 
   before {
     allow(connec_client).to receive(:get).and_return(ActionDispatch::Response.new(200, {}, {company: company}.to_json, {}))
     allow_any_instance_of(Entities::SingletonIntegration).to receive(:get_external_entities).and_return(ext_company)
     allow_any_instance_of(Entities::SingletonIntegration).to receive(:update_external_entity).and_return(nil)
     allow(connec_client).to receive(:batch).and_return(ActionDispatch::Response.new(200, {}, {results: [{status: 200, body: {company: {id: [{provider: 'connec', id: 'some connec id'}]}}}]}.to_json, {}))
+    allow(Maestrano::Connector::Rails::External).to receive(:entities_list).and_return([synchronized_entity])
+    organization.reset_synchronized_entities(true)
   }
 
-  subject { Maestrano::Connector::Rails::SynchronizationJob.new.sync_entity('singleton_integration', organization, connec_client, external_client, nil, {}) }
+  subject { Maestrano::Connector::Rails::SynchronizationJob.new.sync_entity(synchronized_entity, organization, connec_client, external_client, nil, {}) }
 
 
   describe 'when no idmap' do

data/spec/jobs/push_to_connec_job_spec.rb

@@ -60,7 +60,9 @@ describe Maestrano::Connector::Rails::PushToConnecJob do
     describe 'with entities in synchronized entities' do
 
       describe 'complex entity' do
-        before { organization.update(synchronized_entities: {:"#{entity_name1}" => false, :"#{entity_name2}" => true})}
+        let(:hash1) { {can_push_to_connec: false, can_push_to_external: false} }
+        let(:hash2) { {can_push_to_connec: true, can_push_to_external: true} }
+        before { organization.update(synchronized_entities: {:"#{entity_name1}" => hash1, :"#{entity_name2}" => hash2})}
 
         it 'calls consolidate and map data on the complex entity with the right arguments' do
           expect_any_instance_of(Entities::Entity2).to receive(:consolidate_and_map_data).with({"Connec name" => []}, {"Subs"=>[entity21], "ll"=>[]})
@@ -81,7 +83,9 @@ describe Maestrano::Connector::Rails::PushToConnecJob do
       end
 
       describe 'non complex entity' do
-        before { organization.update(synchronized_entities: {:"#{entity_name1}" => true, :"#{entity_name2}" => false})}
+        let(:hash1) { {can_push_to_connec: true, can_push_to_external: true} }
+        let(:hash2) { {can_push_to_connec: false, can_push_to_external: false} }
+        before { organization.update(synchronized_entities: {:"#{entity_name1}" => hash1, :"#{entity_name2}" => hash2})}
 
         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]).and_return({})

data/spec/jobs/synchronization_job_spec.rb

@@ -80,14 +80,6 @@ describe Maestrano::Connector::Rails::SynchronizationJob do
 
         it { performes }
 
-        it 'calls sync entity on all the organization synchronized entities set to true' do
-          organization.synchronized_entities[organization.synchronized_entities.keys.first] = false
-          organization.save
-          expect_any_instance_of(Maestrano::Connector::Rails::SynchronizationJob).to receive(:sync_entity).exactly(organization.synchronized_entities.count - 1).times
-
-          subject
-        end
-
         context 'with options' do
           context 'with only_entities' do
             let(:opts) { {only_entities: %w(people price)} }

data/spec/models/entity_spec.rb

@@ -154,6 +154,8 @@ describe Maestrano::Connector::Rails::Entity do
     before do
       allow(subject.class).to receive(:connec_entity_name).and_return(connec_name)
       allow(subject.class).to receive(:external_entity_name).and_return(external_name)
+      allow(Maestrano::Connector::Rails::External).to receive(:entities_list).and_return(%w(entity))
+      organization.reset_synchronized_entities(true)
     end
 
     describe 'Mapper methods' do

data/spec/models/organization_spec.rb

@@ -209,19 +209,34 @@ describe Maestrano::Connector::Rails::Organization do
     end
 
     describe '#reset_synchronized_entities' do
-      let(:organization) { create(:organization, synchronized_entities: {entity1: true, entity2: false, tomatoes: true}) }
+      let(:hash1) { {can_push_to_connec: true, can_push_to_external: true} }
+      let(:hash2) { {can_push_to_connec: false, can_push_to_external: false} }
+      let(:organization) { create(:organization, synchronized_entities: {entity1: true, entity2: true, tomatoes: false}) }
       subject { organization.reset_synchronized_entities }
 
       it 'keeps only the known entities' do
         subject
-        expect(organization.synchronized_entities).to eql(entity1: true, entity2: false)
+        expect(organization.synchronized_entities).to eql(entity1: hash1, entity2: hash1)
       end
 
       it 'adds missing entities' do
-        organization.update_attributes(synchronized_entities: {entity1: true, tomatoes: true})
+        organization.update_attributes(synchronized_entities: {entity1: true, tomatoes: false})
 
         subject
-        expect(organization.synchronized_entities).to eql(entity1: true, entity2: false)
+        expect(organization.synchronized_entities).to eql(entity1: hash1, entity2: hash2)
+      end
+
+      context 'with metadata from mnohub' do
+        before {
+          organization.push_disabled = true
+          organization.pull_disabled = true
+        }
+
+
+        it 'takes into account the metadata' do
+          subject
+          expect(organization.synchronized_entities).to eql(entity1: hash2, entity2: hash2)
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maestrano-connector-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2.pre.RC1
 platform: ruby
 authors:
 - Maestrano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-04 00:00:00.000000000 Z
+date: 2017-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -420,6 +420,7 @@ files:
 - app/controllers/maestrano/sessions_controller.rb
 - app/controllers/maestrano/synchronizations_controller.rb
 - app/controllers/version_controller.rb
+- app/helpers/maestrano/connector/rails/entity_helper.rb
 - app/helpers/maestrano/connector/rails/session_helper.rb
 - app/jobs/maestrano/connector/rails/all_synchronizations_job.rb
 - app/jobs/maestrano/connector/rails/push_to_connec_job.rb
@@ -461,6 +462,7 @@ files:
 - db/migrate/20160614160654_add_encryption_on_oauth_keys.rb
 - db/migrate/20161011005751_add_unique_index_on_organization_oauth_uid.rb
 - db/migrate/20161018155513_add_org_uid_to_organization.rb
+- db/migrate/20170202033323_update_organization_metadata.rb
 - lib/generators/connector/USAGE
 - lib/generators/connector/complex_entity_generator.rb
 - lib/generators/connector/install_generator.rb
@@ -610,9 +612,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.8