card 1.103.2 → 1.103.3

data/lib/card/set/pattern.rb

@@ -2,42 +2,53 @@ class Card
   module Set
     class Pattern
       class << self
-        def reset
-          nonbase_loadables.each do |set_pattern|
-            Card::Set.const_remove_if_defined set_pattern.to_s.split("::").last
-          end
-          Card.set_patterns = []
-          @card_keys = nil
+        def concrete
+          @concrete ||= []
         end
 
-        def loadables
-          Card.set_patterns.push(Card::Set::Abstract).reverse
+        def reset
+          reloadables.each do |set_pattern|
+            Set.const_remove_if_defined set_pattern.to_s.split("::").last
+          end
+          @concrete = []
+          @card_keys = @codes = @nonbase_codes = @ids = nil
         end
 
-        def nonbase_loadables
-          l = loadables
-          l.delete Card::Set::All
-          l
+        def reloadables
+          r = concrete.push(Abstract)
+          r.delete Set::All
+          r
         end
 
         def find pattern_code
-          Card.set_patterns.find { |sub| sub.pattern_code == pattern_code }
+          concrete.find { |sub| sub.pattern_code == pattern_code }
         end
 
         def card_keys
           @card_keys ||=
-            Card.set_patterns.each_with_object({}) do |set_pattern, hash|
-              card_key = Card.quick_fetch(set_pattern.pattern_code).key
-              hash[card_key] = true
+            concrete.each_with_object({}) do |set_pattern, hash|
+              hash[set_pattern.pattern_id.cardname.key] = true
             end
         end
 
-        def nonbase_codes
-          codes.tap { |list| list.delete :all }
+        def grouped_codes with_all: true
+          g = [[:abstract], nonbase_codes.reverse]
+          g.unshift [:all] if with_all
+          g
         end
 
+        def ids
+          @ids ||= concrete.map(&:pattern_id)
+        end
+
+        private
+
         def codes
-          Card.set_patterns.map(&:pattern_code).push(:abstract).reverse
+          @codes ||= concrete.map(&:pattern_code)
+        end
+
+        def nonbase_codes
+          @nonbase_codes ||= codes.tap { |list| list.delete :all }
         end
       end
     end

data/lib/card/set/registrar.rb

@@ -48,6 +48,14 @@ class Card
         base_modules.clear
       end
 
+      def finalize_load
+        # basket.freeze
+        # basket.each_value(&:freeze)
+        clean_empty_modules
+      end
+
+      private
+
       def clean_empty_modules
         clean_empty_module_from_hash modules[:nonbase]
         modules[:nonbase_format].each_value do |hash|
@@ -62,8 +70,6 @@ class Card
         end
       end
 
-      private
-
       # makes sets ready for dynamic loading via #include_set_modules
       def register_set_of_type set_module, set_type
         mods = modules[set_type]

data/lib/card/set.rb

@@ -48,7 +48,6 @@ class Card
   module Set
     include Event::Api
     include Trait
-    include Basket
     include Inheritance
 
     include Format
@@ -58,15 +57,23 @@ class Card
     extend I18nScope
     extend Registrar
 
-    mattr_accessor :modules, :traits
+    class << self
+      attr_accessor :modules, :traits, :basket
 
-    def self.reset_modules
-      self.modules = { base: [], base_format: {},
-                       nonbase: {}, nonbase_format: {},
-                       abstract: {}, abstract_format: {} }
+      def reset
+        self.modules = {
+          base: [],     base_format: {},
+          nonbase: {},  nonbase_format: {},
+          abstract: {}, abstract_format: {}
+        }
+
+        self.basket = {}
+      end
     end
 
-    reset_modules
+    delegate :basket, to: Set
+
+    reset
 
     # SET MODULE API
     #

data/lib/card/view/classy.rb

@@ -24,9 +24,7 @@ class Card
       #    :single_use  the same as :nests but is removed after the first use
       #    :global      always everywhere
       def class_up klass, classier, scope=:subviews
-        klass = klass.to_s
-
-        storage_voo(scope).add_extra_classes klass, classier, scope
+        storage_voo(scope).add_extra_classes klass.to_s, classier, scope
       end
 
       def class_down klass, classier
@@ -55,10 +53,8 @@ class Card
       end
 
       def add_extra_classes key, classier, scope
