maestrano-connector-rails 1.3.4 → 1.3.5

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

@@ -1,44 +1,33 @@
+# frozen_string_literal: true
 class OauthController < ApplicationController
-
   # TODO
   # Routes for this controller are not provided by the gem and
   # should be set according to your needs
 
   def request_omniauth
-    if is_admin
-      # TODO
-      # Perform oauth request here. The oauth process should be able to
-      # remember the organization, either by a param in the request or using
-      # a session
-    else
-      redirect_to root_url
-    end
+    return redirect_to root_url unless is_admin
+
+    # TODO
+    # Perform oauth request here. The oauth process should be able to
+    # remember the organization, either by a param in the request or using
+    # a session
   end
 
   def create_omniauth
     org_uid = '' # TODO
     organization = Maestrano::Connector::Rails::Organization.find_by_uid_and_tenant(org_uid, current_user.tenant)
 
-    if organization && is_admin?(current_user, organization)
-      # TODO
-      # Update organization with oauth params
-      # Should at least set oauth_uid, oauth_token and oauth_provider
-    end
+    return redirect_to root_url unless organization && is_admin?(current_user, organization)
 
-    redirect_to root_url
+    # TODO
+    # Update organization with oauth params
+    # Should at least set oauth_uid, oauth_token and oauth_provider
   end
 
   def destroy_omniauth
     organization = Maestrano::Connector::Rails::Organization.find_by_id(params[:organization_id])
-
-    if organization && is_admin?(current_user, organization)
-      organization.oauth_uid = nil
-      organization.oauth_token = nil
-      organization.refresh_token = nil
-      organization.sync_enabled = false
-      organization.save
-    end
+    organization.clear_omniauth if organization && is_admin?(current_user, organization)
 
     redirect_to root_url
   end
-end
+end

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

@@ -1,7 +1,7 @@
+# frozen_string_literal: true
 class SharedEntitiesController < ApplicationController
   def index
-    if is_admin
-      @idmaps = Maestrano::Connector::Rails::IdMap.where(organization_id: current_organization.id).order(:connec_entity)
-    end
+    return unless is_admin
+    @idmaps = Maestrano::Connector::Rails::IdMap.where(organization_id: current_organization.id).order(:connec_entity)
   end
-end
+end

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

@@ -1,18 +1,18 @@
 require 'spec_helper'
 
-describe SharedEntitiesController, :type => :controller do
+describe SharedEntitiesController, type: :controller do
   describe 'index' do
     subject { get :index }
 
     it { expect(subject).to be_success }
 
     context 'when user is admin' do
-      let(:organization) {  create(:organization) }
+      let(:organization) { create(:organization) }
       let(:idmap) { create(:idmap, organization: organization) }
-      before {
+      before do
         allow_any_instance_of(Maestrano::Connector::Rails::SessionHelper).to receive(:current_organization).and_return(organization)
         allow_any_instance_of(Maestrano::Connector::Rails::SessionHelper).to receive(:is_admin).and_return(true)
-      }
+      end
 
       it 'assigns the idmaps' do
         subject
@@ -20,4 +20,4 @@ describe SharedEntitiesController, :type => :controller do
       end
     end
   end
-end
+end

data/lib/generators/connector/templates/stylesheets/layout.sass

@@ -30,15 +30,28 @@ html, body
       margin-left: 20px
       margin-top: -17px
 
+    .logo
+      width:         $logo-width
+      height:        $logo-height
+      margin-right:  $logo-margin-right
+      margin-left:   $logo-margin-left
+      margin-top:    $logo-margin-top
+      margin-bottom: $logo-margin-bottom
+
   &.navbar-inverse
     font-weight: 300
     letter-spacing: 1px
 
     ul.nav.navbar-nav
-      text-transform: uppercase
+      text-transform: $navbar-text-transform
+      font-weight:    $navbar-font-weight
 
       a
-        font-size: $normal
+        font-size:         $text-size-normal
+
+        &:hover, &:focus
+          color:             $navbar-links
+          text-decoration:   $navbar-links-decoration
 
 // Reduce the height of the navbar if on mobile device
 @media(min-width: 768px)
@@ -60,4 +73,4 @@ html, body
   text-align: center
 
 .align-right
-  text-align: right
+  text-align: right

data/lib/generators/connector/templates/stylesheets/variables.sass

@@ -17,6 +17,8 @@ $text-color:              #000
 $navbar-bg-color:         #aaa
 $navbar-text-color:       #fff
 
+$navbar-link-hover:       #ffa
+
 $copyright-color:         $navbar-text-color
 
 $primary-button-color:    blue
@@ -32,8 +34,19 @@ $todo-step-badge-color:   darken($todo-step-border-color, 20%)
 /*-----------------------------------------------------------------------*/
 /*                          Text Size                                    */
 /*-----------------------------------------------------------------------*/
