maestrano-connector-rails 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e857fececce75be28dbb9c7b04d0fb0b1dbc888b
-  data.tar.gz: 1a5e21c86c3848d8c352e93cacff1b7a59258177
+  metadata.gz: 4b5dba94b691f6b3af1ac41b6a7d0398ee5396af
+  data.tar.gz: dc4611f5da086cff9fc297b0d0d0eba7aa4e5c8d
 SHA512:
-  metadata.gz: 1d840af38306358956d6c6bcb1af17683563c1bae227fc1d03b91bdc6864b21304d2a01d1939ad50aa09466a3fe214c35b7377c3c25d1e11ff17ff4dab3ad091
-  data.tar.gz: 34d928a71801a4f1dd7bd80e640f112af27a544439e2a96460e116636db7324f76640f277c956fa1c4930721e8489dc591b7013d93fa2c4607d370f24ebe1486
+  metadata.gz: 4b2683f1f4283965f1f4a4c81be839aaa72d734432aa6246d21d2dbf15e90be0161d11a8e863584863531c15af823a2375f38acd667a212733793d47fc32ad57
+  data.tar.gz: d7931fb298a3b542c4a9878ccb6e5b2969efa4b67eb11c47aef601b50ff681d3539d013ed25e3934c129f55a9bb3b992a269fa81e7031fe75c8dbbda5e5f7088

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.0.4

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

@@ -166,14 +166,13 @@ module Maestrano::Connector::Rails::Concerns::Entity
     # Fetch first page
     page_number = 0
     if last_synchronization.blank? || @opts[:full_sync]
-      Maestrano::Connector::Rails::ConnectorLogger.log('debug', @organization, "entity=#{self.class.connec_entity_name}, fetching all data")
       query_params[:$filter] = @opts[:$filter] if @opts[:$filter]
     else
-      Maestrano::Connector::Rails::ConnectorLogger.log('debug', @organization, "entity=#{self.class.connec_entity_name}, fetching data since #{last_synchronization.updated_at.iso8601}")
       query_params[:$filter] = "updated_at gt '#{last_synchronization.updated_at.iso8601}'" + (@opts[:$filter] ? " and #{@opts[:$filter]}" : '')
     end
 
-    uri = "/#{self.class.normalized_connec_entity_name}?#{query_params.to_query}"
+    Maestrano::Connector::Rails::ConnectorLogger.log('debug', @organization, "entity=#{self.class.connec_entity_name}, fetching data with #{query_params.to_query}")
+    uri = "#{self.class.normalized_connec_entity_name}?#{query_params.to_query}"
     response_hash = fetch_connec(uri, 0)
     entities = response_hash["#{self.class.normalized_connec_entity_name}"]
     entities = [entities] if self.class.singleton?
@@ -184,7 +183,7 @@ module Maestrano::Connector::Rails::Concerns::Entity
       # 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.class.normalized_connec_entity_name}/, self.class.normalized_connec_entity_name)
 
-      response_hash = fetch_connec(uri, page_number)
+      response_hash = fetch_connec(next_page, page_number)
       entities << response_hash["#{self.class.normalized_connec_entity_name}"]
     end
 
@@ -325,7 +324,7 @@ module Maestrano::Connector::Rails::Concerns::Entity
       connec_id = entity.delete(:__connec_id)
 
       if entity['id'].blank?
-        idmap = self.class.create_idmap(organization_id: @organization.id, name: self.class.object_name_from_connec_entity_hash(entity), external_entity: external_entity_name.downcase, connec_id: connec_id)
+        idmap = self.class.find_or_create_idmap(organization_id: @organization.id, name: self.class.object_name_from_connec_entity_hash(entity), external_entity: external_entity_name.downcase, connec_id: connec_id)
         next map_connec_entity_with_idmap(entity, external_entity_name, idmap)
       end
 
@@ -492,7 +491,7 @@ module Maestrano::Connector::Rails::Concerns::Entity
       raise "No data received from Connec! when trying to fetch page #{page_number} of #{self.class.normalized_connec_entity_name}" unless response && !response.body.blank?
 
       response_hash = JSON.parse(response.body)
-      Maestrano::Connector::Rails::ConnectorLogger.log('debug', @organization, "received first page entity=#{self.class.connec_entity_name}, response=#{response_hash}")
+      Maestrano::Connector::Rails::ConnectorLogger.log('debug', @organization, "Received page #{page_number} for entity=#{self.class.connec_entity_name}, response=#{response_hash}")
       raise "Received unrecognized Connec! data when trying to fetch page #{page_number} of #{self.class.normalized_connec_entity_name}: #{response_hash}" unless response_hash["#{self.class.normalized_connec_entity_name}"]
 
       response_hash

data/maestrano-connector-rails.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: maestrano-connector-rails 1.0.3 ruby lib
+# stub: maestrano-connector-rails 1.0.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "maestrano-connector-rails"
-  s.version = "1.0.3"
+  s.version = "1.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

data/release_notes.md

@@ -1,3 +1,8 @@
+## 1.0.3
+
+### Fixes
+* Fix an issue with options that were involuntarily shared across entities
+
 ## 1.0.2
 
 ### Fixes

data/spec/integration/connec_to_external_spec.rb

@@ -130,7 +130,7 @@ describe 'connec to the external application' do
 
     it 'does the mapping correctly' do
       idmap = Entities::ConnecToExternal.create_idmap(organization_id: organization.id, external_id: ext_contact_id, connec_id: "23daf041-e18e-0133-7b6a-15461b913fab")
-      allow(Entities::ConnecToExternal).to receive(:create_idmap).and_return(idmap)
+      allow(Entities::ConnecToExternal).to receive(:find_or_create_idmap).and_return(idmap)
       expect_any_instance_of(Entities::ConnecToExternal).to receive(:push_entities_to_external).with([{entity: mapped_entity, idmap: idmap}])
       subject
     end

data/spec/models/entity_spec.rb

@@ -197,7 +197,7 @@ describe Maestrano::Connector::Rails::Entity do
             }
 
             it 'calls get with a singularize url' do
-              expect(connec_client).to receive(:get).with("/#{connec_name.downcase}?")
+              expect(connec_client).to receive(:get).with("#{connec_name.downcase}?")
               subject.get_connec_entities(nil)
             end
           end
@@ -210,14 +210,14 @@ describe Maestrano::Connector::Rails::Entity do
             context 'when opts[:full_sync] is true' do
               let(:opts) { {full_sync: true} }
               it 'performs a full get' do
-                expect(connec_client).to receive(:get).with("/#{connec_name.downcase.pluralize}?")
+                expect(connec_client).to receive(:get).with("#{connec_name.downcase.pluralize}?")
                 subject.get_connec_entities(sync)
               end
             end
 
             context 'when there is no last sync' do
               it 'performs a full get' do
-                expect(connec_client).to receive(:get).with("/#{connec_name.downcase.pluralize}?")
+                expect(connec_client).to receive(:get).with("#{connec_name.downcase.pluralize}?")
                 subject.get_connec_entities(nil)
               end
             end
@@ -225,7 +225,7 @@ describe Maestrano::Connector::Rails::Entity do
             context 'when there is a last sync' do
               it 'performs a time limited get' do
                 uri_param = {"$filter" => "updated_at gt '#{sync.updated_at.iso8601}'"}.to_query
-                expect(connec_client).to receive(:get).with("/#{connec_name.downcase.pluralize}?#{uri_param}")
+                expect(connec_client).to receive(:get).with("#{connec_name.downcase.pluralize}?#{uri_param}")
                 subject.get_connec_entities(sync)
               end
             end
@@ -234,21 +234,21 @@ describe Maestrano::Connector::Rails::Entity do
               it 'support filter option for full sync' do
                 subject.instance_variable_set(:@opts, {full_sync: true, :$filter => "code eq 'PEO12'"})
                 uri_param = {'$filter'=>'code eq \'PEO12\''}.to_query
-                expect(connec_client).to receive(:get).with("/#{connec_name.downcase.pluralize}?#{uri_param}")
+                expect(connec_client).to receive(:get).with("#{connec_name.downcase.pluralize}?#{uri_param}")
                 subject.get_connec_entities(sync)
               end
 
               it 'support filter option for time limited sync' do
                 subject.instance_variable_set(:@opts, {:$filter => "code eq 'PEO12'"})
                 uri_param = {"$filter"=>"updated_at gt '#{sync.updated_at.iso8601}' and code eq 'PEO12'"}.to_query
-                expect(connec_client).to receive(:get).with("/#{connec_name.downcase.pluralize}?#{uri_param}")
+                expect(connec_client).to receive(:get).with("#{connec_name.downcase.pluralize}?#{uri_param}")
                 subject.get_connec_entities(sync)
               end
 
               it 'support orderby option for time limited sync' do
                 subject.instance_variable_set(:@opts, {:$orderby => "name asc"})
                 uri_param = {"$orderby"=>"name asc", "$filter"=>"updated_at gt '#{sync.updated_at.iso8601}'"}.to_query
-                expect(connec_client).to receive(:get).with("/#{connec_name.downcase.pluralize}?#{uri_param}")
+                expect(connec_client).to receive(:get).with("#{connec_name.downcase.pluralize}?#{uri_param}")
                 subject.get_connec_entities(sync)
               end
             end
@@ -259,7 +259,8 @@ describe Maestrano::Connector::Rails::Entity do
               }
 
               it 'calls get multiple times' do
-                expect(connec_client).to receive(:get).twice
+                expect(connec_client).to receive(:get).with('people?')
+                expect(connec_client).to receive(:get).with('people?%24skip=10&%24top=10')
                 subject.get_connec_entities(nil)
               end
             end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maestrano-connector-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Pierre Berard