card-mod-virtual 0.13.3 → 0.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20b4981f1220d1c66018f15039b80cba4a7ded9450d0abd51449ae34d1cd281e
-  data.tar.gz: 56561c3257377fd9c5742c43d692cf54233f48ab5f820f5bcf84b09f43acb42b
+  metadata.gz: 0f51deecf4c604d9f01f6005177e6e8e40e03e4e06fb65ffea94c7b7ed330fc8
+  data.tar.gz: 7ffa17c1ca88784ec32cdeedb2d76422152c89f12c440b69637297a0606792c5
 SHA512:
-  metadata.gz: 523dc884654d0b66764ce33a932854b9eb8d3a9a7184a542621096b7cd55103ccec0177f20e0d4e8cf6992604409791927919e5e7397066dd5f6888261e08ace
-  data.tar.gz: 884081f26d98e9d0cb66935dd88628714e007c00f519ee279af20b68ec2e0960ffde8d7c538b756484a24e1f48ddddd79121aa9343b698d7feb13838a4e13af8
+  metadata.gz: 81a38c4264f6b5bc9466f37fa59738f5bf063759ae51af9102662a445d229dab457b45ea505f7abda8911e0edba86d72f2b97ad75e4ea4ea3a05484a2f55239e
+  data.tar.gz: d6f70615d3288ca37d7137fe0563a0c05d2057e127d28aff528c0732e8f7af1993949999977c4c28f7b9d547fb4e9b64f92efea07bcb35113435c4da555fa195

data/lib/card/virtual.rb

@@ -6,53 +6,44 @@ class Card
   # the card_virtuals table.
   class Virtual < Cardio::Record
     def update new_content
-      update! content: new_content
+      content == new_content ? touch : update!(content: new_content)
       new_content
     end
 
     class << self
-      def create card, virtual_content=nil
-        validate_card card
-        virtual_content ||= block_given? ? yield : card.generate_virtual_content
-        create! left_id: left_id(card),
-                right_id: right_id(card),
-                left_key: card.name.left_key,
-                content: virtual_content
-      end
-
-      def create_or_update card, virtual_content
-        if (virtual_card = find_by_card(card))
-          virtual_card.update virtual_content
-        else
-          create card, virtual_content
+      def fetch card
+        cache.fetch card.key do
+          find_by_card(card) || create(card)
         end
       end
 
-      def fetch_content card, &block
-        find_content_by_card(card) || create(card, &block).content
+      def save card
+        virt = find_by_card card
+        virt ? virt.update(card.virtual_content) : create(card)
       end
 
-      def fetch card, &block
-        find_by_card(card) || create(card, &block)
+      def delete card
+        find_by_card(card)&.delete
       end
 
-      def refresh card
-        virtual = find_by_card(card)
-        return create(card) unless virtual
+      private
 
-        virtual.update card.generate_virtual_content
+      def cache
+        Card::Cache[Virtual]
       end
 
-      def find_content_by_card card
-        where_card(card)&.pluck(:content)&.first
+      def create card
+        validate_card card
+        create! left_id: left_id(card),
+                right_id: right_id(card),
+                left_key: card.name.left_key,
+                content: card.virtual_content
       end
 
       def find_by_card card
         where_card(card).take
       end
 
-      private
-
       def where_card card
         query = { right_id: right_id(card) }
         if (lid = left_id(card))

data/set/abstract/virtual_cache.rb

@@ -4,32 +4,40 @@ def virtual?
   new?
 end
 
-def history?
-  false
-end
-
-def followable?
-  false
+# the content to be cached
+# (can be overridden)
+def virtual_content
+  attributes["db_content"]
 end
 
 def db_content
-  Card::Virtual.fetch_content(self)
+  Virtual.fetch(self)&.content
 end
 
-# called to refresh the virtual content
-# the default way is to use the card's template content
-def generate_virtual_content
-  template&.db_content
+def updated_at
+  Virtual.fetch(self)&.updated_at
 end
 
-event :save_virtual_content, :prepare_to_store, on: :save, changed: :content do
-  Card::Virtual.create_or_update(self, attributes["db_content"])
+event :save_virtual_content, :prepare_to_store, on: :save do
+  Virtual.save self
   abort :success
 end
 
 event :delete_virtual_content, :prepare_to_store, on: :delete do
-  Card::Virtual.find_by_card(self)&.delete
-  abort :success
+  Virtual.delete self
+  abort :success unless real?
+end
+
+# TODO: confirm that the following are needed (and if so, explain why)
+# in theory, if we always abort, we'll never trigger history/follow events,
+# and we'll never have a card to delete, no?
+
+def history?
+  false
+end
+
+def followable?
+  false
 end
 
 def delete

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-virtual
 version: !ruby/object:Gem::Version
-  version: 0.13.3
+  version: 0.14.2
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-24 00:00:00.000000000 Z
+date: 2022-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.103.3
+        version: 1.104.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.103.3
+        version: 1.104.2
 description: ''
 email:
 - info@decko.org
@@ -60,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: virtual