card 1.101.4 → 1.101.5

data/lib/card/format/nest/fetch.rb

@@ -43,12 +43,14 @@ class Card
         def new_supercard_args
           # special case.  gets absolutized incorrectly. fix in name?
           return {} if view_opts[:nest_name].strip.blank?
+
           { supercard: format.context_card }
         end
 
         def new_main_args
           nest_name = view_opts[:nest_name]
           return {} unless nest_name =~ /main/
+
           { name: nest_name.gsub(/^_main\+/, "+"),
             supercard: format.root.card }
         end

data/lib/card/format/nesting/mode.rb

@@ -41,7 +41,7 @@ class Card
         # @param view [Symbol]
         # @return [Symbol ] viewname
         def modal_nest_view view
-          # Note: the subformat always has the same nest_mode as its parent format
+          # NOTE: the subformat always has the same nest_mode as its parent format
           case nest_mode
           when :edit     then view_in_edit_mode(view)
           when :template then :template_nest

data/lib/card/format/nesting/subformat.rb

@@ -3,7 +3,7 @@ class Card
     module Nesting
       # Formats can have subformats. Lineage can be retraced through "parent" format.
       module Subformat
-        # note: while it is possible to have a subformat of a different class,
+        # NOTE: while it is possible to have a subformat of a different class,
         # the :format_class value takes precedence over :format.
         def subformat subcard, opts={}
           subcard = subformat_card subcard
@@ -56,6 +56,7 @@ class Card
 
         def subformat_card subcard
           return subcard if subcard.is_a? Card
+
           Card.fetch subcard, new: {}
         end
       end

data/lib/card/format/render.rb

@@ -65,8 +65,8 @@ class Card
       end
 
       def pretty_path source_location
-        source_location.first.gsub(%r{^.+mod\d+-([^/]+)}, '\1: ') + ":" +
-          source_location.second.to_s
+        "#{source_location.first.gsub(%r{^.+mod\d+-([^/]+)},
+                                      '\1: ')}:#{source_location.second}"
       end
 
       # :standard, :always, :never

data/lib/card/format/wrapper.rb

@@ -46,4 +46,4 @@ class Card
       end
     end
   end
-end
+end

data/lib/card/lexicon.rb

@@ -45,7 +45,8 @@ class Card
       # 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/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

@@ -53,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
@@ -60,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
@@ -100,6 +102,7 @@ class Card
 
       def clean_patterns
         return unless patterns?
+
         reset_patterns
         patterns
       end

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

@@ -18,19 +18,18 @@ class Card
           child_ids :left
         end
 
-        def each_child
+        def each_child &block
           return unless id
 
           Card.where(
             "(left_id = #{id} or right_id = #{id}) and trash is false"
-          ).each do |child|
-            yield child
-          end
+          ).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

@@ -8,8 +8,10 @@ class Card
 
       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

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

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

@@ -8,6 +8,7 @@ class Card
           clause.symbolize_keys!
           clause.each do |key, val|
             next if key.to_sym == :return
+
             # when return values are relative, they are relative to the name of the
             # card returned, not the context card
             clause[key] = normalize_value val

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

@@ -33,7 +33,7 @@ class Card
         # DEPRECATE?
 
         def member_of val
-          interpret right_plus: [Card::RolesID, refer_to: val]
+          interpret right_plus: [Card::RolesID, { refer_to: val }]
         end
 
         def member val

data/lib/card/query/join.rb

@@ -58,7 +58,7 @@ class Card
       private
 
       def inside_or?
-        from&.is_a?(Card::Query) && from.mods[:conj] == "or"
+        from.is_a?(Card::Query) && from.mods[:conj] == "or"
       end
 
       # the options :to and :from can be translated into the full table/alias/field trio.

data/lib/card/query/value/match_value.rb

@@ -21,6 +21,7 @@ class Card
 
         def exact_name_match field
           return false unless match_prefix == "=" && field.to_sym == :name
+
           "#{field_sql field} = #{quote match_term.to_name.key}"
         end
 

data/lib/card/reference/all.rb

@@ -58,12 +58,14 @@ class Card
           interpret_reference ref_hash, referee_name, ref_type
         end
         return if ref_hash.empty?
+
         Reference.mass_insert reference_values_array(ref_hash)
       end
 
       # delete references from this card
       def delete_references_out
         raise "id required to delete references" if id.nil?
+
         Reference.where(referer_id: id).delete_all
       end
 
@@ -71,9 +73,11 @@ class Card
 
       def with_normalized_referee referee_name
         return unless referee_name # eg commented nest has no referee_name
+
         referee_name = referee_name.to_name
         referee_key = referee_name.key
         return if referee_key == key # don't create self reference
+
         yield referee_name, referee_key, Lexicon.id(referee_name)
       end
 
@@ -103,10 +107,10 @@ class Card
         end
       end
 
-      def each_reference_type ref_types
+      def each_reference_type ref_types, &block
         ref_types.delete PARTIAL_REF_CODE if ref_types.size > 1
         # partial references are not necessary if there are explicit references
-        ref_types.each { |ref_type| yield ref_type }
+        ref_types.each(&block)
       end
 
       # invokes the given block for each reference in content with
@@ -122,6 +126,7 @@ class Card
       # but when A's name is changed we have to find and update that link.
       def interpret_partial_references ref_hash, referee_name
         return if referee_name.simple?
+
         [referee_name.left, referee_name.right].each do |sidename|
           interpret_reference ref_hash, sidename, PARTIAL_REF_CODE
         end