-        type = class_list_type scope
-
-        class_list(type)[key] =
-          [class_list(type)[key], classier].flatten.compact.join(" ")
+        list = class_list class_list_type(scope)
+        list[key] = [list[key], classier].flatten.compact.join " "
       end
 
       # remove classes everywhere where they are visible for the given scope
@@ -83,9 +79,7 @@ class Card
 
       def extra_classes klass
         klass = klass.first if klass.is_a?(Array)
-        klass = klass.to_s
-
-        deep_extra_classes klass, :self
+        deep_extra_classes klass.to_s, :self
       end
 
       # recurse through voos and formats to find all extra classes
@@ -135,33 +129,27 @@ class Card
       end
 
       def class_list type=:private
-        case type
-        when :private, :format_private, :public, :single_use
-          @class_list ||= {}
-          @class_list[type] ||= {}
-        else
+        unless type.in? %i[private format_private public single_use]
           raise ArgumentError, "#{type} not a valid class list"
         end
+        @class_list ||= {}
+        @class_list[type] ||= {}
       end
 
+      CLASS_LIST_TYPE = { view: :private,
+                          format: :format_private,
+                          subviews: :format_private,
+                          nests: :public,
+                          global: :public,
+                          single_use: :single_use }.freeze
+
       # Translates scopes to the privacy types used to manage the class lists.
       # A #classy calls looks in the following class_lists:
       #    private - only in the same voo
       #    format_private - the same voo and all parent voos in the same format
       #    public - in all voos in all parent formats
       def class_list_type scope
-        case scope
-        when :view
-          :private
-        when :format, :subviews
-          :format_private
-        when :nests, :global
-          :public
-        when :single_use
-          :single_use
-        else
-          raise ArgumentError, "invalid class_up scope: #{scope}"
-        end
+        CLASS_LIST_TYPE[scope] || raise(ArgumentError, "invalid class_up scope: #{scope}")
       end
     end
   end

data/lib/card/view/options/voo_api.rb

@@ -49,7 +49,9 @@ class Card
         # because they can get changed after.  current solution is a compromise.
         # @return [Hash]
         def slot_options
-          normalized_options.merge(view: requested_view).slice(*Options.slot_keys)
+          normalized_options.merge(view: requested_view)
+                            .merge(normalized_visibility_options)
+                            .slice(*Options.slot_keys)
         end
 
         # ACCESSOR_HELPERS

data/lib/card/view.rb

@@ -27,6 +27,7 @@ class Card
     extend View::Cache::ClassMethods
 
     attr_reader :format, :parent, :card
+    attr_accessor :interior
 
     class << self
       # @return [Symbol] viewname as Symbol

data/lib/card.rb

@@ -123,8 +123,7 @@ class Card < Cardio::Record
   include Director::CardMethods
   include Name::All
   include Content::All
-  include Set::Event::All
-  include Set::Pattern::All
+  include Set::CardMethods
   include Cache::All
   include Director::All
   include Reference::All
@@ -140,28 +139,27 @@ class Card < Cardio::Record
   has_many :actions, -> { where(draft: [nil, false]).order :id }
   has_many :drafts, -> { where(draft: true).order :id }, class_name: :Action
 
-  cattr_accessor :set_patterns, :action_specific_attributes, :set_specific_attributes
+  cattr_accessor :action_specific_attributes, :set_specific_attributes
+  alias_method :card_id, :id
 
   class << self
     delegate :config, :paths, to: Cardio
   end
 
-  self.set_patterns = []
   self.action_specific_attributes = [
     :supercard,
     :superleft,
-    :action,
-    :current_action,
+    :action,                      # [Symbol] :create, :update, or :delete
+    :current_action,              # [Card::Action]
     :last_action_id_before_edit,
 
-    :skip,                        # skip event(s) for all cards in act
-    :skip_in_action,              # skip event for just this card
-    :trigger,                     # trigger event(s) for all cards in act
-    :trigger_in_action,           # trigger event for just this card
+    :skip,                        # [Array] skip event(s) for all cards in act
+    :skip_in_action,              # [Array] skip event for just this card
+    :trigger,                     # [Array] trigger event(s) for all cards in act
+    :trigger_in_action,           # [Array] trigger event for just this card
     :comment,                     # obviated soon
 
     # TODO: refactor following to use skip/trigger
-    :update_referers,             # wrong mechanism for this
     :update_all_users,            # if the above is wrong then this one too
     :silent_change                # and this probably too
   ]

data/lib/cardio/generators/deck_helper.rb

@@ -67,10 +67,6 @@ module Cardio
         text
       end
 
-      def simplecov_config
-        "" # TODO: add simplecov configs here
-      end
-
       def jasmine_yml prefix
         inside("javascripts/support") do
           template "#{prefix}_jasmine.yml.erb", "jasmine.yml"

data/lib/cardio/mod/load_strategy/set_tmp_files.rb

@@ -21,13 +21,19 @@ module Cardio
         end
 
         def load_tmp_files
-          mod_dirs.each_tmp(:set) do |set_tmp_dir|
-            Card::Set::Pattern.codes.each do |pattern|
-              pattern_dir = "#{set_tmp_dir}/#{pattern}"
-              Loader.load_dir "#{pattern_dir}/**" if Dir.exist? pattern_dir
+          pattern_groups.each do |pattern_group|
+            mod_dirs.each_tmp(:set) do |set_tmp_dir|
+              load_tmp_files_for_pattern pattern_group, set_tmp_dir
             end
           end
         end
+
+        def load_tmp_files_for_pattern pattern_group, set_tmp_dir
+          pattern_group.each do |pattern|
+            pattern_dir = "#{set_tmp_dir}/#{pattern}"
+            Loader.load_dir "#{pattern_dir}/**" if Dir.exist? pattern_dir
+          end
+        end
       end
     end
   end

data/lib/cardio/mod/load_strategy.rb

@@ -14,9 +14,7 @@ module Cardio
         end
 
         def class_for_set_pattern strategy
-          return PatternTmpFiles if strategy == :tmp_files
-
-          Eval
+          strategy == :tmp_files ? PatternTmpFiles : Eval
         end
 
         def tmp_files?
@@ -25,7 +23,8 @@ module Cardio
       end
 
       attr_reader :loader
-      delegate :template_class, :each_file, :mod_dirs, :parts_from_path, to: :loader
+      delegate :template_class, :pattern_groups, :each_file, :mod_dirs, :parts_from_path,
+               to: :loader
 
       def initialize loader
         LoadStrategy.current = self.class

data/lib/cardio/mod/loader/set_loader.rb

@@ -5,10 +5,6 @@ module Cardio
       # The mods are given by a Mod::Dirs object.
       # SetLoader can use three different strategies to load the set modules.
       class SetLoader < Loader
-        def template_class
-          SetTemplate
-        end
-
         def initialize args={}
           @no_all = args.delete :no_all
           super load_strategy: args[:load_strategy], mod_dirs: args[:mod_dirs]
@@ -20,22 +16,26 @@ module Cardio
 
         def load
           super
-          # Card::Set.process_base_modules
-          Card::Set.clean_empty_modules
+          Card::Set.finalize_load
         end
 
-        # does not include abstract
-        def main_patterns
-          method = @no_all ? :nonbase_codes : :codes
-          Card::Set::Pattern.send method
+        def template_class
+          SetTemplate
         end
 
         def each_file &block
-          # each_file_with_patterns :abstract, &block
-          each_file_with_patterns(*main_patterns, &block)
+          pattern_groups.each do |pattern_group|
+            each_file_with_patterns pattern_group, &block
+          end
         end
 
-        def each_file_with_patterns *patterns, &block
+        def pattern_groups
+          Card::Set::Pattern.grouped_codes with_all: !@no_all
+        end
+
+        private
+
+        def each_file_with_patterns patterns, &block
           each_mod_dir :set do |base_dir|
             patterns.each do |pattern|
               each_file_in_dir base_dir, pattern.to_s, &block

data/lib/cardio/mod/loader.rb

@@ -22,7 +22,7 @@ module Cardio
 
         def reload_sets
           Card::Set::Pattern.reset
-          Card::Set.reset_modules
+          Card::Set.reset
           SetPatternLoader.new.load
           SetLoader.new(no_all: true).load
         end

data/lib/cardio/railtie.rb

@@ -83,16 +83,17 @@ module Cardio
 
         c.paths.tap do |p|
           p["config/environments"].unshift "#{card_root}/config/environments"
-
           p["config/initializers"] << "#{card_root}/config/initializers"
           p.add "late/initializers", glob: "**/*.rb"
 
-          p["lib/tasks"] << "#{card_root}/lib/card/tasks"
+          p["lib/tasks"] << "#{card_root}/lib/tasks"
 
           p.add "mod", with: "#{card_root}/mod"
           p["mod"] << "mod"
           p.add "files"
 
+          p.add "lib/graph_q_l/types/query.rb"
+
           p.add "db", with: "#{card_root}/db"
           p.add "db/seeds.rb", with: "#{card_root}/db/seeds.rb"
           p.add "db/migrate", with: "#{card_root}/db/migrate"
@@ -105,9 +106,12 @@ module Cardio
             c.autoload_paths += Dir["#{mod_path}/lib"]
             c.watchable_dirs["#{mod_path}/set"] = %i[rb haml]
 
+            p["lib/graph_q_l/types/query.rb"] <<
+              "#{mod_path}/lib/graph_q_l/types/query.rb"
             p["config/initializers"] << "#{mod_path}/init/early"
             p["late/initializers"] << "#{mod_path}/init/late"
             p["config/locales"] << "#{mod_path}/locales"
+            p["lib/tasks"] << "#{mod_path}/lib/tasks"
           end
 
           p["app/models"] = []

data/lib/generators/deck/templates/Gemfile.erb

@@ -30,7 +30,7 @@ gem "card-mod-defaults"<%= repo_path_constraint :mod %>
 # BACKGROUND
 # A background gem is needed to run tasks like sending notifications in a background
 # process.
-# See https://github.com/decko-commons/decko/tree/master/card-mod-delayed_job
+# See https://github.com/decko-commons/decko/tree/main/card-mod-delayed_job
 # for additional configuration details.
 <%= "# " if shark? %>gem "card-mod-delayed_job"<%= repo_path_constraint :mod %>
 

data/lib/generators/deck/templates/Rakefile.erb

@@ -1,5 +1,9 @@
-# Add your own tasks in files placed in lib/tasks ending in .rake,
-# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+# Add your own tasks in files ending in .rake a mod or deck's lib/tasks directory.
+#
+# Deck example:  mydeck/lib/tasks/mytasks.rake
+# Mod example    mydecko/mod/mymod/lib/tasks/mytasks.rake
+#
+# Tasks in these files will automatically be available to Rake.
 
 require File.expand_path("../config/application", __FILE__)
 

data/lib/generators/deck/templates/simplecov.rb.erb

@@ -1,9 +1,11 @@
 
 if ENV["<%= 'REPO_' if platypus? %>TMPSETS"] && ENV["COVERAGE"] != "false"
   SimpleCov.start do
