effective_mergery 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e751ae3a297a246234ca3ff72a6b62bc14155b3bbd6b7c0f9eeaba5b9796af7
-  data.tar.gz: 17d6fbd0a636ceced68cb8fa8ecf75fb065dc6cf852179261cf048188027eb1c
+  metadata.gz: '09d729cc7ba2f40740a83f58b09c7244d2f82f323b7b50fd9ac32f43cbd0b009'
+  data.tar.gz: ee2e412bf88531636840f41817c5b366516f6fa7c1d7abbeca9ef2eb20145bdf
 SHA512:
-  metadata.gz: 45508ec13104cf058e23c0cab87e13c5dd1bf0a51819fbb0e56fde7f2d3cd096ba70b57b0bf754f338ce4b98888f9ee51c08b71a2a454957885e14fb2a307539
-  data.tar.gz: cc61256a1aeb2966098293b2b646ec4e993aeb0fa45fa1ff9a377216916bbbf42fb4b959307ffb7a3c4dbd578133777d6b4bbe9a344a71c7adb0506a15dcb6e2
+  metadata.gz: e7ae5bfc66839df22f1b87fbf6533ae3e8c69aaa1895222c1ee6547222a108c37409c95508e488942470ec3e9f9c3ebb3b972469b4ae31dad749f29bba5e929f
+  data.tar.gz: 1cbe65cefab6cdb88dd5565a38c5eda4cdd6b9d0ee1221721b3d9a6291a292dec45948a43d72ff6badf5c6536b10208840975fab33c811bab7199a421620fcbe

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2017 Code and Effect Inc.
+Copyright 2023 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/app/assets/config/effective_mergery_manifest.js

@@ -0,0 +1,2 @@
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

data/app/controllers/admin/merge_controller.rb

@@ -1,17 +1,20 @@
 module Admin
   class MergeController < ApplicationController
-    before_action :authenticate_user! if defined?(Devise)
+    before_action(:authenticate_user!) if defined?(Devise)
+    before_action { EffectiveResources.authorize!(self, :admin, :effective_mergery) }
 
-    layout (EffectiveMergery.layout.kind_of?(Hash) ? EffectiveMergery.layout[:admin_merge] : EffectiveMergery.layout)
+    include Effective::CrudController
+
+    if (config = EffectiveMergery.layout)
+      layout(config.kind_of?(Hash) ? config[:admin] : config)
+    end
 
     def index
       @page_title = 'Merges'
-      EffectiveMergery.authorized?(self, :admin, :effective_mergery)
     end
 
     def new
       @page_title = 'New Merge'
-      EffectiveMergery.authorized?(self, :admin, :effective_mergery)
 
       begin
         @merge = Effective::Merge.new(type: params[:type])
@@ -23,8 +26,6 @@ module Admin
     end
 
     def create
-      EffectiveMergery.authorized?(self, :admin, :effective_mergery)
-
       @merge = Effective::Merge.new(merge_params)
 
       if @merge.save
@@ -55,8 +56,6 @@ module Admin
 
     # This is the AJAX request for the object's attributes
     def attributes
-      EffectiveMergery.authorized?(self, :admin, :effective_mergery)
-
       object = Effective::Merge.new(type: params[:type]).collection.find(params[:id])
 
       if object.present?
@@ -69,7 +68,7 @@ module Admin
     private
 
     def merge_params
-      params.require(:effective_merge).permit(:type, :source_id, :target_id)
+      params.require(:effective_merge).permit!
     end
 
   end

data/app/models/effective/merge.rb

@@ -7,7 +7,7 @@ module Effective
     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 :type, presence: true, inclusion: { in: EffectiveMergery.mergables, message: 'must be a mergable type' }
+    validates :type, presence: true
     validates :source_id, presence: true, unless: -> { source.present? }
     validates :target_id, presence: true, unless: -> { target.present? }
 
@@ -48,7 +48,7 @@ module Effective
     # 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.include?(type)
+      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)
       true
@@ -58,37 +58,26 @@ module Effective
 
     def merge!(validate: true)
       resource = Effective::Resource.new(source)
+      success = false
 
       klass.transaction do
-        begin
+        # Merge associations
+        (resource.has_ones + resource.has_manys + resource.nested_resources).compact.each do |association|
+          next if association.options[:through].present?
 
-          # Merge associations
-          (resource.has_ones + resource.has_manys + resource.nested_resources).compact.each do |association|
-            next if association.options[:through].present?
-
-            Array(source.send(association.name)).each do |obj|
-              obj.assign_attributes(association.foreign_key => target.id)
-
-              unless obj.save(validate: validate)
-                raise "associated #{obj.class.name}<#{obj.to_param}> is invalid: #{obj.errors.full_messages.to_sentence}"
-              end
-            end
+          Array(source.send(association.name)).each do |obj|
+            obj.assign_attributes(association.foreign_key => target.id)
+            obj.save!(validate: validate)
           end
+        end
 
-          source.destroy!
-
-          unless target.save(validate: validate)
-            raise "merged #{target.class.name} is invalid: #{target.errors.full_messages.to_sentence}"
-          end
+        source.destroy!
 
-          return true
-        rescue => e
-          self.errors.add(:base, e.message)
-          raise ActiveRecord::Rollback
-        end
+        target.save!(validate: validate)
+        success = true
       end
 
-      false
+      success
     end
 
   end

data/config/effective_mergery.rb

@@ -1,26 +1,6 @@
 EffectiveMergery.setup do |config|
-  # Authorization Method
-  #
-  # This method is called by all controller actions with the appropriate action and resource
-  # If the method returns false, an Effective::AccessDenied Error will be raised (see README.md for complete info)
-  #
-  # Use via Proc (and with CanCan):
-  # config.authorization_method = Proc.new { |controller, action, resource| can?(action, resource) }
-  #
-  # Use via custom method:
-  # config.authorization_method = :my_authorization_method
-  #
-  # And then in your application_controller.rb:
-  #
-  # def my_authorization_method(action, resource)
-  #   current_user.is?(:admin)
-  # end
-  #
-  # Or disable the check completely:
-  # config.authorization_method = false
-  config.authorization_method = Proc.new { |controller, action, resource| authorize!(action, resource) } # CanCanCan
 
-  # Admin Screens Layout Settings
+ # Admin Screens Layout Settings
   config.layout = 'application'   # All EffectiveMergery controllers will use this layout
 
   # config.layout = {
@@ -39,10 +19,6 @@ EffectiveMergery.setup do |config|
   #   }
   # }
 
-  # Allow merges for only the following ActiveRecord class names:
-  # config.only = ['User']
-
-  # Allow merges on all ActiveRecord classes, except the following:
-  # config.except = []
-
+  # The class names that can be merged
+  # config.class_names = ['User']
 end

data/lib/effective_mergery/engine.rb

@@ -2,8 +2,6 @@ module EffectiveMergery
   class Engine < ::Rails::Engine
     engine_name 'effective_mergery'
 
-    config.autoload_paths += Dir["#{config.root}/lib/"]
-
     # Set up our default configuration options.
     initializer "effective_mergery.defaults", before: :load_config_initializers do |app|
       eval File.read("#{config.root}/config/effective_mergery.rb")

data/lib/effective_mergery/version.rb

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

data/lib/effective_mergery.rb

@@ -4,41 +4,15 @@ require 'effective_mergery/version'
 
 module EffectiveMergery
 
-  # The following are all valid config keys
-  mattr_accessor :authorization_method
-  mattr_accessor :layout
-  mattr_accessor :admin_simple_form_options
-
-  mattr_accessor :only
-  mattr_accessor :except
-
-  def self.setup
-    yield self
+  def self.config_keys
+    [:layout, :admin_simple_form_options, :class_names]
   end
 
-  def self.authorized?(controller, action, resource)
-    if authorization_method.respond_to?(:call) || authorization_method.kind_of?(Symbol)
-      raise Effective::AccessDenied.new() unless (controller || self).instance_exec(controller, action, resource, &authorization_method)
-    end
-    true
-  end
+  include EffectiveGem
 
+  # Just consider the onlies right now. sorry future matt.
   def self.mergables
-    @mergables ||= (
-      Rails.application.eager_load! unless Rails.configuration.cache_classes
-
-      blacklist = ['Delayed::', 'Effective::', 'ActiveRecord::', 'ApplicationRecord']
-
-      ActiveRecord::Base.descendants.map { |obj| obj.name }.tap do |names|
-        names.reject! { |name| blacklist.any? { |b| name.start_with?(b) } }
-
-        if (onlies = Array(only)).present?
-          names.select! { |name| onlies.include?(name) }
-        elsif (excepts = Array(except)).present?
-          names.reject! { |name| excepts.include?(name) }
-        end
-      end.sort
-    )
+    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.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-03 00:00:00.000000000 Z
+date: 2023-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sass-rails
+  name: sassc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -89,12 +89,12 @@ extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - 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/stylesheets/effective_mergery.scss
 - app/assets/stylesheets/effective_mergery/_merge.scss
 - app/controllers/admin/merge_controller.rb
-- app/models/effective/access_denied.rb
 - app/models/effective/merge.rb
 - app/views/admin/merge/_attributes.html.haml
 - app/views/admin/merge/create.html.haml
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Deep merge any two Active Record objects.

data/app/models/effective/access_denied.rb

@@ -1,17 +0,0 @@
-unless defined?(Effective::AccessDenied)
-  module Effective
-    class AccessDenied < StandardError
-      attr_reader :action, :subject
-
-      def initialize(message = nil, action = nil, subject = nil)
-        @message = message
-        @action = action
-        @subject = subject
-      end
-
-      def to_s
-        @message || I18n.t(:'unauthorized.default', :default => 'Access Denied')
-      end
-    end
-  end
-end