-$small:                          11px
-$normal:                         13px
+$text-size-small:                          11px
+$text-size-normal:                         13px
+
+/*-----------------------------------------------------------------------*/
+/*                          Logo                                         */
+/*-----------------------------------------------------------------------*/
+$logo-width:                     100px
+$logo-height:                    48px
+
+$logo-margin-right:              0
+$logo-margin-left:               10px
+$logo-margin-top:                0
+$logo-margin-bottom:             0
 
 /*-----------------------------------------------------------------------*/
 /*                          Nav bar                                      */
@@ -46,8 +59,13 @@ $navbar-inverse-border:          $navbar-bg-color
 $navbar-desktop-height:          80px
 $navbar-inverse-link-active-bg:  $navbar-inverse-bg
 
-$navbar-padding: 10px
-$footer-height: 50px
+$navbar-text-transform:          uppercase
+$navbar-font-weight:             300
+
+$navbar-links-decoration:        underline
+
+$navbar-padding:                 10px
+$footer-height:                  50px
 
 $brand-success:                  $primary-button-color
 $brand-primary:                  $primary-button-color

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

@@ -1,7 +1,7 @@
+# frozen_string_literal: true
 class SynchronizationsController < ApplicationController
   def index
-    if current_organization
-      @synchronizations = Maestrano::Connector::Rails::Synchronization.where(organization_id: current_organization.id).order(updated_at: :desc).limit(40)
-    end
+    return unless current_organization
+    @synchronizations = Maestrano::Connector::Rails::Synchronization.where(organization_id: current_organization.id).order(updated_at: :desc).limit(40)
   end
-end
+end

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

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe SynchronizationsController, :type => :controller do
+describe SynchronizationsController, type: :controller do
   describe 'index' do
     subject { get :index }
 
@@ -9,9 +9,9 @@ describe SynchronizationsController, :type => :controller do
     context 'when user is logged in' do
       let(:organization) {  create(:organization) }
       let(:synchronization) { create(:synchronization, organization: organization) }
-      before {
+      before do
         allow_any_instance_of(Maestrano::Connector::Rails::SessionHelper).to receive(:current_organization).and_return(organization)
-      }
+      end
 
       it 'assigns the synchronizations' do
         subject
@@ -19,4 +19,4 @@ describe SynchronizationsController, :type => :controller do
       end
     end
   end
-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 1.3.4 ruby lib
+# stub: maestrano-connector-rails 1.3.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "maestrano-connector-rails"
-  s.version = "1.3.4"
+  s.version = "1.3.5"
 
   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-08-08"
+  s.date = "2016-08-19"
   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"]
@@ -57,6 +57,7 @@ Gem::Specification.new do |s|
     "app/models/maestrano/connector/rails/connector_logger.rb",
     "app/models/maestrano/connector/rails/entity.rb",
     "app/models/maestrano/connector/rails/entity_base.rb",
+    "app/models/maestrano/connector/rails/exceptions/entity_not_found_error.rb",
     "app/models/maestrano/connector/rails/external.rb",
     "app/models/maestrano/connector/rails/id_map.rb",
     "app/models/maestrano/connector/rails/organization.rb",
@@ -122,11 +123,8 @@ Gem::Specification.new do |s|
     "spec/dummy/app/assets/images/.keep",
     "spec/dummy/app/assets/javascripts/application.js",
     "spec/dummy/app/assets/stylesheets/application.css",
-    "spec/dummy/app/controllers/admin_controller.rb",
     "spec/dummy/app/controllers/application_controller.rb",
     "spec/dummy/app/controllers/concerns/.keep",
-    "spec/dummy/app/controllers/home_controller.rb",
-    "spec/dummy/app/controllers/oauth_controller.rb",
     "spec/dummy/app/helpers/application_helper.rb",
     "spec/dummy/app/mailers/.keep",
     "spec/dummy/app/models/.keep",
@@ -198,13 +196,14 @@ Gem::Specification.new do |s|
     "spec/routing/connec_routing_spec.rb",
     "spec/spec_helper.rb",
     "template/Procfile",
-    "template/application.yml.sample",
+    "template/application-sample.yml",
     "template/database.yml",
     "template/factories.rb",
     "template/gitignore",
-    "template/maestrano-connector-template.rb",
     "template/maestrano.rb",
+    "template/maestrano_connector_template.rb",
     "template/routes.rb",
+    "template/rubocop.yml",
     "template/settings/development.yml",
     "template/settings/production.yml",
     "template/settings/settings.yml",

data/release_notes.md

@@ -1,3 +1,18 @@
+## 1.3.4
+`maestrano.rb` file should be updated with new synchronization paths.
+
+## Features
+* `connec_version_lt?` method
+
+## Fixes
+* Fixes multi-tenancy of synchronization endpoints
+* Fixes display of singleton entity
+
+## 1.3.3
+
+## Fixes
+* Fixes `connec_version` method
+
 ## 1.3.2
 
 ### Features

data/spec/dummy/tmp/cache/.keep

@@ -0,0 +1 @@
+

data/spec/factories.rb

@@ -1,13 +1,12 @@
 FactoryGirl.define do
-
   factory :user, class: Maestrano::Connector::Rails::User do
-    email "email@example.com"
-    tenant "default"
+    email 'email@example.com'
+    tenant 'default'
   end
 
   factory :organization, class: Maestrano::Connector::Rails::Organization do
-    name "My company"
-    tenant "default"
+    name 'My company'
+    tenant 'default'
     sequence(:uid) { |n| "cld-11#{n}" }
     oauth_uid 'sfuiy765'
     oauth_provider 'this_app'
@@ -21,9 +20,9 @@ FactoryGirl.define do
   factory :idmap, class: Maestrano::Connector::Rails::IdMap do
     sequence(:connec_id) { |n| "#{n}6798-ada6-te43#{n}" }
     connec_entity 'person'
-    sequence(:external_id) { |n| "#{n}4567ada66#{n}" } 
+    sequence(:external_id) { |n| "#{n}4567ada66#{n}" }
     external_entity 'contact'
-    last_push_to_external 2.day.ago
+    last_push_to_external 2.days.ago
     last_push_to_connec 1.day.ago
     association :organization
   end
@@ -33,4 +32,4 @@ FactoryGirl.define do
     status 'SUCCESS'
     partial false
   end
-end
+end

data/spec/jobs/synchronization_job_spec.rb

@@ -154,11 +154,15 @@ describe Maestrano::Connector::Rails::SynchronizationJob do
       let(:batch_limit) { 50 }
 
       context 'non complex entity' do
+        let(:external_entities1) { [] }
+        let(:external_entities2) { [] }
+        let(:connec_entities1) { [] }
+        let(:connec_entities2) { [] }
         before {
           class Entities::Person < Maestrano::Connector::Rails::Entity
           end
-          allow_any_instance_of(Entities::Person).to receive(:get_connec_entities).and_return([])
-          allow_any_instance_of(Entities::Person).to receive(:get_external_entities_wrapper).and_return([])
+          allow_any_instance_of(Entities::Person).to receive(:get_connec_entities).and_return(connec_entities1, connec_entities2)
+          allow_any_instance_of(Entities::Person).to receive(:get_external_entities_wrapper).and_return(external_entities1, external_entities2)
           allow_any_instance_of(Entities::Person).to receive(:consolidate_and_map_data).and_return({})
           allow_any_instance_of(Entities::Person).to receive(:push_entities_to_external)
           allow_any_instance_of(Entities::Person).to receive(:push_entities_to_connec)
@@ -166,20 +170,23 @@ describe Maestrano::Connector::Rails::SynchronizationJob do
 
         context 'with pagination' 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
-              allow(subject).to receive(:perform_sync).and_return(batch_limit, 0)
               expect_any_instance_of(Entities::Person).to receive(:opts_merge!).twice
-              expect(subject).to receive(:perform_sync).twice
+              expect(subject).to receive(:perform_sync).twice.and_call_original
               
               subject.first_sync_entity('person', organization, nil, nil, nil, {}, true)
             end
           end
 
           context 'with less than 50 entities' do
+            let(:external_entities1) { [*1..40] }
+
             it 'calls perform_sync once' do
-              allow(subject).to receive(:perform_sync).and_return(batch_limit - 10)
               expect_any_instance_of(Entities::Person).to receive(:opts_merge!).once.with({__skip: 0})
-              expect(subject).to receive(:perform_sync).once
+              expect(subject).to receive(:perform_sync).once.and_call_original
               
               subject.first_sync_entity('person', organization, nil, nil, nil, {}, true)
             end
@@ -187,12 +194,27 @@ describe Maestrano::Connector::Rails::SynchronizationJob do
         end
 
         context 'without pagination' do
-          it 'calls perform_sync once' do
-            allow(subject).to receive(:perform_sync).and_return(batch_limit + 10)
-            expect_any_instance_of(Entities::Person).to receive(:opts_merge!).once.with({__skip: 0})
-            expect(subject).to receive(:perform_sync).once
-            
-            subject.first_sync_entity('person', organization, nil, nil, nil, {}, true)
+          context 'when more than 50 entities' do
+            let(:external_entities1) { [*1..60] }
+
+            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
+
+          context 'when exactly 50 entities' do
+            let(:external_entities1) { [*1..50] }
+            let(:external_entities1) { [*1..50] }
+
+            it 'calls perform_sync twice but no infinite loop' 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
         end
       end

data/spec/models/complex_entity_spec.rb

@@ -12,14 +12,14 @@ describe Maestrano::Connector::Rails::ComplexEntity do
         it { expect{ subject.external_entities_names }.to raise_error('Not implemented') }
       end
 
-      describe 'count_entities' do
-        it 'returns the biggest array size' do
+      describe 'count_and_first' do
+        it 'returns the biggest array size and the first element of the first non empty array' do
           entities = {
+            'items' => [],
             'people' => [*1..27],
-            'organizations' => [*1..39],
-            'items' => []
+            'organizations' => [*3..39]
           }
-          expect(subject.count_entities(entities)).to eql(39)
+          expect(subject.count_and_first(entities)).to eql(count: 37, first: 1)
         end
       end
 

data/spec/models/entity_spec.rb

@@ -6,7 +6,7 @@ describe Maestrano::Connector::Rails::Entity do
     subject { Maestrano::Connector::Rails::Entity }
 
     # IdMap methods
-    describe 'idmaps mehtods' do
+    describe 'idmaps methods' do
       before {
         allow(subject).to receive(:connec_entity_name).and_return('Ab')
         allow(subject).to receive(:external_entity_name).and_return('Ab')
@@ -111,9 +111,9 @@ describe Maestrano::Connector::Rails::Entity do
       it { expect(subject.connec_matching_fields).to be_nil }
     end
 
-    describe 'count_entities' do
-      it 'returns the array size' do
-        expect(subject.count_entities([*1..27])).to eql(27)
+    describe 'count_and_first' do
+      it 'returns the array size and the first element' do
+        expect(subject.count_and_first([*1..27])).to eql(count: 27, first: 1)
       end
     end
 
@@ -452,7 +452,7 @@ describe Maestrano::Connector::Rails::Entity do
               it 'does one call' do
                 expect(connec_client).to receive(:batch).once
                 subject.push_entities_to_connec_to(entities, connec_name)
-              end              
+              end
             end
 
             context 'when more than 100 entities' do
@@ -700,6 +700,12 @@ describe Maestrano::Connector::Rails::Entity do
             subject.push_entity_to_external(entity_with_idmap2, external_name)
             expect(idmap2.reload.message).to include(msg.truncate(255))
           end
+
+          it 'can raise a custom exception' do
+            allow(subject).to receive(:update_external_entity).and_raise(Maestrano::Connector::Rails::Exceptions::EntityNotFoundError.new)
+            subject.push_entity_to_external(entity_with_idmap1, external_name)
+            expect(idmap1.reload.message).to include("The external_name record has been deleted in External app.")
+          end
         end
       end
 
@@ -724,13 +730,13 @@ describe Maestrano::Connector::Rails::Entity do
         allow(subject.class).to receive(:last_update_date_from_external_entity_hash).and_return(date)
         allow(subject.class).to receive(:creation_date_from_external_entity_hash).and_return(date)
       }
-      
+
       describe 'consolidate_and_map_data' do
         context 'singleton' do
           before {
             allow(subject.class).to receive(:singleton?).and_return(true)
           }
-          
+
           it 'returns the consolidate_and_map_singleton method result' do
             expect(subject).to receive(:consolidate_and_map_singleton).with({}, {}).and_return({result: 1})
             expect(subject.consolidate_and_map_data({}, {})).to eql({result: 1})
@@ -944,8 +950,8 @@ describe Maestrano::Connector::Rails::Entity do
             }
 
             context 'with connec one more recent' do
-              let(:external_date) { 1.year.ago } 
-              let(:date) { 1.day.ago } 
+              let(:external_date) { 1.year.ago }
+              let(:date) { 1.day.ago }
 
               it 'keeps the entity and discards the external one' do
                 expect(subject.consolidate_and_map_connec_entities(entities, external_entities, [], external_name)).to eql([{entity: {mapped: 'entity'}, idmap: Maestrano::Connector::Rails::IdMap.first, id_refs_only_connec_entity: id_refs_only_connec_entity}])
@@ -954,8 +960,8 @@ describe Maestrano::Connector::Rails::Entity do
             end
 
             context 'with external one more recent' do
-              let(:external_date) { 1.month.ago } 
-              let(:date) { 1.year.ago } 
+              let(:external_date) { 1.month.ago }
+              let(:date) { 1.year.ago }
 
               it 'discards the entity and keep the external one' do
                 expect(subject.consolidate_and_map_connec_entities(entities, external_entities, [], external_name)).to eql([])
@@ -1052,4 +1058,4 @@ describe Maestrano::Connector::Rails::Entity do
 
 
   end
-end
+end