maestrano-connector-rails 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a244b15c87cbe928441cf9dab1591be7654ba85
-  data.tar.gz: ba9c4664d925760e710c44c755cf67b7bd0c07cd
+  metadata.gz: c13bb79393ae9579e24ece570350fa0c0c75dc9a
+  data.tar.gz: 190acf9ea6c8b0a6cf4eac8d6c3f86edd50b0455
 SHA512:
-  metadata.gz: 4676868cd1de7f86c3ac9cc594d5227e70a3bf651e4693f4c4dbc5f1e301bac70fa65ffdbf17b4ad79b8e51cb10a1305733fd919eb59f84020ca7802f6641a35
-  data.tar.gz: 806e9113159ef49af0b6daf8d2b1808c72e8df07a0d44f08431c1c8e3ede5e1c00b2a60adf4d272f668cb3c109d14921c14bc7ed9d69948fe79e55893eb38215
+  metadata.gz: 3c971599312170cc42e6754ad7f7e386cc6df2d52fa1c78e5eec880ed5192e1a908c1afbc6be374e251a0912566409b77ac378d4c394528452bea29105ee0212
+  data.tar.gz: 7ad190b146864f5a2c27377d190131cdf11ee308a97c1a65fa82a172659b1fddcc899e02125f66ee52563f8c7873388240ed051d618bb3daa4d8b9f27fef0db7

data/VERSION

@@ -1 +1 @@
-0.2.9
+0.2.10

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

@@ -9,6 +9,14 @@ module Maestrano::Connector::Rails
     #  * :connec_preemption => true|false : preemption is always|never given to connec in case of conflict (if not set, the most recently updated entity is kept)
     def perform(organization, opts)
       return unless organization.sync_enabled
+
+      # Check if previous synchronization is still running
+      previous_synchronization = Synchronization.where(organization_id: organization.id).order(created_at: :desc).first
+      if previous_synchronization && previous_synchronization.status == 'RUNNING'
+        ConnectorLogger.log('info', organization, "Previous synchronization is still running")
+        return
+      end
+
       ConnectorLogger.log('info', organization, "Start synchronization, opts=#{opts}")
       current_synchronization = Synchronization.create_running(organization)
 

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

@@ -85,32 +85,36 @@ module Maestrano::Connector::Rails::Concerns::Entity
       idmap = mapped_external_entity_with_idmap[:idmap]
 
       if idmap.connec_id.blank?
-        connec_entity = self.create_entity_to_connec(connec_client, external_entity, connec_entity_name, organization)
-        idmap.update_attributes(connec_id: connec_entity['id'], connec_entity: connec_entity_name.downcase, last_push_to_connec: Time.now)
+        connec_entity = self.create_connec_entity(connec_client, external_entity, 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 = self.update_entity_to_connec(connec_client, external_entity, idmap.connec_id, connec_entity_name, organization)
-        idmap.update_attributes(last_push_to_connec: Time.now)
+        connec_entity = self.update_connec_entity(connec_client, external_entity, idmap.connec_id, connec_entity_name, organization)
+        idmap.update_attributes(last_push_to_connec: Time.now, message: nil)
       end
+
+      # Store Connec! error if any
+      idmap.update_attributes(message: connec_entity['errors'].first['title']) unless connec_entity.blank? || connec_entity['errors'].blank?
     end
   end
 
-  def create_entity_to_connec(connec_client, mapped_external_entity, connec_entity_name, organization)
+  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 })
     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}"]
   end
 
-  def update_entity_to_connec(connec_client, mapped_external_entity, connec_id, connec_entity_name, organization)
+  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 })
     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}"]
   end
 
   def map_to_external_with_idmap(entity, organization)
     idmap = Maestrano::Connector::Rails::IdMap.find_by(connec_id: entity['id'], connec_entity: self.connec_entity_name.downcase, organization_id: organization.id)
 
-    if idmap && idmap.last_push_to_external && idmap.last_push_to_external > entity['updated_at']
+    if idmap && ((!idmap.to_external) || (idmap.last_push_to_external && idmap.last_push_to_external > entity['updated_at']))
       Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Discard Connec! #{self.connec_entity_name} : #{entity}")
       nil
     else
