klastera 1.4.4.1 → 1.4.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef0519c775285f8e1684e2b7710f6a2729d89335f4742a04f4267a156870746d
-  data.tar.gz: 87adbf443e12d8dc8eb93a6d40dd7518d138dea65c404fc8ac19e9a69ea7a742
+  metadata.gz: 565747ef3918ef0e604b3f971f0b6b8bd559b9f8a168257f3611a977fe90e6ae
+  data.tar.gz: d375f60db78e73711b21b75f796985f416a7a388375518e733afd1686afe49af
 SHA512:
-  metadata.gz: 252b2cc54c25a5d1338d7064610ff2806c4e246f44f1101809fe97b5d0167e9d75de71994f1820e67f0e9c26e164be36ea2fd6ee0922eea9c8152c4ebbce83bb
-  data.tar.gz: 573ef0536c76d2fb6b199ac188cc90ec8f04b780f4d2562a6772b3f73051e77f62d4897ecc633fd3b869ae5d4c5f97a536bb31ebcf13a1c8c58904a37d326d4c
+  metadata.gz: 6754f229308b5f2f268f8239c0057ee869a2fbfee0940f8cff422610c07820f0942e5b12c8c95119f4814e1c64ee7a9ffd2f5fcaf91f9be6f0a1a799f98a1583
+  data.tar.gz: 11af42520852996474e3e5b3c37715de7ac5e5454ce68569b9114cbc298bca233948dff90d4fa53ac7561f0b4378f55353accf5283148560f78e07894c9594e6

data/app/views/layouts/klastera/_cluster_entity_fields.html.erb

@@ -1,6 +1,6 @@
 <tr class="nested-fields">
   <td class="field">
-    <%= f.select :cluster_id, @clusters_session.map{|c|[c.name,c.id]}, { include_blank: true }, { class: 'form-control' } %>
+    <%= f.select :cluster_id, @clusters_session.order(:order,:name).map{|c|[c.name,c.id]}, { include_blank: true }, { class: 'form-control' } %>
   </td>
   <td class="action vertical-align-middle text-center" width="44">
     <%= link_to_remove_association f, class: 'btn btn-danger btn-xs text-danger' do %>

data/app/views/layouts/klastera/_cluster_filter.html.erb

@@ -7,7 +7,7 @@
   <%=yield(f) if block_given? %>
 
   <% if cluster_organization.is_in_cluster_mode? %>
-    <% cluster_collection = cluster_list.map{|c|[c.name,(c.id||c.nid)]} %>
+    <% cluster_collection = cluster_list.order(:order, :name).map{|c|[c.name,(c.id||c.nid)]} %>
     <% if cluster_collection.size > 1 %>
       <div class="inline-label-control-block">
         <%= f.input :cluster_id, collection: cluster_collection, prompt: t('klastera.clusters.all'), label: false, wrapper: false %>

data/app/views/layouts/klastera/_cluster_user_fields.html.erb

@@ -1,6 +1,6 @@
 <tr class="nested-fields">
   <td class="field">
-    <%= f.select :cluster_id, @user.organization.clusters.map{|c|[c.name,c.id]}, { include_blank: true }, { class: 'form-control' } %>
+    <%= f.select :cluster_id, @user.organization.clusters.order(:order, :name).map{|c|[c.name,c.id]}, { include_blank: true }, { class: 'form-control' } %>
   </td>
   <td class="action vertical-align-middle text-center" width="44">
     <%= link_to_remove_association f, class: 'btn btn-danger btn-xs text-danger' do %>

data/db/migrate/20210318185053_add_unique_index_to_cluster_entities.rb

@@ -0,0 +1,5 @@
+class AddUniqueIndexToClusterEntities < ActiveRecord::Migration
+  def change
+    add_index :cluster_entities, %i[cluster_id entity_id entity_type], unique: true, name: :index_on_cluster_id_and_entity_id_and_entity_type
+  end
+end

data/lib/klastera.rb

@@ -54,7 +54,7 @@ module Klastera
       end
       _cluster_entities.map do |ce|
         ce.cluster.try(attribute)
-      end.compact.join(separator)
+      end.compact.sort.join(separator)
     end
 
     ##

data/lib/klastera/version.rb

@@ -1,3 +1,3 @@
 module Klastera
-  VERSION = "1.4.4.1"
+  VERSION = "1.4.4.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: klastera
 version: !ruby/object:Gem::Version
