maestrano-connector-rails 0.2.15 → 0.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60cc3a0fe4fd749682619befa70df6f687b5e208
-  data.tar.gz: d5b2db25bda76bb4d5d096a318652a2099715f2f
+  metadata.gz: 1ac017da954066c7397861d757d620250c1f9d17
+  data.tar.gz: 95034e887a9a9e1ea69c66e397bcc1c9c698e824
 SHA512:
-  metadata.gz: aecf4f9d5b7233e6937868b1510d1356ccc4c551fa3fbc0ce8aee7680372f3a3bce4b43d1b0af00941133b598521ce607973abc1d91ed12875dfd70353bb5f10
-  data.tar.gz: 08f4f20f19fbd49e9627d499d724e1da97c6c34089d99d976c6aaac54c37d9c2d7f4ba7fcbfa39920e677fbc04554c4ec632f174708893882309d8cc83621db2
+  metadata.gz: 9f47439af3beb4b4795d47ba4b5a9685ec35557d9aff988f90486d5ed313499752b46b55c2a7e469e93c34ecb6dd200efc2e570ed6d1aca30d395118a6e97aea
+  data.tar.gz: 9c91c0d18bb5edde590ce3a63349ac3fcd00fde0f359c30a8bd93d07372316c8998de736fa63a05b78250b1812553d554a12c8ea0c4e81277ef56bd49289402e

data/VERSION

@@ -1 +1 @@
-0.2.15
+0.2.16

data/app/controllers/maestrano/connec_controller.rb

@@ -16,7 +16,7 @@ class Maestrano::ConnecController < Maestrano::Rails::WebHookController
 
                 # 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.connec_entities_names.collect{|name| name == entity_name.singularize ? [name, [entity]] : [ name, []]}.flatten(1) ], Hash[ *entity_instance.external_entities_names.collect{|name| [ name, []]}.flatten(1) ], organization, {})
+                  mapped_entity = entity_instance.consolidate_and_map_data(Hash[ *entity_instance.connec_entities_names.collect{|name| name.downcase.pluralize == entity_name ? [name, [entity]] : [ name, []]}.flatten(1) ], Hash[ *entity_instance.external_entities_names.collect{|name| [ name, []]}.flatten(1) ], organization, {})
                 else
                   mapped_entity = entity_instance.consolidate_and_map_data([entity], [], organization, {})
                 end
@@ -48,7 +48,7 @@ class Maestrano::ConnecController < Maestrano::Rails::WebHookController
         if instance.methods.include?('connec_entities_names'.to_sym)
           return {instance: instance, is_complex: true, name: entity_name_from_list} if instance.connec_entities_names.map{|n| n.pluralize.downcase}.include?(entity_name)
         elsif instance.methods.include?('connec_entity_name'.to_sym)
-          return {instance: instance, is_complex: false, name: entity_name_from_list} if instance.connec_entity_name.pluralize.downcase == entity_name
+          return {instance: instance, is_complex: false, name: entity_name_from_list} if instance.normalized_connec_entity_name == entity_name
         end
       end
       nil

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

@@ -6,7 +6,7 @@ module Maestrano::Connector::Rails
     def perform(organization, entities_hash)
       return unless organization.sync_enabled && organization.oauth_uid
 
-      connec_client = Maestrano::Connec::Client.new(organization.uid)
+      connec_client = Maestrano::Connec::Client[organization.tenant].new(organization.uid)
 
       entities_hash.each do |external_entity_name, entities|
         if entity_instance_hash = find_entity_instance(external_entity_name)
@@ -14,7 +14,7 @@ module Maestrano::Connector::Rails
           next unless organization.synchronized_entities[entity_instance_hash[:name].to_sym]
 
           if entity_instance_hash[:is_complex]
-            mapped_entities = entity_instance.consolidate_and_map_data(Hash[ *entity_instance.connec_entities_names.collect{|name| [ name, []]}.flatten(1) ], Hash[ *entity_instance.external_entities_names.collect{|name| name == external_entity_name.singularize ? [name, entities] : [ name, []]}.flatten(1) ], organization, {})
+            mapped_entities = entity_instance.consolidate_and_map_data(Hash[ *entity_instance.connec_entities_names.collect{|name| [ name, []]}.flatten(1) ], Hash[ *entity_instance.external_entities_names.collect{|name| name == external_entity_name ? [name, entities] : [ name, []]}.flatten(1) ], organization, {})
           else
             mapped_entities = entity_instance.consolidate_and_map_data([], entities, organization, {})
           end

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

