maestrano-connector-rails 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7aacc2acd6c8b4ae959bc04f22610a0579eac001
-  data.tar.gz: d0291c5cdc84f85e25e11a845080792e420b27dc
+  metadata.gz: 9444b9cdc7de73b532ce22743daf00eed51f6a88
+  data.tar.gz: 68ae18a05cdca6bf985e6927c06d108ff0cc58bf
 SHA512:
-  metadata.gz: 237c78f0dbf7fcf046858a580eda157c0d2a0629dfbc03048dc79a3218168c2c196a5f6efb308f1a4e4e719b07294d9b8e0d6bc729735280b2581c81f66f48ab
-  data.tar.gz: bc8df72fe6d4e8d81f84b4da628c72011e56d04344053f58ad9dc475ccf5c596fa39f78265fad03ab8badc8eef2ac5cebd95cbabd673c72b7a3a14f433e158f0
+  metadata.gz: 80667b16e9b8d3436992174980c206b91bf8c95b9e1e5169d8aa6f5e963e9543e08be773633b00a49c14f08f06f1032213f49f2db75b7d162d6293e4e5cf75dd
+  data.tar.gz: ad3e5ff87948d0e537ab5d429a021e611f997f47eeca4bac250bdaeb4d33386bfed54d667ff9ceb9518ad0f081cba64e89803588d8b963fdfec393eaed84e133

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

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

@@ -108,6 +108,13 @@ module Maestrano::Connector::Rails::Concerns::Entity
     def object_name_from_external_entity_hash(entity)
       raise "Not implemented"
     end
+
+    # [{reference_class: Entities::.., connec_field: 'account_id', external_field: 'account/something/id'}]
+    # ledger_account_idmap = Entities::Account.find_idmap({connec_id: entity['account_id'], organization_id: organization.id})
+    # ledger_account_id = ledger_account_idmap && ledger_account_idmap.external_id
+    def references
+      []
+    end
   end
 
   # ----------------------------------------------
@@ -115,12 +122,22 @@ module Maestrano::Connector::Rails::Concerns::Entity
   # ----------------------------------------------
   # Map a Connec! entity to the external format
   def map_to_external(entity, organization)
-    self.class.mapper_class.normalize(entity)
+    ref_hash = {}
+    self.class.references.each do |ref|
+      ref_hash.merge! ref[:external_field].split('/').reverse.inject(self.class.id_from_ref(entity, ref, false, organization)) { |a, n| { n.to_sym => a } }
+    end
+
+    self.class.mapper_class.normalize(entity).merge(ref_hash)
   end
 
   # Map an external entity to Connec! format
   def map_to_connec(entity, organization)
-    self.class.mapper_class.denormalize(entity)
+    ref_hash = {}
+    self.class.references.each do |ref|
+      ref_hash.merge! ref[:connec_field].split('/').reverse.inject(self.class.id_from_ref(entity, ref, true, organization)) { |a, n| { n.to_sym => a } }
+    end
+
+    self.class.mapper_class.denormalize(entity).merge(ref_hash)
   end
 
   # ----------------------------------------------
@@ -385,6 +402,24 @@ module Maestrano::Connector::Rails::Concerns::Entity
         entity_instance.map_external_entity_with_idmap(external_entity, connec_entity_name, idmap, organization)
       end
     end
+
+    def id_from_ref(entity, ref, is_external, organization)
+      # field can be address/billing/country_id
+      field = is_external ? ref[:external_field] : ref[:connec_field]
+      field = field.split('/')
+      id = entity
+      field.each do |f|
+        id &&= id[f]
+      end
+
+      if is_external
+        idmap = ref[:reference_class].find_idmap({external_id: id, organization_id: organization.id})
+        idmap && idmap.connec_id
+      else
+        idmap = ref[:reference_class].find_idmap({connec_id: id, organization_id: organization.id})
+        idmap && idmap.external_id
+      end
+    end
   end
 
   def map_external_entity_with_idmap(external_entity, connec_entity_name, idmap, organization)

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

@@ -61,11 +61,41 @@ module Maestrano::Connector::Rails::Concerns::SubEntityBase
         Maestrano::Connector::Rails::IdMap.create(h)
       end
     end
+
+    # { 'External Entity'  => LalaMapper, 'Other external entity' => LiliMapper }
+    # or { 'Connec Entity'  => LalaMapper, 'Other connec entity' => LiliMapper }
+    def mapper_classes
+      {}
+    end
+
+    # {
+    #   'External Entity' => [{reference_class: Entities::.., connec_field: '', external_field: ''}],
+    #   'Other external entity' => [{reference_class: Entities::.., connec_field: '', external_field: ''}]
+    # }
+    def references
+      {}
+    end
   end
 
 
   def map_to(name, entity, organization)
-    raise "Not implemented"
+    mapper = self.class.mapper_classes[name]
+    raise "Impossible mapping from #{self.class.entity_name} to #{name}" unless mapper
+
+    ref_hash = {}
+    if self.class.references[name]
+      self.class.references[name].each do |ref|
+        field = self.class.external? ? ref[:connec_field] : ref[:external_field]
+        ref_hash.merge! field.split('/').reverse.inject(Maestrano::Connector::Rails::Entity.id_from_ref(entity, ref, false, organization)) { |a, n| { n.to_sym => a } }
+      end
+    end
+
+    if self.class.external?
+      mapped_entity = mapper.denormalize(entity)
+    else
+      mapped_entity = mapper.normalize(entity)
+    end
+    mapped_entity.merge(ref_hash)
   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 0.3.1 ruby lib
+# stub: maestrano-connector-rails 0.3.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "maestrano-connector-rails"
-  s.version = "0.3.1"
+  s.version = "0.3.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-03-18"
+  s.date = "2016-03-21"
   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/entity_spec.rb

@@ -132,16 +132,44 @@ describe Maestrano::Connector::Rails::Entity do
 
       describe 'map_to_external' do
         it 'calls the mapper normalize' do
-          expect(AMapper).to receive(:normalize).with({})
+          expect(AMapper).to receive(:normalize).with({}).and_return({})
           subject.map_to_external({}, nil)
         end
+
+        context 'with references' do
+          let!(:organization) { create(:organization) }
+          let!(:idmap) { create(:idmap, organization: organization) }
+          before {
+            clazz = Maestrano::Connector::Rails::Entity
+            allow(clazz).to receive(:find_idmap).and_return(idmap)
+            allow(clazz).to receive(:references).and_return([{reference_class: clazz, connec_field: 'organization_id', external_field: 'contact_id'}])
+          }
+
+          it 'returns the mapped entity with its references' do
+            expect(subject.map_to_external({'organization_id' => 'abcd'}, organization)).to eql({contact_id: idmap.external_id})
+          end
+        end
       end
 
       describe 'map_to_connec' do
         it 'calls the mapper denormalize' do
-          expect(AMapper).to receive(:denormalize).with({})
+          expect(AMapper).to receive(:denormalize).with({}).and_return({})
           subject.map_to_connec({}, nil)
         end
+
+        context 'with references' do
+          let!(:organization) { create(:organization) }
+          let!(:idmap) { create(:idmap, organization: organization) }
+          before {
+            clazz = Maestrano::Connector::Rails::Entity
+            allow(clazz).to receive(:find_idmap).and_return(idmap)
+            allow(clazz).to receive(:references).and_return([{reference_class: clazz, connec_field: 'organization_id', external_field: 'contact_id'}])
+          }
+
+          it 'returns the mapped entity with its references' do
+            expect(subject.map_to_connec({'contact_id' => 'abcd'}, organization)).to eql({organization_id: idmap.connec_id})
+          end
+        end
       end
     end
 

data/spec/models/sub_entity_base_spec.rb

@@ -116,7 +116,33 @@ describe Maestrano::Connector::Rails::SubEntityBase do
     subject { Maestrano::Connector::Rails::SubEntityBase.new }
 
     describe 'map_to' do
-      it { expect{ subject.map_to('name', {}, nil) }.to raise_error('Not implemented') }
+      before {
+        class AMapper
+          extend HashMapper
+        end
+        allow(subject.class).to receive(:mapper_classes).and_return('Name' => AMapper)
+      }
+
+      context 'when external' do
+        before {
+          allow(subject.class).to receive(:external?).and_return(true)
+        }
+
+        it 'calls the mapper denormalize' do
+          expect(AMapper).to receive(:denormalize).and_return({})
+          subject.map_to('Name', {}, nil)
+        end
+      end
+      context 'when not external' do
+        before {
+          allow(subject.class).to receive(:external?).and_return(false)
+        }
+
+        it 'calls the mapper normalize' do
+          expect(AMapper).to receive(:normalize).and_return({})
+          subject.map_to('Name', {}, nil)
+        end
+      end
     end
   end
 end

metadata

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