maestrano-connector-rails 2.0.0.pre.RC6 → 2.0.0.pre.RC7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 709d57eeb33b39db02b69238d334a1b8edf476a3
-  data.tar.gz: 3d02cda21df1ed6deb03bed11f564c02e7d90f58
+  metadata.gz: a654f58cf9e846fe9aabddebb9fbaa1c3dd8b04f
+  data.tar.gz: e04707121bfb1b43002274c6466708a9992edc8e
 SHA512:
-  metadata.gz: 5aaec384d8c164f8fab4235fdf35690b274af38d4ab5aa1644ad917a6479a9fb44d8f4df2ea177675ae7c2d018e8fbf61233b1e40e0b96e97230de14c08285d8
-  data.tar.gz: 43b120fc8e5a75c853161d137a0dab26a8d071d2d91e36beeb139c989b47af0df684a92de49272ddbcdfbbfdc9d5d8118dfa6bef09545935df75f179a580bc14
+  metadata.gz: 7bd0ee4212ed5b77183edf401e16a5f1393612e5a910b977c57f9d413d7a36651d17838758c97f3810736611e670967e085a70a5e1ab86939bb1f1e9cab2402d
+  data.tar.gz: b7a72fc95e58bcf3ff40614bfe5145dc13efd257b9750ae70ea07fc581e55dabc2c3ea3a831f20f872bbef6db94f48241055d0b9ef0f87833ce67315164d9bb9

data/.rubocop.yml

@@ -20,6 +20,9 @@ Style/CollectionMethods:
 Metrics/LineLength:
   Max: 320
 
+Metrics/MethodLength:
+  Max: 50
+
 Style/IndentationConsistency:
   EnforcedStyle: rails
 

data/.rubocop_todo.yml

@@ -102,14 +102,6 @@ Style/EmptyLinesAroundModuleBody:
 Style/FrozenStringLiteralComment:
   Enabled: false
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: predicate, comparison
-Style/NumericPredicate:
-  Exclude:
-    - 'app/models/maestrano/connector/rails/organization.rb'
-
 # Offense count: 3
 # Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
 # NamePrefix: is_, has_, have_

data/VERSION

@@ -1 +1 @@
-2.0.0.pre.RC6
+2.0.0.pre.RC7

data/app/controllers/maestrano/auth/saml_controller.rb

@@ -24,7 +24,7 @@ class Maestrano::Auth::SamlController < Maestrano::Rails::SamlBaseController
     if session[:settings]
       session.delete(:settings)
       redirect_to main_app.root_path
-    elsif current_organization && current_organization.oauth_uid && current_organization.sync_enabled
+    elsif current_organization&.oauth_uid && current_organization&.sync_enabled
       redirect_to main_app.home_redirect_to_external_path
     else
       redirect_to main_app.root_path

data/app/controllers/maestrano/connec_controller.rb

@@ -9,7 +9,7 @@ class Maestrano::ConnecController < Maestrano::Rails::WebHookController
 
         entities.each do |entity|
           organization = Maestrano::Connector::Rails::Organization.find_by_uid_and_tenant(entity[:group_id], params[:tenant])
-          next Rails.logger.warn "Received notification from Connec! for unknown group or group without oauth: #{entity['group_id']} (tenant: #{params[:tenant]})" unless organization && organization.oauth_uid
+          next Rails.logger.warn "Received notification from Connec! for unknown group or group without oauth: #{entity['group_id']} (tenant: #{params[:tenant]})" unless organization&.oauth_uid
           next unless organization.sync_enabled && organization.synchronized_entities[entity_class_hash[:name].to_sym]
 
           Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Received entity from Connec! webhook: Entity=#{entity_name}, Data=#{entity}")

data/app/controllers/maestrano/synchronizations_controller.rb

@@ -3,23 +3,11 @@ class Maestrano::SynchronizationsController < Maestrano::Rails::WebHookControlle
     tenant = params[:tenant]
     uid = params[:id]
     organization = Maestrano::Connector::Rails::Organization.find_by_uid_and_tenant(uid, tenant)
