Refactor patch to make the replication works

lib/octopus.rb

@@ -179,6 +179,7 @@ def self.fully_replicated(&_block)
 require 'octopus/shard_tracking/dynamic'
 
 require 'octopus/model'
+require 'octopus/result_patch'
 require 'octopus/migration'
 require 'octopus/association'
 require 'octopus/collection_association'

lib/octopus/model.rb

@@ -208,23 +208,3 @@ def octopus_set_table_name(value = nil)
 end
 
 ActiveRecord::Base.extend(Octopus::Model)
-
-module SampleFoooBar
-  attr_accessor :current_shard
-
-  private
-
-  def hash_rows
-    if current_shard.blank?
-      super
-    else
-      foo = super
-      foo.each { |f| f.merge!('current_shard' => current_shard) }
-      foo
-    end
-  end
-end
-
-class ActiveRecord::Result
-  prepend SampleFoooBar
-end

lib/octopus/result_patch.rb

@@ -0,0 +1,19 @@
+module Octopus::ResultPatch
+  attr_accessor :current_shard
+
+  private
+
+  def hash_rows
+    if current_shard.blank?
+      super
+    else
+      foo = super
+      foo.each { |f| f.merge!('current_shard' => current_shard) }
+      foo
+    end
+  end
+end
+
+class ActiveRecord::Result
+  prepend Octopus::ResultPatch
+end