Changes based on review.

Author: aardvark179

lib/cext/patches/common_patches.rb

@@ -6,9 +6,7 @@
 # GNU General Public License version 2, or
 # GNU Lesser General Public License version 2.1.
 
-require_relative 'common_patches'
-
-class JsonPatches < CommonPatches
+class JsonPatches
   PATCHES = {
     gem: 'json',
     patches: {

lib/cext/patches/json_patches.rb

@@ -8,9 +8,7 @@
 
 # Patches nokogiri 1.8.1
 
-require_relative 'common_patches'
-
-class NokogiriPatches < CommonPatches
+class NokogiriPatches
 
   XML_NODE_SET_PATCH = <<-EOF
   switch (rb_tr_to_int_const(rb_range_beg_len(arg, &beg, &len, (long)node_set->nodeNr, 0))) {

lib/cext/patches/nokogiri_patches.rb

@@ -6,10 +6,8 @@
 # GNU General Public License version 2, or
 # GNU Lesser General Public License version 2.1.
 
-require_relative 'common_patches'
-
 # Tested with pg version 0.21.0
-class PgPatches < CommonPatches
+class PgPatches
 
   PG_BINARY_ENCODER_PATCH = <<-EOF
     switch(rb_tr_to_int_const(value)){

lib/cext/patches/pg_patches.rb

@@ -6,8 +6,6 @@
 # GNU General Public License version 2, or
 # GNU Lesser General Public License version 2.1.
 
-require_relative 'patches/common_patches'
-
 require_relative 'patches/json_patches'
 require_relative 'patches/nokogiri_patches'
 require_relative 'patches/pg_patches'
@@ -49,7 +47,7 @@ def self.patch(file, contents, directory)
                   directory.end_with?(File.join(patched_file[:gem], 'ext', patched_file[:ext_dir]))
                 else
                   regexp = /^#{Regexp.escape(patched_file[:gem])}\b/
-                  directory.split('/').last(7).any? { |part| part =~ regexp } || file.split('/').last(2).any? { |part| part =~ regexp }
+                  directory.split('/').last(3).any? { |part| part =~ regexp } || file.split('/').last(2).any? { |part| part =~ regexp }
                 end
       if matched
         patched_file[:patches].each do |patch|