card-mod-virtual 0.13.2 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df938a392274da66b29fa013e04706a896c13009c81a7c3966441c7e5e5e36bf
-  data.tar.gz: 3db3c3eb34257e72bff48007d3bd802567598eaa5c54e7a0bdc12fecb1ca2a1d
+  metadata.gz: 1faaea40397c0d5da4eb68f26af697f89f80c38f26185988cac81f01eb0cc938
+  data.tar.gz: 1a5e126f6857daff50088c18e6401b5d9d56c831b4c0b1da56cd0d0b05db6419
 SHA512:
-  metadata.gz: 8b50175982636d3d4679d66ff1841b03a5eb5da1bb62ec19bfb748f073832453d0d9d53f3524a64a60f26a6cabe466ef8029d0c3470346707fa1fc0bfe07c951
-  data.tar.gz: 287b8c010c3a05550e6f846be7dd191c37a362573ff07ca6e0eca7a594421d44e6601f18e4a9a7a33a5902f17a121e21ea06935d512f1fd0ec6cdbb179ac992a
+  metadata.gz: 1c76342d146a4fc7d1c17c20b42716971c84f23111b8939d15770041f0f367c463444033f6654a0dcbcdbd8a0ab2755c7e9b586325d6123be082efc3728f6963
+  data.tar.gz: 8d959e2aa0ce142094980c4cdb1abe6a7f2b2df503a4039129b9c41095cb6d0582055f454826e5a574849a4bfc84f02ce90ba275bce8ede271bc77905c4949ec

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.2
+  version: 0.14.1
 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: 2022-01-04 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.2
+        version: 1.104.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.103.2
+        version: 1.104.1
 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