card 1.99.2 → 1.100.0

data/lib/card/set/trait.rb

@@ -55,17 +55,13 @@ class Card
 
       def define_trait_card trait, opts
         define_method "#{trait}_card" do
-          trait_var "@#{trait}_card" do
-            fetch trait.to_sym, new: opts.clone
-          end
+          fetch trait.to_sym, new: opts.clone, eager_cache: true
         end
       end
 
       def define_trait_reader trait
         define_method trait do
-          trait_var "@#{trait}" do
-            send("#{trait}_card").content
-          end
+          send("#{trait}_card").content
         end
       end
 

data/lib/card/subcards.rb

@@ -63,16 +63,19 @@ class Card
       @keys.send method, *args
     end
 
-    def each_card
-      # fetch all cards first to avoid side effects
-      # e.g. deleting a user adds follow rules and +*account to subcards
-      # for deleting but deleting follow rules can remove +*account from the
-      # cache if it belongs to the rule cards
-      cards = @keys.map do |key|
+    # fetch all cards first to avoid side effects
+    # e.g. deleting a user adds follow rules and +*account to subcards
+    # for deleting but deleting follow rules can remove +*account from the
+    # cache if it belongs to the rule cards
+    def cards
+      @keys.map do |key|
         fetch_subcard key
-      end
+      end.compact
+    end
+
+    def each_card
       cards.each do |card|
-        yield(card) if card
+        yield card
       end
     end
 

data/lib/card/subcards/add.rb

@@ -11,8 +11,7 @@ class Card
       #
       # @example Add a subcard that is added in the integration phase
       #     (and hence doesn't hold up the transaction for the main card)
-      #   add 'spoiler', content: 'John Snow is a Targaryen',
-      #                  transact_in_stage: :integrate
+      #   add 'spoiler', content: 'John Snow is a Targaryen'
       #   add card_obj, delayed: true
 
       def << value
@@ -30,7 +29,7 @@ class Card
 
       def add *args
         case args.first
-        when Card then new_by_card(*args)
+        when Card then new_by_card args.first
         when Hash then add_hash args.first
         else new_by_attributes(*args)
         end
@@ -50,14 +49,14 @@ class Card
       end
       alias_method :add_field, :add_child
 
-      def new_by_card card, opts={}
+      def new_by_card card
         card.supercard = @context_card
         if !card.name.simple? && card.name.field_of?(@context_card.name)
           card.superleft = @context_card
         end
         @keys << card.key
         Card.write_to_soft_cache card
-        card.director = @context_card.director.subdirectors.add(card, opts)
+        card.director = @context_card.director.subdirectors.add card
         card
       end
 
@@ -65,15 +64,14 @@ class Card
         attributes ||= {}
         absolute_name = absolutize_subcard_name name
         subcard_args = extract_subcard_args! attributes
-        t_i_s = attributes.delete(:transact_in_stage)
         card = initialize_by_attributes absolute_name, attributes
-        subcard = new_by_card card, transact_in_stage: t_i_s
+        subcard = new_by_card card
         card.subcards.add subcard_args
         subcard
       end
 
       def initialize_by_attributes name, attributes
-        Card.assign_or_initialize_by name, attributes, local_only: true
+        Card.assign_or_newish name, attributes, local_only: true
       end
 
       # TODO: this method already exists as card instance method in
@@ -105,12 +103,15 @@ class Card
       def multi_add args
         args.each_pair do |key, val|
           case val
-          when String then new_by_attributes key, content: val
+          when String, Array, Integer
+            new_by_attributes key, content: val
           when Card
             val.name = absolutize_subcard_name key
             new_by_card val
-          when nil then next
-          else new_by_attributes key, val
+          when nil
+            next
+          else
+            new_by_attributes key, val
           end
         end
       end

data/lib/card/subcards/remove.rb

@@ -23,7 +23,7 @@ class Card
 
       def clear_key key
         if (subcard = fetch_subcard key)
-          ActManager.deep_delete subcard.director
+          Director.deep_delete subcard.director
           subcard.current_action&.delete
         end
         Card.cache.soft.delete key

data/lib/card/view.rb

@@ -20,11 +20,11 @@ class Card
   #
   class View
     include Options
-    include ::Card::View::Cache
+    include View::Cache
     include Classy
     include Permission
 
-    extend ::Card::View::Cache::ClassMethods
+    extend View::Cache::ClassMethods
 
     attr_reader :format, :parent, :card
 

data/lib/card/view/cache.rb

@@ -214,8 +214,8 @@ class Card
       # Uses the primary cache API.
       def cache_fetch
         caching do
+          ensure_cache_key
           self.class.cache.fetch cache_key do
-            register_cache_key
             yield
           end
         end
@@ -240,8 +240,8 @@ class Card
       end
 
       # Registers the cached view for later clearing in the event of related card changes
-      def register_cache_key
-        card.register_view_cache_key cache_key
+      def ensure_cache_key
+        card.ensure_view_cache_key cache_key
       end
 
       def options_for_cache_key

data/lib/card/view/cache/cache_action.rb

@@ -112,11 +112,8 @@ class Card
         # altered view requests and altered cards are not cacheable
         # @return [True/False]
         def clean_enough_to_cache?
-          requested_view == ok_view && !card.unknown? && !card.db_content_changed?
-          # unknown views may be safe if we add type_id to the cache key for unknown
-          # (or all new?) cards.
-          #
-          #
+          #  requested_view == ok_view && !card.unknown? && !card.db_content_changed?
+          requested_view == ok_view && card.view_cache_clean?
         end
       end
     end

data/lib/card/view/cache/stub.rb

@@ -25,7 +25,7 @@ class Card
 
         # @return [Hash]
         def stub_hash
