lib/card/lexicon.rb in card-1.107.0 vs lib/card/lexicon.rb in card-1.108.0

@@ -1,12 +1,11 @@
 class Card
   # Translates names to ids and vice versa via a cached "lex" representation:
   # name for simple cards, [left_id, right_id] for compound cards.
   #
-  # Note, unlike Card::Fetch, Card::Lexicon:
-  #   1. does NOT distinguish between trashed and untrashed cards.
-  #   2. does NOT respect local name changes
+  # Note, unlike Card::Fetch, Card::Lexicon: does NOT return local name changes
+  # until stored
   module Lexicon
     class << self
       # param id [Integer]
       # @return [String]
       def name id
@@ -31,21 +30,33 @@
       def update card
         add card
         expire_lex card.lex_before_act
       end
 
-      # def delete card
-      #   cache.delete card.id.to_s
-      #   cache.delete cache_key(card.lex_before_act)
-      # end
+      def delete card
+        cache.delete card.id.to_s
+        cache.delete cache_key(card.lex_before_act)
+      end
 
       def lex_to_name lex
         return lex unless lex.is_a? Array
 
         lex.map { |side_id| name side_id or return }.join(Card::Name.joint).to_name
       end
 
+      def cache_key lex
+        "L-#{lex.is_a?(Array) ? lex.join('-') : lex.to_name.key}"
+      end
+
+      def lex_query lex
+        if lex.is_a?(Array)
+          { left_id: lex.first, right_id: lex.last }
+        else
+          { key: lex.to_name.key }
+        end
+      end
+
       # this is to address problems whereby renaming errors leave the lexicon broken.
       # NEEDS TESTING
       def rescuing
         @act_lexes = []
         @act_ids = []
@@ -55,18 +66,27 @@
         @act_ids.each { |id| expire_id id }
         @act_lexes = @act_ids = nil
         raise e
       end
 
+      def write_to_temp_cache id, name, lex
+        cache.temp.write id.to_s, name if id.present?
+        cache.temp.write cache_key(lex), id if lex
+      end
+
+      def write id, name, lex
+        cache.write id.to_s, name
+        cache.write cache_key(lex), id
+      end
+
       private
 
       def add card
         lex = card.lex
         @act_lexes << lex
         @act_ids << card.id
-        cache.write card.id.to_s, lex
-        cache.write cache_key(lex), card.id
+        write card.id, card.name, card.lex
       end
 
       def expire_lex lex
         cache.delete cache_key(lex)
       end
@@ -78,11 +98,13 @@
       def id_to_lex id
         cache.fetch id.to_s do
           result = Card.where(id: id).pluck(:name, :left_id, :right_id).first
           return unless result
 
-          result[0] || [result[1], result[2]]
+          (result[0] || [result[1], result[2]]).tap do |lex|
+            cache.write cache_key(lex), id
+          end
         end
       end
 
       def name_to_lex name
         if name.simple?
@@ -92,23 +114,15 @@
         end
       end
 
       def lex_to_id lex
         cache.fetch cache_key(lex) do
-          Card.where(lex_query(lex)).pluck(:id).first
+          query = lex_query(lex).merge trash: false
+          Card.where(query).pluck(:id).first.tap do |id|
+            # don't store name, because lex might not be the canonical name
+            cache.write id.to_s, lex if lex.is_a?(Array)
+          end
         end
-      end
-
-      def lex_query lex
-        if lex.is_a?(Array)
-          { left_id: lex.first, right_id: lex.last }
-        else
-          { key: lex.to_name.key }
-        end
-      end
-
-      def cache_key lex
-        "L-#{lex.is_a?(Array) ? lex.join('-') : lex.to_name.key}"
       end
     end
   end
 end