card 1.101.2 → 1.102.0

data/lib/card/format/wrapper.rb

@@ -44,6 +44,14 @@ class Card
           raise ArgumentError, "unknown wrapper: #{wrapper}"
         end
       end
+
+      def send_wrapper_method method_name, opts
+        if method(method_name).arity.zero?
+          send method_name
+        else
+          send method_name, (opts || {})
+        end
+      end
     end
   end
-end
+end

data/lib/card/lexicon.rb

@@ -36,16 +36,17 @@ class Card
 
       def update card
         add card
-        cache.delete cache_key(card.old_lex)
+        cache.delete cache_key(card.lex_before_act)
       end
 
       # def delete card
       #   cache.delete card.id.to_s
-      #   cache.delete cache_key(card.old_lex)
+      #   cache.delete cache_key(card.lex_before_act)
       # end
 
       def lex_to_name lex
-        return lex unless lex&.is_a? Array
+        return lex unless lex.is_a? Array
+
         lex.map { |side_id| name side_id or return }.join(Card::Name.joint).to_name
       end
 
@@ -83,7 +84,7 @@ class Card
       end
 
       def cache_key lex
-        "L-" + (lex.is_a?(Array) ? lex.join("-") : lex.to_name.key)
+        "L-#{lex.is_a?(Array) ? lex.join('-') : lex.to_name.key}"
       end
     end
   end

data/lib/card/mailer.rb

@@ -4,20 +4,14 @@ require "open-uri"
 
 class Card
   class Mailer < ActionMailer::Base
-    @@defaults = Card.config.email_defaults || {}
-    @@defaults.symbolize_keys!
-    @@defaults[:return_path] ||= @@defaults[:from] if @@defaults[:from]
-    @@defaults[:charset] ||= "utf-8"
-    default @@defaults
-
     class << self
       def new_mail *args, &block
-        mail = Mail.new(args, &block)
-        method = Card::Mailer.delivery_method
-        mail.delivery_method(method, Card::Mailer.send(:"#{method}_settings"))
-        mail.perform_deliveries    = Card::Mailer.perform_deliveries
-        mail.raise_delivery_errors = Card::Mailer.raise_delivery_errors
-        mail
+        Mail.new(args, &block).tap do |mail|
+          method = Card::Mailer.delivery_method
+          mail.delivery_method(method, send(:"#{method}_settings"))
+          mail.perform_deliveries    = perform_deliveries
+          mail.raise_delivery_errors = raise_delivery_errors
+        end
       end
 
       def layout message
@@ -33,6 +27,15 @@ class Card
           </html>
         HTML
       end
+
+      def defaults_from_config
+        (Card.config.email_defaults || {}).symbolize_keys.tap do |defaults|
+          defaults[:return_path] ||= defaults[:from] if defaults[:from]
+          defaults[:charset] ||= "utf-8"
+        end
+      end
     end
+
+    default defaults_from_config
   end
 end

data/lib/card/mark.rb

@@ -23,16 +23,7 @@ class Card
     def id_or_name parts
       mark = parts.flatten
       mark = mark.first if mark.size <= 1
-      id_from_mark(mark) || name_from_mark(mark)
-    end
-
-    def id_from_mark mark
-      case mark
-      when Integer then mark
-      when Symbol  then Card::Codename.id! mark
-      when String  then id_from_string mark
-      when Card    then mark.id
-      end
+      id_from_mark(mark) || Card::Name[mark]
     end
 
     # translates string identifiers into an id:
@@ -48,20 +39,31 @@ class Card
       end
     end
 
-    def bad_mark mark
-      case mark
+    def name_from_id_from_string id, string
+      fetch_name(id) { bad_mark string }
+    end
+
+    private
+
+    def bad_mark string
+      case string
       when ID_MARK_RE
         raise Card::Error::NotFound, "id doesn't exist: #{Regexp.last_match[:id]}"
       when CODENAME_MARK_RE
         raise Card::Error::CodenameNotFound,
               "codename doesn't exist: #{Regexp.last_match[:codename]}"
       else
-        raise Card::Error, "invalid mark: #{mark}"
+        raise Card::Error, "invalid mark: #{string}"
       end
     end
 
-    def name_from_mark mark
-      Card::Name[mark]
+    def id_from_mark mark
+      case mark
+      when Integer then mark
+      when Symbol  then Card::Codename.id! mark
+      when String  then id_from_string mark
+      when Card    then mark.id
+      end
     end
   end
 end

data/lib/card/model/save_helper.rb

@@ -12,8 +12,8 @@ class Card
       include SaveHelperHelper
       include SaveArguments
 
-      def with_user user_name
-        Card::Auth.with(current_id: Card.fetch_id(user_name)) { yield }
+      def with_user user_name, &block
+        Card::Auth.with(current_id: Card.fetch_id(user_name), &block)
       end
 
       def create_card name_or_args, content_or_args=nil
@@ -121,7 +121,7 @@ class Card
 
       # TODO: this is too specific for this
       def add_script name, opts={}
-        name.sub!(/^script\:?\s?/, "") # in case name is given with prefix
+        name.sub!(/^script:?\s?/, "") # in case name is given with prefix
         # remove it so that we don't double it
 
         add_coderule_item name, "script",

data/lib/card/name.rb

@@ -41,8 +41,8 @@ class Card
 
         if !validated_parts && str.include?(joint)
           compose Cardname.split_parts(str)
-        elsif (id = Card.id_from_string(str))  # handles ~ and :
-          Card.fetch_name(id) { Card.bad_mark(str) }
+        elsif (id = Card.id_from_string str)  # handles ~[id] and :[codename]
+          Card.name_from_id_from_string id, str
         else
           super str
         end
@@ -50,17 +50,18 @@ class Card
 
       # interprets symbols/integers as codenames/ids
       def smart_compose parts
-        name_parts = parts.flatten.map { |part| self[part] }
-        new name_parts.join(joint), true
+        new_from_parts(parts) { |part| self[part] }
       end
 
       def compose parts
-        name_parts = parts.flatten.map { |part| new part }
-        new name_parts.join(joint), true
+        new_from_parts(parts) { |part| new part }
       end
 
-      def url_key_to_standard key
-        key.to_s.tr "_", " "
+      private
+
+      def new_from_parts parts, &block
+        name_parts = parts.flatten.map(&block)
+        new name_parts.join(joint), true
       end
     end
 
@@ -73,7 +74,7 @@ class Card
     end
 
     def code
-      Card::Codename[Card.fetch_id self]
+      Card::Codename[card_id]
     end
 
     def setting?

data/lib/card/name/all.rb

@@ -35,6 +35,10 @@ class Card
         end
       end
 
+      def lex
+        simple? ? name : [left_id, right_id]
+      end
+
       def autoname name
         if Card.exists?(name) || Director.include?(name)
           autoname name.next
@@ -49,6 +53,7 @@ class Card
 
       def update_subcard_names new_name, name_to_replace=nil
         return unless @subcards
+
         subcards.each do |subcard|
           update_subcard_name subcard, new_name, name_to_replace if subcard.new?
         end
@@ -56,6 +61,7 @@ class Card
 
       def key= newkey
         return if newkey == key
+
         update_cache_key key do
           write_attribute :key, (name.simple? ? newkey : nil)
           @key = newkey
@@ -64,6 +70,10 @@ class Card
         @key
       end
 
+      def field tag, opts={}
+        Card.fetch name.field(tag), opts
+      end
+
       private
 
       def assign_side_ids
@@ -92,6 +102,7 @@ class Card
 
       def clean_patterns
         return unless patterns?
+
         reset_patterns
         patterns
       end

data/lib/card/name/all/descendants.rb

@@ -18,16 +18,18 @@ class Card
           child_ids :left
         end
 
-        def each_child
-          child_ids.each do |id|
-            (child = Card[id]) && yield(child)
-            # check should not be needed (remove after fixing data problems)
-          end
+        def each_child &block
+          return unless id
+
+          Card.where(
+            "(left_id = #{id} or right_id = #{id}) and trash is false"
+          ).each(&block)
         end
 
         # eg, A+B is a child of A and B
         def child_ids side=nil
           return [] unless id
+
           side ||= name.simple? ? :part : :left_id
           Auth.as_bot do
             Card.search({ side => id, return: :id, limit: 0 }, "children of #{name}")

data/lib/card/name/card_class.rb

@@ -0,0 +1,28 @@
+class Card
+  class Name
+    # Name-related Card class methods
+    module CardClass
+      def rename! oldname, newname
+        Card[oldname].update! name: newname, update_referers: true
+      end
+
+      def uniquify_name name, rename=:new
+        return name unless Card.exists? name
+
+        uniq_name = generate_alternative_name name
+        return uniq_name unless rename == :old
+
+        rename!(name, uniq_name)
+        name
+      end
+
+      private
+
+      def generate_alternative_name name
+        uniq_name = "#{name} 1"
+        uniq_name.next! while Card.exists?(uniq_name)
+        uniq_name
+      end
+    end
+  end
+end

data/lib/card/name/fields_and_traits.rb

@@ -24,7 +24,8 @@ class Card
 
       # @return [True/False]
       def field_of? context
-        return false unless junction?
+        return false unless compound?
+
         if context.present?
           absolute_name(context).left_name.key == context.to_name.key
         else
@@ -53,7 +54,8 @@ class Card
 
       # @return [True/False]
       def trait_name? *traitlist
-        return false unless junction?
+        return false unless compound?
+
         right_key = right_name.key
         traitlist.any? do |codename|
           Card::Codename.name(codename)&.key == right_key

data/lib/card/name/name_variants.rb

@@ -22,7 +22,6 @@ class Card
         Card.fetch self, new: {}
       end
 
-      # @return [Integer] id of card with name
       def card_id
         Card.fetch_id self
       end

data/lib/card/query.rb

@@ -48,28 +48,28 @@ class Card
       # their values are translated fairly directly into SQL-safe values.
       # (These are referred to as "properties" in CQL documentation. Need to
       # reconcile #EFM)
-      basic:           %i[id name key type_id content left_id right_id
-                          creator_id updater_id codename read_rule_id],
+      basic: %i[id name key type_id content left_id right_id
+                creator_id updater_id codename read_rule_id],
       # "Relational" values can involve tying multiple queries together
-      relational:      %i[type
-                          part left right
-                          editor_of edited_by last_editor_of last_edited_by
-                          creator_of created_by
-                          updater_of updated_by
-                          link_to linked_to_by
-                          include included_by
-                          nest nested_by
+      relational: %i[type
+                     part left right
+                     editor_of edited_by last_editor_of last_edited_by
+                     creator_of created_by
+                     updater_of updated_by
+                     link_to linked_to_by
+                     include included_by
+                     nest nested_by
 
-                          refer_to referred_to_by
-                          member_of member
+                     refer_to referred_to_by
+                     member_of member
 
-                          found_by
-                          not sort match name_match complete],
+                     found_by
+                     not sort match name_match complete],
 
       plus_relational: %i[plus left_plus right_plus],
-      conjunction:     %i[and or all any],
-      ignore:          %i[prepend append vars],
-      deprecated:      %i[view params size]
+      conjunction: %i[and or all any],
+      ignore: %i[prepend append vars],
+      deprecated: %i[view params size]
     }.each_with_object({}) do |pair, h|
       pair[1].each { |v| h[v] = pair[0] }
     end

data/lib/card/query/act_query.rb

@@ -11,11 +11,11 @@ class Card
       end
 
       def action_on card
-        tie :action, { action_on: card }, to: :card_act_id
+        tie :action, { action_on: card }, { to: :card_act_id }
       end
 
       def update_action_on card
-        tie :action, { update_action_on: card }, to: :card_act_id
+        tie :action, { update_action_on: card }, { to: :card_act_id }
       end
 
       def act_by card

data/lib/card/query/action_query.rb

@@ -11,7 +11,7 @@ class Card
       end
 
       def action_by card
-        tie :act, { act_by: card }, from: :card_act_id
+        tie :act, { act_by: card }, { from: :card_act_id }
       end
 
       def update_action_by card

data/lib/card/query/card_query/conjunctions.rb

@@ -15,7 +15,7 @@ class Card
         alias_method :in, :any
 
         def not val
-          tie :card, val, { id: :id }, negate: true
+          tie :card, val, { id: :id }, { negate: true }
         end
 
         def current_conjunction

data/lib/card/query/card_query/interpretation.rb

@@ -53,6 +53,7 @@ class Card
 
         def no_method_for_attribute_type attribute, type
           return if type == :ignore
+
           if type == :deprecated
             deprecated_attribute attribute
           else

data/lib/card/query/card_query/match_attributes.rb

@@ -10,6 +10,7 @@ class Card
         # match term anywhere in name or content
         def match val
           return unless val.present?
+
           subconds = %i[name content].map do |field|
             Value.new([:match, val], self).to_sql field
           end
@@ -19,7 +20,7 @@ class Card
         # match names beginning with term
         def complete val
           val = val.to_name
-          if val.junction?
+          if val.compound?
             interpret left: val.left
             interpret right: { complete: val.right } if val.right.present?
           else