Refactor importer to make it easier to cache asset

My next commit will add in another task to the import, having one instance of ScratchAssetImporter per asset, will make easier to cache the asset and not download it twice

Author: zetter-rpf

lib/scratch_asset_importer.rb

@@ -2,33 +2,36 @@
 
 require 'ruby-progressbar'
 require 'stringio'
+require 'aws-sdk-s3'
 
 class ScratchAssetImporter
-  def self.import(...)
-    new(...).import
+  class << self
+    def import_all(asset_names, asset_base_url)
+      bar = ProgressBar.create(format: '%t: |%B| %c of %C %E', total: asset_names.count) if show_progress?
+
+      asset_names.each do |asset_name|
+        bar.increment if show_progress?
+        new(asset_name, asset_base_url).import
+      end
+    end
+
+    private
+
+    def show_progress?
+      !Rails.env.test?
+    end
   end
 
-  attr_reader :asset_base_url, :asset_names
+  attr_reader :asset_base_url, :asset_name
 
   ASSET_FETCHING_DELAY = 0.2
 
-  def initialize(asset_names, asset_base_url)
-    @asset_names = asset_names
+  def initialize(asset_name, asset_base_url)
+    @asset_name = asset_name
     @asset_base_url = asset_base_url
   end
 
   def import
-    bar = ProgressBar.create(format: '%t: |%B| %c of %C %E', total: asset_names.count) if show_progress?
-
-    asset_names.each do |asset_name|
-      bar.increment if show_progress?
-      import_asset(asset_name)
-    end
-  end
-
-  private
-
-  def import_asset(asset_name)
     return if ScratchAsset.global_assets.exists?(filename: asset_name)
 
     sleep(ASSET_FETCHING_DELAY)
@@ -45,8 +48,4 @@ def connection
       faraday.response :raise_error
     end
   end
-
-  def show_progress?
-    !Rails.env.test?
-  end
 end

lib/scratch_config_importer.rb

@@ -16,7 +16,7 @@ def import
     config = connection.get.body
     asset_config = JSON.parse(config, symbolize_names: true)
     asset_names = extract_asset_names(asset_config)
-    ScratchAssetImporter.import(asset_names, asset_base_url)
+    ScratchAssetImporter.import_all(asset_names, asset_base_url)
   end
 
   def connection

spec/lib/scratch_asset_importer_spec.rb

@@ -4,12 +4,12 @@
 require 'scratch_asset_importer'
 
 RSpec.describe ScratchAssetImporter do
-  describe '.import' do
+  describe '.import_all' do
     it 'imports assets from the config' do
       image = Rails.root.join('spec/fixtures/files/test_image_1.png').read
       stub_request(:get, 'https://example.net/internalapi/asset/123abc.png/get/').to_return(status: 200, body: image)
 
-      described_class.import(['123abc.png'], 'https://example.net/internalapi/asset/')
+      described_class.import_all(['123abc.png'], 'https://example.net/internalapi/asset/')
 
       scratch_asset = ScratchAsset.find_by(filename: '123abc.png')
       expect(scratch_asset).to be_present
@@ -21,7 +21,7 @@
       create(:scratch_asset, :with_file, filename: '123abc.png')
 
       expect do
-        described_class.import(['123abc.png'], 'https://example.net/internalapi/asset/')
+        described_class.import_all(['123abc.png'], 'https://example.net/internalapi/asset/')
       end.not_to change(ScratchAsset, :count)
     end
 
@@ -31,7 +31,7 @@
       stub_request(:get, 'https://example.net/internalapi/asset/123abc.png/get/').to_return(status: 200, body: image)
       stub_request(:get, 'https://example.net/internalapi/asset/456xyz.png/get/').to_return(status: 200, body: image)
 
-      described_class.import(['123abc.png', '456xyz.png'], 'https://example.net/internalapi/asset/')
+      described_class.import_all(['123abc.png', '456xyz.png'], 'https://example.net/internalapi/asset/')
       expect(ScratchAsset.find_by(filename: '123abc.png')).to be_present
       expect(ScratchAsset.find_by(filename: '456xyz.png')).to be_present
     end
@@ -45,7 +45,7 @@
       stub_request(:get, 'https://example.net/internalapi/asset/123abc.png/get/').to_return(status: 200, body: image)
 
       expect do
-        described_class.import(['123abc.png'], 'https://example.net/internalapi/asset/')
+        described_class.import_all(['123abc.png'], 'https://example.net/internalapi/asset/')
       end.to change { ScratchAsset.global_assets.where(filename: '123abc.png').count }.by(1)
     end
 
@@ -55,7 +55,7 @@
       stub_request(:get, 'https://example.net/internalapi/asset/123abc.png/get/').to_return(status: 500, body: 'error')
       stub_request(:get, 'https://example.net/internalapi/asset/456xyz.png/get/').to_return(status: 200, body: image)
 
-      described_class.import(['123abc.png', '456xyz.png'], 'https://example.net/internalapi/asset/')
+      described_class.import_all(['123abc.png', '456xyz.png'], 'https://example.net/internalapi/asset/')
       expect(ScratchAsset.find_by(filename: '123abc.png')).not_to be_present
       expect(ScratchAsset.find_by(filename: '456xyz.png')).to be_present
     end

spec/lib/scratch_config_importer_spec.rb

@@ -5,7 +5,7 @@
 
 RSpec.describe ScratchConfigImporter do
   before do
-    allow(ScratchAssetImporter).to receive(:import)
+    allow(ScratchAssetImporter).to receive(:import_all)
   end
 
   describe '.import' do
@@ -15,7 +15,7 @@
 
       described_class.import('https://example.com/config/backdrops.json', 'https://example.net/internalapi/asset/')
 
-      expect(ScratchAssetImporter).to have_received(:import).with(['123abc.png'], 'https://example.net/internalapi/asset/')
+      expect(ScratchAssetImporter).to have_received(:import_all).with(['123abc.png'], 'https://example.net/internalapi/asset/')
     end
 
     it 'handles assets nested under sounds and costumes' do
@@ -33,7 +33,7 @@
 
       described_class.import('https://example.com/config/sprites.json', 'https://example.net/internalapi/asset/')
 
-      expect(ScratchAssetImporter).to have_received(:import).with(['123abc.png', '456xyz.png'], 'https://example.net/internalapi/asset/')
+      expect(ScratchAssetImporter).to have_received(:import_all).with(['123abc.png', '456xyz.png'], 'https://example.net/internalapi/asset/')
     end
   end
 end