Simplify backend resetters

shioyama · Apr 24, 2018 · 77696e2 · 77696e2
1 parent 2282934
commit 77696e2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 13 deletions.
diff --git a/lib/mobility/active_model/backend_resetter.rb b/lib/mobility/active_model/backend_resetter.rb
@@ -9,7 +9,7 @@ module ActiveModel
     class BackendResetter < Mobility::BackendResetter
 
       # (see Mobility::BackendResetter#initialize)
-      def initialize(attribute_names)
+      def initialize(attribute_names, &block)
         super
 
         model_reset_method = @model_reset_method

diff --git a/lib/mobility/active_record/backend_resetter.rb b/lib/mobility/active_record/backend_resetter.rb
@@ -12,15 +12,14 @@ module ActiveRecord
     class BackendResetter < Mobility::ActiveModel::BackendResetter
 
       # @param [Class] model_class Class of model to which backend resetter will be applied
-      def included(model_class)
+      def initialize(attribute_names, &block)
+        super
+
         model_reset_method = @model_reset_method
 
-        mod = Module.new do
-          define_method :reload do |*args|
-            super(*args).tap { instance_eval(&model_reset_method) }
-          end
+        define_method :reload do |*args|
+          super(*args).tap { instance_eval(&model_reset_method) }
         end
-        model_class.include mod
       end
     end
   end

diff --git a/lib/mobility/sequel/backend_resetter.rb b/lib/mobility/sequel/backend_resetter.rb
@@ -9,15 +9,14 @@ module Sequel
     class BackendResetter < Mobility::BackendResetter
 
       # @param [Class] model_class Class of model to which backend resetter will be applied
-      def included(model_class)
+      def initialize(attribute_names, &block)
+        super
+
         model_reset_method = @model_reset_method
 
-        mod = Module.new do
-          define_method :refresh do
-            super().tap { instance_eval(&model_reset_method) }
-          end
+        define_method :refresh do
+          super().tap { instance_eval(&model_reset_method) }
         end
-        model_class.include mod
       end
     end
   end