tessa 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 153d1d11991ae3282b26a80ef33694cb8aae8773fe0ceddc5176243beb137581
-  data.tar.gz: 6c98f75781366eca6d43ba73789fa85e8470f0f2b47971392ee0d8afe61bab18
+  metadata.gz: 9f9b764a91daef07d23dcc4adf14060ec1546e3f6cdff0b548b10c4caeb56598
+  data.tar.gz: e40a45f82d40fb0e3051dc67ffd263541cc2afec0a836912b8dfadbbd9bddf16
 SHA512:
-  metadata.gz: 7aac9e710299385ed4fc9fa6845b9a0974046817149994d8ca15f1c746501a1b9573e9c3455f8707806df69f519d04b5b6f4ac185c70af4f802eec5416bb87f2
-  data.tar.gz: 938d746824307da74813f937184fee8fb32f2f286e01301a695b5a2871410d2a7bfc1e796e1e2365aa0144898a16d73364b4bb58b78eac5b0526746ef1e4d262
+  metadata.gz: 7de9f6c50a229e8cd628fc09d6fcb4bdbb83b0bd7366c12b547870ce245b936026bcabc28412ffe1bcbca929300e3c0693012b439621063da3f755db1716f71d
+  data.tar.gz: ec6c2da67ac86e579541bdc485351032718c475077e98fa046cc5cd8959eb728c6a5da915522b73fe7031360c9eb57a0612a27ee39ec467dca619be4e3ea0188

data/lib/tessa/model/dynamic_extensions.rb

@@ -44,9 +44,11 @@ class Tessa::DynamicExtensions
             
             case attachable
             when Tessa::AssetChangeSet
-              attachable.changes.each do |change|
-                a.attach(change.id) if change.add?
-                a.detach if change.remove?
+              attachable.changes.select(&:remove?).each { a.detatch }
+              attachable.changes.select(&:add?).each do |change|
+                next if #{field.id_field} == change.id
+
+                a.attach(change.id)
               end
             when nil
               a.detach
@@ -72,24 +74,22 @@ class Tessa::DynamicExtensions
     def build(mod)
       mod.class_eval <<~CODE, __FILE__, __LINE__ + 1
           def #{name}
-            if #{name}_attachments.present?
-              return #{name}_attachments.map do |a|
-                Tessa::ActiveStorage::AssetWrapper.new(a)
-              end
-            end
-
-            # fall back to old Tessa fetch if not present
-            if field = self.class.tessa_fields["#{name}".to_sym]
-              @#{name} ||= fetch_tessa_remote_assets(field.id(on: self))
-            end
+            field = self.class.tessa_fields["#{name}".to_sym]
+            tessa_ids = field.id(on: self) - #{name}_attachments.map(&:key)
+            
+            @#{name} ||= [
+              *#{name}_attachments.map { |a| Tessa::ActiveStorage::AssetWrapper.new(a) },
+              *fetch_tessa_remote_assets(tessa_ids)
+            ]
           end
 
           def #{field.id_field}
-            # Use the attachment's key
-            return #{name}_attachments.map(&:key) if #{name}_attachments.present?
-
-            # fallback to Tessa's database column
-            super
+            [
+              # Use the attachment's key
+              *#{name}_attachments.map(&:key),
+              # include from Tessa's database column
+              *super
+            ]
           end
 
           def #{name}=(attachables)
@@ -99,18 +99,25 @@ class Tessa::DynamicExtensions
 
             case attachables
             when Tessa::AssetChangeSet
-              attachables.changes.each do |change|
-                a.attach(change.id) if change.add?
-                raise 'TODO' if change.remove?
+              attachables.changes.select(&:remove?).each do |change|
+                if existing = #{name}_attachments.find { |a| a.key == change.id }
+                  existing.destroy
+                else
+                  ids = self.#{field.id_field}
+                  ids.delete(change.id.to_i)
+                  self.#{field.id_field} = ids
+                end
+              end
+              attachables.changes.select(&:add?).each do |change|
+                next if #{field.id_field}.include? change.id
+
+                a.attach(change.id)
               end
             when nil
               a.detach
             else
               a.attach(*attachables)
             end
-
-            # overwrite the tessa ID in the database
-            self.#{field.id_field} = nil
           end
 
           def attributes

data/lib/tessa/version.rb

@@ -1,3 +1,3 @@
 module Tessa
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/lib/tessa.rb

@@ -16,37 +16,51 @@ require "tessa/upload"
 require "tessa/view_helpers"
 
 module Tessa
-  def self.config
-    @config ||= Config.new
-  end
+  class << self
+    def config
+      @config ||= Config.new
+    end
 
-  def self.setup
-    yield config
-  end
+    def setup
+      yield config
+    end
 