-  version: 1.4.4.1
+  version: 1.4.4.5
 platform: ruby
 authors:
 - Gino Barahona
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-14 00:00:00.000000000 Z
+date: 2021-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -94,14 +94,12 @@ files:
 - db/migrate/20200330221601_add_order_field_to_clusters.rb
 - db/migrate/20200518142609_create_klastera_cluster_entities.rb
 - db/migrate/20200908180057_add_cluster_config_to_organization.rb
+- db/migrate/20210318185053_add_unique_index_to_cluster_entities.rb
 - lib/klastera.rb
 - lib/klastera/engine.rb
 - lib/klastera/version.rb
 - lib/tasks/klastera_tasks.rake
 - test/controllers/klastera/clusters_controller_test.rb
-- test/dummy/log/development.log
-- test/dummy/log/test.log
-- test/dummy/tmp/pids/server.pid
 - test/fixtures/klastera/cluster_users.yml
 - test/fixtures/klastera/clusters.yml
 - test/integration/navigation_test.rb
@@ -113,7 +111,7 @@ homepage: https://github.com/ginosx/klastera
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -128,14 +126,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.0.6
+signing_key:
 specification_version: 4
 summary: Clusterization Engine
 test_files:
-- test/dummy/log/test.log
-- test/dummy/log/development.log
-- test/dummy/tmp/pids/server.pid
 - test/integration/navigation_test.rb
 - test/models/klastera/cluster_user_test.rb
 - test/models/klastera/cluster_test.rb

data/test/dummy/log/development.log

@@ -1,108 +0,0 @@
-
-
-Started GET "/" for ::1 at 2020-03-24 17:46:51 -0300
-
-ActiveRecord::NoDatabaseError (FATAL:  database "dummy_development" does not exist
-):
-  activerecord (4.2.11.1) lib/active_record/connection_adapters/postgresql_adapter.rb:661:in `rescue in connect'
-  activerecord (4.2.11.1) lib/active_record/connection_adapters/postgresql_adapter.rb:650:in `connect'
-  activerecord (4.2.11.1) lib/active_record/connection_adapters/postgresql_adapter.rb:242:in `initialize'
-  activerecord (4.2.11.1) lib/active_record/connection_adapters/postgresql_adapter.rb:44:in `new'
-  activerecord (4.2.11.1) lib/active_record/connection_adapters/postgresql_adapter.rb:44:in `postgresql_connection'
-  activerecord (4.2.11.1) lib/active_record/connection_adapters/abstract/connection_pool.rb:438:in `new_connection'
-  activerecord (4.2.11.1) lib/active_record/connection_adapters/abstract/connection_pool.rb:448:in `checkout_new_connection'
-  activerecord (4.2.11.1) lib/active_record/connection_adapters/abstract/connection_pool.rb:422:in `acquire_connection'
-  activerecord (4.2.11.1) lib/active_record/connection_adapters/abstract/connection_pool.rb:349:in `block in checkout'
-  /Users/gino/.rvm/rubies/ruby-2.5.7/lib/ruby/2.5.0/monitor.rb:235:in `mon_synchronize'
-  activerecord (4.2.11.1) lib/active_record/connection_adapters/abstract/connection_pool.rb:348:in `checkout'
-  activerecord (4.2.11.1) lib/active_record/connection_adapters/abstract/connection_pool.rb:263:in `block in connection'
-  /Users/gino/.rvm/rubies/ruby-2.5.7/lib/ruby/2.5.0/monitor.rb:235:in `mon_synchronize'
-  activerecord (4.2.11.1) lib/active_record/connection_adapters/abstract/connection_pool.rb:262:in `connection'
-  activerecord (4.2.11.1) lib/active_record/connection_adapters/abstract/connection_pool.rb:571:in `retrieve_connection'
-  activerecord (4.2.11.1) lib/active_record/connection_handling.rb:113:in `retrieve_connection'
-  activerecord (4.2.11.1) lib/active_record/connection_handling.rb:87:in `connection'
-  activerecord (4.2.11.1) lib/active_record/migration.rb:383:in `connection'
-  activerecord (4.2.11.1) lib/active_record/migration.rb:370:in `call'
-  actionpack (4.2.11.1) lib/action_dispatch/middleware/callbacks.rb:29:in `block in call'
-  activesupport (4.2.11.1) lib/active_support/callbacks.rb:88:in `__run_callbacks__'
-  activesupport (4.2.11.1) lib/active_support/callbacks.rb:778:in `_run_call_callbacks'
-  activesupport (4.2.11.1) lib/active_support/callbacks.rb:81:in `run_callbacks'
-  actionpack (4.2.11.1) lib/action_dispatch/middleware/callbacks.rb:27:in `call'
-  actionpack (4.2.11.1) lib/action_dispatch/middleware/reloader.rb:73:in `call'
-  actionpack (4.2.11.1) lib/action_dispatch/middleware/remote_ip.rb:78:in `call'
-  actionpack (4.2.11.1) lib/action_dispatch/middleware/debug_exceptions.rb:17:in `call'
-  actionpack (4.2.11.1) lib/action_dispatch/middleware/show_exceptions.rb:30:in `call'
-  railties (4.2.11.1) lib/rails/rack/logger.rb:38:in `call_app'
-  railties (4.2.11.1) lib/rails/rack/logger.rb:20:in `block in call'
-  activesupport (4.2.11.1) lib/active_support/tagged_logging.rb:68:in `block in tagged'
-  activesupport (4.2.11.1) lib/active_support/tagged_logging.rb:26:in `tagged'
-  activesupport (4.2.11.1) lib/active_support/tagged_logging.rb:68:in `tagged'
-  railties (4.2.11.1) lib/rails/rack/logger.rb:20:in `call'
-  actionpack (4.2.11.1) lib/action_dispatch/middleware/request_id.rb:21:in `call'
-  rack (1.6.13) lib/rack/methodoverride.rb:22:in `call'
-  rack (1.6.13) lib/rack/runtime.rb:18:in `call'
-  activesupport (4.2.11.1) lib/active_support/cache/strategy/local_cache_middleware.rb:28:in `call'
-  rack (1.6.13) lib/rack/lock.rb:17:in `call'
-  actionpack (4.2.11.1) lib/action_dispatch/middleware/static.rb:120:in `call'
-  rack (1.6.13) lib/rack/sendfile.rb:113:in `call'
-  railties (4.2.11.1) lib/rails/engine.rb:518:in `call'
-  railties (4.2.11.1) lib/rails/application.rb:165:in `call'
-  rack (1.6.13) lib/rack/lock.rb:17:in `call'
-  rack (1.6.13) lib/rack/content_length.rb:15:in `call'
-  rack (1.6.13) lib/rack/handler/webrick.rb:88:in `service'
-  /Users/gino/.rvm/rubies/ruby-2.5.7/lib/ruby/2.5.0/webrick/httpserver.rb:140:in `service'
-  /Users/gino/.rvm/rubies/ruby-2.5.7/lib/ruby/2.5.0/webrick/httpserver.rb:96:in `run'
-  /Users/gino/.rvm/rubies/ruby-2.5.7/lib/ruby/2.5.0/webrick/server.rb:307:in `block in start_thread'
-
-
-  Rendered /Users/gino/.rvm/gems/ruby-2.5.7@llegando/gems/actionpack-4.2.11.1/lib/action_dispatch/middleware/templates/rescues/_source.erb (5.9ms)
-  Rendered /Users/gino/.rvm/gems/ruby-2.5.7@llegando/gems/actionpack-4.2.11.1/lib/action_dispatch/middleware/templates/rescues/_trace.html.erb (3.9ms)
-  Rendered /Users/gino/.rvm/gems/ruby-2.5.7@llegando/gems/actionpack-4.2.11.1/lib/action_dispatch/middleware/templates/rescues/_request_and_response.html.erb (1.4ms)
-  Rendered /Users/gino/.rvm/gems/ruby-2.5.7@llegando/gems/actionpack-4.2.11.1/lib/action_dispatch/middleware/templates/rescues/diagnostics.html.erb within rescues/layout (182.3ms)
-
-
-Started GET "/" for ::1 at 2020-03-24 17:48:58 -0300
-Processing by Rails::WelcomeController#index as HTML
-  Rendered /Users/gino/.rvm/gems/ruby-2.5.7@llegando/gems/railties-4.2.11.1/lib/rails/templates/rails/welcome/index.html.erb (2.0ms)
-Completed 200 OK in 17ms (Views: 17.1ms | ActiveRecord: 0.0ms)
-
-
-Started GET "/clusters" for ::1 at 2020-03-24 17:51:49 -0300
-
-ActionController::RoutingError (No route matches [GET] "/clusters"):
-  actionpack (4.2.11.1) lib/action_dispatch/middleware/debug_exceptions.rb:21:in `call'
-  actionpack (4.2.11.1) lib/action_dispatch/middleware/show_exceptions.rb:30:in `call'
-  railties (4.2.11.1) lib/rails/rack/logger.rb:38:in `call_app'
-  railties (4.2.11.1) lib/rails/rack/logger.rb:20:in `block in call'
-  activesupport (4.2.11.1) lib/active_support/tagged_logging.rb:68:in `block in tagged'
-  activesupport (4.2.11.1) lib/active_support/tagged_logging.rb:26:in `tagged'
-  activesupport (4.2.11.1) lib/active_support/tagged_logging.rb:68:in `tagged'
-  railties (4.2.11.1) lib/rails/rack/logger.rb:20:in `call'
-  actionpack (4.2.11.1) lib/action_dispatch/middleware/request_id.rb:21:in `call'
-  rack (1.6.13) lib/rack/methodoverride.rb:22:in `call'
-  rack (1.6.13) lib/rack/runtime.rb:18:in `call'
-  activesupport (4.2.11.1) lib/active_support/cache/strategy/local_cache_middleware.rb:28:in `call'
-  rack (1.6.13) lib/rack/lock.rb:17:in `call'
-  actionpack (4.2.11.1) lib/action_dispatch/middleware/static.rb:120:in `call'
-  rack (1.6.13) lib/rack/sendfile.rb:113:in `call'
-  railties (4.2.11.1) lib/rails/engine.rb:518:in `call'
-  railties (4.2.11.1) lib/rails/application.rb:165:in `call'
-  rack (1.6.13) lib/rack/lock.rb:17:in `call'
-  rack (1.6.13) lib/rack/content_length.rb:15:in `call'
-  rack (1.6.13) lib/rack/handler/webrick.rb:88:in `service'
-  /Users/gino/.rvm/rubies/ruby-2.5.7/lib/ruby/2.5.0/webrick/httpserver.rb:140:in `service'
-  /Users/gino/.rvm/rubies/ruby-2.5.7/lib/ruby/2.5.0/webrick/httpserver.rb:96:in `run'
-  /Users/gino/.rvm/rubies/ruby-2.5.7/lib/ruby/2.5.0/webrick/server.rb:307:in `block in start_thread'
-
-
-  Rendered /Users/gino/.rvm/gems/ruby-2.5.7@llegando/gems/actionpack-4.2.11.1/lib/action_dispatch/middleware/templates/rescues/_trace.html.erb (4.7ms)
-  Rendered /Users/gino/.rvm/gems/ruby-2.5.7@llegando/gems/actionpack-4.2.11.1/lib/action_dispatch/middleware/templates/routes/_route.html.erb (0.9ms)
-  Rendered /Users/gino/.rvm/gems/ruby-2.5.7@llegando/gems/actionpack-4.2.11.1/lib/action_dispatch/middleware/templates/routes/_route.html.erb (0.5ms)
-  Rendered /Users/gino/.rvm/gems/ruby-2.5.7@llegando/gems/actionpack-4.2.11.1/lib/action_dispatch/middleware/templates/routes/_table.html.erb (11.0ms)
-  Rendered /Users/gino/.rvm/gems/ruby-2.5.7@llegando/gems/actionpack-4.2.11.1/lib/action_dispatch/middleware/templates/rescues/_request_and_response.html.erb (9.0ms)
-  Rendered /Users/gino/.rvm/gems/ruby-2.5.7@llegando/gems/actionpack-4.2.11.1/lib/action_dispatch/middleware/templates/rescues/routing_error.html.erb within rescues/layout (210.1ms)
-  ActiveRecord::SchemaMigration Load (1.9ms)  SELECT "schema_migrations".* FROM "schema_migrations"
-Migrating to AddAuthorIdToBlorghArticles (20200325002402)
-   (0.3ms)  BEGIN
-   (1.0ms)  ALTER TABLE "blorgh_articles" ADD "super_cluster_id" integer
-   (0.2ms)  ROLLBACK

data/test/dummy/tmp/pids/server.pid

@@ -1 +0,0 @@
-86448