card 1.102.0 → 1.103.3

data/db/seed/test/fixtures/schema_migrations_core_cards.yml

@@ -316,4 +316,24 @@ schema_migrations_core_cards_157:
 schema_migrations_core_cards_158:
   version: '20191118145629'
 schema_migrations_core_cards_159:
+  version: '20200804112345'
+schema_migrations_core_cards_160:
+  version: '20200804112346'
+schema_migrations_core_cards_161:
+  version: '20200804112347'
+schema_migrations_core_cards_162:
+  version: '20200804112348'
+schema_migrations_core_cards_163:
+  version: '20200805112346'
+schema_migrations_core_cards_164:
+  version: '20200806112346'
+schema_migrations_core_cards_165:
+  version: '20200809112346'
+schema_migrations_core_cards_166:
   version: '20200821231558'
+schema_migrations_core_cards_167:
+  version: '20201115133753'
+schema_migrations_core_cards_168:
+  version: '20201129140917'
+schema_migrations_core_cards_169:
+  version: '20210509141814'

data/db/test_seed.rb

@@ -1,6 +1,7 @@
 # -*- encoding : utf-8 -*-
 
 require "timecop"
+require "active_support/core_ext/numeric/time"
 
 # noinspection RubyResolve
 class SharedData
@@ -12,7 +13,7 @@ class SharedData
     "Big Brother", "Optic fan", "Sunglasses fan", "Narcissist"
   ].freeze
 
-  CARDTYPE_COUNT = 44
+  CARDTYPE_COUNT = 54
 
   class << self
     def create_user name, args
@@ -210,6 +211,10 @@ class SharedData
       create "Cardtype E+*type+*default"
     end
 
+    def future_stamp
+      Time.zone.local 2020, 1, 1, 0, 0, 0
+    end
+
     def notification_cards
       Timecop.freeze(Cardio.future_stamp - 1.day) do
         # fwiw Timecop is apparently limited by ruby Time object,

data/lib/card/auth/current.rb

@@ -76,7 +76,7 @@ class Card
       end
 
       def session_user_key
-        "user_#{Cardio.database_name.underscore}".to_sym
+        "user_#{Cardio.database.underscore}".to_sym
       end
 
       private

data/lib/card/cache/persistent.rb

@@ -27,7 +27,7 @@ class Card
         @store = opts[:store]
         @klass = opts[:class]
         @class_key = @klass.to_s.to_name.key
-        @database = opts[:database] || Cardio.database_name
+        @database = opts[:database] || Cardio.database
       end
 
       # renew insures you're using the most current cache version by

data/lib/card/cache/persistent_class.rb

@@ -12,7 +12,7 @@ class Card
       end
 
       def stamp_key
-        "#{Cardio.database_name}-stamp"
+        "#{Cardio.database}-stamp"
       end
 
       def renew

data/lib/card/cache.rb

@@ -107,7 +107,7 @@ class Card
       # (the non-standard caches)
       def reset_other
         Card::Codename.reset_cache
-        Cardio.delete_tmp_files!
+        Cardio::Utils.delete_tmp_files!
       end
 
       # generate a cache key from an object

data/lib/card/codename.rb

@@ -138,7 +138,7 @@ class Card
 
       def unknown_codename! mark
         raise Card::Error::CodenameNotFound,
-              Cardio.t(:lib_exception_unknown_codename, codename: mark)
+              ::I18n.t(:lib_exception_unknown_codename, codename: mark)
       end
 
       def id_constant codename, id=nil

data/lib/card/content/chunk.rb

@@ -89,7 +89,6 @@ class Card
       register_list :nest_only, [:Nest]
       register_list :query, [:QueryReference]
       register_list :stub, [:ViewStub]
-      register_list :references_keep_escaping,  %i[KeepEscapedLiteral Nest Link]
     end
   end
 end

data/lib/card/content/diff/summary.rb

@@ -7,21 +7,11 @@ class Card
           opts ||= {}
           @remaining_chars = opts[:length] || 50
           @joint = opts[:joint] || "..."
-
-          @summary = nil
           @chunks = []
-          @content_omitted = false
         end
 
         def rendered
-          @summary ||=
-            begin
-              truncate_overlap
-              @chunks.map do |chunk|
-                @content_omitted ||= chunk[:action] == :ellipsis
-                render_chunk chunk[:action], chunk[:text]
-              end.join
-            end
+          @rendered ||= render
         end
 
         def add text
@@ -44,6 +34,14 @@ class Card
 
         private
 
+        def render
+          truncate_overlap
+          @chunks.map do |chunk|
+            @content_omitted ||= chunk[:action] == :ellipsis
+            render_chunk chunk[:action], chunk[:text]
+          end.join
+        end
+
         def add_chunk text, action
           return unless @remaining_chars.positive?
 
@@ -119,16 +117,14 @@ class Card
           @chunks[index][:text] += @joint
         end
 
+        JOINT_REPLACEMENT = { added: :ellipis, deleted: :added }.freeze
+
         def replace_with_joint index
           @chunks.pop
-          return unless index.positive?
+          return unless index.positive? &&
+                        (previous_action = JOINT_REPLACEMENT[@chunks[index - 1][:action]])
 
-          case @chunks[index - 1][:action]
-          when :added
-            add_chunk_to_list @joint, :ellipsis
-          when :deleted
-            add_chunk_to_list @joint, :added
-          end
+          add_chunk_to_list @joint, previous_action
         end
       end
     end

data/lib/card/content.rb

@@ -104,7 +104,7 @@ class Card
     end
 
     def without_references &block
-      without_chunks Chunk::Nest, Chunk::Link, &block
+      without_chunks Chunk::Nest, Chunk::Link, Chunk::EscapedLiteral, &block
     end
 
     def without_chunks *chunk_classes
@@ -114,6 +114,14 @@ class Card
       unstash_chunks processed, stash
     end
 
+    def strip_nests
+      strip_chunks Chunk::Nest
+    end
+
+    def strip_chunks chunk_type
+      chunks.reject! { |c| c.is_a? chunk_type }
+    end
+
     private
 
     def interpret_chunk_type chunk_type

data/lib/card/director/act_direction.rb

@@ -14,9 +14,11 @@ class Card
       end
 
       def run_act card
-        self.act_card = card
-        # add new_director(card)
-        yield
+        Lexicon.rescuing do
+          self.act_card = card
+          # add new_director(card)
+          yield
+        end
       ensure
         clear
       end

data/lib/card/director/all.rb

@@ -23,19 +23,19 @@ class Card
         act(as_subcard: as_subcard) { super **args }
       end
 
-      def save *args
+      def save *_args
         act { super }
       end
 
-      def valid? *args
+      def valid? *_args
         act(validating: true) { super }
       end
 
-      def update *args
+      def update *_args
         act { super }
       end
 
-      def update! *args
+      def update! *_args
         act { super }
       end
 

data/lib/card/director/stages.rb

@@ -26,6 +26,8 @@ class Card
           STAGE_INDEX[stage]
         when Integer
           stage
+        when nil
+          -1
         else
           raise Card::Error, "not a valid stage: #{stage}"
         end

data/lib/card/error.rb

@@ -22,7 +22,7 @@ class Card
     end
 
     def message_from_card
-      Cardio.t :lib_exception_for_card, cardname: card.name, message: card_message_text
+      ::I18n.t :lib_exception_for_card, cardname: card.name, message: card_message_text
     end
 
     def backtrace

data/lib/card/fetch/results.rb

@@ -28,7 +28,7 @@ class Card
         elsif opts[:skip_virtual]
           return nil
         else
-          assign_name_from_mark
+          assign_name mark
         end
         yield
       end
@@ -53,9 +53,9 @@ class Card
       def quick_renew
         return false unless quick_renew?
 
-        # Rails.logger.info "QUICK renewing: #{mark}, #{new_opts}"
         update_supercard
-        assign_name_from_mark
+        opts_name = new_opts[:name]
+        assign_name(opts_name.present? ? opts_name : mark)
         true
       end
 
@@ -123,11 +123,11 @@ class Card
         @new_opts ||= opts[:new]
       end
 
-      def assign_name_from_mark
+      def assign_name requested
         return if opts[:local_only]
-        return unless mark&.to_s != card.name
+        return unless requested&.to_s != card.name
 
-        card.name = mark.to_s
+        card.name = requested.to_s
       end
     end
   end

data/lib/card/{tasks/card/file_card_creator → file_card_creator}/abstract_file_card.rb

@@ -1,8 +1,3 @@
-require_relative "./output_helper"
-require_relative "./abstract_file_card/source_file"
-require_relative "./abstract_file_card/ruby_file"
-require_relative "./abstract_file_card/migration_file"
-
 class Card
   class FileCardCreator
     # A template class for generating cards that are linked to source files.

data/lib/card/{tasks/card/file_card_creator.rb → file_card_creator.rb}

@@ -1,8 +1,3 @@
-require_relative "./file_card_creator/script_card"
-require_relative "./file_card_creator/style_card"
-require_relative "./file_card_creator/haml_card"
-require_relative "./file_card_creator/abstract_file_card"
-
 class Card
   # A Factory class
   # It chooses the class to create the file card according to the given type.

data/lib/card/format/content.rb

@@ -7,14 +7,12 @@ class Card
         content_obj.to_s
       end
 
-      # Preserves the syntax in all nests. The content is yielded with placeholders
-      # for all nests. After executing the given block the original nests are put back in.
-      # Placeholders are numbers in double curly brackets like {{2}}.
+      # 1. Break out references (nests / links) into separate chunks
+      # 2. yields the other (non-ref) content
+      # 3. processes references
       def safe_process_content override_content=nil, content_opts=nil, &block
-        content_obj =
-          content_object override_content, chunk_list: :references_keep_escaping
-        result = content_obj.without_references(&block)
-        process_content result, content_opts
+        content_obj = content_object override_content, chunk_list: :references
+        process_content content_obj.without_references(&block), content_opts
       end
 
       # nested by another card's content

data/lib/card/format/error.rb

@@ -47,7 +47,7 @@ class Card
         if card&.name.present?
           safe_name
         else
-          Cardio.t :lib_no_cardname
+          ::I18n.t :lib_no_cardname
         end
       end
 

data/lib/card/format/nest/fetch.rb

@@ -24,7 +24,7 @@ class Card
         end
 
         def not_found_codename_error codename
-          Cardio.t :lib_exception_unknown_codename, codename: codename
+          ::I18n.t :lib_exception_unknown_codename, codename: codename
         end
 
         def new_card cardish

data/lib/card/format/render.rb

@@ -8,11 +8,9 @@ class Card
         voo = View.new self, view, view_options, @voo
         with_voo voo do
           voo.process do |final_view|
-            final_render final_view
+            wrap_and_render final_view
           end
         end
-      rescue StandardError => e
-        rescue_view e, view
       end
 
       def with_voo voo
@@ -38,13 +36,15 @@ class Card
       end
 
       def final_render view
-        current_view(view) do
-          with_wrapper do
-            method = view_method view
-            rendered = final_render_call method
-            add_debug_info view, method, rendered
-          end
-        end
+        method = view_method view
+        rendered = final_render_call method
+        add_debug_info view, method, rendered
+      end
+
+      def wrap_and_render view
+        current_view(view) { with_wrapper { final_render view } }
+      rescue StandardError => e
+        rescue_view e, view
       end
 
       def final_render_call method

data/lib/card/format.rb

@@ -33,6 +33,9 @@ class Card
     attr_reader :card, :parent, :main_opts, :modal_opts
     attr_accessor :form, :error_status, :rendered
 
+    delegate :basket, to: Set
+    delegate :session, :params, to: Env
+
     def self.view_caching?
       true
     end
@@ -47,7 +50,7 @@ class Card
     def require_card_to_initialize!
       return if @card
 
-      raise Card::Error, Cardio.t(:lib_exception_init_without_card)
+      raise Card::Error, ::I18n.t(:lib_exception_init_without_card)
     end
 
     def include_set_format_modules
@@ -66,18 +69,10 @@ class Card
       end
     end
 
-    def params
-      Env.params
-    end
-
     def controller
       @controller || Env[:controller] ||= CardController.new
     end
 
-    def session
-      Env.session
-    end
-
     def mime_type
       "text/plain"
     end

data/lib/card/lexicon.rb

@@ -28,15 +28,9 @@ class Card
         Card::Cache[Lexicon]
       end
 
-      def add card
-        lex = card.lex
-        cache.write card.id.to_s, lex
-        cache.write cache_key(lex), card.id
-      end
-
       def update card
         add card
-        cache.delete cache_key(card.lex_before_act)
+        expire_lex card.lex_before_act
       end
 
       # def delete card
@@ -50,8 +44,37 @@ class Card
         lex.map { |side_id| name side_id or return }.join(Card::Name.joint).to_name
       end
 
+      # this is to address problems whereby renaming errors leave the lexicon broken.
+      # NEEDS TESTING
+      def rescuing
+        @act_lexes = []
+        @act_ids = []
+        yield
+      rescue StandardError => e
+        @act_lexes.each { |lex| expire_lex lex }
+        @act_ids.each { |id| expire_id id }
+        @act_lexes = @act_ids = nil
+        raise e
+      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
+      end
+
+      def expire_lex lex
+        cache.delete cache_key(lex)
+      end
+
+      def expire_id id
+        cache.delete id.to_s
+      end
+
       def id_to_lex id
         cache.fetch id.to_s do
           result = Card.where(id: id).pluck(:name, :left_id, :right_id).first

data/lib/card/model/save_helper/save_arguments.rb

@@ -86,7 +86,9 @@ class Card
         end
 
         def standard_changing_arg card, key, value
-          card.send(key) != value unless value.is_a? ::File
+          return true if value.is_a? ::File
+
+          card.send(key) != value
         end
       end
     end

data/lib/card/name/card_class.rb

@@ -3,7 +3,7 @@ class Card
     # Name-related Card class methods
     module CardClass
       def rename! oldname, newname
-        Card[oldname].update! name: newname, update_referers: true
+        Card[oldname].update! name: newname
       end
 
       def uniquify_name name, rename=:new

data/lib/card/name.rb

@@ -19,7 +19,7 @@ class Card
         case cardish
         when Card             then cardish.name
         when Symbol, Integer  then Card.fetch_name(cardish)
-        when Array            then smart_compose cardish
+        when Array            then compose cardish
         when String, NilClass then new cardish
         else
           raise ArgumentError, "#{cardish.class} not supported as name identifier"
@@ -40,7 +40,7 @@ class Card
         str = str.to_s
 
         if !validated_parts && str.include?(joint)
-          compose Cardname.split_parts(str)
+          string_compose Cardname.split_parts(str)
         elsif (id = Card.id_from_string str)  # handles ~[id] and :[codename]
           Card.name_from_id_from_string id, str
         else
@@ -49,16 +49,16 @@ class Card
       end
 
       # interprets symbols/integers as codenames/ids
-      def smart_compose parts
+      def compose parts
         new_from_parts(parts) { |part| self[part] }
       end
 
-      def compose parts
+      private
+
+      def string_compose parts
         new_from_parts(parts) { |part| new part }
       end
 
-      private
-
       def new_from_parts parts, &block
         name_parts = parts.flatten.map(&block)
         new name_parts.join(joint), true

data/lib/card/reference/all.rb

@@ -64,7 +64,7 @@ class Card
 
       # delete references from this card
       def delete_references_out
-        raise "id required to delete references" if id.nil?
+        return unless id.present?
 
         Reference.where(referer_id: id).delete_all
       end

data/lib/card/set/card_methods.rb

@@ -0,0 +1,13 @@
+class Card
+  module Set
+    # Set-related methods included in card class
+    # (note: Card::Set::All would follow our naming convention but is in use by the
+    # "all" set)
+    module CardMethods
+      include Event::All
+      include Pattern::All
+
+      delegate :basket, to: Set
+    end
+  end
+end

data/lib/card/set/event/skip_and_trigger.rb

@@ -34,6 +34,14 @@ class Card
           @trigger_hash ||= hash_with_value trigger, true
         end
 
+        def skip_event? event
+          full_skip_hash.key? event.to_s
+        end
+
+        def trigger_event? event
+          full_trigger_hash.key? event.to_s
+        end
+
         private
 
         # "applies always means event can run

data/lib/card/set/format/abstract_format/wrapper.rb

@@ -75,7 +75,7 @@ class Card
           def define_wrap_with_method wrapper_name, wrapper_method_name
             class_exec(self) do |_format|
               define_method "wrap_with_#{wrapper_name}" do |*args, &interior|
-                @interior, opts = interior ? [interior.call, args.first] : args
+                voo.interior, opts = interior ? [interior.call, args.first] : args
                 send_wrapper_method wrapper_method_name, opts
               end
             end

data/lib/card/set/format/abstract_format.rb

@@ -7,12 +7,13 @@ class Card
       # Whenever you create a format block in a set module in a {Cardio::Mod mod}, you
       # create a format module that is extended with AbstractFormat.
       module AbstractFormat
-        include Set::Basket
         include ViewOpts
         include ViewDefinition
         include HamlViews
         include Wrapper
 
+        delegate :basket, to: Set
+
         # _Views_ are the primary way that both sharks and monkeys interact with cards.
         # Sharks select views to use in _nests_.  Monkeys can define and tweak those
         # views. These docs will introduce the basics of view definition.

data/lib/card/set/format/haml_paths.rb

@@ -3,6 +3,7 @@ class Card
     module Format
       # methods for handling paths to HAML templates
       module HamlPaths
+        CORE_MODS = ::Set.new %w[core admin].freeze
         TEMPLATE_DIR = %w[template set].freeze
 
         delegate :tmp_files?, to: Cardio::Mod::LoadStrategy
@@ -60,11 +61,11 @@ class Card
         end
 
         def source_mod_dir modname, carddir
-          if (m = modname.match(/^card-mod-(?<shortname>.*)/))
-            "/mod/#{m[:shortname]}/set/"
-          else
-            "#{carddir}/mod/#{modname}/set/"
-          end
+          # TODO: handle non-standard mod dirs
+          dir = "/mod/#{modname}/set/"
+          return dir unless modname.in? CORE_MODS
+
+          "#{carddir}/#{dir}/"
         end
 
         def try_haml_template_path template_path, view, source_dir, ext="haml"