tessa 1.0.0.pre.rc3 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17688b084097b7f79807a5a55ca6a7d26bbc0b08e242876afe101d3cb5073698
-  data.tar.gz: 739705feff83e9b10c30f119b29bb455f9d8b67263447997fc30255d54b5c4ed
+  metadata.gz: 9f9b764a91daef07d23dcc4adf14060ec1546e3f6cdff0b548b10c4caeb56598
+  data.tar.gz: e40a45f82d40fb0e3051dc67ffd263541cc2afec0a836912b8dfadbbd9bddf16
 SHA512:
-  metadata.gz: 113b0ff0fef87cebead7f296902273448a1333d7abfc8d93a2ba308944df19f169b72579a076a378350435037d7af9001680e83fc27a32cc07db0a4dfbd754cf
-  data.tar.gz: 7281dbe6f2b6a571d34c3db137fcb593dd64c586b92034333ff3908a5ce0856444b4ee459b40d29660a8d7834592027ac58b57e51036804757150f7a48df81b2
+  metadata.gz: 7de9f6c50a229e8cd628fc09d6fcb4bdbb83b0bd7366c12b547870ce245b936026bcabc28412ffe1bcbca929300e3c0693012b439621063da3f755db1716f71d
+  data.tar.gz: ec6c2da67ac86e579541bdc485351032718c475077e98fa046cc5cd8959eb728c6a5da915522b73fe7031360c9eb57a0612a27ee39ec467dca619be4e3ea0188

data/lib/tessa/active_storage/asset_wrapper.rb

@@ -1,5 +1,9 @@
 module Tessa::ActiveStorage
   class AssetWrapper < SimpleDelegator
+    def id
+      key
+    end
+
     def public_url
       Rails.application.routes.url_helpers.
         rails_blob_url(__getobj__, disposition: :inline)
@@ -14,7 +18,10 @@ module Tessa::ActiveStorage
     end
 
     def meta
-      {}
+      {
+        mime_type: content_type,
+        size: byte_size
+      }
     end
 
     def failure?

data/lib/tessa/config.rb

@@ -11,7 +11,11 @@ module Tessa
 
     def connection
       @connection ||= Faraday.new(url: url) do |conn|
-        conn.basic_auth username, password
+        if conn.respond_to?(:basic_auth)
+          conn.basic_auth username, password
+        else # Faraday >= 1.0
+          conn.request :authorization, :basic, username, password
+        end
         conn.request :url_encoded
         conn.adapter Faraday.default_adapter
       end

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.0-rc3"
+  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/config_spec.rb

@@ -95,10 +95,6 @@ RSpec.describe Tessa::Config do
           connection
         end
 
-        it "sets up basic auth params" do
-          expect(spy).to have_received(:basic_auth).with(args[:username], args[:password])
-        end
-
         it "sets up url_encoded request handler" do
           expect(spy).to have_received(:request).with(:url_encoded)
         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]

data/spec/tessa/upload/uploads_file_spec.rb

@@ -69,14 +69,4 @@ RSpec.describe Tessa::Upload::UploadsFile do
       end
     end
   end
-
-  describe ".connection_factory" do
-    it "returns a new Faraday::Connection with the default adapter" do
-      obj = described_class.connection_factory
-      expect(obj).to be_a(Faraday::Connection)
-      expect(obj.builder.handlers)
-        .to eq([Faraday::Adapter::NetHttp])
-    end
-  end
-
 end

data/tessa.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "faraday", "<1"
+  spec.add_dependency "faraday"
   spec.add_dependency "virtus", "~>1.0.4"
 
   spec.add_development_dependency "rake", "~> 10.0"

data/yarn.lock

@@ -415,11 +415,6 @@ doctrine@^2.1.0:
   dependencies:
     esutils "^2.0.2"
 
-dropzone@^4:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/dropzone/-/dropzone-4.3.0.tgz#48b0b8f2ad092872e4b535b672a7c3f1a1d67c91"
-  integrity sha512-KAP4sc9wjaU5xLhZ7olSH1ni72IbXk2l9iF9Ai5p3slwDtKTJunKkQpdFg7voyOcUU+6j75xEhHh+yPqd/Z/PA==
-
 es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.2, es-abstract@^1.19.5:
   version "1.20.1"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.1.tgz#027292cd6ef44bd12b1913b828116f54787d1814"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tessa
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.rc3
+  version: 1.0.2
 platform: ruby
 authors:
 - Justin Powell
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-13 00:00:00.000000000 Z
+date: 2022-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: virtus
   requirement: !ruby/object:Gem::Requirement
@@ -262,9 +262,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3.1
 signing_key: