maestrano-connector-rails 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 173bdf0c540c2e0218f01962ca98defe2e678bb9
-  data.tar.gz: f4e34051fbecb1035281eea03895e8b98ad4f418
+  metadata.gz: e2b30b01e9635bb23e54086aa72a76209ff6ff90
+  data.tar.gz: 093c8366dae9dd669fd6989f95e8030c44698d1b
 SHA512:
-  metadata.gz: 031e61b8d07199ad89fbc7cae4b5bb245f9c1873d04964bb1c2a698aa5f1ef016faa4e72c61c9939e6b25bacf283949d785ad1c4b31bee2c90b1239cc8162a25
-  data.tar.gz: 1dbcaf2614a24187b2a9ab91629a32f6da76876107b934fce5e31f977b6ac15aaac3877564a35721c24a21b5b1c3370a641cd4ef814da4afc90e237a23754452
+  metadata.gz: c4e022328533a25167c5c3d37b4c146edf6a9d88bec6d952209a3a52d3b156f7262800bdc7148ba8a4320272a4e39720704adb57529ccb294cfda08e5fd623a1
+  data.tar.gz: cd8609ffcf02458ea2b97419076ec7e521a28fa9fde702d2ce7c6bd9fecf773c6cc63dc9fb3a708f8e5bfb3f46132984d1ce71b2226715b31172f8c2b5c196cd

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.4

data/app/controllers/maestrano/connec_controller.rb

@@ -4,7 +4,7 @@ class Maestrano::ConnecController < Maestrano::Rails::WebHookController
     Rails.logger.debug "Received notification from Connec!: #{params}"
 
     begin
-      params.except(:tenant, :controller, :action).each do |entity_name, entities|
+      params.except(:tenant, :controller, :action, :connec).each do |entity_name, entities|
 
         entity_instance_hash = find_entity_instance(entity_name)
         next Rails.logger.info "Received notification from Connec! for unknow entity: #{entity_name}" unless entity_instance_hash
@@ -23,11 +23,15 @@ class Maestrano::ConnecController < Maestrano::Rails::WebHookController
           last_synchronization = organization.last_successful_synchronization
 
           entity_instance.before_sync(connec_client, external_client, last_synchronization, organization, {})
+          
+
           # Build expected input for consolidate_and_map_data
           if entity_instance_hash[:is_complex]
-            mapped_entity = entity_instance.consolidate_and_map_data(Hash[ *entity_instance.class.connec_entities_names.collect{|name| name.parameterize('_').pluralize == entity_name ? [name, [entity]] : [ name, []]}.flatten(1) ], Hash[ *entity_instance.class.external_entities_names.collect{|name| [ name, []]}.flatten(1) ], organization, {})
+            filtered_entities = entity_instance.filter_connec_entities(Hash[ *entity_instance.class.connec_entities_names.collect{|name| name.parameterize('_').pluralize == entity_name ? [name, [entity]] : [ name, []]}.flatten(1) ], organization)
+            mapped_entity = entity_instance.consolidate_and_map_data(filtered_entities, Hash[ *entity_instance.class.external_entities_names.collect{|name| [ name, []]}.flatten(1) ], organization, {})
           else
-            mapped_entity = entity_instance.consolidate_and_map_data([entity], [], organization, {})
+            filtered_entities = entity_instance.filter_connec_entities([entity], organization)
+            mapped_entity = entity_instance.consolidate_and_map_data(filtered_entities, [], organization, {})
           end
           entity_instance.push_entities_to_external(external_client, mapped_entity[:connec_entities], organization)
 

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

@@ -176,4 +176,14 @@ module Maestrano::Connector::Rails::Concerns::ComplexEntity
   def after_sync(connec_client, external_client, last_synchronization, organization, opts)
     # Does nothing by default
   end
+
+  # This method is called during the webhook workflow only. It should return the hash of arrays of filtered entities
+  # The aim is to have the same filtering as with the Connec! filters on API calls in the webhooks
+  # input :  {
+  #             external_entities_names[0]: [unmapped_external_entity1}, unmapped_external_entity2],
+  #             external_entities_names[1]: [unmapped_external_entity3}, unmapped_external_entity4]
+  #          }
+  def filter_connec_entities(entities, organization, opts={})
+    entities
+  end
 end

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

@@ -267,7 +267,7 @@ module Maestrano::Connector::Rails::Concerns::Entity
           batch_entities[index][:idmap].update_attributes(connec_id: result['body'][self.class.normalize_connec_entity_name(connec_entity_name)]['id'], last_push_to_connec: Time.now, message: nil)
         else
           Maestrano::Connector::Rails::ConnectorLogger.log('error', organization, "Error while pushing to Connec!: #{result['body']}")
-          batch_entities[index][:idmap].update_attributes(message: result['body'])
+          batch_entities[index][:idmap].update_attributes(message: result['body'].truncate(255))
         end
       end
       start += request_per_call
@@ -340,7 +340,7 @@ module Maestrano::Connector::Rails::Concerns::Entity
     rescue => e
       # Store External error
       Maestrano::Connector::Rails::ConnectorLogger.log('error', organization, "Error while pushing to #{Maestrano::Connector::Rails::External.external_name}: #{e}")
-      idmap.update_attributes(message: e.message)
+      idmap.update_attributes(message: e.message.truncate(255))
     end
   end
 
@@ -353,6 +353,12 @@ module Maestrano::Connector::Rails::Concerns::Entity
     Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Sending update #{external_entity_name} (id=#{external_id}): #{mapped_connec_entity} to #{Maestrano::Connector::Rails::External.external_name}")
     raise "Not implemented"
   end
+
+  # This method is called during the webhook workflow only. It should return the array of filtered entities
+  # The aim is to have the same filtering as with the Connec! filters on API calls in the webhooks
+  def filter_connec_entities(entities, organization, opts={})
+    entities
+  end
   # ----------------------------------------------
   #                 General methods
   # ----------------------------------------------

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.4.3 ruby lib
+# stub: maestrano-connector-rails 0.4.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "maestrano-connector-rails"
-  s.version = "0.4.3"
+  s.version = "0.4.4"
 
   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-05-04"
+  s.date = "2016-05-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/realse_notes.md

@@ -1,3 +1,9 @@
+## 0.4.3
+
+### Fixes
+* Add `forced` option in home_controller when requesting a manual synchronization.
+
+
 ## 0.4.2
 /!\ This release contains a new migration that you'll need to fetch and run
 

data/spec/controllers/connec_controller_spec.rb

@@ -71,6 +71,7 @@ describe Maestrano::ConnecController, type: :controller do
 
           it 'process the data and push them' do
             expect_any_instance_of(Entities::ContactAndLead).to receive(:before_sync)
+            expect_any_instance_of(Entities::ContactAndLead).to receive(:filter_connec_entities).and_return({"Lead"=>[entity]})
             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)
             expect_any_instance_of(Entities::ContactAndLead).to receive(:after_sync)
@@ -138,6 +139,7 @@ describe Maestrano::ConnecController, type: :controller do
 
             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], [], organization, {}).and_return({})
               expect_any_instance_of(Entities::Person).to receive(:push_entities_to_external)
               expect_any_instance_of(Entities::Person).to receive(:after_sync)

data/spec/models/complex_entity_spec.rb

@@ -21,9 +21,9 @@ describe Maestrano::Connector::Rails::ComplexEntity do
   end
 
   describe 'general methods' do
+    let(:organization) { create(:organization) }
 
     describe 'map_to_external_with_idmap' do
-      let(:organization) { create(:organization) }
       let(:id) { '322j-bbfg4' }
       let(:entity) { {'id' => id, 'name' => 'John', 'updated_at' => 2.day.ago} }
       let(:mapped_entity) { {'first_name' => 'John'} }
@@ -90,6 +90,9 @@ describe Maestrano::Connector::Rails::ComplexEntity do
       end
     end
 
+    describe 'filter_connec_entities' do
+      it { expect(subject.filter_connec_entities({'lead' => [{a: 2}]}, organization)).to eql({'lead' => [{a: 2}]}) }
+    end
   end
 
   describe 'methods with sub complex entities' do

data/spec/models/entity_spec.rb

@@ -420,7 +420,8 @@ describe Maestrano::Connector::Rails::Entity do
         end
 
         context 'with errors' do
-          let(:result400) { {status: 400, body: 'Not Found'} }
+          let(:err_msg) { 'Not Found' }
+          let(:result400) { {status: 400, body: err_msg} }
           before {
             allow(client).to receive(:batch).and_return(ActionDispatch::Response.new(200, {}, {results: [result400, result400]}.to_json, {}))
           }
@@ -430,6 +431,15 @@ describe Maestrano::Connector::Rails::Entity do
             idmap2.reload
             expect(idmap2.message).to eq result400[:body]
           end
+
+          context 'with a long error message' do
+            let(:err_msg) { 'A very long sentence with a lot of error or more likely a badly designed API that return an html 404 page instead of a nice json answer an then the world is sad and the kitten are unhappy. So juste to be safe we are truncating the error message and I am running out of words to write I hope it is long enough' }
+            it 'truncates the error message' do
+              subject.push_entities_to_connec_to(client, entities_with_idmaps, '', organization)
+              idmap2.reload
+              expect(idmap2.message).to eq err_msg.truncate(255)
+            end
+          end
         end
       end
 
@@ -505,6 +515,10 @@ describe Maestrano::Connector::Rails::Entity do
           end
         end
       end
+
+      describe 'filter_connec_entities' do
+        it { expect(subject.filter_connec_entities([{a: 2}], organization)).to eql([{a: 2}]) }
+      end
     end
 
 

metadata

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