maestrano-connector-rails 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a68bf394fe0506af2d7ebf7f26fd3d03c05f3fb6
-  data.tar.gz: cf4b53e1b341757e263e0c12b68192fcbe187344
+  metadata.gz: b6c98a08a281bfea7334aa9670a91b0e6f49a85e
+  data.tar.gz: 6800242ca6b7d834df0d4acd6128541f8adf7f4d
 SHA512:
-  metadata.gz: a3feb1c40cef5102c1d68ff42b988b07fe604b2b9a2f70c4a5c1a6563310915003211ada51a2e063c2219f3796be7b5fd0dae664b24217b55255733793253264
-  data.tar.gz: 6e0cc236c7a0e449a39611225ac8f2bf490f81556691ed5d7c26f52dab454dd7edc58fdd1aeb01206d6686d563db3b6c24189712bb0b265ca92093221da62e8d
+  metadata.gz: 78d4add0da696a67f179f24de422e65b9f84dc0eed4ef1108c89c17c917e089afd58acd2423b754eeb3342272136c6460d6f679229bb7f110b11c9e3809014b1
+  data.tar.gz: c2c008d2c6ce5387b0a527b359b23af8669ffc7b3b094fe7676c752318a950297178be80c4e3c7372ae25732d88e0b9f06fe2aded0d3a9328a739057fc345d3e

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

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

@@ -51,7 +51,7 @@ module Maestrano::Connector::Rails::Concerns::ConnecHelper
       ref = array_of_refs.shift
       field = entity[ref]
 
-      # Follow embedment path, remplace if it's a string
+      # Follow embedment path, remplace if it's not an array or a hash
       unless field.blank?
         case field
         when Array
@@ -60,7 +60,7 @@ module Maestrano::Connector::Rails::Concerns::ConnecHelper
           end
         when HashWithIndifferentAccess
           fold_references_helper(entity[ref], array_of_refs, organization)
-        when String
+        else
           id = field
           entity[ref] = [id_hash(id, organization)]
         end

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

@@ -244,7 +244,7 @@ module Maestrano::Connector::Rails::Concerns::Entity
 
     unless ids_to_send_to_connec.empty?
       # Send the external ids to connec if it was a creation
-      proc = lambda{|id| batch_op('put', {id: [Maestrano::Connector::Rails::ConnecHelper.id_hash(id[:external_id], @organization)]}, id[:connec_id], self.class.normalize_connec_entity_name(self.class.connec_entity_name)) }
+      proc = lambda{|id| batch_op('put', {id: [Maestrano::Connector::Rails::ConnecHelper.id_hash(id[:idmap].external_id, @organization)]}, id[:idmap].connec_id, self.class.normalize_connec_entity_name(self.class.connec_entity_name)) }
       batch_calls(ids_to_send_to_connec, proc, self.class.connec_entity_name, true)
     end
   end
@@ -257,10 +257,10 @@ module Maestrano::Connector::Rails::Concerns::Entity
     begin
       # Create and return id to send to connec!
       if idmap.external_id.blank?
-        connec_id = mapped_connec_entity_with_idmap[:idmap].connec_id
+        connec_id = idmap.connec_id
         external_id = create_external_entity(mapped_connec_entity, external_entity_name)
         idmap.update(external_id: external_id, last_push_to_external: Time.now, message: nil)
-        return {connec_id: connec_id, external_id: external_id, idmap: idmap}
+        return {idmap: idmap}
 
       # Update
       else
@@ -271,7 +271,7 @@ module Maestrano::Connector::Rails::Concerns::Entity
         if self.class.singleton? && idmap.last_push_to_external.nil?
           connec_id = mapped_connec_entity_with_idmap[:idmap].connec_id
           idmap.update(last_push_to_external: Time.now, message: nil)
-          return {connec_id: connec_id, external_id: idmap.external_id}
+          return {idmap: idmap}
         else
           idmap.update(last_push_to_external: Time.now, message: nil)
         end

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 1.0.1 ruby lib
+# stub: maestrano-connector-rails 1.0.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "maestrano-connector-rails"
-  s.version = "1.0.1"
+  s.version = "1.0.2"
 
   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-25"
+  s.date = "2016-05-27"
   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/models/connec_helper_spec.rb

@@ -94,9 +94,10 @@ describe Maestrano::Connector::Rails::ConnecHelper do
   end
 
   describe 'fold_references' do
+    let(:id) { 'id1' }
     let(:mapped_hash) {
       {
-        id: 'id1',
+        id: id,
         organization_id: nil,
         contact: {
           id: ''
@@ -115,7 +116,7 @@ describe Maestrano::Connector::Rails::ConnecHelper do
     let(:output_hash) {
       {
         "id" => [
-          subject.id_hash('id1', organization)
+          subject.id_hash(id, organization)
         ],
         "organization_id" => nil,
         "contact" => {
@@ -139,5 +140,13 @@ describe Maestrano::Connector::Rails::ConnecHelper do
     it 'folds the existing refs' do
       expect(subject.fold_references(mapped_hash, ['organization_id', 'contact/id', 'lines/id', 'not_here_ref'], organization)).to eql(output_hash.with_indifferent_access)
     end
+
+    context 'when id is an integer' do
+      let(:id) { 1234 }
+
+      it 'folds the existing refs' do
+        expect(subject.fold_references(mapped_hash, ['organization_id', 'contact/id', 'lines/id', 'not_here_ref'], organization)).to eql(output_hash.with_indifferent_access)
+      end
+    end
   end
 end

data/spec/models/entity_spec.rb

@@ -574,9 +574,9 @@ describe Maestrano::Connector::Rails::Entity do
             expect(idmap2.last_push_to_external).to_not be_nil
           end
 
-          it 'returns an hash with the external_id' do
+          it 'returns an hash with the idmap' do
             allow(subject).to receive(:create_external_entity).and_return('999111')
-            expect(subject.push_entity_to_external(entity_with_idmap2, external_name)).to eql({connec_id: idmap2.connec_id, external_id: '999111', idmap: idmap2})
+            expect(subject.push_entity_to_external(entity_with_idmap2, external_name)).to eql({idmap: idmap2})
           end
         end
 

metadata

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