effective_mergery 0.2.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09d729cc7ba2f40740a83f58b09c7244d2f82f323b7b50fd9ac32f43cbd0b009'
-  data.tar.gz: ee2e412bf88531636840f41817c5b366516f6fa7c1d7abbeca9ef2eb20145bdf
+  metadata.gz: d8a7243e93f05391396a3da6a84e7d1716df8cb7e8654ebb3256580305d8b58a
+  data.tar.gz: 2a18ad03f692f3a6d114a1ae098f2f09d981f03c4aecf338c7cc90504ecb454a
 SHA512:
-  metadata.gz: e7ae5bfc66839df22f1b87fbf6533ae3e8c69aaa1895222c1ee6547222a108c37409c95508e488942470ec3e9f9c3ebb3b972469b4ae31dad749f29bba5e929f
-  data.tar.gz: 1cbe65cefab6cdb88dd5565a38c5eda4cdd6b9d0ee1221721b3d9a6291a292dec45948a43d72ff6badf5c6536b10208840975fab33c811bab7199a421620fcbe
+  metadata.gz: dfd33e2d4c7d72786842be57e0ff29dd516ac08f390f0f2b85f845adb81494edccf6a593d15af8459d167f74433776e7c3fe6d9cee6a75b88f04e1880d055791
+  data.tar.gz: d5f1a5868dc219bcc2980ecafa86416cf03949450a4614363fdb917b725a922452afdd17924f58f6ca7f1abdfc3f8acc8301fcf5aaba4554dada6d479066f3e1

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023 Code and Effect Inc.
+Copyright 2026 Code and Effect Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,6 +1,6 @@
 # Effective Mergery
 
-Merge any two Active Record objects, along with all associated objects, into one record.
+Merge any two Active Record Users, along with all associated objects, into one record.
 
 ## Getting Started
 
@@ -38,11 +38,10 @@ Require the stylesheet on the asset pipeline by adding the following to your app
 
 ## Usage
 
-Visit `/admin/merge` and select an object type to merge.
+Visit `/admin/merge/new` and select an object type to merge.
 
 ```ruby
-link_to 'Merge', effective_mergery.admin_merge_index_path
-link_to 'Merge: User', effective_mergery.new_admin_merge_path(type: 'User')
+link_to 'Merge', effective_mergery.new_admin_merge_path
 ```
 
 ## Permissions
@@ -51,6 +50,7 @@ Add the following permissions (using CanCan):
 
 ```ruby
 can :admin, :effective_mergery
+can :manage, Effective::Merge
 ```
 
 ## License
@@ -65,4 +65,3 @@ MIT License. Copyright [Code and Effect Inc.](http://www.codeandeffect.com/)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Bonus points for test coverage
 6. Create new Pull Request
-

data/app/controllers/admin/merges_controller.rb

@@ -0,0 +1,15 @@
+module Admin
+  class MergesController < ApplicationController
+    before_action(:authenticate_user!) if defined?(Devise)
+    before_action { EffectiveResources.authorize!(self, :admin, :effective_mergery) }
+
+    include Effective::CrudController
+
+    page_title "Merge Users"
+
+    def merge_params
+      params.require(:effective_merge).permit!
+    end
+
+  end
+end

data/app/models/effective/merge.rb

@@ -2,83 +2,215 @@ module Effective
   class Merge
     include ActiveModel::Model
 
-    attr_accessor :type, :source, :source_id, :target, :target_id
+    attr_accessor :current_user
+    attr_accessor :source_type, :source_id
+    attr_accessor :target_type, :target_id
 
-    validate(if: -> { source_id.present? }) { @source ||= collection.find_by_id(source_id) }
-    validate(if: -> { target_id.present? }) { @target ||= collection.find_by_id(target_id) }
+    validates :target_id, presence: true
+    validates :target_type, presence: true
 
-    validates :type, presence: true
-    validates :source_id, presence: true, unless: -> { source.present? }
-    validates :target_id, presence: true, unless: -> { target.present? }
+    validates :source_id, presence: true
+    validates :source_type, presence: true
 
-    validate(if: -> { source_id.present? && target_id.present? }) do
-      self.errors.add(:target_id, "can't be the same as source") if source_id == target_id
+    validate(if: -> { source.present? && target.present? }) do
+      errors.add(:base, "must be the same type") unless target.class == source.class
+      errors.add(:target_id, "can't be the same record") if target.id == source.id
     end
 
-    validates :source, presence: { message: 'invalid source id' }, if: -> { source_id.present? }
-    validates :target, presence: { message: 'invalid target id' }, if: -> { target_id.present? }
+    # Both records must be fully valid before we start moving anything
+    validate(if: -> { source.present? }) do
+      errors.add(:source_id, "is invalid: #{source.errors.full_messages.to_sentence}") unless source.valid?
+    end
 
-    def to_s
-      return 'New Merge' unless type
-      type.downcase
+    validate(if: -> { target.present? }) do
+      errors.add(:target_id, "is invalid: #{target.errors.full_messages.to_sentence}") unless target.valid?
     end
 
-    def save(validate: true)
-      return false unless valid?
-      (merge!(validate: validate) rescue false)
+    def to_s
+      (source.present? && target.present?) ? "Merge of #{source} to #{target}" : "New Merge"
     end
 
-    def save!(validate: true)
-      raise 'is invalid' unless valid?
-      merge!(validate: validate)
+    def source
+      @source ||= source_type.try(:safe_constantize).try(:find_by_id, source_id)
     end
 
-    def collection
-      @collection ||= (klass.respond_to?(:effective_mergery_collection) ? klass.effective_mergery_collection : klass.all)
+    def source=(resource)
+      raise('expected an ActiveRecord::Base resource') unless resource.is_a?(ActiveRecord::Base)
+      assign_attributes(source_type: resource.class.name, source_id: resource.id)
+      @source = resource
     end
 
-    def form_collection
-      @form_collection ||= (klass.respond_to?(:effective_mergery_form_collection) ? klass.effective_mergery_form_collection : collection)
+    def target
+      @target ||= target_type.try(:safe_constantize).try(:find_by_id, target_id)
     end
 
-    def klass
-      @klass ||= type.safe_constantize
+    def target=(resource)
+      raise('expected an ActiveRecord::Base resource') unless resource.is_a?(ActiveRecord::Base)
+      assign_attributes(target_type: resource.class.name, target_id: resource.id)
+      @target = resource
     end
 
-    # This is called on Admin::Merges#new
-    def validate_klass!
-      raise "type can't be blank" unless type.present?
-      raise 'type must be a mergable type' unless EffectiveMergery.mergables.map(&:name).include?(type)
-      raise "invalid ActiveRecord klass" unless klass
-      raise "invalid ActiveRecord collection" unless collection.kind_of?(ActiveRecord::Relation)
+    def new_record?
       true
     end
 
-    private
+    def save!
+      merge!
+    end
 
     def merge!(validate: true)
-      resource = Effective::Resource.new(source)
-      success = false
+      raise ActiveRecord::RecordInvalid.new(self) unless valid?
+
+      Rails.application.eager_load! unless Rails.application.config.eager_load
 
-      klass.transaction do
-        # Merge associations
-        (resource.has_ones + resource.has_manys + resource.nested_resources).compact.each do |association|
-          next if association.options[:through].present?
+      klasses = defined?(Tenant) ? Tenant.klasses : ActiveRecord::Base.descendants.reject(&:abstract_class?)
+      klasses = klasses.select { |klass| klass.table_exists? }
 
-          Array(source.send(association.name)).each do |obj|
-            obj.assign_attributes(association.foreign_key => target.id)
-            obj.save!(validate: validate)
+      success = false
+
+      EffectiveResources.transaction do
+        # Re-point every record that belongs to the source onto the target, treating the target as the
+        # authoritative account. We walk from the belongs_to side so we catch foreign keys no has_many/has_one
+        # is declared for - polymorphic owners (Effective::Address, Effective::EventRegistration) and named
+        # self-refs alike (advisor_id, endorser_id, reviewer_id) - and move them with update_all. No per-record
+        # validations or callbacks run, so historical data and business rules can't block the merge. Any source
+        # record that would duplicate one the target already owns (per a uniqueness validator OR a unique index)
+        # is deleted instead of moved, so the merge never creates a duplicate or trips a unique constraint.
+        klasses.each do |klass|
+          source_foreign_keys(klass).each do |foreign_key, foreign_type|
+            source_records = records_for(klass, foreign_key, foreign_type, source)
+            next unless source_records.exists?
+
+            attributes = { foreign_key => target.id }
+            attributes[foreign_type] = target.class.name if foreign_type
+
+            # Addresses are kept as a whole set, not merged record by record: if the target already has any
+            # addresses, keep the target's and drop the source's; only copy the source's over when the target
+            # has none.
+            if klass.name == 'Effective::Address'
+              records_for(klass, foreign_key, foreign_type, target).exists? ? source_records.delete_all : source_records.update_all(attributes)
+              next
+            end
+
+            duplicate_ids = duplicate_record_ids(klass, foreign_key, foreign_type)
+            source_records.where(id: duplicate_ids).delete_all if duplicate_ids.present?
+            source_records.where.not(id: duplicate_ids).update_all(attributes)
           end
         end
 
-        source.destroy!
+        # Prove the merge is complete before we destroy the source: nothing may still reference it.
+        assert_no_references_to_source!(klasses)
 
+        # Everything the source owned now points at the target; whatever is left dies with the source.
+        # Reload first so dependent: callbacks only fire for what STILL points at the source (update_all
+        # bypasses the in-memory association cache).
+        source.reload.destroy!
         target.save!(validate: validate)
+
+        log_merged!
+
         success = true
       end
 
       success
     end
 
+    private
+
+    # [[foreign_key, foreign_type], ...] for every belongs_to on klass that could point at the source:
+    # polymorphic, or one whose target IS the source's class (belongs_to :user, self-refs like advisor_id).
+    # foreign_type is nil for non-polymorphic associations; associations missing their column are skipped.
+    def source_foreign_keys(klass)
+      klass.reflect_on_all_associations(:belongs_to).filter_map do |reflection|
+        next unless reflection.polymorphic? || (reflection.klass == source.class rescue false)
+
+        foreign_key = reflection.foreign_key.to_s
+        next unless klass.column_names.include?(foreign_key)
+
+        [foreign_key, (reflection.foreign_type.to_s if reflection.polymorphic?)]
+      end
+    end
+
+    # The klass records owned by `owner` through foreign_key (scoped by *_type for polymorphics).
+    def records_for(klass, foreign_key, foreign_type, owner)
+      scope = klass.where(foreign_key => owner.id)
+      foreign_type ? scope.where(foreign_type => owner.class.name) : scope
+    end
+
+    # Safety net run before we destroy the source: after the move, none of the models we moved may still point
+    # at the source - otherwise destroying it would orphan or cascade-delete that record. Re-checks the same
+    # klasses the move walked, so a bug there (an STI type mismatch, a row written mid-merge) fails the merge
+    # loudly and rolls it back instead of losing data.
+    def assert_no_references_to_source!(klasses)
+      klasses.uniq(&:table_name).each do |klass|
+        source_foreign_keys(klass).each do |foreign_key, foreign_type|
+          next unless records_for(klass, foreign_key, foreign_type, source).exists?
+
+          raise "Merge incomplete: #{klass.table_name}.#{foreign_key} still references #{source_type} ##{source_id}"
+        end
+      end
+    end
+
+    # Ids of the source's `klass` records the (authoritative) target already has an equivalent of - judged by
+    # klass's uniqueness validators AND unique indexes that involve the foreign key we're repointing. These get
+    # deleted instead of moved, so the merge can neither create a duplicate nor trip a unique index.
+    def duplicate_record_ids(klass, foreign_key, foreign_type)
+      identifying_columns = dedupe_key_columns(klass, foreign_key, foreign_type)
+      return [] if identifying_columns.blank?
+
+      source_records = records_for(klass, foreign_key, foreign_type, source)
+      target_records = records_for(klass, foreign_key, foreign_type, target)
+
+      identifying_columns.flat_map do |columns|
+        if columns.empty?
+          # One-per-owner (e.g. a membership, unique on the owner alone): if the target already owns one,
+          # every source record is a duplicate and is dropped rather than moved into the unique constraint.
+          target_records.exists? ? source_records.pluck(:id) : []
+        else
+          existing = target_records.pluck(*columns).map { |row| Array(row) }.to_set
+          source_records.pluck(:id, *columns).filter_map { |id, *values| id if existing.include?(values) }
+        end
+      end.uniq
+    end
+
+    # The column sets that - together with the foreign key - make a record unique for its owner, drawn from
+    # both uniqueness validators and unique indexes. The foreign key (and its *_type) is dropped from each set
+    # since every moved record shares the target's value for those; an empty set means the record is unique on
+    # the owner alone (one-per-owner). Partial indexes are skipped - their WHERE can't be judged from columns.
+    def dedupe_key_columns(klass, foreign_key, foreign_type)
+      removable = [foreign_key, foreign_type].compact
+
+      from_validators = klass.validators.select { |validator| validator.kind == :uniqueness }.filter_map do |validator|
+        columns = (Array(validator.attributes) + Array(validator.options[:scope])).map(&:to_s)
+        (columns - removable) if columns.include?(foreign_key)
+      end
+
+      from_indexes =
+        begin
+          klass.connection.indexes(klass.table_name).filter_map do |index|
+            next unless index.unique && index.where.blank?
+            columns = Array(index.columns).map(&:to_s)
+            (columns - removable) if columns.include?(foreign_key)
+          end
+        rescue StandardError
+          []
+        end
+
+      (from_validators + from_indexes).uniq
+    end
+
+    def log_merged!
+      return unless defined?(EffectiveLogger)
+
+      EffectiveLogger.success(
+        "Merged #{source} into #{target}",
+        user: current_user,
+        associated: target,
+        source_id: source_id,
+        target_id: target_id,
+        source_email: source.try(:email),
+        source_name: source.to_s
+      )
+    end
   end
 end

data/app/views/admin/merges/_associations.html.haml

@@ -0,0 +1,23 @@
+- effective_resource = Effective::Resource.new(resource)
+- associations = (effective_resource.has_ones + effective_resource.has_manys).reject { |association| association.options[:through].present? }
+- limit = 10
+
+%table.table.table-sm.table-striped.mt-4
+  %tbody
+    - associations.each do |association|
+      - collection = resource.send(association.name)
+      - records = (collection.respond_to?(:limit) ? collection.limit(limit).to_a : Array(collection))
+      - next if records.blank?
+
+      - total = (collection.respond_to?(:count) ? collection.count : records.size)
+      - admin_resource = (Effective::Resource.new(association.klass, namespace: :admin) rescue nil)
+
+      %tr
+        %th.text-nowrap= association.name.to_s.humanize
+        %td
+          - records.each do |record|
+            - path = (admin_resource&.action_path(:edit, record) || admin_resource&.action_path(:show, record))
+            %div= path.present? ? link_to(record.to_s, path) : record.to_s
+
+          - if total > records.size
+            %small.text-muted= "and #{total - records.size} more…"

data/app/views/admin/merges/_form.html.haml

@@ -0,0 +1,35 @@
+= effective_form_with(model: [:admin, merge], engine: true) do |f|
+  -# User
+  - klass = (current_user.class)
+  - ajax_url = (effective_resources.users_effective_ajax_index_path unless Rails.env.test?)
+
+  .row
+    .col
+      = f.hidden_field :source_type, value: klass.name
+      = f.select :source_id, klass.all, ajax_url: ajax_url, hint: 'This record will be destroyed',
+        'data-load-ajax-url': effective_mergery.new_admin_merge_path,
+        'data-load-ajax-div': '#effective-mergery-ajax',
+        'data-load-ajax-all': true
+    .col
+      = f.hidden_field :target_type, value: klass.name
+      = f.select :target_id, klass.all, ajax_url: ajax_url, hint: 'This record will be kept',
+        'data-load-ajax-url': effective_mergery.new_admin_merge_path,
+        'data-load-ajax-div': '#effective-mergery-ajax',
+        'data-load-ajax-all': true
+
+  #effective-mergery-ajax
+    - source = f.object.source
+    - target = f.object.target
+
+    .row
+      .col-6
+        - if source.present?
+          = card(source.to_s) do
+            = render('admin/merges/resource', resource: source)
+      .col-6
+        - if target.present?
+          = card(target.to_s) do
+            = render('admin/merges/resource', resource: target)
+
+    - if source.present? && target.present?
+      = f.submit "Merge", center: true, 'data-confirm': "Are you sure you want to merge these records and destroy #{source}?"

data/app/views/admin/merges/_resource.html.haml

@@ -0,0 +1,6 @@
+- if resource.class.name.ends_with?("::User")
+  = render('admin/merges/user', user: resource)
+- else
+  - raise("Unsupported mergable class: #{resource.class.name}")
+
+= render('admin/merges/associations', resource: resource)

data/app/views/admin/merges/_user.html.haml

@@ -0,0 +1,3 @@
+= effective_table_with(user) do |f|
+  = render_if_exists('users/fields_account', f: f)
+  = render_if_exists('users/fields_demographics', f: f)

data/app/views/admin/merges/index.html.haml

@@ -0,0 +1 @@
+= render('admin/merges/form', merge: Effective::Merge.new)

data/config/effective_mergery.rb

@@ -1,24 +1,3 @@
 EffectiveMergery.setup do |config|
-
- # Admin Screens Layout Settings
-  config.layout = 'application'   # All EffectiveMergery controllers will use this layout
-
-  # config.layout = {
-  #   merge: 'application',
-  #   admin_merge: 'admin',
-  # }
-
-  config.admin_simple_form_options = {}  # For the /admin/merge/new form
-  # config.admin_simple_form_options = {
-  #   :html => {:class => ['form-horizontal']},
-  #   :wrapper => :horizontal_form,
-  #   :wrapper_mappings => {
-  #     :boolean => :horizontal_boolean,
-  #     :check_boxes => :horizontal_radio_and_checkboxes,
-  #     :radio_buttons => :horizontal_radio_and_checkboxes
-  #   }
-  # }
-
-  # The class names that can be merged
-  # config.class_names = ['User']
+  # config.layout = { admin_merge: 'admin' }
 end

data/config/routes.rb

@@ -1,11 +1,9 @@
+Rails.application.routes.draw do
+  mount EffectiveMergery::Engine => '/', :as => 'effective_mergery'
+end
+
 EffectiveMergery::Engine.routes.draw do
   namespace :admin do
-    resources :merge, only: [:index, :new, :create] do
-      get :attributes, on: :collection
-    end
+    resources :merges, only: [:index, :new, :create]
   end
 end
-
-Rails.application.routes.draw do
-  mount EffectiveMergery::Engine => '/', :as => 'effective_mergery'
-end

data/lib/effective_mergery/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMergery
-  VERSION = '0.2.0'.freeze
+  VERSION = '1.0.0'.freeze
 end

data/lib/effective_mergery.rb

@@ -5,14 +5,8 @@ require 'effective_mergery/version'
 module EffectiveMergery
 
   def self.config_keys
-    [:layout, :admin_simple_form_options, :class_names]
+    [:layout]
   end
 
   include EffectiveGem
-
-  # Just consider the onlies right now. sorry future matt.
-  def self.mergables
-    Array(class_names).map { |name| name.constantize }
-  end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_mergery
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-26 00:00:00.000000000 Z
+date: 2026-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,16 +16,16 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
-  name: effective_resources
+  name: effective_bootstrap
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coffee-rails
+  name: effective_datatables
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: effective_resources
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,13 +67,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sassc
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -67,13 +81,83 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simple_form
+  name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: haml-rails
+  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: pry-byebug
+  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: effective_logging
+  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: effective_test_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: effective_developer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -91,15 +175,16 @@ files:
 - README.md
 - app/assets/config/effective_mergery_manifest.js
 - app/assets/javascripts/effective_mergery.js
-- app/assets/javascripts/effective_mergery/merge.js.coffee
+- app/assets/javascripts/effective_mergery/base.js
 - app/assets/stylesheets/effective_mergery.scss
 - app/assets/stylesheets/effective_mergery/_merge.scss
-- app/controllers/admin/merge_controller.rb
+- app/controllers/admin/merges_controller.rb
 - app/models/effective/merge.rb
-- app/views/admin/merge/_attributes.html.haml
-- app/views/admin/merge/create.html.haml
-- app/views/admin/merge/index.html.haml
-- app/views/admin/merge/new.html.haml
+- app/views/admin/merges/_associations.html.haml
+- app/views/admin/merges/_form.html.haml
+- app/views/admin/merges/_resource.html.haml
+- app/views/admin/merges/_user.html.haml
+- app/views/admin/merges/index.html.haml
 - config/effective_mergery.rb
 - config/routes.rb
 - lib/effective_mergery.rb
@@ -125,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Deep merge any two Active Record objects.

data/app/assets/javascripts/effective_mergery/merge.js.coffee

@@ -1,20 +0,0 @@
-loadAttributes = (event) ->
-  $obj = $(event.currentTarget)
-
-  id = parseInt($obj.val())
-  type = $obj.closest('form').find("input[name='effective_merge[type]']").val()
-
-  selector = if ($obj.attr('name') == 'effective_merge[source_id]') then '.source' else '.target'
-  content = $obj.closest('form').find(selector).first()
-
-  url = "/admin/merge/attributes?id=#{id}&type=#{type}"
-
-  if id != undefined && id != NaN && id > 0 && type.length > 0
-    content.load(url, (response, status, xhr) =>
-      content.html('<p>This item is unavailable (ajax error)</p>') if status == 'error'
-    )
-  else
-    content.html('')
-
-$(document).on 'change', "select[name='effective_merge[source_id]']", (event) -> loadAttributes(event)
-$(document).on 'change', "select[name='effective_merge[target_id]']", (event) -> loadAttributes(event)

data/app/controllers/admin/merge_controller.rb

@@ -1,75 +0,0 @@
-module Admin
-  class MergeController < ApplicationController
-    before_action(:authenticate_user!) if defined?(Devise)
-    before_action { EffectiveResources.authorize!(self, :admin, :effective_mergery) }
-
-    include Effective::CrudController
-
-    if (config = EffectiveMergery.layout)
-      layout(config.kind_of?(Hash) ? config[:admin] : config)
-    end
-
-    def index
-      @page_title = 'Merges'
-    end
-
-    def new
-      @page_title = 'New Merge'
-
-      begin
-        @merge = Effective::Merge.new(type: params[:type])
-        @merge.validate_klass!
-      rescue => e
-        flash[:danger] = "An error occurred while loading #{@merge}: #{e.message}"
-        redirect_to effective_mergery.admin_merge_index_path
-      end
-    end
-
-    def create
-      @merge = Effective::Merge.new(merge_params)
-
-      if @merge.save
-        @page_title = 'Successful Merge'
-        flash[:success] = "Successfully merged #{@merge}"
-
-        if defined?(EffectiveLogging)
-          EffectiveLogger.success(
-            "Merged #{@merge} - #{@merge.source.respond_to?(:to_s_verbose) ? @merge.source.to_s_verbose : @merge.source.to_s}",
-            user: (current_user rescue false),
-            associated: @merge.target,
-            source_id: @merge.source_id,
-            target_id: @merge.target_id,
-            mergable_type: @merge.type,
-            source_email: (@merge.source.email if @merge.source.respond_to?(:email)),
-            source_name: (@merge.source.full_name if @merge.source.respond_to?(:full_name))
-          )
-        end
-
-        @merge.target = @merge.collection.find(@merge.target_id)
-      else
-        @page_title = 'New Merge'
-        flash.now[:danger] = "Unable to merge #{@merge}: #{@merge.errors.full_messages.to_sentence}"
-
-        render :new
-      end
-    end
-
-    # This is the AJAX request for the object's attributes
-    def attributes
-      object = Effective::Merge.new(type: params[:type]).collection.find(params[:id])
-
-      if object.present?
-        render partial: '/admin/merge/attributes', locals: { resource: object }
-      else
-        render body: '<p>None Available</p>'
-      end
-    end
-
-    private
-
-    def merge_params
-      params.require(:effective_merge).permit!
-    end
-
-  end
-end

data/app/views/admin/merge/_attributes.html.haml

@@ -1,3 +0,0 @@
-= tableize_hash(resource.attributes, table: 'table table-merge table-attributes')
-%hr
-= tableize_hash(Effective::Resource.new(resource).instance_attributes.except(:attributes), table: 'table table-merge', sub_table: 'table table-merge table-subtable')

data/app/views/admin/merge/create.html.haml

@@ -1,11 +0,0 @@
-%h1.effective-admin-heading= @page_title
-
-.row
-  .col-sm-2
-  .col-sm-8
-    %p= @merge.target
-    = render partial: '/admin/merge/attributes', locals: { resource: @merge.target }
-  .col-sm-2
-
-.text-center
-  %p= link_to "Merge Another #{@merge}", effective_mergery.new_admin_merge_path(type: @merge.type), class: 'btn btn-primary'

data/app/views/admin/merge/index.html.haml

@@ -1,10 +0,0 @@
-%h1.effective-admin-heading= @page_title
-
-%p Please select one of the following to merge:
-
-- if EffectiveMergery.mergables.blank?
-  %p There is nothing available to merge.
-- else
-  %ul
-    - EffectiveMergery.mergables.each do |name|
-      %li= link_to name, effective_mergery.new_admin_merge_path(type: name)

data/app/views/admin/merge/new.html.haml

@@ -1,29 +0,0 @@
-%h1.effective-admin-heading= @page_title
-
-%p Please select a source and target. The source record's associated data, but not its attributes, will be merged into the target. The source record will then be destroyed.
-
-.effective-merge
-  = simple_form_for([:admin, @merge], url: effective_mergery.admin_merge_index_path) do |f|
-    = f.input :type, as: :hidden
-
-    .row
-      .col-sm-6
-        = f.input :source_id, as: (defined?(EffectiveFormInputs) ? :effective_select : :select),
-          collection: f.object.form_collection,
-          hint: 'This record will be destroyed'
-      .col-sm-6
-        = f.input :target_id, as: (defined?(EffectiveFormInputs) ? :effective_select : :select),
-          collection: f.object.form_collection,
-          hint: 'This record will be kept'
-
-    .row
-      .col-sm-6.source
-        - if f.object.source.present?
-          = render partial: '/admin/merge/attributes', locals: { resource: f.object.source }
-
-      .col-sm-6.target
-        - if f.object.target.present?
-          = render partial: '/admin/merge/attributes', locals: { resource: f.object.target }
-
-    .form-actions
-      = f.button :submit, "Merge #{@merge}", data: { disable_with: 'Merging...', confirm: "Really merge? The source record will be destroyed."}