maestrano-connector-rails 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fbcf23f810c8f8163bffe839d39ef0d36531fde
-  data.tar.gz: 1ef445f37a5a3dc44bd737e966a65ca5a03ef73b
+  metadata.gz: 10545da2fb0a9de8fdd05ee7fced909eee0ba976
+  data.tar.gz: d5b49147ff797a4a120c66a7d7508f968d03fed5
 SHA512:
-  metadata.gz: 20f2202b8094a5c43fe5066f9b918fa4307b527531228d1d5f21e37de581e7c292d90a5984134231f6d40fc585417b4c7eabc4d8b812109eeea65aab5a49a986
-  data.tar.gz: 14d8ba996bb7c9e11525d12d17086126035a882d2b7fe532ff8c6b22ff8ee9377555b5a3580d91a0e615eac7cd8c5b24dad8b09e88837ed7f017d8cdf6e7079a
+  metadata.gz: 9768a574a8b656df7b32893759bcfd6f9564ec1e1e75e29b2fcc7f3313b22f3f07a9c11984e004298746cb7890aec36c3f07d441897667f16888eee7b66b999b
+  data.tar.gz: 5e064f3e79676cb28125dc3e0accc57f86a1c18cf0f6cae7016fea4c7814c406c4f0e9c7c150d09612c3fd8ede3119aa5c0f80b958e78851d9714465c8738bf9

data/VERSION

@@ -1 +1 @@
-0.3.7
+0.3.8

data/app/controllers/maestrano/account/group_users_controller.rb

@@ -9,8 +9,8 @@ class Maestrano::Account::GroupUsersController < Maestrano::Rails::WebHookContro
     group_uid = params[:group_id]
     
     # Get the entities
-    user = User.find_by_provider_and_uid_and_tenant('maestrano', user_uid, params[:tenant])
-    organization = Organization.find_by_provider_and_uid_and_tenant('maestrano', group_uid, params[:tenant])
+    user = Maestrano::Connector::Rails::User.find_by_uid_and_tenant(user_uid, params[:tenant] || 'default')
+    organization = Maestrano::Connector::Rails::Organization.find_by_uid_and_tenant(group_uid, params[:tenant] || 'default')
     
     # Remove the user from the organization
     organization.remove_member(user)

data/app/controllers/maestrano/account/groups_controller.rb

@@ -5,13 +5,13 @@ class Maestrano::Account::GroupsController < Maestrano::Rails::WebHookController
   # Delete an entire group
   def destroy
     # id
-    group_uid = params[:id]
+    org_uid = params[:id]
     
     # Get entity
-    organization = Organization.find_by_provider_and_uid_and_tenant('maestrano', group_uid, params[:tenant])
+    organization = Maestrano::Connector::Rails::Organization.find_by_uid_and_tenant(org_uid, params[:tenant] || 'default')
     
     # Delete all relations
-    organization.user_company_rels.delete_all
+    organization.user_organization_rels.delete_all
     
     # Delete the organization
     organization.destroy

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.3.7 ruby lib
+# stub: maestrano-connector-rails 0.3.8 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "maestrano-connector-rails"
-  s.version = "0.3.7"
+  s.version = "0.3.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
@@ -98,6 +98,8 @@ Gem::Specification.new do |s|
     "pkg/maestrano-connector-rails-0.2.16.gem",
     "pkg/maestrano-connector-rails-0.2.4.gem",
     "spec/controllers/connec_controller_spec.rb",
+    "spec/controllers/group_users_controller_spec.rb",
+    "spec/controllers/groups_controller_spec.rb",
     "spec/dummy/README.md",
     "spec/dummy/Rakefile",
     "spec/dummy/app/assets/images/.keep",

data/spec/controllers/group_users_controller_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe Maestrano::Account::GroupUsersController, type: :controller do
+  routes { Maestrano::Connector::Rails::Engine.routes }
+
+  describe "destroy" do
+  	let!(:organization) { create(:organization, uid: 'cld-abc', tenant: 'abc') }
+    let!(:user) { create(:user, tenant: 'abc', uid: 'usr-nnc') }
+  	let(:params) { {tenant: organization.tenant, group_id: organization.uid, id: user.uid} }
+  	subject { delete :destroy, params }
+
+    before {
+        controller.class.skip_before_filter :authenticate_maestrano!
+        organization.add_member(user)
+    }
+
+  	it 'is successful' do
+      subject
+  		expect(response).to be_success
+  	end
+
+    it 'destroys the user_organization_rels' do
+      expect{ subject }.to change{ Maestrano::Connector::Rails::UserOrganizationRel.count }.by(-1)
+    end
+
+    context 'with default tenant' do
+      before {
+        organization.update(tenant: 'default')
+        user.update(tenant: 'default')
+      }
+      let(:params) { {group_id: organization.uid, id: user.uid} }
+
+      it 'destroys the organization' do
+        expect{ subject }.to change{ Maestrano::Connector::Rails::UserOrganizationRel.count }.by(-1)
+      end
+    end
+  end
+
+end

data/spec/controllers/groups_controller_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe Maestrano::Account::GroupsController, type: :controller do
+  routes { Maestrano::Connector::Rails::Engine.routes }
+
+  describe "destroy" do
+  	let!(:organization) { create(:organization, uid: 'cld-abc', tenant: 'abc') }
+  	let(:params) { {tenant: organization.tenant, id: organization.uid} }
+  	subject { delete :destroy, params }
+
+    before {
+        controller.class.skip_before_filter :authenticate_maestrano!
+    }
+
+  	it 'is successful' do
+      subject
+  		expect(response).to be_success
+  	end
+
+    it 'destroys the organization' do
+      expect{ subject }.to change{ Maestrano::Connector::Rails::Organization.count }.by(-1)
+    end
+
+    context 'with default tenant' do
+      before {
+        organization.update(tenant: 'default')
+      }
+      let(:params) { {id: organization.uid} }
+
+      it 'destroys the organization' do
+        expect{ subject }.to change{ Maestrano::Connector::Rails::Organization.count }.by(-1)
+      end
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maestrano-connector-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Pierre Berard
@@ -308,6 +308,8 @@ files:
 - pkg/maestrano-connector-rails-0.2.16.gem
 - pkg/maestrano-connector-rails-0.2.4.gem
 - spec/controllers/connec_controller_spec.rb
+- spec/controllers/group_users_controller_spec.rb
+- spec/controllers/groups_controller_spec.rb
 - spec/dummy/README.md
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/images/.keep