-    def add_mod_group modname
-      mod_dir = /(card-mod-)?#{Regexp.escape modname}/
-      add_group "Mod: #{modname}", %r{(^|card-mod-|mod/|/tmp.*/.*/mod\d{3}-)#{mod_dir}}
+    def add_mod_groups dir_pattern
+      Dir[dir_pattern].each do |path|
+        modname = File.basename path
+        add_group "Mod: #{modname}", %r{(mod/|mod\d{3}-)#{modname}}
+      end
     end
     <% if platypus? %>
     root "<%= expanded_repo_path %>"
@@ -16,15 +18,9 @@ if ENV["<%= 'REPO_' if platypus? %>TMPSETS"] && ENV["COVERAGE"] != "false"
     add_group "Cardname", "cardname"
     add_group "Decko", "decko"
 
-    Dir["#{root}/{card/mod/*,card-mod-*}"].each do |path|
-      match = path.match %r{/card[-/]mod[-/](?<modname>.*)$}
-      add_mod_group match[:modname]
-    end
+    add_mod_groups "#{root}/{card/,}/mod/*"
     <% else %>
-    Dir["mod/*"].each do |path|
-      modname = path.gsub "mod/", ""
-      add_mod_group modname
-    end
+    add_mod_groups "mod/*"
     <% end %>
     add_filter "/spec/"
     add_filter "/features/"

data/mod/admin/set/all/admin.rb

@@ -0,0 +1,16 @@
+
+basket[:tasks] = []
+
+# to add an admin task:
+#
+# basket[:tasks] << {
+#   name: NAME,
+#   irreversible: TRUE/FALSE,
+#   execute_policy: -> { TASK_CODE },
+#   stats: {
+#     title: TITLE_STRING,
+#     count: -> { COUNT_CODE },
+#     link_text: LINK_STRING,
+#     task:
+#   }
+# }

data/mod/admin/set/self/admin.rb

@@ -1,10 +1,6 @@
-# collect arrays of the form
-# [task symbol, { execute_policy: block, stats_policy: block }]
-basket :tasks
-
 def run_task_from_task_basket task
   task = task.to_sym
-  task_data = tasks.find { |h| h[:name].to_sym == task.to_sym }
+  task_data = basket[:tasks].find { |h| h[:name].to_sym == task.to_sym }
   if !irreversibles_tasks_allowed? && task_data[:irreversible]
     not_allowed task_data[:stats][:link_text]
   elsif task_data
@@ -47,7 +43,7 @@ format :html do
     stats = card_stats
     stats += cache_stats
     stats += memory_stats
-    card.tasks.each do |task|
+    basket[:tasks].each do |task|
       stats += Array.wrap task[:stats]
     end
     table_content = stats.map { |args| stat_row(args) }

data/mod/admin/set/self/admin_info.rb

@@ -1,12 +1,9 @@
-basket :warnings
-
+basket[:warnings] = [:no_email_delivery]
 # For each warning in the basket (eg :my_warning), the core view
 # will run a test by appending a question mark (eg #my_warning?).
 # If it fails it will generate a message by appending message
 # (eg #my_warning_message).
 
-add_to_basket :warnings, :no_email_delivery
-
 def no_email_delivery?
   Card.config.action_mailer.perform_deliveries == false
 end
@@ -17,7 +14,7 @@ end
 
 format :html do
   view :core do
-    warnings = card.warnings.map do |warning|
+    warnings = basket[:warnings].map do |warning|
       card.send("#{warning}?") ? send("#{warning}_message") : nil
     end
     warnings.compact!

data/mod/core/locales/en.yml

@@ -21,10 +21,9 @@ en:
   core_exception_almost_deleted: Narrowly averted deleting current file
   core_is_incomplete: is incomplete
   core_only_admins_codename: only admins can set codename
-  core_rename_and_update: "Rename and Update"
   core_renaming: "Renaming"
   core_rename: "Rename"
-  core_rename_confirm: "Are you sure you want to rename"
-  core_rename_reference_confirm:
-    This name is referred to at least %{count} time(s). You may choose to <em>update</em>
-    those references to use the new name."
+  core_rename_confirm: "Are you sure you want to rename?"
+
+  skip_update_referer_content:
+    do not update references to this name

data/mod/core/set/all/name_events.rb

@@ -77,7 +77,7 @@ event :update_lexicon, :finalize, changed: :name, on: :save do
 end
 
 event :cascade_name_changes, :finalize, on: :update, changed: :name do
-  each_descendant { |d| d.rename_as_descendant update_referers }
+  each_descendant { |d| d.rename_as_descendant !skip_update_referers? }
 end
 
 protected

data/mod/core/set/all/reference_events.rb

@@ -1,10 +1,5 @@
-# test for updating referer content
-event :prepare_referer_update, :validate, on: :update, changed: :name do
-  self.update_referers = ![nil, false, "false"].member?(update_referers)
-end
-
 # on rename, update names in cards that refer to self by name (as directed)
-event :update_referer_content, :finalize, on: :update, when: :update_referers do
+event :update_referer_content, :finalize, on: :update, changed: :name, skip: :allowed do
   referers.each do |card|
     next if card.structure
 
@@ -19,13 +14,13 @@ end
 # eg.  A links to X+Y.  if X+Y is renamed and we're not updating the link in A,
 # then we need to be sure that A has a partial reference
 event :update_referer_references_out, :finalize,
-      changed: :name, on: :update, when: :not_update_referers do
+      changed: :name, on: :update, when: :skip_update_referers? do
   referers.map(&:update_references_out)
 end
 
 # when name changes, update references to card
 event :refresh_references_in, :finalize, changed: :name, on: :save do
-  Reference.unmap_referees id if action == :update && !update_referers
+  Reference.unmap_referees id if action == :update && skip_update_referers?
   Reference.map_referees key, id
 end
 
@@ -51,8 +46,8 @@ end
 
 protected
 
-def not_update_referers
-  !update_referers
+def skip_update_referers?
+  skip_event? :update_referer_content
 end
 
 private

data/mod/core/set/all/trash.rb

@@ -1,5 +1,4 @@
-Self::Admin.add_to_basket(
-  :tasks,
+basket[:tasks] << {
   name: :empty_trash,
   irreversible: true,
   execute_policy: -> { Card.empty_trash },
@@ -9,7 +8,7 @@ Self::Admin.add_to_basket(
     link_text: "empty trash",
     task: "empty_trash"
   }
-)
+}
 
 module ClassMethods
   def empty_trash