-          { cast: card.cast,
+          { cast: stub_cast,
             view_opts: normalized_options.merge(normalized_visibility_options),
             format_opts: { nest_mode: format.nest_mode,
                            override: root?,
@@ -37,6 +37,12 @@ class Card
           # been replaced with stubs - only to standard nest calls. The override value
           # is used to retain this distinction.
         end
+
+        def stub_cast
+          cast = card.cast
+          cast.delete :content if cast[:content].nil?
+          cast
+        end
       end
     end
   end

data/lib/card/view/classy.rb

@@ -97,6 +97,15 @@ class Card
 
       private
 
+      def ancestor_extra_classes klass, space
+        if parent
+          parent_space = space == :self ? :self_format : :ancestor_format
+          parent.deep_extra_classes(klass, parent_space)
+        else
+          next_format_ancestor&.deep_extra_classes(klass, :ancestor_format)
+        end
+      end
+
       def storage_voo scope
         # When we climb up the voo tree and cross a nest boundary then we can jump only
         # to the root voo of the parent format. Hence we have to add classes to the root
@@ -117,15 +126,6 @@ class Card
         [classes, class_list(:single_use).delete(klass)]
       end
 
-      def ancestor_extra_classes klass, space
-        if parent
-          parent_space = space == :self ? :self_format : :ancestor_format
-          parent.deep_extra_classes(klass, parent_space)
-        else
-          next_format_ancestor&.deep_extra_classes(klass, :ancestor_format)
-        end
-      end
-
       def ok_types space
         case space
         when :ancestor_format then [:public]

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

@@ -52,14 +52,6 @@ class Card
           normalized_options.merge(view: requested_view).slice(*Options.slot_keys)
         end
 
-        # def inherit key
-        #   if live_options.key? key
-        #     live_options[key]
-        #   elsif (ancestor = next_ancestor)
-        #     ancestor.inherit key
-        #   end
-        # end
-
         # ACCESSOR_HELPERS
         # methods that follow the normalize_#{key} pattern are called by accessors
         # (arguably that should be done during normalization!)

data/lib/cardio.rb

@@ -94,8 +94,8 @@ module Cardio
         rescue_all_in_controller: true,
         navbox_match_start_only: true,
 
-        reload_sets: false,
-        load_strategy: :eval
+        load_strategy: :eval,
+        cache_set_module_list: false
       }
     end
 

data/mod/account/set/abstract/account_field.rb

@@ -8,8 +8,10 @@ end
 
 # force inherit permission on create
 # (cannot be done with rule, because sets are not addressable)
-def applicable_permission_rule_id _direct_rule, action
-  return left_permission_rule_id action if action == :create
-
-  super
+def permission_rule_id action
+  if action == :create
+    left_permission_rule_id action
+  else
+    super
+  end
 end

data/mod/account/set/all/account.rb

@@ -1,6 +1,6 @@
 module ClassMethods
   def default_accounted_type_id
-    Card::UserID
+    UserID
   end
 end
 
@@ -14,8 +14,8 @@ end
 
 def among? ok_ids
   ok_ids.any? do |ok_id|
-    ok_id == Card::AnyoneID ||
-      (ok_id == Card::AnyoneWithRoleID && all_enabled_roles.size > 1) ||
+    ok_id == AnyoneID ||
+      (ok_id == AnyoneWithRoleID && all_enabled_roles.size > 1) ||
       parties.member?(ok_id)
   end
 end
@@ -30,12 +30,16 @@ def read_rules
   @read_rules ||= fetch_read_rules
 end
 
+def read_rules_hash
+  @read_rules_hash ||= read_rules.each_with_object({}) { |id, h| h[id] = true }
+end
+
 def fetch_read_rules
-  return [] if id == Card::WagnBotID # always_ok, so not needed
+  return [] if id == WagnBotID # always_ok, so not needed
 
-  ([Card::AnyoneID] + parties).each_with_object([]) do |party_id, rule_ids|
-    next unless self.class.read_rule_cache[party_id]
-    rule_ids.concat self.class.read_rule_cache[party_id]
+  ([AnyoneID] + parties).each_with_object([]) do |party_id, rule_ids|
+    next unless (cache = Card::Rule.read_rule_cache[party_id])
+    rule_ids.concat cache
   end
 end
 
@@ -51,11 +55,11 @@ ensure
 end
 
 def all_enabled_roles
-  @all_active_roles ||= (id == Card::AnonymousID ? [] : enabled_role_ids)
+  @all_active_roles ||= (id == AnonymousID ? [] : enabled_role_ids)
 end
 
 def all_roles
-  @all_roles ||= (id == Card::AnonymousID ? [] : fetch_roles)
+  @all_roles ||= (id == AnonymousID ? [] : fetch_roles)
 end
 
 def enabled_role_ids
@@ -63,13 +67,13 @@ def enabled_role_ids
     # workaround for broken migrations
     return fetch_roles unless Card::Codename.exists? :enabled_roles
 
-    role_trait = fetch(:enabled_roles, new: { type_id: Card::SessionID })
+    role_trait = fetch(:enabled_roles, eager_cache: true, new: { type_id: SessionID })
     role_trait.virtual? ? role_trait.item_ids : fetch_roles
   end
 end
 
 def fetch_roles
-  [Card::AnyoneSignedInID] + role_ids_from_roles_trait
+  [AnyoneSignedInID] + role_ids_from_roles_trait
 end
 
 def role_ids_from_roles_trait

data/mod/account/set/right/account.rb

@@ -36,7 +36,7 @@ end
 
 def send_account_email email_template
   ecard = Card[email_template]
-  unless ecard&.type_id == Card::EmailTemplateID
+  unless ecard&.type_id == EmailTemplateID
     raise Card::Error, "invalid email template: #{email_template}"
   end
 

data/mod/account/set/right/email.rb

@@ -9,7 +9,7 @@ end
 event :validate_unique_email, after: :validate_email, on: :save do
   if content.present?
     Auth.as_bot do
-      wql = { right_id: Card::EmailID, eq: content, return: :id }
+      wql = { right_id: EmailID, eq: content, return: :id }
       wql[:not] = { id: id } if id
       wql_comment = tr(:search_email_duplicate, content: content)
       if Card.search(wql, wql_comment).first

data/mod/account/set/self/signin.rb

@@ -23,7 +23,7 @@ end
 
 event :signout, :validate, on: :delete do
   Env.reset_session
-  Auth.signin Card::AnonymousID
+  Auth.signin AnonymousID
   abort :success
 end
 

data/mod/account/set/type/signup.rb

@@ -31,7 +31,8 @@ event :approve_without_verification, :validate, on: :update, trigger: :required
 end
 
 event :act_as_current_for_integrate_stage, :integrate, on: :create do
-  Auth.signin id
+  # needs justification!
+  Auth.current_id = id
 end
 
 def account_subfield

data/mod/account/set/type/signup/views.rb

@@ -39,7 +39,7 @@ format :html do
   end
 
   def self_signup?
-    card.creator_id == Card::AnonymousID
+    card.creator_id == AnonymousID
   end
 
   def account_lines

data/mod/account/spec/set/right/account_spec.rb

@@ -65,7 +65,7 @@ RSpec.describe Card::Set::Right::Account do
 
     it "contains deck title" do
       body = @mail.parts[0].body.raw_source
-      expect(body).to match(Card.global_setting(:title))
+      expect(body).to match(Card::Rule.global_setting(:title))
     end
 
     it "contains link to verify account" do
@@ -111,7 +111,7 @@ RSpec.describe Card::Set::Right::Account do
 
     it "contains deck title" do
       body = @mail.parts[0].body.raw_source
-      expect(body).to match(Card.global_setting(:title))
+      expect(body).to match(Card::Rule.global_setting(:title))
     end
 
     it "contains password reset link" do

data/mod/account/spec/set/type/signup_spec.rb

@@ -64,7 +64,7 @@ RSpec.describe Card::Set::Type::Signup do
     it "sends email with an appropriate link" do
       @mail = ActionMailer::Base.deliveries.last
       body = @mail.parts[0].body.raw_source
-      expect(body).to match(Card.global_setting(:title))
+      expect(body).to match(Card::Rule.global_setting(:title))
     end
 
     it "notifies someone" do

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

@@ -119,7 +119,7 @@ format :html do
   end
 
   def machine_cache_count
-    Card::Virtual.where(right_id: Card::MachineCacheID).count
+    Card::Virtual.where(right_id: MachineCacheID).count
   end
 
   def delete_sessions_link months

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

@@ -1,36 +1,38 @@
+basket :warnings
+
+# 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
+
 def clean_html?
   false
 end
 
 format :html do
   view :core do
-    warnings = []
-    warnings << email_warning if Card.config.action_mailer.perform_deliveries == false
-    if Card.config.recaptcha_site_key ==
-       Card::Auth::Permissions::RECAPTCHA_DEFAULTS[:recaptcha_site_key] &&
-       card.rule(:captcha) == "1"
-      warnings << recaptcha_warning
-    end
-    return "" if warnings.empty?
-
-    alert :warning, true do
-      warning_list warnings
+    warnings = card.warnings.map do |warning|
+      card.send("#{warning}?") ? send("#{warning}_message") : nil
     end
+    warnings.compact!
+    warnings.empty? ? "" : warning_alert(warnings)
   end
 
-  def warning_list warnings
-    # 'ADMINISTRATOR WARNING'
+  def warning_alert warnings
     admin_warn = I18n.t(:admin_warn, scope: "mod.admin.set.self.admin_info")
-    "<h5>#{admin_warn}</h5>" + list_tag(warnings)
-  end
-
-  def warning_list_with_auto_scope warnings
     # 'ADMINISTRATOR WARNING'
-    admin_warn = tr(:admin_warn)
-    "<h5>#{admin_warn}</h5>" + warnings.join("\n")
+    alert :warning, true do
+      "<h5>#{admin_warn}</h5>" + list_tag(warnings)
+    end
   end
 
-  def email_warning
+  def no_email_delivery_message
     # "Email delivery is turned off."
     # "Change settings in config/application.rb to send sign up notifications."
     I18n.t(:email_off,
@@ -38,29 +40,9 @@ format :html do
            path: "config/application.rb")
   end
 
-  def recaptcha_warning
-    warning =
-      if Card::Env.localhost?
-        # %(Your captcha is currently working with temporary settings.
-        #   This is fine for a local installation, but you will need new
-        #   recaptcha keys if you want to make this site public.)
-        I18n.t(:captcha_temp, scope: "mod.admin.set.self.admin_info",
-                              recaptcha_link: add_recaptcha_keys_link)
-      else
-        # %(You are configured to use [[*captcha]], but for that to work
-        #   you need new recaptcha keys.)
-        I18n.t(:captcha_keys, scope: "mod.admin.set.self.admin_info",
-                              recaptcha_link: add_recaptcha_keys_link,
-                              captcha_link: link_to_card(:captcha))
-      end
-    <<-HTML
-      <p>#{warning}</p>
-    HTML
-  end
-
-  def add_recaptcha_keys_link
-    nest :recaptcha_settings,
-         view: :edit_link, title: I18n.t(:recaptcha_keys,
-                                         scope: "mod.admin.set.self.admin_info")
+  def warning_list_with_auto_scope warnings
+    # 'ADMINISTRATOR WARNING'
+    admin_warn = tr(:admin_warn)
+    "<h5>#{admin_warn}</h5>" + warnings.join("\n")
   end
 end