lib/ardb/default_order_by.rb in ardb-0.29.1 vs lib/ardb/default_order_by.rb in ardb-0.29.2

@@ -1,48 +1,50 @@
-require "much-plugin"
+# frozen_string_literal: true
 
+require "much-mixin"
+
 module Ardb
   module DefaultOrderBy
-    include MuchPlugin
+    include MuchMixin
 
     DEFAULT_ATTRIBUTE  = :order_by
     DEFAULT_SCOPE_PROC = proc{ self.class.scoped }
 
-    plugin_included do
+    mixin_included do
       @ardb_default_order_by_config = {}
     end
 
-    plugin_class_methods do
+    mixin_class_methods do
       def default_order_by(options = nil)
         options ||= {}
 
         @ardb_default_order_by_config.merge!({
-          :attribute  => options[:attribute] || DEFAULT_ATTRIBUTE,
-          :scope_proc => options[:scope]     || DEFAULT_SCOPE_PROC
+          attribute: options[:attribute] || DEFAULT_ATTRIBUTE,
+          scope_proc: options[:scope] || DEFAULT_SCOPE_PROC,
         })
 
-        before_validation :ardb_default_order_by, :on => :create
+        before_validation :ardb_default_order_by, on: :create
       end
 
       def ardb_default_order_by_config
         @ardb_default_order_by_config
       end
     end
 
-    plugin_instance_methods do
+    mixin_instance_methods do
       private
 
       def reset_order_by
         attr_name  = self.class.ardb_default_order_by_config[:attribute]
         scope_proc = self.class.ardb_default_order_by_config[:scope_proc]
 
-        current_max = self.instance_eval(&scope_proc).maximum(attr_name) || 0
-        self.send("#{attr_name}=", current_max + 1)
+        current_max = instance_eval(&scope_proc).maximum(attr_name) || 0
+        send("#{attr_name}=", current_max + 1)
       end
 
       def ardb_default_order_by
         attr_name = self.class.ardb_default_order_by_config[:attribute]
-        reset_order_by if self.send(attr_name).to_s.empty?
+        reset_order_by if send(attr_name).to_s.empty?
         true
       end
     end
   end
 end