@@ -22,7 +22,7 @@ module Maestrano::Connector::Rails
 
       begin
         last_synchronization = Synchronization.where(organization_id: organization.id, status: 'SUCCESS', partial: false).order(updated_at: :desc).first
-        connec_client = Maestrano::Connec::Client.new(organization.uid)
+        connec_client = Maestrano::Connec::Client[organization.tenant].new(organization.uid)
         external_client = External.get_client(organization)
 
         if opts[:only_entities]

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

@@ -28,6 +28,14 @@ module Maestrano::Connector::Rails::Concerns::Entity
   # ----------------------------------------------
   #                 Connec! methods
   # ----------------------------------------------
+  def normalized_connec_entity_name
+    if self.singleton?
+      self.connec_entity_name.downcase
+    else
+      self.connec_entity_name.downcase.pluralize
+    end
+  end
+
   def get_connec_entities(client, last_synchronization, organization, opts={})
     Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Fetching Connec! #{self.connec_entity_name}")
 
@@ -36,18 +44,18 @@ module Maestrano::Connector::Rails::Concerns::Entity
     # Fetch first page
     if last_synchronization.blank? || opts[:full_sync]
       Maestrano::Connector::Rails::ConnectorLogger.log('debug', organization, "entity=#{self.connec_entity_name}, fetching all data")
-      response = client.get("/#{self.connec_entity_name.downcase.pluralize}")
+      response = client.get("/#{self.normalized_connec_entity_name}")
     else
       Maestrano::Connector::Rails::ConnectorLogger.log('debug', organization, "entity=#{self.connec_entity_name}, fetching data since #{last_synchronization.updated_at.iso8601}")
       query_param = URI.encode("$filter=updated_at gt '#{last_synchronization.updated_at.iso8601}'")
-      response = client.get("/#{self.connec_entity_name.downcase.pluralize}?#{query_param}")
+      response = client.get("/#{self.normalized_connec_entity_name}?#{query_param}")
     end
     raise "No data received from Connec! when trying to fetch #{self.connec_entity_name.pluralize}" unless response
 
     response_hash = JSON.parse(response.body)
     Maestrano::Connector::Rails::ConnectorLogger.log('debug', organization, "received first page entity=#{self.connec_entity_name}, response=#{response.body}")
-    if response_hash["#{self.connec_entity_name.downcase.pluralize}"]
-      entities << response_hash["#{self.connec_entity_name.downcase.pluralize}"]
+    if response_hash["#{self.normalized_connec_entity_name}"]
+      entities << response_hash["#{self.normalized_connec_entity_name}"]
     else
       raise "Received unrecognized Connec! data when trying to fetch #{self.connec_entity_name.pluralize}"
     end
@@ -55,15 +63,15 @@ module Maestrano::Connector::Rails::Concerns::Entity
     # Fetch subsequent pages
     while response_hash['pagination'] && response_hash['pagination']['next']
       # ugly way to convert https://api-connec/api/v2/group_id/organizations?next_page_params to /organizations?next_page_params
-      next_page = response_hash['pagination']['next'].gsub(/^(.*)\/#{self.connec_entity_name.downcase.pluralize}/, self.connec_entity_name.downcase.pluralize)
+      next_page = response_hash['pagination']['next'].gsub(/^(.*)\/#{self.normalized_connec_entity_name}/, self.normalized_connec_entity_name)
       response = client.get(next_page)
 
       raise "No data received from Connec! when trying to fetch subsequent page of #{self.connec_entity_name.pluralize}" unless response
       Maestrano::Connector::Rails::ConnectorLogger.log('debug', organization, "received next page entity=#{self.connec_entity_name}, response=#{response.body}")
 
       response_hash = JSON.parse(response.body)
-      if response_hash["#{self.connec_entity_name.downcase.pluralize}"]
-        entities << response_hash["#{self.connec_entity_name.downcase.pluralize}"]
+      if response_hash["#{self.normalized_connec_entity_name}"]
+        entities << response_hash["#{self.normalized_connec_entity_name}"]
       else
         raise "Received unrecognized Connec! data when trying to fetch subsequent page of #{self.connec_entity_name.pluralize}"
       end
@@ -99,16 +107,16 @@ module Maestrano::Connector::Rails::Concerns::Entity
 
   def create_connec_entity(connec_client, mapped_external_entity, connec_entity_name, organization)
     Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Sending create #{connec_entity_name}: #{mapped_external_entity} to Connec!")
-    response = connec_client.post("/#{connec_entity_name.downcase.pluralize}", { "#{connec_entity_name.downcase.pluralize}".to_sym => mapped_external_entity })
+    response = connec_client.post("/#{normalized_connec_entity_name}", { "#{normalized_connec_entity_name}".to_sym => mapped_external_entity })
     raise "No response received from Connec! when trying to create a #{self.connec_entity_name}" unless response
-    JSON.parse(response.body)["#{connec_entity_name.downcase.pluralize}"]
+    JSON.parse(response.body)["#{normalized_connec_entity_name}"]
   end
 
   def update_connec_entity(connec_client, mapped_external_entity, connec_id, connec_entity_name, organization)
     Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Sending update #{connec_entity_name}: #{mapped_external_entity} to Connec!")
-    response = connec_client.put("/#{connec_entity_name.downcase.pluralize}/#{connec_id}", { "#{connec_entity_name.downcase.pluralize}".to_sym => mapped_external_entity })
+    response = connec_client.put("/#{normalized_connec_entity_name}/#{connec_id}", { "#{normalized_connec_entity_name}".to_sym => mapped_external_entity })
     raise "No response received from Connec! when trying to update a #{self.connec_entity_name}" unless response
-    JSON.parse(response.body)["#{connec_entity_name.downcase.pluralize}"]
+    JSON.parse(response.body)["#{normalized_connec_entity_name}"]
   end
 
   def map_to_external_with_idmap(entity, organization)
@@ -238,6 +246,10 @@ module Maestrano::Connector::Rails::Concerns::Entity
   #             Entity specific methods
   # Those methods need to be define in each entity
   # ----------------------------------------------
+  # Is this resource a singleton (in Connec!)?
+  def singleton?
+    false
+  end
 
   # Entity name in Connec!
   def connec_entity_name

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.15 ruby lib
+# stub: maestrano-connector-rails 0.2.16 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "maestrano-connector-rails"
-  s.version = "0.2.15"
+  s.version = "0.2.16"
 
   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-02"
+  s.date = "2016-03-07"
   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/controllers/connec_controller_spec.rb

@@ -50,7 +50,7 @@ describe Maestrano::ConnecController, type: :controller do
           allow(Maestrano::Connector::Rails::Entity).to receive(:entities_list).and_return(%w(contact_and_lead))
           class Entities::ContactAndLead < Maestrano::Connector::Rails::ComplexEntity
             def connec_entities_names
-              %w(lead)
+              %w(Lead)
             end
           end
           module Entities::SubEntities end;
@@ -70,7 +70,7 @@ describe Maestrano::ConnecController, type: :controller do
           let!(:organization) { create(:organization, uid: group_id, oauth_uid: 'lala', sync_enabled: true, synchronized_entities: {contact_and_lead: true}) }
 
           it 'process the data and push them' do
-            expect_any_instance_of(Entities::ContactAndLead).to receive(:consolidate_and_map_data).with({"lead"=>[entity]}, {}, organization, {}).and_return({})
+            expect_any_instance_of(Entities::ContactAndLead).to receive(:consolidate_and_map_data).with({"Lead"=>[entity]}, {}, organization, {}).and_return({})
             expect_any_instance_of(Entities::ContactAndLead).to receive(:push_entities_to_external)
             subject
           end
@@ -84,7 +84,7 @@ describe Maestrano::ConnecController, type: :controller do
           allow(Maestrano::Connector::Rails::Entity).to receive(:entities_list).and_return(%w(person))
           class Entities::Person < Maestrano::Connector::Rails::Entity
             def connec_entity_name
-              'person'
+              'People'
             end
           end
         }

data/spec/jobs/push_to_connec_job_spec.rb

@@ -17,7 +17,7 @@ describe Maestrano::Connector::Rails::PushToConnecJob do
     allow_any_instance_of(Entities::Entity2).to receive(:consolidate_and_map_data).and_return({})
     allow_any_instance_of(Entities::Entity2).to receive(:push_entities_to_connec)
     allow_any_instance_of(Entities::Entity2).to receive(:connec_entities_names).and_return(%w())
-    allow_any_instance_of(Entities::Entity2).to receive(:external_entities_names).and_return(%w(sub ll))
+    allow_any_instance_of(Entities::Entity2).to receive(:external_entities_names).and_return(%w(Subs ll))
     module Entities::SubEntities end;
     class Entities::SubEntities::Sub < Maestrano::Connector::Rails::SubEntityBase
     end
@@ -27,7 +27,7 @@ describe Maestrano::Connector::Rails::PushToConnecJob do
   let(:entity11) { {first_name: 'John'} }
   let(:entity12) { {first_name: 'Jane'} }
   let(:entity21) { {job: 'Pizza guy'} }
-  let(:hash) { {'ext_entity1' => [entity11, entity12], 'sub' => [entity21]} }
+  let(:hash) { {'ext_entity1' => [entity11, entity12], 'Subs' => [entity21]} }
   subject { Maestrano::Connector::Rails::PushToConnecJob.perform_now(organization, hash) }
 
   describe 'with organization sync enabled set to false' do
@@ -66,7 +66,7 @@ describe Maestrano::Connector::Rails::PushToConnecJob do
         before { organization.update(synchronized_entities: {:"#{entity_name1}" => false, :"#{entity_name2}" => true})}
 
         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({}, {"sub"=>[entity21], "ll"=>[]}, organization, {})
+          expect_any_instance_of(Entities::Entity2).to receive(:consolidate_and_map_data).with({}, {"Subs"=>[entity21], "ll"=>[]}, organization, {})
           expect_any_instance_of(Entities::Entity2).to receive(:push_entities_to_connec)
           subject
         end

data/spec/models/entity_spec.rb

@@ -43,59 +43,91 @@ describe Maestrano::Connector::Rails::Entity do
     describe 'connec_methods' do
       let(:organization) { create(:organization) }
       let(:client) { Maestrano::Connec::Client.new(organization.uid) }
-      let(:connec_name) { 'person' }
+      let(:connec_name) { 'Person' }
       let(:external_name) { 'external_name' }
       let(:sync) { create(:synchronization) }
       before {
         allow(subject).to receive(:connec_entity_name).and_return(connec_name)
       }
 
-      describe 'get_connec_entities' do
+      describe 'normalized_connec_entity_name' do
+        context 'for a singleton resource' do
+          before {
+            allow(subject).to receive(:singleton?).and_return(true)
+          }
 
-        describe 'with response' do
+          it { expect(subject.normalized_connec_entity_name).to eql('person') }
+        end
+
+        context 'for a non singleton resource' do
           before {
-            allow(client).to receive(:get).and_return(ActionDispatch::Response.new(200, {}, {people: []}.to_json, {}))
+            allow(subject).to receive(:singleton?).and_return(false)
           }
 
-          context 'when opts[:full_sync] is true' do
-            it 'performs a full get' do
-              expect(client).to receive(:get).with("/#{connec_name.downcase.pluralize}")
-              subject.get_connec_entities(client, nil, organization, {full_sync: true})
-            end
-          end
+          it { expect(subject.normalized_connec_entity_name).to eql('people') }
+        end
+      end
 
-          context 'when there is no last sync' do
-            it 'performs a full get' do
-              expect(client).to receive(:get).with("/#{connec_name.downcase.pluralize}")
-              subject.get_connec_entities(client, nil, organization)
-            end
-          end
+      describe 'get_connec_entities' do
+
+        describe 'with response' do
+          context 'for a singleton resource' do
+            before {
+              allow(client).to receive(:get).and_return(ActionDispatch::Response.new(200, {}, {person: []}.to_json, {}))
+              allow(subject).to receive(:singleton?).and_return(true)
+            }
 
-          context 'when there is a last sync' do
-            it 'performs a time limited get' do
-              uri_param = URI.encode("$filter=updated_at gt '#{sync.updated_at.iso8601}'")
-              expect(client).to receive(:get).with("/#{connec_name.downcase.pluralize}?#{uri_param}")
-              subject.get_connec_entities(client, sync, organization)
+            it 'calls get with a singularize url' do
+              expect(client).to receive(:get).with("/#{connec_name.downcase}")
+              subject.get_connec_entities(client, nil, organization)
             end
           end
 
-          context 'with pagination' do
+          context 'for a non singleton resource' do
             before {
-              allow(client).to receive(:get).and_return(ActionDispatch::Response.new(200, {}, {people: [], pagination: {next: "https://api-connec.maestrano.com/api/v2/cld-dkg601/people?%24skip=10&%24top=10"}}.to_json, {}), ActionDispatch::Response.new(200, {}, {people: []}.to_json, {}))
+              allow(client).to receive(:get).and_return(ActionDispatch::Response.new(200, {}, {people: []}.to_json, {}))
             }
 
-            it 'calls get multiple times' do
-              expect(client).to receive(:get).twice
-              subject.get_connec_entities(client, nil, organization)
+            context 'when opts[:full_sync] is true' do
+              it 'performs a full get' do
+                expect(client).to receive(:get).with("/#{connec_name.downcase.pluralize}")
+                subject.get_connec_entities(client, nil, organization, {full_sync: true})
+              end
+            end
+
+            context 'when there is no last sync' do
+              it 'performs a full get' do
+                expect(client).to receive(:get).with("/#{connec_name.downcase.pluralize}")
+                subject.get_connec_entities(client, nil, organization)
+              end
+            end
+
+            context 'when there is a last sync' do
+              it 'performs a time limited get' do
+                uri_param = URI.encode("$filter=updated_at gt '#{sync.updated_at.iso8601}'")
+                expect(client).to receive(:get).with("/#{connec_name.downcase.pluralize}?#{uri_param}")
+                subject.get_connec_entities(client, sync, organization)
+              end
             end
-          end
 
-          context 'with an actual response' do
-            let(:people) { [{first_name: 'John'}, {last_name: 'Durand'}, {job_title: 'Engineer'}] }
+            context 'with pagination' do
+              before {
+                allow(client).to receive(:get).and_return(ActionDispatch::Response.new(200, {}, {people: [], pagination: {next: "https://api-connec.maestrano.com/api/v2/cld-dkg601/people?%24skip=10&%24top=10"}}.to_json, {}), ActionDispatch::Response.new(200, {}, {people: []}.to_json, {}))
+              }
 
-            it 'returns an array of entities' do
-              allow(client).to receive(:get).and_return(ActionDispatch::Response.new(200, {}, {people: people}.to_json, {}))
-              expect(subject.get_connec_entities(client, nil, organization)).to eql(JSON.parse(people.to_json))
+              it 'calls get multiple times' do
+                expect(client).to receive(:get).twice
+                subject.get_connec_entities(client, nil, organization)
+              end
+            end
+
+            context 'with an actual response' do
+              let(:people) { [{first_name: 'John'}, {last_name: 'Durand'}, {job_title: 'Engineer'}] }
+
+              it 'returns an array of entities' do
+                allow(client).to receive(:get).and_return(ActionDispatch::Response.new(200, {}, {people: people}.to_json, {}))
+                expect(subject.get_connec_entities(client, nil, organization)).to eql(JSON.parse(people.to_json))
+              end
             end
           end
         end
@@ -141,7 +173,7 @@ describe Maestrano::Connector::Rails::Entity do
           expect(idmap1.last_push_to_connec).to_not eql(old_push_date)
           idmap2.reload
           expect(idmap2.connec_id).to eql(id)
-          expect(idmap2.connec_entity).to eql(connec_name)
+          expect(idmap2.connec_entity).to eql(connec_name.downcase)
           expect(idmap2.last_push_to_connec).to_not be_nil
         end
       end
@@ -155,7 +187,7 @@ describe Maestrano::Connector::Rails::Entity do
           }
 
           it 'sends a post to connec' do
-            expect(client).to receive(:post).with("/#{connec_name.pluralize}", {"#{connec_name.pluralize}".to_sym => entity})
+            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
 
@@ -183,7 +215,7 @@ describe Maestrano::Connector::Rails::Entity do
           }
 
           it 'sends a put to connec' do
-            expect(client).to receive(:put).with("/#{connec_name.pluralize}/#{id}", {"#{connec_name.pluralize}".to_sym => entity})
+            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
@@ -206,7 +238,7 @@ describe Maestrano::Connector::Rails::Entity do
         }
 
         context 'when entity has an idmap' do
-          let!(:idmap) { create(:idmap, organization: organization, connec_entity: connec_name, connec_id: id, last_push_to_external: 3.hour.ago)}
+          let!(:idmap) { create(:idmap, organization: organization, 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 } }
@@ -459,6 +491,12 @@ describe Maestrano::Connector::Rails::Entity do
 
 
     # Entity specific methods
+    describe 'singleton?' do
+      it 'is false by default' do
+        expect(subject.singleton?).to be false
+      end
+    end
+
     describe 'connec_entity_name' do
       it { expect{ subject.connec_entity_name }.to raise_error('Not implemented') }
     end

metadata

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