card 1.103.2 → 1.103.3

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

@@ -1486,8 +1486,8 @@ cards_072:
   references_expired: 
   trash: false
   type_id: 3
-  db_content: "<p>Searches return a list of cards using [[http://decko.org/wagn/WQL|WQL,
-    the Wagn Query Language]]. See the [[http://decko.org/wagn/WQL syntax|syntax documentation]].</p>"
+  db_content: "<p>Searches return a list of cards using [[http://decko.org/WQL|WQL,
+    the Wagn Query Language]]. See the [[http://decko.org/WQL syntax|syntax documentation]].</p>"
 cards_073:
   id: 184
   name: by name
@@ -1595,7 +1595,7 @@ cards_078:
   references_expired: 
   trash: false
   type_id: 3
-  db_content: "<p>These cards allow unrestricted HTML. [[http://decko.org/wagn/HTML|more]]</p>"
+  db_content: "<p>These cards allow unrestricted HTML. [[http://decko.org/HTML|more]]</p>"
 cards_079:
   id: 205
   name: 
@@ -1667,7 +1667,7 @@ cards_082:
   references_expired: 
   trash: false
   type_id: 3
-  db_content: "<p>Toggles simply indicate yes or no. [[http://decko.org/wagn/Toggle|more]].</p>"
+  db_content: "<p>Toggles simply indicate yes or no. [[http://decko.org/Toggle|more]].</p>"
 cards_083:
   id: 213
   name: 
@@ -2397,7 +2397,7 @@ cards_122:
   references_expired: 
   trash: false
   type_id: 3
-  db_content: "<div>Sets define a group of cards to which settings can apply. [[http://www.decko.org/wagn/Setting|Learn
+  db_content: "<div>Sets define a group of cards to which settings can apply. [[http://www.decko.org/Setting|Learn
     more about settings.]]</div>"
 cards_123:
   id: 298
@@ -2419,7 +2419,7 @@ cards_123:
   db_content: |-
     <div>Settings affect how cards look and behave. Settings are available under each card's Options tab.</div>
     <p>&nbsp;</p>
-    <div><em>[[http://www.decko.org/wagn/Setting|Learn more about settings.]]</em></div>
+    <div><em>[[http://www.decko.org/Setting|Learn more about settings.]]</em></div>
 cards_124:
   id: 300
   name: 

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/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/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/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
@@ -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.rb

@@ -60,7 +60,7 @@ class Card
 
         card = Card[name]
         card.update! codename: nil
-        card.delete! update_referers: true
+        card.delete!
       end
 
       # create if card doesn't exist

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/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.rb

@@ -114,13 +114,12 @@ class Card
 
       # make mod ready to include in base (non-set-specific) format classes
       def register_all_set_format format_class, mod
-        add_to_array_val modules[:base_format], format_class, mod
+        add_to_array_val Set.modules[:base_format], format_class, mod
       end
 
       def register_standard_set_format format_class, mod
-        format_type = abstract_set? ? :abstract_format : :nonbase_format
         # ready to include dynamically in set members' format singletons
-        format_hash = modules[format_type][format_class] ||= {}
+        format_hash = Set.modules[set_format_type_key][format_class] ||= {}
         add_to_array_val format_hash, shortname, mod
       end
 

data/lib/card/set/helpers.rb

@@ -19,6 +19,20 @@ class Card
         Pattern.find(pattern_code).anchor_parts_count
       end
 
+      def set_format_type_key
+        :"#{set_type_key}_format"
+      end
+
+      def set_type_key
+        if all_set?
+          :base
+        elsif abstract_set?
+          :abstract
+        else
+          :nonbase
+        end
+      end
+
       def set_name_parts
         @set_name_parts ||= name.split "::"
       end
@@ -39,6 +53,47 @@ class Card
       def respond_to_missing? method_name, _include_private=false
         method_name.match? SET_PATTERN_TEST_REGEXP
       end
+
+      def modules
+        if all_set?
+          [self]
+        elsif abstract_set?
+          [test_set]
+        else
+          Set.modules[:nonbase][shortname] || []
+        end
+      end
+
+      def format_modules format_sym
+        type_key = set_format_type_key
+        if !type_key || type_key == :base_format
+          [format_module(format_sym)]
+        elsif abstract_set?
+          [test_set.format_module(format_sym)]
+        else
+          format_class = Card::Format.format_class format: format_sym
+          Card::Set.modules[type_key][format_class][shortname] || []
+        end
+      end
+
+      def format_module format_sym
+        const_get Card::Format.format_class_name(format_sym)
+      end
+
+      def test_set
+        # rubocop:disable Lint/Eval
+        ::Card::Set::Self.const_remove_if_defined :TestSet
+        eval <<-RUBY, binding, __FILE__, __LINE__ + 1
+          class ::Card::Set::Self
+            module TestSet
+              extend Card::Set
+              include_set #{name}
+            end
+          end
+        RUBY
+        ::Card::Set::Self::TestSet
+        # rubocop:enable Lint/Eval
+      end
     end
   end
 end

data/lib/card/set/inheritance.rb

@@ -74,7 +74,7 @@ class Card
       def each_format_with_mods set
         set_type = set.abstract_set? ? :abstract : :nonbase
         format_type = "#{set_type}_format".to_sym
-        modules[format_type].each_pair { |*args| yield(*args) }
+        Set.modules[format_type].each_pair { |*args| yield(*args) }
       end
 
       def applicable_format? format, except, only

data/lib/card/set/pattern/all.rb

@@ -7,18 +7,18 @@ class Card
           defined? @patterns
         end
 
-        def all_patterns
-          @all_patterns ||= set_patterns.map { |sub| sub.new self }.compact
+        def concrete_patterns
+          @concrete_patterns ||= Pattern.concrete.map { |sub| sub.new self }.compact
         end
 
         # new cards do not
         def patterns
-          @patterns ||= (new_card? ? all_patterns[1..-1] : all_patterns)
+          @patterns ||= (new_card? ? concrete_patterns[1..-1] : concrete_patterns)
         end
 
         def reset_patterns
           # Rails.logger.info "resetting patterns: #{name}"
-          @patterns = @all_patterns = nil
+          @patterns = @concrete_patterns = nil
           @template = @virtual = nil
           @set_mods_loaded = @set_modules = @set_names = @rule_set_keys = nil
           @junction_only = nil # only applies to set cards
@@ -30,13 +30,14 @@ class Card
         end
 
         def set_modules
-          @set_modules ||= all_patterns[0..-2].reverse.map(&:module_list).flatten.compact
+          @set_modules ||=
+            concrete_patterns[0..-2].reverse.map(&:module_list).flatten.compact
         end
 
         def set_format_modules klass
           @set_format_modules ||= {}
           @set_format_modules[klass] =
-            all_patterns[0..-2].reverse.map do |pattern|
+            concrete_patterns[0..-2].reverse.map do |pattern|
               pattern.format_module_list klass
             end.flatten.compact
         end

data/lib/card/set/pattern/class_methods.rb

@@ -14,11 +14,11 @@ class Card
         def register pattern_code, opts={}
           if (self.pattern_id = Card::Codename.id(pattern_code))
             self.pattern_code = pattern_code
-            Card.set_patterns.insert opts.delete(:index).to_i, self
+            Pattern.concrete.insert opts.delete(:index).to_i, self
             self.anchorless = !respond_to?(:anchor_name)
             opts.each { |key, val| send "#{key}=", val }
           else
-            warn "no codename for pattern_code #{pattern_code}"
+            warn "no codename for pattern code: #{pattern_code}"
           end
         end