maestrano-connector-rails 0.2.17 → 0.2.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb5c07cb2cd6e41eed0cf6d969bccfaca04bbfd7
-  data.tar.gz: 597eff9e10f8091d32df3efa8fe3d401686471b1
+  metadata.gz: f94f571529c54189a2416028f32c9eaf10f0f496
+  data.tar.gz: ec2a9b0396f561cb157aa909f758b66b07d50cd9
 SHA512:
-  metadata.gz: 8255bd1676f26950267b98125e88679f3d91d5d127e650fbcfe4bc7d72c55b4d3d5ef3742022b6e2cdd267d5cab9d0fa449ed4197817f94c8ee43400320c4a55
-  data.tar.gz: 897a96ac9045cb71828ade21e216586f34db7af9bbec6ea7d6c1dca7cdbcbf9666e44a4a5dcb8f1fdb74fcd2fa194fa6f8386125f49b8cc21c73fc4dc372a65c
+  metadata.gz: 580f8d9921831198e67a9102ddce992fbe6359b08f0346a32c35af69385ca4f51c6c35a34975b71e7744e74b24fa8d7a03cc4e48ab0e8d31464da2d729091c33
+  data.tar.gz: 46749aca76d739411ea64a4187a7fdfdbe2d1c795481306458c338bac8586628a6706cae51132e1c5538de1c6f490ffed6357f2a52057efacb0dd889b7444c50

data/VERSION

@@ -1 +1 @@
-0.2.17
+0.2.18

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

@@ -68,6 +68,10 @@ module Maestrano::Connector::Rails::Concerns::Entity
   #                 Connec! methods
   # ----------------------------------------------
   def normalized_connec_entity_name
+    normalize_connec_entity_name(connec_entity_name)
+  end
+
+  def normalize_connec_entity_name(connec_entity_name)
     if singleton?
       connec_entity_name.downcase
     else
@@ -133,10 +137,10 @@ module Maestrano::Connector::Rails::Concerns::Entity
 
       begin
         if idmap.connec_id.blank?
-          connec_entity = create_connec_entity(connec_client, external_entity, connec_entity_name, organization)
+          connec_entity = create_connec_entity(connec_client, external_entity, normalize_connec_entity_name(connec_entity_name), organization)
           idmap.update_attributes(connec_id: connec_entity['id'], connec_entity: connec_entity_name.downcase, last_push_to_connec: Time.now, message: nil)
         else
-          connec_entity = update_connec_entity(connec_client, external_entity, idmap.connec_id, connec_entity_name, organization)
+          connec_entity = update_connec_entity(connec_client, external_entity, idmap.connec_id, normalize_connec_entity_name(connec_entity_name), organization)
           idmap.update_attributes(last_push_to_connec: Time.now, message: nil)
         end
       rescue => e
@@ -148,18 +152,18 @@ 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("/#{normalized_connec_entity_name}", { "#{normalized_connec_entity_name}".to_sym => mapped_external_entity })
+    response = connec_client.post("/#{connec_entity_name}", { "#{connec_entity_name}".to_sym => mapped_external_entity })
     response = JSON.parse(response.body)
     raise "Connec!: #{response['errors']['title']}" if response['errors'] && response['errors']['title']
-    response["#{normalized_connec_entity_name}"]
+    response["#{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("/#{normalized_connec_entity_name}/#{connec_id}", { "#{normalized_connec_entity_name}".to_sym => mapped_external_entity })
+    response = connec_client.put("/#{connec_entity_name}/#{connec_id}", { "#{connec_entity_name}".to_sym => mapped_external_entity })
     response = JSON.parse(response.body)
     raise "Connec!: #{response['errors']['title']}" if response['errors'] && response['errors']['title']
-    response["#{normalized_connec_entity_name}"]
+    response["#{connec_entity_name}"]
   end
 
   def map_to_external_with_idmap(entity, organization)

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

@@ -17,13 +17,13 @@ module Maestrano::Connector::Rails
       if external?
         entity_name
       else
-        raise "Forbidden call"
+        raise "Forbidden call: cannot call external_entity_name for a connec entity"
       end
     end
 
     def connec_entity_name
       if external?
-        raise "Forbidden call"
+        raise "Forbidden call: cannot call connec_entity_name for an external entity"
       else
         entity_name
       end
@@ -47,13 +47,13 @@ module Maestrano::Connector::Rails
         })
         Maestrano::Connector::Rails::IdMap.create(h)
       else
-        raise 'Forbidden call'
+        raise 'Forbidden call: cannot call create_idmap_from_external_entity for a connec entity'
       end
     end
 
     def create_idmap_from_connec_entity(entity, external_entity_name, organization)
       if external?
-        raise 'Forbidden call'
+        raise 'Forbidden call: cannot call create_idmap_from_connec_entity for an external entity'
       else
         h = names_hash.merge({
           connec_id: entity['id'],

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 0.2.17 ruby lib
+# stub: maestrano-connector-rails 0.2.18 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "maestrano-connector-rails"
-  s.version = "0.2.17"
+  s.version = "0.2.18"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

data/spec/models/complex_entity_spec.rb

@@ -364,7 +364,8 @@ describe Maestrano::Connector::Rails::ComplexEntity do
     end
 
     describe 'push_entities_to_connec' do
-      let(:mapped_entity_with_idmap) { {entity: {}, idmap: nil} }
+      let(:idmap) { nil }
+      let(:mapped_entity_with_idmap) { {entity: {}, idmap: idmap} }
       let(:external_hash) {
         {
           'sc_e1' => {'connec1' => [mapped_entity_with_idmap]},
@@ -377,6 +378,24 @@ describe Maestrano::Connector::Rails::ComplexEntity do
         expect_any_instance_of(Entities::SubEntities::ScE2).to receive(:push_entities_to_connec_to).twice
         subject.push_entities_to_connec(nil, external_hash, nil)
       end
+
+      describe 'full call' do
+        let(:organization) { create(:organization) }
+        let!(:client) { Maestrano::Connec::Client.new(organization.uid) }
+        let(:idmap) { create(:idmap, organization: organization) }
+        before {
+          [Entities::SubEntities::ScE1, Entities::SubEntities::ScE2].each do |klass|
+            allow_any_instance_of(klass).to receive(:external?).and_return(true)
+            allow_any_instance_of(klass).to receive(:entity_name).and_return('n')
+          end
+          allow(client).to receive(:put).and_return(ActionDispatch::Response.new(200, {}, {people: {}}.to_json, {}))
+        }
+        it 'is successful' do
+          subject.push_entities_to_connec(client, external_hash, organization)
+          idmap.reload
+          expect(idmap.message).to be nil
+        end
+      end
     end
 
 

data/spec/models/entity_spec.rb

@@ -200,8 +200,8 @@ describe Maestrano::Connector::Rails::Entity do
           allow(subject).to receive(:create_connec_entity).and_return({'id' => id})
           allow(subject).to receive(:external_entity_name).and_return(external_name)
 
-          expect(subject).to receive(:create_connec_entity).with(client, entity2, connec_name, organization)
-          expect(subject).to receive(:update_connec_entity).with(client, entity1, idmap1.connec_id, connec_name, organization)
+          expect(subject).to receive(:create_connec_entity).with(client, entity2, connec_name.downcase.pluralize, organization)
+          expect(subject).to receive(:update_connec_entity).with(client, entity1, idmap1.connec_id, connec_name.downcase.pluralize, organization)
           old_push_date = idmap1.last_push_to_connec
 
           subject.push_entities_to_connec_to(client, entities_with_idmaps, connec_name, organization)
@@ -224,11 +224,11 @@ describe Maestrano::Connector::Rails::Entity do
 
         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)
+          subject.create_connec_entity(client, entity, connec_name.downcase.pluralize, organization)
         end
 
         it 'returns the created entity' do
-          expect(subject.create_connec_entity(client, entity, connec_name, organization)).to eql(JSON.parse(entity.to_json))
+          expect(subject.create_connec_entity(client, entity, connec_name.downcase.pluralize, organization)).to eql(JSON.parse(entity.to_json))
         end
       end
 
@@ -242,7 +242,7 @@ describe Maestrano::Connector::Rails::Entity do
 
         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)
+          subject.update_connec_entity(client, entity, id, connec_name.downcase.pluralize, organization)
         end
       end
 

data/spec/models/sub_entity_base_spec.rb

@@ -28,7 +28,10 @@ describe Maestrano::Connector::Rails::SubEntityBase do
     end
 
     context 'when entity is not external' do
-      it { expect{ subject.external_entity_name }.to raise_error('Not implemented') }
+      before {
+        allow_any_instance_of(Maestrano::Connector::Rails::SubEntityBase).to receive(:external?).and_return(false)
+      }
+      it { expect{ subject.external_entity_name }.to raise_error('Forbidden call: cannot call external_entity_name for a connec entity') }
     end
   end
 
@@ -45,7 +48,10 @@ describe Maestrano::Connector::Rails::SubEntityBase do
     end
 
     context 'when entity is external' do
-      it { expect{ subject.connec_entity_name }.to raise_error('Not implemented') }
+      before {
+        allow_any_instance_of(Maestrano::Connector::Rails::SubEntityBase).to receive(:external?).and_return(true)
+      }
+      it { expect{ subject.connec_entity_name }.to raise_error('Forbidden call: cannot call connec_entity_name for an external entity') }
     end
   end
 
@@ -83,7 +89,7 @@ describe Maestrano::Connector::Rails::SubEntityBase do
     end
     context 'when not external' do
       let(:bool) { false }
-      it { expect{ subject.create_idmap_from_external_entity({}, '', organization) }.to raise_error('Forbidden call') }
+      it { expect{ subject.create_idmap_from_external_entity({}, '', organization) }.to raise_error('Forbidden call: cannot call create_idmap_from_external_entity for a connec entity') }
     end
   end
 
@@ -97,7 +103,7 @@ describe Maestrano::Connector::Rails::SubEntityBase do
     }
 
     context 'when external' do
-      it { expect{ subject.create_idmap_from_connec_entity({}, '', organization) }.to raise_error('Forbidden call') }
+      it { expect{ subject.create_idmap_from_connec_entity({}, '', organization) }.to raise_error('Forbidden call: cannot call create_idmap_from_connec_entity for an external entity') }
     end
     context 'when not external' do
       let(:bool) { false }

metadata

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