maintenance_tasks 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '017924f32ef1d9cb9e8ef6b739e1dc7ab60695dce1ee03c9f9f14fcaa35dfdde'
-  data.tar.gz: 17d3d2e220dd8b3cc7270797398abe33e5c90e38a3d19b28a571cb61c94a567c
+  metadata.gz: ab7d654d153de66a16dc940efdafe3c15e0f151383829b1cb331a67a86c6532c
+  data.tar.gz: 375fde5efda30bd597d9609f08ee2edada28d336e97991b05e9357f5edca17cb
 SHA512:
-  metadata.gz: '0942f2e8f1d23e1dc180a13deef7af7c198dcb348fdd62ed0c9107d4eded0a7908c0477c6e15c954658f4a99a41c5858fec4b02477d8deed4f72f44c4ae7cb5e'
-  data.tar.gz: 61c1d448e4c1eaf7a8076dc253d72de1d515b70ed4623b76a290b24dd4e6f0c76aff6fccde27619eceffc497ca750910aa9590363f2c3cbd2085a75a8838a18f
+  metadata.gz: 3ec5d5108af6fecdcfa4a8fd7a37640f48f3e5dc39c918a8a0bf52bd9792474f465cfc495491caad22337da8bba6446726e0f58114e1b22a44e2b30a10168d3c
+  data.tar.gz: 07c9fc9e6e5779fe9180081c5b8306acb43ab6d30dd500b2c2184ab24e8e901e1221f88c29294eaba51cf38f81e054f4ce2575fcd02f897d22238f0fe04c08df

data/app/models/maintenance_tasks/run.rb

@@ -41,6 +41,11 @@ module MaintenanceTasks
 
     scope :active, -> { where(status: ACTIVE_STATUSES) }
 
+    # Ensure ActiveStorage is in use before preloading the attachments
+    scope :with_attached_csv, -> do
+      with_attached_csv_file if ActiveStorage::Attachment.table_exists?
+    end
+
     validates_with RunStatusValidator, on: :update
 
     has_one_attached :csv_file
@@ -188,11 +193,21 @@ module MaintenanceTasks
     def csv_attachment_presence
       if Task.named(task_name) < CsvCollection && !csv_file.attached?
         errors.add(:csv_file, 'must be attached to CSV Task.')
-      elsif !(Task.named(task_name) < CsvCollection) && csv_file.attached?
+      elsif !(Task.named(task_name) < CsvCollection) && csv_file.present?
         errors.add(:csv_file, 'should not be attached to non-CSV Task.')
       end
     rescue Task::NotFoundError
       nil
     end
+
+    # Fetches the attached ActiveStorage CSV file for the run. Checks first
+    # whether the ActiveStorage::Attachment table exists so that we are
+    # compatible with apps that are not using ActiveStorage.
+    #
+    # @return [ActiveStorage::Attached::One] the attached CSV file
+    def csv_file
+      return unless ActiveStorage::Attachment.table_exists?
+      super
+    end
   end
 end

data/app/models/maintenance_tasks/task_data.rb

@@ -135,7 +135,7 @@ module MaintenanceTasks
     private
 
     def runs
-      Run.where(task_name: name).with_attached_csv_file.order(created_at: :desc)
+      Run.where(task_name: name).with_attached_csv.order(created_at: :desc)
     end
   end
 end

data/app/views/maintenance_tasks/runs/_info.html.erb

@@ -9,7 +9,7 @@
   <%= render "maintenance_tasks/runs/info/#{run.status}", run: run %>
 </div>
 
-<% if run.csv_file.attached? %>
+<% if run.csv_file.present? %>
   <div class="block">
     <%= link_to('Download CSV', csv_file_download_path(run)) %>
   </div>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maintenance_tasks
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Shopify Engineering
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-01 00:00:00.000000000 Z
+date: 2021-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -151,10 +151,10 @@ files:
 homepage: https://github.com/Shopify/maintenance_tasks
 licenses: []
 metadata:
-  source_code_uri: https://github.com/Shopify/maintenance_tasks/tree/v1.1.1
+  source_code_uri: https://github.com/Shopify/maintenance_tasks/tree/v1.1.2
   allowed_push_host: https://rubygems.org
 post_install_message: |-
-  Thank you for installing Maintenance Tasks 1.1.1. To complete, please run:
+  Thank you for installing Maintenance Tasks 1.1.2. To complete, please run:
 
   rails generate maintenance_tasks:install
 rdoc_options: []