effective_mergery 0.1 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 185eb0a320784bf5e9f6cc24b1db3296761469d8
-  data.tar.gz: 79ed4931f61a2c803e50e8b132d9bae2d0060c97
+SHA256:
+  metadata.gz: 4e751ae3a297a246234ca3ff72a6b62bc14155b3bbd6b7c0f9eeaba5b9796af7
+  data.tar.gz: 17d6fbd0a636ceced68cb8fa8ecf75fb065dc6cf852179261cf048188027eb1c
 SHA512:
-  metadata.gz: 29c4448f5df36346b5567795a9548ed8f1bcef9d03d7e83142c479653a26027b3f940cc234b603ec54278988deb14ef1fdfeaf24caf654a3856d1998e04ffab1
-  data.tar.gz: bd52345540fcfd32a37751d8d25e70857158a9ccacd64332850f827988475aa28573dcbc9753b318a8c3eea8451f4c2630f47185baec4b958c049bf07cdea0e8
+  metadata.gz: 45508ec13104cf058e23c0cab87e13c5dd1bf0a51819fbb0e56fde7f2d3cd096ba70b57b0bf754f338ce4b98888f9ee51c08b71a2a454957885e14fb2a307539
+  data.tar.gz: cc61256a1aeb2966098293b2b646ec4e993aeb0fa45fa1ff9a377216916bbbf42fb4b959307ffb7a3c4dbd578133777d6b4bbe9a344a71c7adb0506a15dcb6e2

data/app/assets/stylesheets/effective_mergery/_merge.scss

@@ -3,3 +3,22 @@
     .table-attributes { opacity: 0.4; }
   }
 }
+
+.table-merge.table > thead > tr > th,
+.table-merge.table > thead > tr > td,
+.table-merge.table > tbody > tr > th,
+.table-merge.table > tbody > tr > td,
+.table-merge.table > tfoot > tr > th,
+.table-merge.table > tfoot > tr > td {
+  padding: 0 5px 5px 5px;
+}
+
+.effective-merge {
+  .encrypted_password,
+  .reset_password_token,
+  .confirmation_token,
+  .unique_session_id,
+  .invitation_token {
+    display: none;
+  }
+}

data/app/controllers/admin/merge_controller.rb

@@ -31,6 +31,19 @@ module Admin
         @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'

data/app/models/effective/merge.rb

@@ -34,7 +34,11 @@ module Effective
     end
 
     def collection
-      @collection ||= (klass.respond_to?(:sorted) ? klass.sorted : klass.all)
+      @collection ||= (klass.respond_to?(:effective_mergery_collection) ? klass.effective_mergery_collection : klass.all)
+    end
+
+    def form_collection
+      @form_collection ||= (klass.respond_to?(:effective_mergery_form_collection) ? klass.effective_mergery_form_collection : collection)
     end
 
     def klass

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

@@ -1,3 +1,3 @@
-= tableize_hash(resource.attributes, table: 'table table-attributes')
+= tableize_hash(resource.attributes, table: 'table table-merge table-attributes')
 %hr
-= tableize_hash(Effective::Resource.new(resource).instance_attributes.except(:attributes))
+= 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/new.html.haml

@@ -3,17 +3,17 @@
 %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], (EffectiveOrders.admin_simple_form_options || {}).merge(url: effective_mergery.admin_merge_index_path) do |f|
+  = 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.collection,
+          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.collection,
+          collection: f.object.form_collection,
           hint: 'This record will be kept'
 
     .row
@@ -25,5 +25,5 @@
         - if f.object.target.present?
           = render partial: '/admin/merge/attributes', locals: { resource: f.object.target }
 
-    .text-center
+    .form-actions
       = f.button :submit, "Merge #{@merge}", data: { disable_with: 'Merging...', confirm: "Really merge? The source record will be destroyed."}

data/lib/effective_mergery/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMergery
-  VERSION = '0.1'.freeze
+  VERSION = '0.1.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_mergery
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: 0.1.4
 platform: ruby
 authors:
 - Code and Effect
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-07-04 00:00:00.000000000 Z
+date: 2021-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -110,7 +110,7 @@ homepage: https://github.com/code-and-effect/effective_mergery
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -125,9 +125,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Deep merge any two Active Record objects.
 test_files: []