-  def self.find_assets(ids)
-    if [*ids].empty?
-      if ids.is_a?(Array)
-        []
-      else
-        nil
-      end
-    elsif (blobs = ::ActiveStorage::Blob.where(key: ids).to_a).present?
-      if ids.is_a?(Array)
-        blobs.map { |a| Tessa::ActiveStorage::AssetWrapper.new(a) }
-      else
-        Tessa::ActiveStorage::AssetWrapper.new(blobs.first)
-      end
-    else
-      Tessa::Asset.find(ids)
+    def find_assets(ids)
+      return find_all_assets(ids) if ids.is_a?(Array)
+
+      return find_asset(ids)
     end
-  rescue Tessa::RequestFailed => err
-    if ids.is_a?(Array)
-      ids.map do |id|
-        Tessa::Asset::Failure.factory(id: id, response: err.response)
+
+    private
+
+    def find_asset(id)
+      return nil unless id
+
+      if blob = ::ActiveStorage::Blob.find_by(key: id)
+        return Tessa::ActiveStorage::AssetWrapper.new(blob)
       end
-    else
-      Tessa::Asset::Failure.factory(id: ids, response: err.response)
+
+      Tessa::Asset.find(id)
+    rescue Tessa::RequestFailed => err
+      Tessa::Asset::Failure.factory(id: id, response: err.response)
+    end
+
+    def find_all_assets(ids)
+      return [] if ids.empty?
+
+      blobs = ::ActiveStorage::Blob.where(key: ids).to_a
+        .map { |a| Tessa::ActiveStorage::AssetWrapper.new(a) }
+      ids = ids - blobs.map(&:key)
+      assets = 
+        begin
+          Tessa::Asset.find(ids) if ids.any?
+        rescue Tessa::RequestFailed => err
+          ids.map do |id|
+            Tessa::Asset::Failure.factory(id: id, response: err.response)
+          end
+        end
+
+      [*blobs, *assets]
     end
   end
 

data/spec/tessa/model_spec.rb

@@ -41,6 +41,7 @@ RSpec.describe Tessa::Model do
       let(:model) {
         MultipleAssetModel
       }
+      let(:instance) { model.new(another_place: []) }
 
       it "sets all attributes on ModelField properly" do
         field = model.tessa_fields[:multiple_field]
@@ -89,6 +90,7 @@ RSpec.describe Tessa::Model do
       let(:model) {
         MultipleAssetModel
       }
+      let(:instance) { model.new(another_place: []) }
       subject(:getter) { instance.multiple_field }
 
       it "calls find for each of the file_ids and returns result" do
@@ -181,9 +183,11 @@ RSpec.describe Tessa::Model do
         SingleAssetModel
       }
       subject(:getter) { instance.avatar }
+      let(:file) {
+        Rack::Test::UploadedFile.new("README.md")
+      }
 
       it 'attaches uploaded file' do
-        file = Rack::Test::UploadedFile.new("README.md")
         instance.avatar = file
 
         expect(getter.name).to eq('avatar')
@@ -194,28 +198,65 @@ RSpec.describe Tessa::Model do
       end
 
       it 'sets the ID to be the ActiveStorage key' do
-        file = Rack::Test::UploadedFile.new("README.md")
         instance.avatar = file
 
         expect(instance.avatar_id).to eq(instance.avatar_attachment.key)
       end
 
       it 'sets the ID in the attributes' do
-        file = Rack::Test::UploadedFile.new("README.md")
         instance.avatar = file
         
         expect(instance.attributes['avatar_id']).to eq(instance.avatar_attachment.key)
       end
+
+      it 'attaches signed ID from Tessa::AssetChangeSet' do
+        blob = ::ActiveStorage::Blob.create_before_direct_upload!({
+          filename: 'README.md',
+          byte_size: file.size,
+          content_type: file.content_type,
+          checksum: '1234'
+        })
+
+        changeset = Tessa::AssetChangeSet.new(
+          changes: [{ 'id' => blob.signed_id, 'action' => 'add' }]
+        )
+        instance.avatar = changeset
+
+        expect(instance.avatar_id).to eq(instance.avatar_attachment.key)
+      end
+
+      it 'does nothing when "add"ing an existing blob' do
+        # Before this HTTP POST, we've previously uploaded this file
+        instance.avatar = file
+
+        # In this HTTP POST, we re-upload the 'add' action with the same ID
+        changeset = Tessa::AssetChangeSet.new(
+          changes: [{ 'id' => instance.avatar_attachment.key, 'action' => 'add' }]
+        )
+
+        # We expect that we're not going to detatch the existing attachment
+        expect(instance.avatar_attachment).to_not receive(:destroy)
+
+        # act
+        instance.avatar = changeset
+
+        expect(instance.avatar_id).to eq(instance.avatar_attachment.key)
+      end
     end
 
     context "with a multiple typed field" do
       let(:model) {
         MultipleAssetModel
       }
+      let(:instance) { model.new(another_place: []) }
+      let(:file) {
+        Rack::Test::UploadedFile.new("README.md")
+      }
+      let(:file2) {
+        Rack::Test::UploadedFile.new("LICENSE.txt")
+      }
 
       it 'attaches uploaded files' do
-        file = Rack::Test::UploadedFile.new("README.md")
-        file2 = Rack::Test::UploadedFile.new("LICENSE.txt")
         instance.multiple_field = [file, file2]
 
         expect(instance.multiple_field[0].name).to eq('multiple_field')
@@ -231,20 +272,119 @@ RSpec.describe Tessa::Model do
       end
 
       it 'sets the ID to be the ActiveStorage key' do
-        file = Rack::Test::UploadedFile.new("README.md")
-        file2 = Rack::Test::UploadedFile.new("LICENSE.txt")
         instance.multiple_field = [file, file2]
 
         expect(instance.another_place).to eq(instance.multiple_field_attachments.map(&:key))
       end
 
       it 'sets the ID in the attributes' do
-        file = Rack::Test::UploadedFile.new("README.md")
-        file2 = Rack::Test::UploadedFile.new("LICENSE.txt")
         instance.multiple_field = [file, file2]
         
         expect(instance.attributes['another_place']).to eq(instance.multiple_field_attachments.map(&:key))
       end
+
+      it 'attaches signed ID from Tessa::AssetChangeSet' do
+        blob = ::ActiveStorage::Blob.create_before_direct_upload!({
+          filename: 'README.md',
+          byte_size: file.size,
+          content_type: file.content_type,
+          checksum: '1234'
+        })
+        blob2 = ::ActiveStorage::Blob.create_before_direct_upload!({
+          filename: "LICENSE.txt",
+          byte_size: file2.size,
+          content_type: file2.content_type,
+          checksum: '5678'
+        })
+
+        changeset = Tessa::AssetChangeSet.new(
+          changes: [
+            { 'id' => blob.signed_id, 'action' => 'add' },
+            { 'id' => blob2.signed_id, 'action' => 'add' },
+          ]
+        )
+        instance.multiple_field = changeset
+
+        expect(instance.another_place).to eq([
+          blob.key,
+          blob2.key
+        ])
+      end
+
+      it 'does nothing when "add"ing an existing blob' do
+        # Before this HTTP POST, we've previously uploaded these files
+        instance.multiple_field = [file, file2]
+        keys = instance.multiple_field_attachments.map(&:key)
+
+        # In this HTTP POST, we re-upload the 'add' action with the same ID
+        changeset = Tessa::AssetChangeSet.new(
+          changes: [
+            { 'id' => keys[0], 'action' => 'add' },
+            { 'id' => keys[1], 'action' => 'add' },
+          ]
+        )
+
+        # We expect that we're not going to detatch the existing attachment
+        instance.multiple_field_attachments.each do |a|
+          expect(a).to_not receive(:destroy)
+        end
+
+        # act
+        instance.multiple_field = changeset
+
+        expect(instance.another_place).to eq(keys)
+      end
+
+      it 'replaces Tessa assets with ActiveStorage assets' do
+        # Before deploying this code, we previously had DB records with Tessa IDs
+        instance.update!(another_place: [1, 2, 3])
+
+        # In this HTTP POST, we removed one of the tessa assets and uploaded a
+        # new ActiveStorage asset
+        blob = ::ActiveStorage::Blob.create_before_direct_upload!({
+          filename: 'README.md',
+          byte_size: file.size,
+          content_type: file.content_type,
+          checksum: '1234'
+        })
+        changeset = Tessa::AssetChangeSet.new(
+          changes: [
+            { 'id' => 1, 'action' => 'add' },
+            { 'id' => 2, 'action' => 'remove' },
+            { 'id' => 3, 'action' => 'add' },
+            { 'id' => blob.signed_id, 'action' => 'add' },
+          ]
+        )
+
+        # We'll download these assets when we access #multiple_field
+        allow(Tessa.config.connection).to receive(:get)
+          .with("/assets/1,3")
+          .and_return(double("response",
+            success?: true,
+            body: [
+              { 'id' => 1, 'public_url' => 'test1' },
+              { 'id' => 2, 'public_url' => 'test2' }
+            ].to_json))
+
+        blob.upload(file)
+
+        # act
+        instance.multiple_field = changeset
+
+        expect(instance.another_place).to eq([
+          blob.key, 1, 3
+        ])
+
+        assets = instance.multiple_field
+        expect(assets[0].key).to eq(blob.key)
+        expect(assets[0].service_url)
+          .to start_with('https://www.example.com/rails/active_storage/disk/')
+
+        expect(assets[1].id).to eq(1)
+        expect(assets[1].public_url).to eq('test1')
+        expect(assets[2].id).to eq(2)
+        expect(assets[2].public_url).to eq('test2')
+      end
     end
   end
 
@@ -385,6 +525,7 @@ RSpec.describe Tessa::Model do
       let(:model) {
         MultipleAssetModel
       }
+      let(:instance) { model.new(another_place: []) }
       
       before do
         instance.another_place = [2, 3]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tessa
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Justin Powell
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-15 00:00:00.000000000 Z
+date: 2022-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday