duty_free 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc07e472cca2426a694a59754a83d12b93ad6572530d9b5f584b8aecfbbbacf4
-  data.tar.gz: 7b160b28ab7e70409ee095d6ba1892fa06d24310ebba4529ae0a5f8c57949673
+  metadata.gz: aa24c207ea3302cdd1cb04bf479c8140c63b4854a3ca628cb9a9f2b02ca9db19
+  data.tar.gz: 2d01e88512109b271209cb95f5b2b3e8f3b4222fda500e0d5f7b8ab06f6a0c11
 SHA512:
-  metadata.gz: 25e0702b19e9e5e810f0632da354060ae15da6207c7af33c930eb5825c2f28046e09a481a49ce95bbce46ddb02cc6dd991d2d2728582335f1260b7153bf28998
-  data.tar.gz: 0e265c33a7b1611aa8cb5c28edef6632d3f9e1c2adc9c15f644b6757b2229fb22248a0a37589449e97adbea8876e76aa601331b44556f277ea17255ad6af47d0
+  metadata.gz: 025a2518dd7b88156e77be76697eeb0480b0a3fe7930fda9d4f2509b4d718e9d17744a6f5fb4ffdf8709ea7a80a0056fdb525d19ade89e3da1af084a9feb7a54
+  data.tar.gz: c1fd873299cb7bfca3f265d949c9e7bcc2788b5d2854a92c409ac4c5d7248827f07c4e21c2b353c10115d97201103b3e78dbbd119b2b61ae3b1a2f1659533649

data/lib/duty_free/extensions.rb

@@ -627,7 +627,6 @@ module DutyFree
                   start = 0
                   trim_prefix = v.titleize[start..-(v.name.length + 2)]
                   trim_prefix << ' ' unless trim_prefix.blank?
-                  binding.pry unless assoc
                   if assoc.belongs_to?
                     klass = Object.const_get(assoc&.class_name)
                     # Try to find a unique item if one is referenced

data/lib/duty_free/util.rb

@@ -97,7 +97,7 @@ module DutyFree
 
     # ===================================
     # Epic require patch
-    def self._patch_require(module_filename, folder_matcher, search_text, replacement_text, autoload_symbol = nil)
+    def self._patch_require(module_filename, folder_matcher, replacements, autoload_symbol = nil, is_bundler = false)
       mod_name_parts = module_filename.split('.')
       extension = case mod_name_parts.last
                   when 'rb', 'so', 'o'
@@ -120,10 +120,17 @@ module DutyFree
           Dir.mkdir(new_part) unless Dir.exist?(new_part)
           new_part
         end
-        if ::DutyFree::Util._write_patched(folder_matcher, module_filename, extension, custom_require_dir, nil, search_text, replacement_text) &&
+        if ::DutyFree::Util._write_patched(folder_matcher, module_filename, extension, custom_require_dir, nil, replacements) &&
            !alp.include?(custom_require_dir)
           alp.unshift(custom_require_dir)
         end
+      elsif is_bundler
+        puts "Bundler hack"
+        require 'pry-byebug'
+        binding.pry
+        x = 5
+        # bin_path
+        # puts Bundler.require.inspect
       else
         unless (require_overrides = ::DutyFree::Util.instance_variable_get(:@_require_overrides))
           ::DutyFree::Util.instance_variable_set(:@_require_overrides, (require_overrides = {}))
@@ -134,19 +141,19 @@ module DutyFree
           # then required in place of the original.
 
           Kernel.module_exec do
-            # class << self
             alias_method :orig_require, :require
-            # end
             # To be most faithful to Ruby's normal behaviour, this should look like a public singleton
             define_method(:require) do |name|
+              # %%% Can get a message such as "ActionDispatch::Routing is not missing constant RouteSet! (NameError)"
+              # binding.pry if name.start_with?('action_dispatch/routing/route_') # || name == 'active_support/values/time_zone'
               if (require_override = ::DutyFree::Util.instance_variable_get(:@_require_overrides)[name])
-                extension, folder_matcher, search_text, replacement_text, autoload_symbol = require_override
+                extension, folder_matcher, replacements, autoload_symbol = require_override
                 patched_filename = "/patched_#{name.tr('/', '_')}#{extension}"
                 if $LOADED_FEATURES.find { |f| f.end_with?(patched_filename) }
                   false
                 else
                   is_replaced = false