@@ -141,21 +145,26 @@ module Maestrano::Connector::Rails::Concerns::Entity
     idmap = mapped_connec_entity_with_idmap[:idmap]
     connec_entity = mapped_connec_entity_with_idmap[:entity]
 
-    if idmap.external_id.blank?
-      external_id = self.create_entity_to_external(external_client, connec_entity, external_entity_name, organization)
-      idmap.update_attributes(external_id: external_id, external_entity: external_entity_name.downcase, last_push_to_external: Time.now)
-    else
-      self.update_entity_to_external(external_client, connec_entity, idmap.external_id, external_entity_name, organization)
-      idmap.update_attributes(last_push_to_external: Time.now)
+    begin
+      if idmap.external_id.blank?
+        external_id = self.create_external_entity(external_client, connec_entity, external_entity_name, organization)
+        idmap.update_attributes(external_id: external_id, external_entity: external_entity_name.downcase, last_push_to_external: Time.now, message: nil)
+      else
+        self.update_external_entity(external_client, connec_entity, idmap.external_id, external_entity_name, organization)
+        idmap.update_attributes(last_push_to_external: Time.now, message: nil)
+      end
+    rescue => e
+      # Store External error
+      idmap.update_attributes(message: e.message)
     end
   end
 
-  def create_entity_to_external(client, mapped_connec_entity, external_entity_name, organization)
+  def create_external_entity(client, mapped_connec_entity, external_entity_name, organization)
     Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Sending create #{external_entity_name}: #{mapped_connec_entity} to #{@@external_name}")
     raise "Not implemented"
   end
 
-  def update_entity_to_external(client, mapped_connec_entity, external_id, external_entity_name, organization)
+  def update_external_entity(client, mapped_connec_entity, external_id, external_entity_name, organization)
     Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Sending update #{external_entity_name} (id=#{external_id}): #{mapped_connec_entity} to #{@@external_name}")
     raise "Not implemented"
   end
@@ -183,6 +192,9 @@ module Maestrano::Connector::Rails::Concerns::Entity
         next {entity: self.map_to_connec(entity, organization), idmap: Maestrano::Connector::Rails::IdMap.create(external_id: self.get_id_from_external_entity_hash(entity), external_entity: self.external_entity_name.downcase, organization_id: organization.id)}
       end
 
+      # Not pushing entity to Connec!
+      next nil unless idmap.to_connec
+
       # Entity has not been modified since its last push to connec!
       if idmap.last_push_to_connec && idmap.last_push_to_connec > self.get_last_update_date_from_external_entity_hash(entity)
         Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Discard #{@@external_name} #{self.external_entity_name} : #{entity}")
@@ -222,14 +234,18 @@ module Maestrano::Connector::Rails::Concerns::Entity
   #             Entity specific methods
   # Those methods need to be define in each entity
   # ----------------------------------------------
+  
+  # Entity name in Connec!
   def connec_entity_name
     raise "Not implemented"
   end
 
+  # Entity name in external system
   def external_entity_name
     raise "Not implemented"
   end
 
+  # Entity Mapper Class
   def mapper_class
     raise "Not implemented"
   end

data/db/migrate/20160215103120_add_name_to_id_map.rb

@@ -0,0 +1,8 @@
+class AddNameToIdMap < ActiveRecord::Migration
+  def change
+    add_column :id_maps, :to_connec, :boolean, default: true
+    add_column :id_maps, :to_external, :boolean, default: true
+    add_column :id_maps, :name, :string
+    add_column :id_maps, :message, :string
+  end
+end

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.9 ruby lib
+# stub: maestrano-connector-rails 0.2.10 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "maestrano-connector-rails"
-  s.version = "0.2.9"
+  s.version = "0.2.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
@@ -57,6 +57,7 @@ Gem::Specification.new do |s|
     "db/migrate/20151122163325_create_synchronizations.rb",
     "db/migrate/20151122163449_create_id_maps.rb",
     "db/migrate/20160205132857_add_sync_enabled_to_organizations.rb",
+    "db/migrate/20160215103120_add_name_to_id_map.rb",
     "lib/generators/connector/USAGE",
     "lib/generators/connector/complex_entity_generator.rb",
     "lib/generators/connector/install_generator.rb",
@@ -127,12 +128,6 @@ Gem::Specification.new do |s|
     "spec/dummy/config/routes.rb",
     "spec/dummy/config/secrets.yml",
     "spec/dummy/db/development.sqlite3",
-    "spec/dummy/db/migrate/20160204223447_create_users.maestrano_connector_rails_engine.rb",
-    "spec/dummy/db/migrate/20160204223448_create_organizations.maestrano_connector_rails_engine.rb",
-    "spec/dummy/db/migrate/20160204223449_create_user_organization_rels.maestrano_connector_rails_engine.rb",
-    "spec/dummy/db/migrate/20160204223450_create_synchronizations.maestrano_connector_rails_engine.rb",
-    "spec/dummy/db/migrate/20160204223451_create_id_maps.maestrano_connector_rails_engine.rb",
-    "spec/dummy/db/migrate/20160205133024_add_sync_enabled_to_organizations.maestrano_connector_rails_engine.rb",
     "spec/dummy/db/schema.rb",
     "spec/dummy/db/test.sqlite3",
     "spec/dummy/lib/assets/.keep",

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160205133024) do
+ActiveRecord::Schema.define(version: 20160215103120) do
 
   create_table "id_maps", force: :cascade do |t|
     t.string   "connec_id"
@@ -21,8 +21,12 @@ ActiveRecord::Schema.define(version: 20160205133024) do
     t.integer  "organization_id"
     t.datetime "last_push_to_connec"
     t.datetime "last_push_to_external"
-    t.datetime "created_at",            null: false
-    t.datetime "updated_at",            null: false
+    t.datetime "created_at",                           null: false
+    t.datetime "updated_at",                           null: false
+    t.boolean  "to_connec",             default: true
+    t.boolean  "to_external",           default: true
+    t.string   "name"
+    t.string   "message"
   end
 
   add_index "id_maps", ["connec_id", "connec_entity", "organization_id"], name: "idmap_connec_index"

data/spec/models/entity_spec.rb

@@ -128,11 +128,11 @@ describe Maestrano::Connector::Rails::Entity do
         let(:id) { 'ab12-34re' }
 
         it 'create or update the entities and idmaps according to their idmap state' do
-          allow(subject).to receive(:create_entity_to_connec).and_return({'id' => id})
+          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_entity_to_connec).with(client, entity2, connec_name, organization)
-          expect(subject).to receive(:update_entity_to_connec).with(client, entity1, idmap1.connec_id, connec_name, organization)
+          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)
           old_push_date = idmap1.last_push_to_connec
 
           subject.push_entities_to_connec_to(client, entities_with_idmaps, connec_name, organization)
@@ -146,7 +146,7 @@ describe Maestrano::Connector::Rails::Entity do
         end
       end
 
-      describe 'create_entity_to_connec' do
+      describe 'create_connec_entity' do
         let(:entity) { {name: 'John'} }
 
         describe 'with a response' do
@@ -156,11 +156,11 @@ 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})
-            subject.create_entity_to_connec(client, entity, connec_name, organization)
+            subject.create_connec_entity(client, entity, connec_name, organization)
           end
 
           it 'returns the created entity' do
-            expect(subject.create_entity_to_connec(client, entity, connec_name, organization)).to eql(JSON.parse(entity.to_json))
+            expect(subject.create_connec_entity(client, entity, connec_name, organization)).to eql(JSON.parse(entity.to_json))
           end
         end
 
@@ -168,11 +168,11 @@ describe Maestrano::Connector::Rails::Entity do
           before {
             allow(client).to receive(:post).and_return(nil)
           }
-          it { expect{ subject.create_entity_to_connec(client, entity, connec_name, organization) }.to raise_error("No response received from Connec! when trying to create a #{connec_name}") }
+          it { expect{ subject.create_connec_entity(client, entity, connec_name, organization) }.to raise_error("No response received from Connec! when trying to create a #{connec_name}") }
         end
       end
 
-       describe 'update_entity_to_connec' do
+       describe 'update_connec_entity' do
         let(:organization) { create(:organization) }
         let(:entity) { {name: 'John'} }
         let(:id) { '88ye-777ab' }
@@ -184,7 +184,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})
-            subject.update_entity_to_connec(client, entity, id, connec_name, organization)
+            subject.update_connec_entity(client, entity, id, connec_name, organization)
           end
         end
 
@@ -192,7 +192,7 @@ describe Maestrano::Connector::Rails::Entity do
           before {
             allow(client).to receive(:put).and_return(nil)
           }
-          it { expect{ subject.update_entity_to_connec(client, entity, id, connec_name, organization) }.to raise_error("No response received from Connec! when trying to update a #{connec_name}") }
+          it { expect{ subject.update_connec_entity(client, entity, id, connec_name, organization) }.to raise_error("No response received from Connec! when trying to update a #{connec_name}") }
         end
       end
 
@@ -273,13 +273,13 @@ describe Maestrano::Connector::Rails::Entity do
 
       describe 'push_entity_to_external' do
         context 'when the entity idmap has an external id' do
-          it 'calls update_entity_to_external' do
-            expect(subject).to receive(:update_entity_to_external).with(nil, entity1, idmap1.external_id, external_name, organization)
+          it 'calls update_external_entity' do
+            expect(subject).to receive(:update_external_entity).with(nil, entity1, idmap1.external_id, external_name, organization)
             subject.push_entity_to_external(nil, entity_with_idmap1, external_name, organization)
           end
 
           it 'updates the idmap last push to external' do
-            allow(subject).to receive(:update_entity_to_external)
+            allow(subject).to receive(:update_external_entity)
             time_before = idmap1.last_push_to_external
             subject.push_entity_to_external(nil, entity_with_idmap1, external_name, organization)
             idmap1.reload
@@ -288,13 +288,13 @@ describe Maestrano::Connector::Rails::Entity do
         end
 
         context 'when the entity idmap does not have an external id' do
-          it 'calls create_entity_to_external' do
-            expect(subject).to receive(:create_entity_to_external).with(nil, entity2, external_name, organization)
+          it 'calls create_external_entity' do
+            expect(subject).to receive(:create_external_entity).with(nil, entity2, external_name, organization)
             subject.push_entity_to_external(nil, entity_with_idmap2, external_name, organization)
           end
 
           it 'updates the idmap external id, entity and last push' do
-            allow(subject).to receive(:create_entity_to_external).and_return('999111')
+            allow(subject).to receive(:create_external_entity).and_return('999111')
             subject.push_entity_to_external(nil, entity_with_idmap2, external_name, organization)
             idmap2.reload
             expect(idmap2.external_id).to eql('999111')
@@ -304,16 +304,16 @@ describe Maestrano::Connector::Rails::Entity do
         end
       end
 
-      describe 'create_entity_to_external' do
+      describe 'create_external_entity' do
         let(:organization) { create(:organization) }
 
-        it { expect{ subject.create_entity_to_external(nil, nil, nil, organization) }.to raise_error('Not implemented') }
+        it { expect{ subject.create_external_entity(nil, nil, nil, organization) }.to raise_error('Not implemented') }
       end
 
-      describe 'update_entity_to_external' do
+      describe 'update_external_entity' do
         let(:organization) { create(:organization) }
 
-        it { expect{ subject.update_entity_to_external(nil, nil, nil, nil, organization) }.to raise_error('Not implemented') }
+        it { expect{ subject.update_external_entity(nil, nil, nil, nil, organization) }.to raise_error('Not implemented') }
       end
 
       describe 'get_id_from_external_entity_hash' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maestrano-connector-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - Pierre Berard
@@ -225,6 +225,7 @@ files:
 - db/migrate/20151122163325_create_synchronizations.rb
 - db/migrate/20151122163449_create_id_maps.rb
 - db/migrate/20160205132857_add_sync_enabled_to_organizations.rb
+- db/migrate/20160215103120_add_name_to_id_map.rb
 - lib/generators/connector/USAGE
 - lib/generators/connector/complex_entity_generator.rb
 - lib/generators/connector/install_generator.rb
@@ -295,12 +296,6 @@ files:
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
 - spec/dummy/db/development.sqlite3
-- spec/dummy/db/migrate/20160204223447_create_users.maestrano_connector_rails_engine.rb
-- spec/dummy/db/migrate/20160204223448_create_organizations.maestrano_connector_rails_engine.rb
-- spec/dummy/db/migrate/20160204223449_create_user_organization_rels.maestrano_connector_rails_engine.rb
-- spec/dummy/db/migrate/20160204223450_create_synchronizations.maestrano_connector_rails_engine.rb
-- spec/dummy/db/migrate/20160204223451_create_id_maps.maestrano_connector_rails_engine.rb
-- spec/dummy/db/migrate/20160205133024_add_sync_enabled_to_organizations.maestrano_connector_rails_engine.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/lib/assets/.keep

data/spec/dummy/db/migrate/20160204223447_create_users.maestrano_connector_rails_engine.rb

@@ -1,17 +0,0 @@
-# This migration comes from maestrano_connector_rails_engine (originally 20151122162100)
-class CreateUsers < ActiveRecord::Migration
-  def change
-    create_table :users do |t|
-      t.string :provider
-      t.string :uid
-      t.string :first_name
-      t.string :last_name
-      t.string :email
-      t.string :tenant
-
-      t.timestamps null: false
-    end
-
-    add_index :users, [:uid, :tenant], name: 'user_uid_index'
-  end
-end

data/spec/dummy/db/migrate/20160204223448_create_organizations.maestrano_connector_rails_engine.rb

@@ -1,22 +0,0 @@
-# This migration comes from maestrano_connector_rails_engine (originally 20151122162414)
-class CreateOrganizations < ActiveRecord::Migration
-  def change
-    create_table :organizations do |t|
-      t.string :provider
-      t.string :uid
-      t.string :name
-      t.string :tenant
-
-      t.string :oauth_provider
-      t.string :oauth_uid
-      t.string :oauth_token
-      t.string :refresh_token
-      t.string :instance_url
-
-      t.string :synchronized_entities
-
-      t.timestamps null: false
-    end
-    add_index :organizations, [:uid, :tenant], name: 'orga_uid_index'
-  end
-end

data/spec/dummy/db/migrate/20160204223449_create_user_organization_rels.maestrano_connector_rails_engine.rb

@@ -1,13 +0,0 @@
-# This migration comes from maestrano_connector_rails_engine (originally 20151122162613)
-class CreateUserOrganizationRels < ActiveRecord::Migration
-  def change
-    create_table :user_organization_rels do |t|
-      t.integer :user_id
-      t.integer :organization_id
-
-      t.timestamps
-    end
-    add_index :user_organization_rels, :organization_id, name: 'rels_orga_index'
-    add_index :user_organization_rels, :user_id, name: 'rels_user_index'
-  end
-end

data/spec/dummy/db/migrate/20160204223450_create_synchronizations.maestrano_connector_rails_engine.rb

@@ -1,14 +0,0 @@
-# This migration comes from maestrano_connector_rails_engine (originally 20151122163325)
-class CreateSynchronizations < ActiveRecord::Migration
-  def change
-    create_table :synchronizations do |t|
-      t.integer :organization_id
-      t.string  :status
-      t.text    :message
-      t.boolean :partial, default: false
-
-      t.timestamps null: false
-    end
-    add_index :synchronizations, :organization_id, name: 'synchronization_orga_id_index'
-  end
-end

data/spec/dummy/db/migrate/20160204223451_create_id_maps.maestrano_connector_rails_engine.rb

@@ -1,19 +0,0 @@
-# This migration comes from maestrano_connector_rails_engine (originally 20151122163449)
-class CreateIdMaps < ActiveRecord::Migration
-  def change
-    create_table :id_maps do |t|
-      t.string :connec_id
-      t.string :connec_entity
-      t.string :external_id
-      t.string :external_entity
-      t.integer :organization_id
-      t.datetime :last_push_to_connec
-      t.datetime :last_push_to_external
-
-      t.timestamps null: false
-    end
-    add_index :id_maps, [:connec_id, :connec_entity, :organization_id], name: 'idmap_connec_index'
-    add_index :id_maps, [:external_id, :external_entity, :organization_id], name: 'idmap_external_index'
-    add_index :id_maps, :organization_id, name: 'idmap_organization_index'
-  end
-end

data/spec/dummy/db/migrate/20160205133024_add_sync_enabled_to_organizations.maestrano_connector_rails_engine.rb

@@ -1,6 +0,0 @@
-# This migration comes from maestrano_connector_rails_engine (originally 20160205132857)
-class AddSyncEnabledToOrganizations < ActiveRecord::Migration
-  def change
-    add_column :organizations, :sync_enabled, :boolean, default: false
-  end
-end