card 1.103.2 → 1.104.1

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

@@ -63,3 +63,5 @@ schema_migrations_031:
   version: '20200718051236'
 schema_migrations_032:
   version: '20200805200729'
+schema_migrations_033:
+  version: '20211128040849'

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

@@ -337,3 +337,11 @@ schema_migrations_core_cards_168:
   version: '20201129140917'
 schema_migrations_core_cards_169:
   version: '20210509141814'
+schema_migrations_core_cards_170:
+  version: '202108028112350'
+schema_migrations_core_cards_171:
+  version: '202108028112351'
+schema_migrations_core_cards_172:
+  version: '202108028112352'
+schema_migrations_core_cards_173:
+  version: '20211107155032'

data/db/test_seed.rb

@@ -13,7 +13,7 @@ class SharedData
     "Big Brother", "Optic fan", "Sunglasses fan", "Narcissist"
   ].freeze
 
-  CARDTYPE_COUNT = 54
+  CARDTYPE_COUNT = 44
 
   class << self
     def create_user name, args
@@ -153,9 +153,6 @@ class SharedData
       create_pointer "items",
                      content: ["Parry Hotter", "42", "Stam Broker", "First",
                                "yeti skin+image", "*all+*script+*machine output"]
-      # Card['*all+*style' ].ensure_machine_output
-      # Card['*all+*script'].ensure_machine_output
-      # (ie9 = Card[:script_html5shiv_printshiv]) && ie9.ensure_machine_output
     end
 
     def user_and_role_cards
@@ -216,7 +213,7 @@ class SharedData
     end
 
     def notification_cards
-      Timecop.freeze(Cardio.future_stamp - 1.day) do
+      Timecop.freeze(future_stamp - 1.day) do
         # fwiw Timecop is apparently limited by ruby Time object,
         # which goes only to 2037 and back to 1900 or so.
         #  whereas DateTime can represent all dates.

data/db/version.txt

@@ -1 +1 @@
-20200805200729
+20211128040849

data/db/version_core_cards.txt

@@ -1 +1 @@
-201905021300268
+202108028112352

data/lib/card/auth/current.rb

@@ -43,7 +43,7 @@ class Card
       end
 
       # set current from token, api_key, or session
-      def signin_with _opts={}
+      def signin_with opts={}
         if opts[:token]
           signin_with_token opts[:token]
         else

data/lib/card/auth/permissions.rb

@@ -5,39 +5,14 @@ class Card
       # user has "root" permissions
       # @return [true/false]
       def always_ok?
-        usr_id = as_id
-        case usr_id
-        when Card::WagnBotID then true # cannot disable
-        when nil             then false
+        case as_id
+        when WagnBotID then true # cannot disable
+        when nil       then false
         else
-          always_ok_usr_id? usr_id
+          always_ok_cached?
         end
       end
 
-      # specified user has root permission
-      # @param usr_id [Integer]
-      # @return [true/false]
-      def always_ok_usr_id? usr_id, force_cache_update=false
-        always = always_cache
-        if always[usr_id].nil? || force_cache_update
-          update_always_cache usr_id, admin?(usr_id)
-        else
-          always[usr_id]
-        end
-      end
-
-      def update_always_cache usr_id, value
-        always = always_cache
-        always = always.dup if always.frozen?
-        always[usr_id] = value
-        Card.cache.write "ALWAYS", always
-        value
-      end
-
-      def always_cache
-        Card.cache.read("ALWAYS") || {}
-      end
-
       # list of names of cardtype cards that current user has perms to create
       # @return [Array of strings]
       def createable_types
@@ -56,16 +31,43 @@ class Card
       end
 
       # test whether user is an administrator
-      # @param user_id [Integer]
+      # @param user_mark [Cardish]
       # @return [true/false]
-      def admin? user_id
-        has_role? user_id, Card::AdministratorID
+      def admin? user_mark=nil
+        user_mark ||= as_id
+        has_role? Card::AdministratorID, user_mark
       end
 
-      def has_role? user_id, role_id
-        return false unless user_id && role_id
+      def has_role? role_mark, user_mark=nil
+        user_mark ||= as_id
+        return false unless (role_id = role_mark&.card_id)
 
-        Card[user_id].all_enabled_roles.include? role_id
+        Card[user_mark].all_enabled_roles.include? role_id
+      end
+
+      def update_always_cache value
+        always = always_cache
+        always = always.dup if always.frozen?
+        always[as_id] = value
+        Card.cache.write "ALWAYS", always
+        value
+      end
+
+      private
+
+      # specified user has root permission
+      # @return [true/false]
+      def always_ok_cached?
+        always = always_cache
+        if always[as_id].nil?
+          update_always_cache admin?
+        else
+          always[as_id]
+        end
+      end
+
+      def always_cache
+        Card.cache.read("ALWAYS") || {}
       end
     end
   end

data/lib/card/content/all.rb

@@ -5,10 +5,10 @@ class Card
       def content
         structured_content || standard_content
       end
-      alias_method :raw_content, :content # DEPRECATED!
+      # alias_method :raw_content, :content # DEPRECATED!
 
       def content= value
-        self.db_content = standardize_content(value)
+        self.db_content = standardize_content value
       end
 
       def content?
@@ -20,7 +20,7 @@ class Card
       end
 
       def standardize_content value
-        value.is_a?(Array) ? value.join("\n") : value
+        value.is_a?(Array) ? items_content(value) : value
       end
 
       def structured_content

data/lib/card/content/chunk.rb

@@ -89,7 +89,7 @@ class Card
       register_list :nest_only, [:Nest]
       register_list :query, [:QueryReference]
       register_list :stub, [:ViewStub]
-      register_list :references_keep_escaping,  %i[KeepEscapedLiteral Nest Link]
+      register_list :none, []
     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

@@ -4,9 +4,7 @@ class Card
       attr_accessor :act, :act_card
 
       def act_director
-        return unless act_card
-
-        act_card.director
+        act_card&.director
       end
 
       def directors
@@ -14,9 +12,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/card_methods.rb

@@ -12,7 +12,6 @@ class Card
 
       def prepare_for_phases
         reset_patterns
-        identify_action
         include_set_modules
       end
 

data/lib/card/director/phases.rb

@@ -16,6 +16,7 @@ class Card
 
       def prepare_for_phases
         @card.prepare_for_phases unless running?
+        @card.identify_action
         @running = true
         @subdirectors.each(&:prepare_for_phases)
       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/director.rb

@@ -180,6 +180,7 @@ class Card
       @subdirectors.clear
       @stage = nil
       @action = nil
+      @running = false
     end
 
     def appoint card

data/lib/card/fetch/all.rb

@@ -3,10 +3,10 @@ class Card
     # fetch-related Card instance methods
     module All
       # fetching from the context of a card
-      def fetch traits, opts={}
+      def fetch field_marks, opts={}
         opts[:new][:supercard] = self if opts[:new]
-        Array.wrap(traits).inject(self) do |card, trait|
-          Card.fetch card.name.trait(trait), opts
+        Array.wrap(field_marks).inject(self) do |card, mark|
+          Card.fetch card.name.field(mark.cardname), opts
         end
       end
 

data/lib/card/fetch/card_class.rb

@@ -26,7 +26,7 @@ class Card
       #      new: { opts for Card#new }  Return a new card when not found
       # @return [Card]
       def fetch *args
-        f = Card::Fetch.new(*args)
+        f = Fetch.new(*args)
         f.retrieve_or_new
       rescue ActiveModel::RangeError => _e
         Card.new name: "card id out of range: #{f.mark}"
@@ -65,19 +65,13 @@ class Card
       def id cardish
         case cardish
         when Integer then cardish
-        when Card then cardish.id
-        when Symbol then Card::Codename.id cardish
-        else fetch_id cardish
+        when Card    then cardish.id
+        when Symbol  then Codename.id cardish
+        when String  then Lexicon.id cardish
+        else quick_fetch(cardish)&.id
         end
       end
 
-      # @param mark_parts - see #fetch
-      # @return [Integer]
-      def fetch_id *mark_parts
-        mark = Card::Fetch.new(*mark_parts)&.mark
-        mark.is_a?(Integer) ? mark : quick_fetch(mark.to_s)&.id
-      end
-
       # @param mark - see #fetch
       # @return [Card::Name]
       def fetch_name *mark, &block

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
 
@@ -63,7 +63,7 @@ class Card
         return unless (sc = new_opts[:supercard])
 
         @card.supercard = sc
-        @card.update_superleft @card.name
+        @card.update_superleft
       end
 
       def quick_renew?
@@ -116,18 +116,18 @@ class Card
       def supercard_might_change_type?
         # ...via type_plus_right rule
         sc = new_opts[:supercard]
-        @force_type_lookup = sc&.new? && (sc.type_id != sc.default_type_id)
+        @force_type_lookup = sc&.new? && (sc.type_id != Card.default_type_id)
       end
 
       def new_opts
         @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

@@ -14,12 +14,12 @@ class Card
         @anyone_can[task]
       end
 
-      def view_for_unknown _view
+      def view_for_unknown setting_view
         if main?
           root.error_status = 404
           :not_found
         else
-          :unknown
+          setting_view || :unknown
         end
       end
 

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

@@ -72,8 +72,8 @@ class Card
             case key.to_s
             when /^\+/
               changing_field_arg key, value
-            when "name"
-              card.name.to_s != value
+            when /name$/
+              card.send(key).to_s != value
             else
               standard_changing_arg card, key, value
             end

data/lib/card/model/save_helper.rb

@@ -13,7 +13,7 @@ class Card
       include SaveArguments
 
       def with_user user_name, &block
-        Card::Auth.with(current_id: Card.fetch_id(user_name), &block)
+        Card::Auth.with(current_id: user_name.card_id, &block)
       end
 
       def create_card name_or_args, content_or_args=nil
@@ -59,8 +59,8 @@ class Card
         return unless delete_code_card? name
 
         card = Card[name]
-        card.update! codename: nil
-        card.delete! update_referers: true
+        card.update! codename: ""
+        card.delete!
       end
 
       # create if card doesn't exist