effective_developer 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5ec0b8ebeb89650bcd3faa9d72db0a63e59d412da44774ddf243cb41e2e27f9
-  data.tar.gz: 030ee9a657eecd09ecbe4b35340c7a50d05128b7320ad8b098449088bd9b55d9
+  metadata.gz: f3a6071b2027da0c4eb454ff1d2446f014c557a99cb495190c5594d2d9ecda81
+  data.tar.gz: 3bdec7afda572520e2ac59ba94ca47116ea4019a2b582cc71e6c4bd0e28e0467
 SHA512:
-  metadata.gz: 710dc72a3a8e31c031e7c357429e721ae4b550facca68fcf70054e6bcd1b3f6275e12619e4bbc5174e49077f6803290b6e5e2fe5c955a9d028630ff5815210ba
-  data.tar.gz: d57c9a3f9697100ea078dbd6de9be128935349ec98380da04336c0a0d24edd6699fa4286b14464b834ed85fb813f3da7c7f3a16e129506be80ee2bbe6c95b46e
+  metadata.gz: 2c013f0c196b01b41860abe74341736f2a5bffbc45781a5190c38e68cb642145c5de1784b3473183a83e1b72fc97991be459f169f7d72165f37961c406a17115
+  data.tar.gz: 27a7d4470f8c02d76826e220861d9f43fa6cbe715059363a3fa010721878541586f6d831281114226806075adcb00bc994bb96deb1a1fdca49e0fe3addfbc365

data/app/models/effective/asset_replacer.rb

@@ -12,10 +12,12 @@ module Effective
     BATCH_SIZE = 500
     TIMEOUT = 120
 
-    def replace!(force: false)
+    def replace!(skip_existing: false)
       verify!
 
-      attachments_to_process().find_in_batches(batch_size: BATCH_SIZE).each do |attachments|
+      attachments = attachments_to_process().to_a
+
+      while(true)
         wait_for_active_job!
 
         puts "\nEnqueuing #{attachments.length} attachments with ids #{attachments.first.id} to #{attachments.last.id}"
@@ -32,16 +34,22 @@ module Effective
           many = attachable.respond_to?(boxes) && attachable.send(boxes).kind_of?(ActiveStorage::Attached::Many)
           box = (one ? box : boxes)
 
-          unless force
+          if skip_existing
             existing = Array(attachable.send(box))
 
             if existing.any? { |obj| obj.respond_to?(:filename) && obj.filename.to_s == asset.file_name }
-              puts("Skipping: #{attachable.class.name} #{attachable.id} #{box} #{asset.file_name}. Already exists."); next
+              puts("Skipping existing #{attachable.class.name} #{attachable.id} #{box} #{asset.file_name}.")
+              next
             end
           end
 
           Effective::AssetReplacerJob.perform_later(attachment, box)
         end
+
+        attachments = attachments_to_process().where.not(id: attachments.map(&:id))
+        break if attachments.to_a.blank?
+
+        GC.start
       end
 
       puts "\nAll Done. Have a great day."
@@ -56,7 +64,7 @@ module Effective
       asset = attachment.asset
       attachable = attachment.attachable
 
-      attachable.upgrading = true if attachable.respond_to?(:upgrading=)
+      attachable.replacing_asset = true if attachable.respond_to?(:replacing_asset=)
 
       Timeout.timeout(TIMEOUT) do
         attachable.send(box).attach(
@@ -120,15 +128,20 @@ module Effective
     def wait_for_active_job!
       while(true)
         if(jobs = enqueued_jobs_count) > (BATCH_SIZE / 10)
-          print '.'; sleep(2)
+          print '.'; sleep(3)
         else
           break
         end
       end
     end
 
+    # The last BATCH_SIZE attachments
     def attachments_to_process
-      Effective::Attachment.all.where(replaced: [nil, false]).order(:id).where('id < ?', 10000)
+      Effective::Attachment.all
+        .includes(:asset)
+        .where(replaced: [nil, false])
+        .reorder(id: :desc)
+        .limit(BATCH_SIZE)
     end
 
     def enqueued_jobs_count

data/lib/effective_developer/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDeveloper
-  VERSION = '0.6.5'.freeze
+  VERSION = '0.6.6'.freeze
 end

data/lib/tasks/{replace_assets.rake → replace_effective_assets.rake}

@@ -1,5 +1,5 @@
-# bundle exec rake replace_assets
+# bundle exec rake replace_effective_assets
 desc 'Replaces effective_assets with ActiveStorage'
-task :replace_assets => :environment do
+task :replace_effective_assets => :environment do
   Effective::AssetReplacer.new.replace!
 end

data/lib/tasks/{replace_snippets.rake → replace_effective_snippets.rake}

@@ -1,5 +1,5 @@
-# bundle exec rake replace_snippets
+# bundle exec rake replace_effective_snippets
 desc 'Replaces effective_assets snippets with ActiveStorage uploads'
-task :replace_snippets => :environment do
+task :replace_effective_snippets => :environment do
   Effective::SnippetReplacer.new.replace!
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_developer
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Code and Effect
@@ -104,8 +104,8 @@ files:
 - lib/tasks/effective_csv_importer.rake
 - lib/tasks/pg_pull.rake
 - lib/tasks/rename_class.rake
-- lib/tasks/replace_assets.rake
-- lib/tasks/replace_snippets.rake
+- lib/tasks/replace_effective_assets.rake
+- lib/tasks/replace_effective_snippets.rake
 - lib/tasks/reset_pk_sequence.rake
 - lib/tasks/upgrade_forms.rake
 - lib/tasks/validate.rake