-                  if (replacement_path = ::DutyFree::Util._write_patched(folder_matcher, name, extension, ::DutyFree::Util._custom_require_dir, patched_filename, search_text, replacement_text))
+                  if (replacement_path = ::DutyFree::Util._write_patched(folder_matcher, name, extension, ::DutyFree::Util._custom_require_dir, patched_filename, replacements))
                     is_replaced = Kernel.send(:orig_require, replacement_path)
                   elsif replacement_path.nil?
                     puts "Couldn't find #{name} to require it!"
@@ -159,12 +166,13 @@ module DutyFree
             end
           end
         end
-        require_overrides[module_filename] = [extension, folder_matcher, search_text, replacement_text, autoload_symbol]
+        require_overrides[module_filename] = [extension, folder_matcher, replacements, autoload_symbol]
       end
     end
 
     def self._custom_require_dir
       unless (custom_require_dir = ::DutyFree::Util.instance_variable_get(:@_custom_require_dir))
+        require 'tmpdir'
         ::DutyFree::Util.instance_variable_set(:@_custom_require_dir, (custom_require_dir = Dir.mktmpdir))
         # So normal Ruby require will now pick this one up
         $LOAD_PATH.unshift(custom_require_dir)
@@ -178,11 +186,12 @@ module DutyFree
 
     # Returns the full path to the replaced filename, or
     # false if the file already exists, and nil if it was unable to write anything.
-    def self._write_patched(folder_matcher, name, extension, dir, patched_filename, search_text, replacement_text)
+    def self._write_patched(folder_matcher, name, extension, dir, patched_filename, replacements)
       # See if our replacement file might already exist for some reason
       name = +"/#{name}" unless name.start_with?('/')
       name << extension unless name.end_with?(extension)
-      return false if File.exist?(replacement_path = "#{dir}#{patched_filename || name}")
+      puts (replacement_path = "#{dir}#{patched_filename || name}")
+      return false if File.exist?(replacement_path)
 
       # Dredge up the original .rb file, doctor it, and then require it instead
       num_written = nil
@@ -193,9 +202,14 @@ module DutyFree
         orig_path = "#{path}#{name}"
         break if path.include?(folder_matcher) && (orig_as = File.open(orig_path))
       end
-      if (orig_text = orig_as&.read)
-        File.open(replacement_path, 'w') do |replacement|
-          num_written = replacement.write(orig_text.gsub(search_text, replacement_text))
+      puts [folder_matcher, name].inspect
+      if (updated_text = orig_as&.read)
+        File.open(replacement_path, 'w') do |replaced_file|
+          replacements = [replacements] unless replacements.first.is_a?(Array)
+          replacements.each do |search_text, replacement_text|
+            updated_text.gsub!(search_text, replacement_text)
+          end
+          num_written = replaced_file.write(updated_text)
         end
         orig_as.close
       end

data/lib/duty_free/version_number.rb

@@ -5,7 +5,7 @@ module DutyFree
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY = 9
+    TINY = 10
 
     # PRE is nil unless it's a pre-release (beta, RC, etc.)
     PRE = nil

data/lib/duty_free.rb

@@ -50,15 +50,15 @@ if ActiveRecord.version < ::Gem::Version.new('3.2') &&
   # Remove circular reference for "now"
   ::DutyFree::Util._patch_require(
     'active_support/values/time_zone.rb', '/activesupport',
-    '  def parse(str, now=now)',
-    '  def parse(str, now=now())'
+    ['  def parse(str, now=now)',
+    '  def parse(str, now=now())']
   )
   # Remove circular reference for "reflection" for ActiveRecord 3.1
   if ActiveRecord.version >= ::Gem::Version.new('3.1')
     ::DutyFree::Util._patch_require(
       'active_record/associations/has_many_association.rb', '/activerecord',
-      'reflection = reflection)',
-      'reflection = reflection())',
+      ['reflection = reflection)',
+      'reflection = reflection())'],
       :HasManyAssociation # Make sure the path for this guy is available to be autoloaded
     )
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duty_free
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-26 00:00:00.000000000 Z
+date: 2024-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord