card-mod-virtual 0.13.1 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db231fd316475b2c5e51952b5e6f037244bc79a8f528c6f9b02b8f4e21ade29b
-  data.tar.gz: 5c5c3ddc8773e7e14989dd4d5fee1aef0b13e924ae0b5fb06df4764fd1de165f
+  metadata.gz: 9a59c7e89230f55bb5907d1e4ca56d9afa02e8dec1f9136596dcab631d059a41
+  data.tar.gz: 9e3d08065b6045ca63f67cbe4de5707f49c9a969222c623f6c71d281caff8f4e
 SHA512:
-  metadata.gz: 279f8313e1b25f402806c7aaf19d33655668a013f4d3fc3eea9cee9548992c8deda62d1d38713c5087fd620d2397090d07dc43c890c94a4ada2ca56b758a494d
-  data.tar.gz: 30be35cca7c0a483b39ea174bd3dc53f5cc5af16c1ec1195bc2fa04b8eb6556f326a93c7b2045bb20322ce97c61b2e2f5cb5c8e8e4cdf24c44869c25e8af33d7
+  metadata.gz: a0bb370753984df37ceda8e765be6f469b0883cce42518394462118ff418ea59a1635ee47a624e8ecac79623b4db672c951bb80cd830f0c2dc554819d074a458
+  data.tar.gz: 4c8dbe734f3cfeb86f7fd9d668d5594fbf3fc434c4fb6d7597e8137b463013d128e56cd76cdd80b5b7982698aa712ceeb6d13810f02f406291dc7a91dd576c9a

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.1
+  version: 0.14.0
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-06 00:00:00.000000000 Z
+date: 2021-12-22 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.1
+        version: 1.104.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.103.1
+        version: 1.104.0
 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