-    return render json: {errors: [{message: "Organization not found", code: 404}]}, status: :not_found unless organization
-
-    h = {
-      group_id: organization.uid,
-      sync_enabled: organization.sync_enabled
-    }
-
-    last_sync = organization.synchronizations.last
-    if last_sync
-      h.merge!(
-        status: last_sync.status,
-        message: last_sync.message,
-        updated_at: last_sync.updated_at
-      )
-    end
+    return render json: {errors: [{message: 'Organization not found', code: 404}]}, status: :not_found unless organization
+
+    status = organization_status organization
 
-    render json: h
+    render_organization_sync(organization, status, 200)
   end
 
   def create
@@ -27,21 +15,55 @@ class Maestrano::SynchronizationsController < Maestrano::Rails::WebHookControlle
     uid = params[:group_id]
     opts = params[:opts] || {}
     organization = Maestrano::Connector::Rails::Organization.find_by_uid_and_tenant(uid, tenant)
-    return render json: {errors: [{message: "Organization not found", code: 404}]}, status: :not_found unless organization
+    return render json: {errors: [{message: 'Organization not found', code: 404}]}, status: :not_found unless organization
+
+    status = organization_status(organization)
 
-    Maestrano::Connector::Rails::SynchronizationJob.perform_later(organization, opts.with_indifferent_access)
-    head :created
+    unless status == 'RUNNING' || status == 'ENQUEUED'
+      Maestrano::Connector::Rails::SynchronizationJob.perform_later(organization.id, opts.with_indifferent_access)
+      status = 'ENQUEUED'
+    end
+
+    render_organization_sync(organization, status, 201)
   end
 
   def toggle_sync
     tenant = params[:tenant]
     uid = params[:group_id]
     organization = Maestrano::Connector::Rails::Organization.find_by_uid_and_tenant(uid, tenant)
-    return render json: {errors: [{message: "Organization not found", code: 404}]}, status: :not_found unless organization
+    return render json: {errors: [{message: 'Organization not found', code: 404}]}, status: :not_found unless organization
 
     organization.toggle(:sync_enabled)
     organization.save
-
-    render json: {sync_enabled: organization.sync_enabled}
+    status = organization_status organization
+    render_organization_sync(organization, status, 200)
   end
+
+  private
+
+    def render_organization_sync(organization, status, code)
+      h = {
+        group_id: organization.uid,
+        sync_enabled: organization.sync_enabled,
+        status: status
+      }
+      last_sync = organization.synchronizations.last
+      if last_sync
+        h[:message] = last_sync.message
+        h[:updated_at] = last_sync.updated_at
+      end
+
+      render json: h, status: code
+    end
+
+    def organization_status(organization)
+      last_sync = organization.synchronizations.last
+      if Maestrano::Connector::Rails::SynchronizationJob.find_running_job(organization.id)
+        'RUNNING'
+      elsif Maestrano::Connector::Rails::SynchronizationJob.find_job(organization.id)
+        'ENQUEUED'
+      else
+        last_sync&.status || 'DISABLED'
+      end
+    end
 end

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

@@ -6,7 +6,7 @@ module Maestrano::Connector::Rails
     def perform(name = nil, count = nil)
       Maestrano::Connector::Rails::Organization.where.not(oauth_provider: nil, encrypted_oauth_token: nil).each do |o|
         next unless [true, 1].include?(o.sync_enabled)
-        Maestrano::Connector::Rails::SynchronizationJob.perform_later(o, {})
+        Maestrano::Connector::Rails::SynchronizationJob.perform_later(o.id, {})
       end
     end
   end

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

@@ -7,9 +7,9 @@ module Maestrano::Connector::Rails
     #  * :only_entities => [person, tasks_list]
     #  * :full_sync => true  synchronization is performed without date filtering
     #  * :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
-
+    def perform(organization_id, opts = {})
+      organization = Maestrano::Connector::Rails::Organization.find(organization_id)
+      return unless organization&.sync_enabled
       # Check if previous synchronization is still running
       if Synchronization.where(organization_id: organization.id, status: 'RUNNING').where(created_at: (30.minutes.ago..Time.now)).exists?
         ConnectorLogger.log('info', organization, 'Synchronization skipped: Previous synchronization is still running')
@@ -105,6 +105,25 @@ module Maestrano::Connector::Rails
       end
     end
 
+    def self.enqueued?(organization_id)
+      SynchronizationJob.find_job(organization_id).present? || SynchronizationJob.find_running_job(organization_id).present?
+    end
+
+    def self.find_job(organization_id)
+      queue = Sidekiq::Queue.new(:default)
+      queue.find do |job|
+        organization_id == job.item['args'][0]['arguments'].first
+      end
+    end
+
+    def self.find_running_job(organization_id)
+      Sidekiq::Workers.new.find do |_, _, work|
+        work['queue'] == 'default' && work['payload']['args'][0]['arguments'].first == organization_id
+      end
+    rescue
+      nil
+    end
+
     private
 
       def instanciate_entity(entity_name, organization, connec_client, external_client, opts)
@@ -120,7 +139,7 @@ module Maestrano::Connector::Rails
         entity_instance.push_entities_to_external(mapped_entities[:connec_entities])
         entity_instance.push_entities_to_connec(mapped_entities[:external_entities])
         entity_instance.after_sync(last_synchronization_date)
-        
+
         entity_instance.class.count_and_first(external ? external_entities : connec_entities)
       end
   end

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

@@ -312,7 +312,7 @@ module Maestrano::Connector::Rails::Concerns::Entity
 
     Maestrano::Connector::Rails::ConnectorLogger.log('info', @organization, "Sending Connec! #{self.class.connec_entity_name.pluralize} to #{Maestrano::Connector::Rails::External.external_name} #{external_entity_name.pluralize}")
 
-    entities_to_send_to_connec = mapped_connec_entities_with_idmaps.map{ |mapped_connec_entity_with_idmap|
+    entities_to_send_to_connec = mapped_connec_entities_with_idmaps.map { |mapped_connec_entity_with_idmap|
       push_entity_to_external(mapped_connec_entity_with_idmap, external_entity_name)
     }.compact
 
@@ -324,7 +324,7 @@ module Maestrano::Connector::Rails::Concerns::Entity
     # with either only the id, or the id + id references
     proc = lambda do |entity|
       id = {id: [Maestrano::Connector::Rails::ConnecHelper.id_hash(entity[:idmap].external_id, @organization)]}
-      body = entity[:completed_hash] ? entity[:completed_hash].merge(id) : id
+      body = entity[:completed_hash]&.merge(id) || id
       batch_op('put', body, entity[:idmap].connec_id, self.class.normalized_connec_entity_name)
     end
     batch_calls(entities_to_send_to_connec, proc, self.class.connec_entity_name, true)

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

@@ -62,7 +62,7 @@ module Maestrano::Connector::Rails
     end
 
     def member?(user)
-      user_organization_rels.where(user_id: user.id).count > 0
+      user_organization_rels.where(user_id: user.id).count.positive?
     end
 
     def remove_member(user)
@@ -108,7 +108,7 @@ module Maestrano::Connector::Rails
     end
 
     def last_synchronization_date
-      (last_successful_synchronization && last_successful_synchronization.updated_at) || date_filtering_limit
+      last_successful_synchronization&.updated_at || date_filtering_limit
     end
   end
 end

data/lib/generators/connector/templates/home_controller.rb

@@ -23,7 +23,7 @@ class HomeController < ApplicationController
 
   def synchronize
     return redirect_to(:back) unless is_admin
-    Maestrano::Connector::Rails::SynchronizationJob.perform_later(current_organization, (params['opts'] || {}).merge(forced: true))
+    Maestrano::Connector::Rails::SynchronizationJob.perform_later(current_organization.id, (params['opts'] || {}).merge(forced: true))
     flash[:info] = 'Synchronization requested'
     redirect_to(:back)
   end
@@ -35,7 +35,7 @@ class HomeController < ApplicationController
   private
 
     def start_synchronization(old_sync_state, organization)
-      Maestrano::Connector::Rails::SynchronizationJob.perform_later(organization, {})
+      Maestrano::Connector::Rails::SynchronizationJob.perform_later(organization.id, {})
       flash[:info] = 'Congrats, you\'re all set up! Your data are now being synced'
     end
 end

data/lib/generators/connector/templates/home_controller_spec.rb

@@ -87,7 +87,7 @@ describe HomeController, type: :controller do
         subject { post :synchronize, opts: {'opts' => 'some_opts'} }
 
         it 'calls perform_later with opts' do
-          expect(Maestrano::Connector::Rails::SynchronizationJob).to receive(:perform_later).with(organization, 'opts' => 'some_opts', forced: true)
+          expect(Maestrano::Connector::Rails::SynchronizationJob).to receive(:perform_later).with(organization.id, 'opts' => 'some_opts', forced: true)
           subject
         end
       end
@@ -96,7 +96,7 @@ describe HomeController, type: :controller do
         subject { post :synchronize }
 
         it 'calls perform_later with empty opts hash' do
-          expect(Maestrano::Connector::Rails::SynchronizationJob).to receive(:perform_later).with(organization, forced: true)
+          expect(Maestrano::Connector::Rails::SynchronizationJob).to receive(:perform_later).with(organization.id, forced: true)
           subject
         end
       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 2.0.0.pre.RC6 ruby lib
+# stub: maestrano-connector-rails 2.0.0.pre.RC7 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "maestrano-connector-rails"
-  s.version = "2.0.0.pre.RC6"
+  s.version = "2.0.0.pre.RC7"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Maestrano", "Pierre Berard", "Marco Bagnasco"]
-  s.date = "2016-09-20"
+  s.date = "2016-09-30"
   s.description = "Maestrano is the next generation marketplace for SME applications. See https://maestrano.com for details."
   s.email = "developers@maestrano.com"
   s.executables = ["rails"]

data/spec/controllers/synchronizations_controller_spec.rb

@@ -61,6 +61,7 @@ describe Maestrano::SynchronizationsController, type: :controller do
               JSON.parse({
                 group_id: organization.uid,
                 sync_enabled: organization.sync_enabled,
+                status: 'DISABLED'
               }.to_json)
             )
           end
@@ -78,7 +79,7 @@ describe Maestrano::SynchronizationsController, type: :controller do
                 sync_enabled: organization.sync_enabled,
                 status: sync2.status,
                 message: sync2.message,
-                updated_at: sync2.updated_at   
+                updated_at: sync2.updated_at
               }.to_json)
             )
           end
@@ -135,7 +136,7 @@ describe Maestrano::SynchronizationsController, type: :controller do
         end
 
         it 'queues a sync' do
-          expect(Maestrano::Connector::Rails::SynchronizationJob).to receive(:perform_later).with(organization, opts)
+          expect(Maestrano::Connector::Rails::SynchronizationJob).to receive(:perform_later).with(organization.id, opts)
           subject
         end
       end

data/spec/jobs/all_synchronizations_job_spec.rb

@@ -14,9 +14,9 @@ describe Maestrano::Connector::Rails::AllSynchronizationsJob do
 
   describe 'perform' do
     it 'does not calls sync entity' do
-      expect(Maestrano::Connector::Rails::SynchronizationJob).to_not receive(:perform_later).with(organization_not_linked, anything)
-      expect(Maestrano::Connector::Rails::SynchronizationJob).to_not receive(:perform_later).with(organization_not_active, anything)
-      expect(Maestrano::Connector::Rails::SynchronizationJob).to receive(:perform_later).with(organization_to_process, anything)
+      expect(Maestrano::Connector::Rails::SynchronizationJob).to_not receive(:perform_later).with(organization_not_linked.id, anything)
+      expect(Maestrano::Connector::Rails::SynchronizationJob).to_not receive(:perform_later).with(organization_not_active.id, anything)
+      expect(Maestrano::Connector::Rails::SynchronizationJob).to receive(:perform_later).with(organization_to_process.id, anything)
 
       subject
     end

data/spec/jobs/synchronization_job_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Maestrano::Connector::Rails::SynchronizationJob do
   let(:organization) { create(:organization) }
   let(:opts) { {} }
-  subject { Maestrano::Connector::Rails::SynchronizationJob.perform_now(organization, opts) }
+  subject { Maestrano::Connector::Rails::SynchronizationJob.perform_now(organization.id, opts) }
 
   def does_not_perform
     expect_any_instance_of(Maestrano::Connector::Rails::SynchronizationJob).to_not receive(:sync_entity)
@@ -20,7 +20,7 @@ describe Maestrano::Connector::Rails::SynchronizationJob do
     end
 
     context 'with sync_enabled set to true' do
-      before { organization.update(sync_enabled: true)} 
+      before { organization.update(sync_enabled: true)}
 
       context 'with a sync still running for less than 30 minutes' do
         let!(:running_sync) { create(:synchronization, organization: organization, status: 'RUNNING', created_at: 29.minutes.ago) }
@@ -77,11 +77,12 @@ describe Maestrano::Connector::Rails::SynchronizationJob do
 
       context 'subsequent sync' do
         let!(:old_sync) { create(:synchronization, partial: false, status: 'SUCCESS', organization: organization) }
-        
+
         it { performes }
 
         it 'calls sync entity on all the organization synchronized entities set to true' do
           organization.synchronized_entities[organization.synchronized_entities.keys.first] = false
+          organization.save
           expect_any_instance_of(Maestrano::Connector::Rails::SynchronizationJob).to receive(:sync_entity).exactly(organization.synchronized_entities.count - 1).times
 
           subject
@@ -172,11 +173,11 @@ describe Maestrano::Connector::Rails::SynchronizationJob do
           context 'with more than 50 entities' do
             let(:external_entities1) { [*1..50] }
             let(:external_entities2) { [*51..60] }
-            
+
             it 'calls perform_sync several time' do
               expect_any_instance_of(Entities::Person).to receive(:opts_merge!).twice
               expect(subject).to receive(:perform_sync).twice.and_call_original
-              
+
               subject.first_sync_entity('person', organization, nil, nil, nil, {}, true)
             end
           end
@@ -187,7 +188,7 @@ describe Maestrano::Connector::Rails::SynchronizationJob do
             it 'calls perform_sync once' do
               expect_any_instance_of(Entities::Person).to receive(:opts_merge!).once.with({__skip: 0})
               expect(subject).to receive(:perform_sync).once.and_call_original
-              
+
               subject.first_sync_entity('person', organization, nil, nil, nil, {}, true)
             end
           end
@@ -200,7 +201,7 @@ describe Maestrano::Connector::Rails::SynchronizationJob do
             it 'calls perform_sync once' do
               expect_any_instance_of(Entities::Person).to receive(:opts_merge!).once.with({__skip: 0})
               expect(subject).to receive(:perform_sync).once.and_call_original
-              
+
               subject.first_sync_entity('person', organization, nil, nil, nil, {}, true)
             end
           end
@@ -220,4 +221,4 @@ describe Maestrano::Connector::Rails::SynchronizationJob do
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maestrano-connector-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.RC6
+  version: 2.0.0.pre.RC7
 platform: ruby
 authors:
 - Maestrano
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-20 00:00:00.000000000 Z
+date: 2016-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails