pairer 1.0.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8774463f2c0328260af7daf81b8c36eb0f019c841777e163fcb59ca7e799ba0
-  data.tar.gz: fdbffea2f68177d3b6d74ae71a6fd32e1a7a967118a624296091d9f1a105f0ca
+  metadata.gz: 03422d4cc7e2e8f77e732ab5d8c961a12ac1eca81f239ff1686225a03b044b96
+  data.tar.gz: 7093748edb2faae592a62dc81dbde13d123914cfb2537b78afe1149dd31c4b16
 SHA512:
-  metadata.gz: 3f39555a2253f14613bee72894a8b96ed255d9d482daeb5e713099c0fa13bdb6038780c206235ae93d819b987fa8eaa8b86258346c90789aaf8f4a9448771704
-  data.tar.gz: cb2d36c125a60124159a8ed48835b92e52554fa2e253817b5a60edb19535b4e2a164616c7f42454174a884d3feb0bbf51810c6aa7d2c909597d076fa7f90c4f0
+  metadata.gz: a6f6cfea6e12f5efd07b1d7a118e13f14196406bc3ef25341fef7974fff6d6f650dca5fc80b216222fcd754eaa3a89f3495c8b4942403c5480bcb5161fc0c23f
+  data.tar.gz: ab9182ccfc3c737f39247c1a10fac7a47d12db3f71749e9d337ad374359a99e583937d8cd0ada65d237e8f898799a3e59cb10d16b291e4760e6248bae776050a

data/README.md

@@ -1,6 +1,8 @@
 # Pairer
 
-<a href='https://github.com/westonganger/pairer/actions' target='_blank'><img src="https://github.com/westonganger/pairer/workflows/Tests/badge.svg" style="max-width:100%;" height='21' style='border:0px;height:21px;' border='0' alt="CI Status"></a>
+<a href="https://badge.fury.io/rb/pairer" target="_blank"><img height="21" style='border:0px;height:21px;' border='0' src="https://badge.fury.io/rb/pairer.svg" alt="Gem Version"></a>
+<a href='https://github.com/westonganger/pairer/actions' target='_blank'><img src="https://github.com/westonganger/pairer/actions/workflows/test.yml/badge.svg?branch=master" style="max-width:100%;" height='21' style='border:0px;height:21px;' border='0' alt="CI Status"></a>
+<a href='https://rubygems.org/gems/pairer' target='_blank'><img height='21' style='border:0px;height:21px;' src='https://img.shields.io/gem/dt/pairer?color=brightgreen&label=Rubygems%20Downloads' border='0' alt='RubyGems Downloads' /></a>
 
 Pairer is a Rails app/engine to help you to easily generate and rotate pairs within a larger group. For example its great for pair programming teams where you want to work with someone new everyday.
 
@@ -12,11 +14,20 @@ Each organization has many boards. Within each board you can create people and r
 
 Developed as a Rails engine. So you can add to any existing app or create a brand new app with the functionality.
 
+First add the gem to your Gemfile
+
 ```ruby
 ### Gemfile
 gem 'pairer'
 ```
 
+Then install and run the database migrations
+
+```sh
+bundle install
+bundle exec rake pairer:install:migrations
+bundle exec rake db:migrate
+```
 
 #### Option A: Mount to a path
 
@@ -120,11 +131,10 @@ Run server using: `bin/dev` or `cd test/dummy/; rails s`
 bundle exec rspec
 ```
 
-We can locally test different versions of Rails using `ENV['RAILS_VERSION']` and different database gems using `ENV['DB_GEM']`
+We can locally test different versions of Rails using `ENV['RAILS_VERSION']`
 
 ```
 export RAILS_VERSION=7.0
-export DB_GEM=sqlite3
 bundle install
 bundle exec rspec
 ```

data/Rakefile

@@ -12,7 +12,6 @@ load 'rails/tasks/statistics.rake'
 require 'bundler/gem_tasks'
 
 require 'rspec/core/rake_task'
-
 RSpec::Core::RakeTask.new(:spec)
 
 task test: [:spec]

data/app/assets/javascripts/pairer/application.js

@@ -1,6 +1,3 @@
-//= require rails-ujs
-//= require bootstrap-sprockets
-
 window.init = function(){
   $('form').attr('autocomplete', 'off');
 

data/app/assets/stylesheets/pairer/application.css

@@ -0,0 +1,65 @@
+:root{
+  --navbar-height: 3.5em;
+}
+
+.navbar{
+  font-size: 1.1em;
+  min-height: var(--navbar-height);
+}
+
+.navbar .navbar-brand{
+  font-size: 1.5em;
+  font-family: monospace;
+  padding: 8px 15px;
+}
+
+.navbar .navbar-brand:hover{
+  color: initial;
+}
+
+.navbar .navbar-nav li a, .navbar-brand{
+  line-height: var(--my-navbar-height)/2;
+}
+
+.alert .close{
+  opacity: 0.6;
+}
+
+.alert .close:hover{
+  opacity: 0.8;
+}
+
+h1, h2, h3, h4, h5{
+  color: #424242;
+}
+
+body{
+  background-color: #F5F6F6;
+  padding-top: 80px;
+  padding-bottom: 20px;
+}
+
+label{
+  margin-right: 10px;
+}
+
+footer{
+  position: fixed;
+  text-align: center;
+  bottom: 10px;
+  right: 0;
+  left: 0;
+}
+
+.btn-default{
+  border-color: gray;
+  background-color: gray;
+  background-image: none;
+}
+
+@media(max-width: 768px){
+  .form-inline .form-control{
+    display: inline-block;
+    width: initial;
+  }
+}

data/app/assets/stylesheets/pairer/utility.css

@@ -0,0 +1,79 @@
+.no-gutter{
+  padding:0 !important;
+}
+.bold{
+  font-weight:bold !important;
+}
+.no-bold{
+  font-weight:400 !important;
+}
+.italic{
+  font-style: italic !important;
+}
+.underline{
+  text-decoration:underline !important;
+}
+.space-left{
+  margin-left:5px !important;
+}
+.space-left2{
+  margin-left:10px !important;
+}
+.space-left3{
+  margin-left:15px !important;
+}
+.space-left4{
+  margin-left:20px !important;
+}
+.space-left5{
+  margin-left:30px !important;
+}
+.space-right{
+  margin-right:5px !important;
+}
+.space-right2{
+  margin-right:10px !important;
+}
+.space-right3{
+  margin-right:15px !important;
+}
+.space-right4{
+  margin-right:20px !important;
+}
+.space-right5{
+  margin-right:30px !important;
+}
+.space-above{
+  margin-top:5px !important;
+}
+.space-above2{
+  margin-top:10px !important;
+}
+.space-above3{
+  margin-top:20px !important;
+}
+.space-above4{
+  margin-top:30px !important;
+}
+.space-above5{
+  margin-top:40px !important;
+}
+.space-below{
+  margin-bottom:5px !important;
+}
+.space-below2{
+  margin-bottom:10px !important;
+}
+.space-below3{
+  margin-bottom:15px !important;
+}
+.space-below4{
+  margin-bottom:20px !important;
+}
+.space-below5{
+  margin-bottom:30px !important;
+}
+.table-text-center th,
+.table-text-center td{
+  text-align:center !important;
+}

data/app/channels/pairer/application_cable.rb

@@ -0,0 +1,9 @@
+module Pairer
+  module ApplicationCable
+    class Channel < ActionCable::Channel::Base
+    end
+
+    class Connection < ActionCable::Connection::Base
+    end
+  end
+end

data/app/channels/pairer/board_channel.rb

@@ -0,0 +1,7 @@
+module Pairer
+  class BoardChannel < ApplicationCable::Channel
+    def subscribed
+      stream_from "board_#{params[:id]}"
+    end
+  end
+end

data/app/controllers/pairer/boards_controller.rb

@@ -74,13 +74,15 @@ module Pairer
       else
         saved = @board.update(params.require(:board).permit(:name, :password, :group_size, :num_iterations_to_track, roles: []))
       end
-      
+
       if saved
         if params.dig(:board, :password)
           flash.notice = "Password updated."
         else
           flash.notice = "Board updated."
         end
+
+        broadcast_changes
       else
         if @board.errors[:num_iterations_to_track].present?
           flash.alert = "Number of Iterations to Track #{@board.errors[:num_iterations_to_track].first}"
@@ -100,14 +102,19 @@ module Pairer
 
     def shuffle
       @board.shuffle!
+      broadcast_changes
       redirect_to(action: :show)
     end
 
     def create_person
       @person = @board.people.create(name: params[:name])
 
+      if @person.persisted?
+        broadcast_changes
+      end
+
       if request.format.js?
-        render
+        render_js_page_replace
       else
         redirect_to(action: :show)
       end
@@ -117,9 +124,10 @@ module Pairer
       @person = @board.people.find_by!(public_id: params.require(:person_id))
 
       @person.toggle!(:locked)
+      broadcast_changes
 
       if request.format.js?
-        render
+        render_js_page_replace
       else
         redirect_to(action: :show)
       end
@@ -129,56 +137,104 @@ module Pairer
       @person = @board.people.find_by!(public_id: params.require(:person_id))
 
       @person.destroy!
+      broadcast_changes
 
       redirect_to(action: :show)
     end
 
     def create_group
       @group = @board.groups.create!(board_iteration_number: @board.current_iteration_number)
+      broadcast_changes
 
       if request.format.js?
-        render
+        render_js_page_replace
       else
         redirect_to(action: :show)
       end
     end
 
     def lock_group
-      @group = @board.groups.find_by!(public_id: params.require(:group_id))
+      @group = @board.current_groups.find_by!(public_id: params.require(:group_id))
 
       @group.toggle!(:locked)
+      broadcast_changes
 
       if request.format.js?
-        render
+        render_js_page_replace
       else
         redirect_to(action: :show)
       end
     end
 
     def delete_group
-      @group = @board.groups.find_by!(public_id: params.require(:group_id))
+      @group = @board.current_groups.find_by!(public_id: params.require(:group_id))
 
       @group.destroy!
+      broadcast_changes
 
       if request.format.js?
-        render
+        render_js_page_replace
       else
         redirect_to(action: :show)
       end
     end
 
     def update_group
-      @group = @board.groups.find_by!(public_id: params.require(:group_id))
+      @group = @board.current_groups.find_by!(public_id: params.require(:group_id))
+
+      person_ids_was = @group.person_ids_array
+      roles_was = @group.roles_array
 
       attrs = {
         person_ids: (params[:person_ids] if params[:person_ids].present?),
         roles: (params[:roles] if params[:roles].present?),
       }.compact
 
-      @group.update!(attrs)
+      @group.assign_attributes(attrs)
+
+      new_person_ids = @group.person_ids_array - person_ids_was
+      new_roles = @group.roles_array - roles_was
+
+      if @group.changed?
+        changed = true
+
+        if params[:removal] == "true"
+          @group.save!
+        else
+          ActiveRecord::Base.transaction do
+            @group.save!
+
+            if new_person_ids.any?
+              @board.current_groups.detect do |g|
+                next if g.id == @group.id
+
+                if g.person_ids_array.intersection(new_person_ids).any?
+                  g.person_ids = g.person_ids_array - @group.person_ids_array
+                  g.save!
+                  true
+                end
+              end
+            end
+
+            if new_roles.any?
+              @board.current_groups.detect do |g|
+                next if g.id == @group.id
+
+                if g.roles_array.intersection(new_roles).any?
+                  g.roles = g.roles_array - @group.roles_array
+                  g.save!
+                  true
+                end
+              end
+            end
+          end
+        end
+
+        broadcast_changes
+      end
 
       if request.format.js?
-        render
+        render_js_page_replace
       else
         redirect_to(action: :show)
       end
@@ -191,12 +247,37 @@ module Pairer
         redirect_to(action: :index)
       end
 
-      @board = Pairer::Board.find_by!(org_id: session[:pairer_current_org_id], public_id: params[:id])
+      @board = Pairer::Board
+        .includes(:people, :groups)
+        .find_by!(org_id: session[:pairer_current_org_id], public_id: params[:id])
     end
 
     def people_by_id
       @people_by_id ||= @board.people.map{|x| [x.to_param, x] }.to_h
     end
 
+    def broadcast_changes
+      ActionCable.server.broadcast(
+        "board_#{@board.public_id}",
+        {
+          action: "reload",
+          identifier: session[:pairer_user_id],
+        }
+      )
+    end
+
+    include ActionView::Helpers::JavaScriptHelper
+    def render_js_page_replace
+      get_board
+
+      js_page_content = escape_javascript(render_to_string "pairer/boards/show", layout: false)
+
+      javascript = <<~STR
+        $("#page-content").html("#{js_page_content}");
+      STR
+
+      render(js: javascript)
+    end
+
   end
 end

data/app/controllers/pairer/sessions_controller.rb

@@ -12,6 +12,7 @@ module Pairer
       elsif request.method == "POST"
         if Pairer.config.allowed_org_ids.include?(params[:org_id]&.downcase)
           session[:pairer_current_org_id] = params[:org_id].downcase
+          session[:pairer_user_id] = "#{session[:pairer_current_org_id]}_#{SecureRandom.uuid}"
           redirect_to boards_path
         end
       end
@@ -23,6 +24,7 @@ module Pairer
       else
         session.delete(:pairer_current_org_id)
         session.delete(:pairer_current_board_id)
+        session.delete(:pairer_user_id)
         flash.notice = "Signed out"
         redirect_to sign_in_path
       end

data/app/models/pairer/application_record.rb

@@ -15,5 +15,18 @@ module Pairer
       try(:public_id) || id
     end
 
+    if Rails::VERSION::STRING.to_f < 7
+      def in_order_of(column, order_array)
+        Arel.sql(
+          <<~SQL
+            case #{table_name}.#{column}
+            #{order_array.map_with_index{|x, i| "when '#{x}' then #{i+1}"}.join(" ")}
+            else #{order_array.size+1}
+            end
+          SQL
+        )
+      end
+    end
+
   end
 end

data/app/models/pairer/board.rb

@@ -55,7 +55,7 @@ module Pairer
       groups.where(board_iteration_number: prev_iteration_number).each do |g|
         if g.locked?
           ### Clone Locked Groups
-          
+
           new_group = g.dup
 
           new_group.assign_attributes(
@@ -70,7 +70,7 @@ module Pairer
           available_roles = (available_roles - new_group.roles_array)
         else
           ### Retain Position of Locked People within Existing Groups
-          
+
           group_locked_person_ids = (g.person_ids_array - available_person_ids)
 
           if group_locked_person_ids.any?
@@ -102,7 +102,7 @@ module Pairer
 
           if available_person_ids.size < num_to_add
             ### Add to group whatever is left
-            
+
             g.person_ids = g.person_ids_array + available_person_ids
 
             available_person_ids = []
@@ -118,13 +118,15 @@ module Pairer
           end
 
           g.person_ids = (g.person_ids_array | chosen_person_ids).sort
+
+          available_person_ids = (available_person_ids - chosen_person_ids)
         end
 
         ### Assign People to New Groups
         while available_person_ids.any? do
           if available_person_ids.size <= self.group_size
             ### Create group using whats left
-            
+
             new_groups << groups.new(
               board_iteration_number: next_iteration_number,
               person_ids: available_person_ids,
@@ -183,7 +185,7 @@ module Pairer
 
       ### Reload groups to fix any issues with caching after creations and deletions
       groups.reload
-        
+
       return true
     end
 
@@ -198,7 +200,7 @@ module Pairer
     end
 
     private
-    
+
     def stats_hash_for_two_pairs
       h = {}
 

data/app/models/pairer/group.rb

@@ -25,7 +25,7 @@ module Pairer
 
     def roles=(val)
       if val.is_a?(Array)
-        sanitized_array = self[:roles] = val.map{|x| x.presence&.strip }.uniq(&:downcase).compact
+        sanitized_array = val.map{|x| x.presence&.strip }.uniq(&:downcase).compact
 
         if !new_record?
           sanitized_array = sanitized_array.intersection(board.roles_array) ### This may slow the query down

data/app/views/layouts/pairer/application.html.slim

@@ -11,8 +11,11 @@ html
 
     = favicon_link_tag "pairer/favicon.ico"
 
+    link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootswatch/3.4.0/united/bootstrap.min.css" integrity="sha512-JsK+6bBl5wmtKe9PnCXclLS1fwG7GvLZ9IkBg/ACzuSJJUKTedxyXRFujJf+KpcNFFhSX+I05YPAm99r1ivmog==" crossorigin="anonymous" referrerpolicy="no-referrer"
+
+    = stylesheet_link_tag 'pairer/utility'
     = stylesheet_link_tag 'pairer/application', media: 'all'
-    
+
     script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js" referrerpolicy="no-referrer"
 
     link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.1/css/font-awesome.min.css" integrity="sha512-IJ+BZHGlT4K43sqBGUzJ90pcxfkREDVZPZxeexRigVL8rzdw/gyJIflDahMdNzBww4k0WxpyaWpC2PLQUWmMUQ==" crossorigin="anonymous" referrerpolicy="no-referrer"
@@ -22,8 +25,13 @@ html
     link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.13.2/themes/base/jquery-ui.min.css" integrity="sha512-ELV+xyi8IhEApPS/pSj66+Jiw+sOT1Mqkzlh8ExXihe4zfqbWkxPRi8wptXIO9g73FSlhmquFlUOuMSoXz5IRw==" crossorigin="anonymous" referrerpolicy="no-referrer"
     script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.13.2/jquery-ui.min.js" integrity="sha512-57oZ/vW8ANMjR/KQ6Be9v/+/h6bq9/l3f0Oc7vn6qMqyhvPd1cvKBRWWpzu0QoneImqr2SkmO4MSqU+RpHom3Q==" crossorigin="anonymous" referrerpolicy="no-referrer"
 
+    script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui-touch-punch/0.2.3/jquery.ui.touch-punch.min.js" integrity="sha512-0bEtK0USNd96MnO4XhH8jhv3nyRF0eK87pJke6pkYf3cM0uDIhNJy9ltuzqgypoIFXw3JSuiy04tVk4AjpZdZw==" crossorigin="anonymous" referrerpolicy="no-referrer"
+
+    script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.4.1/js/bootstrap.min.js" integrity="sha512-oBTprMeNEKCnqfuqKd6sbvFzmFQtlXS3e0C/RGFV0hD6QzhHV+ODfaQbAlmY6/q0ubbwlAM/nCJjkrgA3waLzg==" crossorigin="anonymous" referrerpolicy="no-referrer"
+
+    = javascript_include_tag 'rails-ujs'
     = javascript_include_tag 'pairer/application'
-    
+
   body
     nav.navbar.navbar-inverse.navbar-fixed-top
       .container-fluid
@@ -50,4 +58,5 @@ html
     .container-fluid
       = render "pairer/shared/flash"
 
-      = yield
+      #page-content
+        = yield

data/app/views/pairer/boards/_action_cable_script.html.erb

@@ -0,0 +1,17 @@
+<script type="module">
+  import * as ActionCable from "https://cdn.jsdelivr.net/npm/@rails/actioncable@<%= Rails::VERSION::STRING.split(".")[0..2].join(".") %>/+esm";
+
+  var consumer = ActionCable.createConsumer();
+
+  var warned = false;
+
+  consumer.subscriptions.create({channel: "Pairer::BoardChannel", id: "<%= @board.public_id %>"}, {
+    received: function(data){
+      if(data.action == "reload" && data.identifier != "<%= session[:pairer_user_id] %>" && !warned){
+        warned = true;
+        alert("The data has been modified since this page was loaded.\n\nPress OK to reload the page.");
+        window.location.reload();
+      }
+    },
+  });
+</script>

data/app/views/pairer/boards/show.html.slim

@@ -160,7 +160,7 @@ javascript:
         connectWith: ".person-list",
         items: "> .person",
         revert: true,
-        update: function(){
+        receive: function(event, ui){
           var group_id = $(this).data('group-id');
           var prev_person_ids = $(this).data('prev-person-ids');
 
@@ -168,6 +168,26 @@ javascript:
 
           if(!group_id){
             // When on the unassigned list
+
+            if(ui.sender){
+              var group_id = ui.sender.data("group-id");
+              var person_ids = [];
+
+              ui.sender.find('.person').each(function(i, item){
+                person_ids.push($(item).data('person-id'));
+              });
+
+              if(person_ids.length === 0){
+                person_ids.push(""); // to ensure empty array value make the params
+              }
+
+              $.ajax({
+                url: "#{update_group_board_path(@board, format: :js)}",
+                method: "POST",
+                data: {group_id: group_id, person_ids: person_ids, removal: "true"},
+              });
+            }
+
             return true; // true only skips ajax update, false cancels the entire item drag/move
           }
 
@@ -177,7 +197,7 @@ javascript:
             person_ids.push($(item).data('person-id'));
           });
 
-          if(equals(prev_person_ids.sort(), person_ids.sort())){
+          if(equals(prev_person_ids.sort(), Array(person_ids).sort())){
             return true; // true only skips ajax update, false cancels the entire item drag/move
           }
 
@@ -189,8 +209,6 @@ javascript:
             url: "#{update_group_board_path(@board, format: :js)}",
             method: "POST",
             data: {group_id: group_id, person_ids: person_ids},
-          }).done(function(){
-            $el.data('prev-person-ids', person_ids);
           });
         },
       });
@@ -199,7 +217,7 @@ javascript:
         connectWith: ".roles-list",
         items: "> .role",
         revert: true,
-        update: function(){
+        receive: function(event, ui){
           var group_id = $(this).data('group-id');
           var prev_roles = $(this).data('prev-roles');
 
@@ -207,6 +225,26 @@ javascript:
 
           if(!group_id){
             // When on the unassigned list
+
+            if(ui.sender){
+              var group_id = ui.sender.data("group-id");
+              var roles = [];
+
+              ui.sender.find('.role').each(function(i, item){
+                roles.push($(item).data('role-name'));
+              });
+
+              if(roles.length === 0){
+                roles.push(""); // to ensure empty array value make the params
+              }
+
+              $.ajax({
+                url: "#{update_group_board_path(@board, format: :js)}",
+                method: "POST",
+                data: {group_id: group_id, roles: roles},
+              });
+            }
+
             return true; // true only skips ajax update, false cancels the entire item drag/move
           }
 
@@ -216,7 +254,7 @@ javascript:
             roles.push($(item).data('role-name'));
           });
 
-          if(equals(prev_roles.sort(), roles.sort())){
+          if(equals(prev_roles.sort(), Array(roles).sort())){
             return true; // true only skips ajax update, false cancels the entire item drag/move
           }
 
@@ -228,8 +266,6 @@ javascript:
             url: "#{update_group_board_path(@board, format: :js)}",
             method: "POST",
             data: {group_id: group_id, roles: roles},
-          }).done(function(){
-            $el.data('prev-roles', roles);
           });
         },
       });
@@ -238,3 +274,5 @@ javascript:
     window.init_sortable_lists();
 
   });
+
+= render "action_cable_script"

data/lib/pairer/engine.rb

@@ -1,7 +1,4 @@
 require 'slim'
-require 'sassc-rails'
-require 'bootstrap-sass'
-require 'bootswatch-rails'
 require 'hashids'
 
 module Pairer
@@ -9,8 +6,11 @@ module Pairer
     isolate_namespace Pairer
 
     initializer "pairer.assets.precompile" do |app|
+      # this initializer is only called when sprockets is in use
+
       app.config.assets.precompile << "pairer_manifest.js" ### manifest file required
       app.config.assets.precompile << "pairer/favicon.ico"
+      app.config.assets.precompile << "rails-ujs" # provided by activesupport
 
       ### Automatically precompile assets in specified folders
       ["app/assets/images/"].each do |folder|
@@ -28,16 +28,6 @@ module Pairer
       end
     end
 
-    initializer "pairer.append_migrations" do |app|
-      ### Automatically load all migrations into main rails app
-      
-      if !app.root.to_s.match?(root.to_s)
-        config.paths["db/migrate"].expanded.each do |expanded_path|
-          app.config.paths["db/migrate"] << expanded_path
-        end
-      end
-    end
-
     initializer "pairer.load_static_assets" do |app|
       ### Expose static assets
       app.middleware.use ::ActionDispatch::Static, "#{root}/public"

data/lib/pairer/version.rb

@@ -1,3 +1,3 @@
 module Pairer
-  VERSION = '1.0.0'
+  VERSION = "1.2.0".freeze
 end

data/lib/pairer.rb

@@ -14,11 +14,3 @@ module Pairer
   end
 
 end
-
-if RUBY_VERSION.to_f <= 2.6 && !Array.new.respond_to?(:intersection)
-  Array.class_eval do
-    def intersection(other)
-      self & other
-    end
-  end
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pairer
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Weston Ganger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-03 00:00:00.000000000 Z
+date: 2024-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,16 +16,16 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
-  name: slim
+  name: actioncable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sassc-rails
+  name: slim
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -52,34 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bootstrap-sass
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: bootswatch-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: hashids
   requirement: !ruby/object:Gem::Requirement
@@ -122,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: factory_bot
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -192,8 +150,10 @@ files:
 - app/assets/images/pairer/favicon.ico
 - app/assets/images/pairer/sweep.png
 - app/assets/javascripts/pairer/application.js
-- app/assets/stylesheets/pairer/application.scss
-- app/assets/stylesheets/pairer/utility.scss
+- app/assets/stylesheets/pairer/application.css
+- app/assets/stylesheets/pairer/utility.css
+- app/channels/pairer/application_cable.rb
+- app/channels/pairer/board_channel.rb
 - app/controllers/pairer/application_controller.rb
 - app/controllers/pairer/boards_controller.rb
 - app/controllers/pairer/sessions_controller.rb
@@ -207,6 +167,7 @@ files:
 - app/models/pairer/person.rb
 - app/views/layouts/pairer/application.html.slim
 - app/views/layouts/pairer/application.js.erb
+- app/views/pairer/boards/_action_cable_script.html.erb
 - app/views/pairer/boards/_current_groups.html.slim
 - app/views/pairer/boards/_group.html.slim
 - app/views/pairer/boards/_group_lock_button.html.slim
@@ -214,14 +175,8 @@ files:
 - app/views/pairer/boards/_recently_accessed_boards.html.slim
 - app/views/pairer/boards/_role.html.slim
 - app/views/pairer/boards/_stats.html.slim
-- app/views/pairer/boards/create_group.js.erb
-- app/views/pairer/boards/create_person.js.erb
-- app/views/pairer/boards/delete_group.js.erb
 - app/views/pairer/boards/index.html.slim
-- app/views/pairer/boards/lock_group.js.erb
-- app/views/pairer/boards/lock_person.js.erb
 - app/views/pairer/boards/show.html.slim
-- app/views/pairer/boards/update_group.js.erb
 - app/views/pairer/exceptions/show.html.slim
 - app/views/pairer/sessions/sign_in.html.slim
 - app/views/pairer/shared/_flash.html.slim
@@ -247,14 +202,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.22
 signing_key:
 specification_version: 4
 summary: Rails app/engine to Easily rotate and keep track of working pairs

data/app/assets/stylesheets/pairer/application.scss

@@ -1,82 +0,0 @@
-/*
- *= require ./utility
- *= require_self
- */
-
-$my-navbar-height: 3.5em;
-
-@import "bootswatch/united/variables";
-
-$grid-float-breakpoint: 992px; // collapse for xs and sm devices */
-
-@import "bootstrap-sprockets";
-@import "bootstrap";
-@import "bootswatch/united/bootswatch";
-
-.badge-danger{
-  background-color: $brand-danger !important;
-  color: white !important;
-}
-
-.navbar{
-  font-size: 1.1em;
-  min-height: $my-navbar-height;
-
-  .navbar-brand{
-    font-size: 1.5em;
-    font-family: monospace;
-    padding: 8px 15px; 
-    &:hover{
-      color: initial;
-    }
-  }
-
-  .navbar-nav li a, .navbar-brand{
-    line-height: $my-navbar-height/2;
-  }
-}
-
-
-.alert{
-  .close{
-    opacity: 0.6;
-    &:hover{
-      opacity: 0.8;
-    }
-  }
-}
-
-h1, h2, h3, h4, h5{
-  color: #424242;
-}
-
-body{
-  background-color: #F5F6F6;
-  padding-top: 80px;
-  padding-bottom: 20px;
-}
-
-label{
-  margin-right: 10px;
-}
-
-footer{
-  position: fixed;
-  text-align: center;
-  bottom: 10px;
-  right: 0;
-  left: 0;
-}
-
-.btn-default{
-  border-color: gray;
-  background-color: gray;
-  background-image: none;
-}
-
-@media(max-width: 768px){
-  .form-inline .form-control{
-    display: inline-block;
-    width: initial;
-  }
-}

data/app/assets/stylesheets/pairer/utility.scss

@@ -1,221 +0,0 @@
-.no-gutter{
-  padding:0 !important;
-}
-.bold{
-  font-weight:bold !important;
-}
-.no-bold{
-  font-weight:400 !important;
-}
-.italic{
-  font-style: italic !important;
-}
-.underline{
-  text-decoration:underline !important;
-}
-.space-left{
-  margin-left:5px !important;
-}
-.space-left2{
-  margin-left:10px !important;
-}
-.space-left3{
-  margin-left:15px !important;
-}
-.space-left4{
-  margin-left:20px !important;
-}
-.space-left5{
-  margin-left:30px !important;
-}
-.space-right{
-  margin-right:5px !important;
-}
-.space-right2{
-  margin-right:10px !important;
-}
-.space-right3{
-  margin-right:15px !important;
-}
-.space-right4{
-  margin-right:20px !important;
-}
-.space-right5{
-  margin-right:30px !important;
-}
-.space-above{
-  margin-top:5px !important;
-}
-.space-above2{
-  margin-top:10px !important;
-}
-.space-above3{
-  margin-top:20px !important;
-}
-.space-above4{
-  margin-top:30px !important;
-}
-.space-above5{
-  margin-top:40px !important;
-}
-.space-below{
-  margin-bottom:5px !important;
-}
-.space-below2{
-  margin-bottom:10px !important;
-}
-.space-below3{
-  margin-bottom:15px !important;
-}
-.space-below4{
-  margin-bottom:20px !important;
-}
-.space-below5{
-  margin-bottom:30px !important;
-}
-.width-100{
-  width:100%;
-}
-.width-90{
-  width: 90%;
-}
-.table-text-center{
-  th td{
-    text-align:center !important;
-  }
-}
-.display-table{
-  height:130px;
-  display:table;
-  
-  .vertical-align{
-    display:table-cell;
-    vertical-align:middle;
-  }
-}
-/*
-.visible-xs,
-.visible-sm,
-.visible-md,
-.visible-lg {
-  display: none !important;
-}
-
-.visible-xs {
-  @media (max-width: 767px) {
-    display: block !important;
-    table{
-      display: table !important; 
-    }
-    tr{ 
-      display: table-row !important;
-    }
-    th, td{ 
-      display: table-cell !important;
-    }
-    i, abbr, cite, code, strong, a, br, img, span, sub, button, input, label, select, textarea{
-      display: inline !important;
-    }
-  }
-}
-
-.visible-sm {
-  @media (min-width: 768px) and (max-width: 991px) {
-    display: block !important;
-    table{
-      display: table !important; 
-    }
-    tr{ 
-      display: table-row !important;
-    }
-    th, td{ 
-      display: table-cell !important;
-    }
-    i, abbr, cite, code, strong, a, br, img, span, sub, button, input, label, select, textarea{
-      display: inline !important;
-    }
-  }
-}
-
-.visible-md {
-  @media (min-width: 992px) and (max-width: 1199px) {
-    display: block !important;
-    table{
-      display: table !important; 
-    }
-    tr{ 
-      display: table-row !important;
-    }
-    th, td{ 
-      display: table-cell !important;
-    }
-    i, abbr, cite, code, strong, a, br, img, span, sub, button, input, label, select, textarea{
-      display: inline !important;
-    }
-  }
-}
-
-.visible-lg {
-  @media (min-width: 1200px) {
-    display: block !important;
-    table{
-      display: table !important; 
-    }
-    tr{ 
-      display: table-row !important;
-    }
-    th, td{ 
-      display: table-cell !important;
-    }
-    i, abbr, cite, code, strong, a, br, img, span, sub, button, input, label, select, textarea{
-      display: inline !important;
-    }
-  }
-}
-
-.hidden-xs {
-  @media (max-width: 767px) {
-    display: none !important;
-  }
-}
-.hidden-sm {
-  @media (min-width: 768px) and (max-width: 991px) {
-    display: none !important;
-  }
-}
-.hidden-md {
-  @media (min-width: 992px) and (max-width: 1199px) {
-    display: none !important;
-  }
-}
-.hidden-lg {
-  @media (min-width: 1200px) {
-    display: none !important;
-  }
-}
-.visible-print {
-  display: none !important;
-
-  @media print {
-    display: block !important;
-    table{
-      display: table !important; 
-    }
-    tr{ 
-      display: table-row !important;
-    }
-    th, td{ 
-      display: table-cell !important;
-    }
-    i, abbr, cite, code, strong, a, br, img, span, sub, button, input, label, select, textarea{
-      display: inline !important;
-    }
-  }
-}
-
-.hidden-print {
-  @media print {
-    display: none !important;
-  }
-}
-*/

data/app/views/pairer/boards/create_group.js.erb

@@ -1,3 +0,0 @@
-$(".groups-container tbody").append("<%= j render 'pairer/boards/group', group: @group %>");
-
-window.init_sortable_lists();

data/app/views/pairer/boards/create_person.js.erb

@@ -1,7 +0,0 @@
-if(<%= raw @person.persisted? %>){
-  $(".unassigned-lists-container .person-list").append("<%= j render 'pairer/boards/person', person: @person %>")
-
-  $("form.new-person-form").find("input","select","textarea").val('')
-}else if(<%= raw @person.errors[:name].present? %>){
-  alert("Name <%= @person.errors[:name].first %>");
-}

data/app/views/pairer/boards/delete_group.js.erb

@@ -1,7 +0,0 @@
-var group_row = $(".group-row[data-group-id=<%= @group.public_id %>]");
-
-$('.unassigned-lists-container .person-list').append(group_row.find(".person"));
-
-$('.unassigned-lists-container .roles-list').append(group_row.find(".role"));
-
-group_row.remove();

data/app/views/pairer/boards/lock_group.js.erb

@@ -1 +0,0 @@
-$(".group-row[data-group-id=<%= @group.public_id %>] .group-lock-btn").replaceWith("<%= j render "group_lock_button", group: @group %>");

data/app/views/pairer/boards/lock_person.js.erb

@@ -1 +0,0 @@
-$(".person[data-person-id=<%= @person.public_id %>]").replaceWith("<%= j render "person", person: @person %>")