maestrano-connector-rails 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07ffd861760785ab2d5e54e574a0d5382d643496
-  data.tar.gz: 4184a45eb2939e6506d780963161d242546c0ebd
+  metadata.gz: 2a82734a77d8a8231e8a01d8c9c9e0f62e684cad
+  data.tar.gz: 73ce17a1cacbd9f5c0c988e4c132b1f7c8769b63
 SHA512:
-  metadata.gz: 4512861d9e65c9771e54657c432fde4f5d18c424a81e3d277e559f175db0f28655a7cdf0fa3361f85392b7e6a822359d45b66e487def78eb01c68ff1452cd0ec
-  data.tar.gz: 2827d2a7e1a3352850f9d536d24c12484528cbe60656dc1cff61dd7bcc4f54a7bb8aadce3e33124e792f3937324644eee2d532f3dfb223c0981514c26ced1314
+  metadata.gz: a092e0cfcecc3f1f6745ad6ad49970a8cfdd5e0e1887f5a29f2e79fa5e23502b893e15d81e57f3d0d89e15b6392b9a5b9dee0d044177334c304913b69db4b023
+  data.tar.gz: 9b9232cd104ec556d91ddcda3af1eeb12e3db8be65371ccc98a81b6d67b38dd5f48fb52974999eb854562416a601293b3bd3e65f3f511509288f83295076ccd7

data/VERSION

@@ -1 +1 @@
-1.3.3
+1.3.4

data/app/controllers/maestrano/synchronizations_controller.rb

@@ -1,7 +1,8 @@
 class Maestrano::SynchronizationsController < Maestrano::Rails::WebHookController
   def show
+    tenant = params[:tenant]
     uid = params[:id]
-    organization = Maestrano::Connector::Rails::Organization.find_by_uid(uid)
+    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 = {
@@ -22,9 +23,10 @@ class Maestrano::SynchronizationsController < Maestrano::Rails::WebHookControlle
   end
 
   def create
+    tenant = params[:tenant]
     uid = params[:group_id]
     opts = params[:opts] || {}
-    organization = Maestrano::Connector::Rails::Organization.find_by_uid(uid)
+    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
 
     Maestrano::Connector::Rails::SynchronizationJob.perform_later(organization, opts.with_indifferent_access)
@@ -32,8 +34,9 @@ class Maestrano::SynchronizationsController < Maestrano::Rails::WebHookControlle
   end
 
   def toggle_sync
+    tenant = params[:tenant]
     uid = params[:group_id]
-    organization = Maestrano::Connector::Rails::Organization.find_by_uid(uid)
+    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
 
     organization.toggle(:sync_enabled)

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

@@ -28,6 +28,15 @@ module Maestrano::Connector::Rails::Concerns::ConnecHelper
       @@connec_version
     end
 
+    def connec_version_lt?(version, organization)
+      version = Gem::Version.new(version)
+      current_version = Gem::Version.new(connec_version(organization))
+
+      current_version < version
+    rescue
+      true
+    end
+
     # Replaces the arrays of id received from Connec! by the id of the external application
     # Returns a hash {entity: {}, connec_id: '', id_refs_only_connec_entity: {}}
     # If an array has no id for this oauth_provider and oauth_uid but has one for connec, it returns a nil entity (skip the record)

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

@@ -136,7 +136,7 @@ module Maestrano::Connector::Rails::Concerns::Entity
     end
 
     def public_connec_entity_name
-      connec_entity_name.pluralize
+      singleton? ? connec_entity_name : connec_entity_name.pluralize
     end
 
     def public_external_entity_name

data/config/routes.rb

@@ -7,11 +7,14 @@ Maestrano::Connector::Rails::Engine.routes.draw do
     match 'signout', to: 'sessions#destroy', as: 'signout', via: [:get, :post]
     post 'connec/notifications/:tenant' => 'connec#notifications'
 
-    resources :synchronizations, only: [:show, :create] do
-      collection do
-        put :toggle_sync
+    resources :dependancies, only: [:index]
+
+    scope ':tenant' do
+      resources :synchronizations, only: [:show, :create] do
+        collection do
+          put :toggle_sync
+        end
       end
     end
-    resources :dependancies, only: [:index]
   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.3 ruby lib
+# stub: maestrano-connector-rails 1.3.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "maestrano-connector-rails"
-  s.version = "1.3.3"
+  s.version = "1.3.4"
 
   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-07-29"
+  s.date = "2016-08-08"
   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/controllers/synchronizations_controller_spec.rb

@@ -4,9 +4,10 @@ describe Maestrano::SynchronizationsController, type: :controller do
   routes { Maestrano::Connector::Rails::Engine.routes }
 
   let(:uid) { 'cld-aaaa' }
+  let(:tenant) { 'default' }
 
   describe 'show' do
-    subject { get :show, id: uid }
+    subject { get :show, id: uid, tenant: tenant }
 
 
     context 'without authentication' do
@@ -26,11 +27,22 @@ describe Maestrano::SynchronizationsController, type: :controller do
       }
 
       context 'when organization is not found' do
-        let!(:organization) { create(:organization, uid: 'cld-bbbb') }
+        context 'bad uid' do
+          let!(:organization) { create(:organization, uid: 'cld-bbbb') }
 
-        it 'is a 404' do
-          subject
-          expect(response.status).to eq(404)
+          it 'is a 404' do
+            subject
+            expect(response.status).to eq(404)
+          end
+        end
+
+        context 'bad tenant' do
+          let!(:organization) { create(:organization, uid: uid, tenant: 'another_tenant') }
+
+          it 'is a 404' do
+            subject
+            expect(response.status).to eq(404)
+          end
         end
       end
 
@@ -77,7 +89,7 @@ describe Maestrano::SynchronizationsController, type: :controller do
 
   describe 'create' do
     let(:opts) { {'only_entities' => ['customer']} }
-    subject { post :create, group_id: uid, opts: opts }
+    subject { post :create, group_id: uid, opts: opts, tenant: tenant }
 
 
     context 'without authentication' do
@@ -103,6 +115,15 @@ describe Maestrano::SynchronizationsController, type: :controller do
           subject
           expect(response.status).to eq(404)
         end
+
+        context 'bad tenant' do
+          let!(:organization) { create(:organization, uid: uid, tenant: 'another_tenant') }
+
+          it 'is a 404' do
+            subject
+            expect(response.status).to eq(404)
+          end
+        end
       end
 
       context 'when organization is found' do
@@ -122,7 +143,7 @@ describe Maestrano::SynchronizationsController, type: :controller do
   end
 
   describe 'toggle_sync' do
-    subject { put :toggle_sync, group_id: uid }
+    subject { put :toggle_sync, group_id: uid, tenant: tenant }
 
 
     context 'without authentication' do
@@ -148,6 +169,15 @@ describe Maestrano::SynchronizationsController, type: :controller do
           subject
           expect(response.status).to eq(404)
         end
+
+        context 'bad tenant' do
+          let!(:organization) { create(:organization, uid: uid, tenant: 'another_tenant') }
+
+          it 'is a 404' do
+            subject
+            expect(response.status).to eq(404)
+          end
+        end
       end
 
       context 'when organization is found' do

data/spec/models/connec_helper_spec.rb

@@ -29,7 +29,28 @@ describe Maestrano::Connector::Rails::ConnecHelper do
       expect(subject.connec_version(organization)).to eql('1.1')
       expect(subject.connec_version(organization2)).to eql('1.2')
     end
+  end
+
+  describe 'connec_version_lt?' do
+    before {
+      allow(subject).to receive(:connec_version).and_return('1.1.0')
+    }
+
+    it 'returns true if the current version is gt the parameter' do
+      expect(subject.connec_version_lt?('1.0.1', nil)).to be false
+    end
 
+    it 'returns false if the current version is lt the parameter' do
+      expect(subject.connec_version_lt?('1.2.1', nil)).to be true
+    end
+    
+    it 'returns false if the current version is eq the parameter' do
+      expect(subject.connec_version_lt?('1.1.0', nil)).to be false
+    end
+
+    it 'returns true if something fails' do
+      expect(subject.connec_version_lt?('lala', nil)).to be true
+    end
   end
 
   describe 'unfold_references' do

data/spec/models/entity_spec.rb

@@ -118,14 +118,25 @@ describe Maestrano::Connector::Rails::Entity do
     end
 
     describe 'public_connec_entity_name' do
-      it 'returns the connec_entity_name' do
+      it 'returns the pluralized connec_entity_name' do
         allow(subject).to receive(:connec_entity_name).and_return('tree')
         expect(subject.public_connec_entity_name).to eql('trees')
       end
+
+      context 'when singleton' do
+        before {
+          allow(subject).to receive(:singleton?).and_return(true)
+        }
+
+        it 'returns the connec_entity_name' do
+          allow(subject).to receive(:connec_entity_name).and_return('tree')
+          expect(subject.public_connec_entity_name).to eql('tree')
+        end
+      end
     end
 
     describe 'public_external_entity_name' do
-      it 'returns the external_entity_name' do
+      it 'returns the pluralized external_entity_name' do
         allow(subject).to receive(:external_entity_name).and_return('tree')
         expect(subject.public_external_entity_name).to eql('trees')
       end

data/template/maestrano.rb

@@ -30,6 +30,12 @@
 
     config.sso.x509_certificate = Settings[tenant][:x509_certificate]
     config.sso.x509_fingerprint = Settings[tenant][:x509_fingerprint]
+
+    # => Synchronizations endpoints
+    config.app.synchronization_status_path = "/maestrano/#{tenant}/synchronizations/:cld-uid"
+    config.app.synchronization_toggle_path = "/maestrano/#{tenant}/synchronizations/toggle_sync"
+    config.app.synchronization_start_path = "/maestrano/#{tenant}/synchronizations"
+
     # ==> Single Sign-On activation
     # Enable/Disable single sign-on. When troubleshooting authentication issues
     # you might want to disable SSO temporarily

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maestrano-connector-rails
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors:
 - Pierre Berard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-29 00:00:00.000000000 Z
+date: 2016-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails