card 1.99.1 → 1.99.2

data/mod/core/format/html_format.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 
-require_dependency "card/content/diff"
+# # require "card/content/diff"
 
 class Card
   class Format

data/mod/core/set/abstract/code_file.rb

@@ -9,17 +9,17 @@ end
 # @return [Array<String>, String] the name of file(s) to be loaded
 def source_files
   case type_id
-  when CoffeeScriptID then "#{codename}.js.coffee"
-  when JavaScriptID   then "#{codename}.js"
-  when CssID          then "#{codename}.css"
-  when ScssID         then "#{codename}.scss"
+  when Card::CoffeeScriptID then "#{codename}.js.coffee"
+  when Card::JavaScriptID   then "#{codename}.js"
+  when Card::CssID          then "#{codename}.css"
+  when Card::ScssID         then "#{codename}.scss"
   end
 end
 
 def source_dir
   case type_id
-  when CoffeeScriptID, JavaScriptID then "lib/javascript"
-  when CssID, ScssID then "lib/stylesheets"
+  when Card::CoffeeScriptID, Card::JavaScriptID then "lib/javascript"
+  when Card::CssID, Card::ScssID then "lib/stylesheets"
   else
     "lib"
   end

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

@@ -40,7 +40,7 @@ format do
   end
 
   view :label do
-    card.label
+    card.label.to_s
   end
 
   view :smart_label, cache: :never, unknown: true do

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

@@ -24,8 +24,7 @@ end
 
 def on_condition_applies? _event, actions
   actions = Array(actions).compact
-  return true if actions.empty?
-  actions.include? @action
+  actions.empty? ? true : actions.include?(@action)
 end
 
 # if changing name/type, the old card has no-longer-applicable set modules, so we create

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

@@ -106,7 +106,7 @@ module ClassMethods
   # @param mark - see #fetch
   # @return [Integer]
   def fetch_type_id *mark
-    (card = quick_fetch(mark)) && card.type_id
+    quick_fetch(mark)&.type_id
   end
 end
 
@@ -114,33 +114,37 @@ end
 # INSTANCE METHODS
 # fetching from the context of a card
 
-def fetch opts={}
-  traits = opts.delete(:trait)
-  return unless traits
-  # should this fail as an incorrect api call?
-  traits = Array.wrap traits
-  traits.inject(self) do |card, trait|
+def fetch traits, opts={}
+  opts[:new][:supercard] = self if opts[:new]
+  Array.wrap(traits).inject(self) do |card, trait|
     Card.fetch card.name.trait(trait), opts
   end
 end
 
-def renew args={}
-  opts = args[:new].clone
+def renew mark, new_opts
+  return self if new_opts.blank?
+  opts = new_opts.clone.merge name: mark
+  copy = dup
   handle_default_content opts
-  opts[:name] ||= name
-  opts[:skip_modules] = args[:skip_modules]
-  Card.new opts
+  copy.newish opts
+  copy
 end
 
-def handle_default_content opts
-  if (default_content = opts.delete(:default_content)) && db_content.blank?
-    opts[:content] ||= default_content
-  elsif db_content.present? && !opts[:content]
-    # don't overwrite existing content
-    opts[:content] = db_content
+def newish opts
+  Card.with_normalized_new_args opts do |norm_opts|
+    handle_type norm_opts do
+      assign_attributes norm_opts
+      self.name = name # trigger superize_name
+    end
   end
 end
 
+def handle_default_content opts
+  return unless (default_content = opts.delete(:default_content)) && db_content.blank?
+
+  opts[:content] ||= default_content
+end
+
 def refresh force=false
   return self unless force || frozen? || readonly?
   return unless id
@@ -148,4 +152,3 @@ def refresh force=false
   fresh_card.include_set_modules
   fresh_card
 end
-

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

@@ -119,14 +119,16 @@ module ClassMethods
   end
 
   def new_card_fetch_results card, mark, opts
-    case
-      when opts[:new].present? then return card.renew(opts)
-      when opts[:new] # noop for empty hash
-      when opts[:skip_virtual] then return nil
+    if (new_opts = opts[:new])
+      card = card.renew mark, new_opts
+    elsif opts[:skip_virtual]
+      return nil
     end
     card.assign_name_from_fetched_mark! mark, opts
     finalize_fetch_results card, opts
-    card if opts[:new] || card.known?
+    # must include_set_modules before checking `card.known?`,
+    # in case, eg, set modules override #virtual?
+    card if new_opts || card.known?
   end
 
   def finalize_fetch_results card, opts

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

@@ -2,36 +2,62 @@ JUNK_INIT_ARGS = %w[missing skip_virtual id].freeze
 
 module ClassMethods
   def new args={}, _options={}
+    with_normalized_new_args args do |normalized_args|
+      super normalized_args
+    end
+  end
+
+  def with_normalized_new_args args={}
     args = (args || {}).stringify_keys
+    delete_junk_args args
+    normalize_type_args args
+    normalize_content_args args
+    yield args
+  end
+
+  private
+
+  def delete_junk_args args
     JUNK_INIT_ARGS.each { |a| args.delete(a) }
+  end
+
+  def normalize_type_args args
     %w[type type_code].each { |k| args.delete(k) if args[k].blank? }
+  end
+
+  def normalize_content_args args
     args.delete("content") if args["attach"] # should not be handled here!
-    super args
+    args["db_content"] = args.delete "content" if args["content"]
   end
 end
 
 def initialize args={}
   args["name"] = initial_name args["name"]
-  args["db_content"] = args.delete "content" if args["content"]
-  @supercard = args.delete "supercard" # must come before name=
 
-  handle_skip_args args do
-    super args # ActiveRecord #initialize
+  handle_set_modules args do
+    handle_type args do
+      super args # ActiveRecord #initialize
+    end
   end
   self
 end
 
-def handle_skip_args args
+def handle_set_modules args
   skip_modules = args.delete "skip_modules"
+  yield
+  include_set_modules unless skip_modules
+end
+
+def handle_type args
   skip_type_lookup = args["skip_type_lookup"]
+  @supercard = args.delete "supercard"
+
   yield
   self.type_id = get_type_id_from_structure if !type_id && !skip_type_lookup
-  include_set_modules unless skip_modules
 end
 
 def initial_name name
-  return name if name.is_a? String
-  Card::Name[name].to_s
+  name.is_a?(String) ? name : Card::Name[name].to_s
 end
 
 def include_set_modules

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

@@ -20,29 +20,39 @@ def item_count args={}
   item_names(args).size
 end
 
+def items_to_content array
+  items = array.map { |i| standardize_item i }.reject(&:blank?)
+  self.content = items.to_pointer_content
+end
+
+def standardize_item item
+  Card::Name[item]
+end
+
 def include_item? item
-  key = item.is_a?(Card) ? item.name.key : item.to_name.key
-  item_names.map { |name| name.to_name.key }.member? key
+  item_names.include? Card::Name[item]
 end
 
 def add_item item
   return if include_item? item
-  self.content = "#{content}\n#{item}"
+  items_to_content(items_strings << item)
 end
 
 def drop_item item
+  item = Card::Name[item]
   return unless include_item? item
-  new_names = item_names.reject { |i| i == item }
-  self.content = new_names.empty? ? "" : new_names.join("\n")
+  items_to_content(item_names.reject { |i| i == item })
 end
 
 def insert_item index, name
   new_names = item_names
   new_names.delete name
   new_names.insert index, name
-  self.content = new_names.join "\n"
+  items_to_content new_names
 end
 
+# I think the following should work as add_item...
+#
 def add_id id
   add_item "~#{id}"
 end

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

@@ -55,21 +55,25 @@ end
 def update_subcard_names new_name, name_to_replace=nil
   return unless @subcards
   subcards.each do |subcard|
-    # if subcard has a relative name like +C
-    # and self is a subcard as well that changed from +B to A+B then
-    # +C should change to A+B+C. #replace doesn't work in this case
-    # because the old name +B is not a part of +C
-    name_to_replace ||=
-      if subcard.name.junction? &&
-         subcard.name.parts.first.empty? &&
-         new_name.parts.first.present?
-        # replace the empty part
-        "".to_name
-      else
-        name
-      end
-    subcard.name = subcard.name.swap name_to_replace, new_name.s
-    subcard.update_subcard_names new_name, name
+    update_subcard_name subcard, new_name, name_to_replace if subcard.new?
+  end
+end
+
+def update_subcard_name subcard, new_name, name_to_replace
+  name_to_replace ||= name_to_replace_for_subcard subcard, new_name
+  subcard.name = subcard.name.swap name_to_replace, new_name.s
+  subcard.update_subcard_names new_name, name # needed?  shouldn't #name= trigger this?
+end
+
+def name_to_replace_for_subcard subcard, new_name
+  # if subcard has a relative name like +C
+  # and self is a subcard as well that changed from +B to A+B then
+  # +C should change to A+B+C. #replace doesn't work in this case
+  # because the old name +B is not a part of +C
+  if subcard.name.starts_with_joint? && new_name.parts.first.present?
+    "".to_name
+  else
+    name
   end
 end
 

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

@@ -53,3 +53,7 @@ end
 def rule_set_keys
   @rule_set_keys ||= patterns.map(&:rule_set_key).compact
 end
+
+def include_module? set
+  singleton_class&.include? set
+end

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

@@ -29,8 +29,9 @@ def ok? action
 end
 
 def ok_with_fetch? action, opts={}
-  card = opts[:trait].nil? ? self : fetch(opts)
-  card && card.ok_without_fetch?(action)
+  trait = opts.delete :trait
+  card = trait.nil? ? self : fetch(trait, opts)
+  card&.ok_without_fetch? action
 end
 
 # note: method is chained so that we can return the instance variable @action_ok
@@ -179,20 +180,21 @@ event :set_field_read_rules,
   # (because of *type plus right)
   # skip if name is updated because will already be resaved
 
-  Auth.as_bot do
-    fields.each do |field|
-      field.refresh.update_read_rule
-    end
+  each_field_as_bot do |field|
+    field.refresh.update_read_rule
   end
 end
 
-# currently doing a brute force search for every card that may be impacted.
-# may want to optimize(?)
 def update_field_read_rules
+  return unless type_id_changed? || read_rule_id_changed?
+  each_field_as_bot do |field|
+    field.update_read_rule if field.rule(:read) == "_left"
+  end
+end
+
+def each_field_as_bot
   Auth.as_bot do
-    fields.each do |field|
-      field.update_read_rule if field.rule(:read) == "_left"
-    end
+    fields.each { |field| yield field }
   end
 end
 

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

@@ -15,6 +15,7 @@ def suspend_name name
 end
 
 event :validate_renaming, :validate, on: :update, changed: :name, skip: :allowed do
+  return if name_before_act&.to_name == name # just changing to new variant
   errors.add :content, tr(:cannot_change_content) if db_content_is_changing?
   errors.add :type, tr(:cannot_change_type) if type_id_is_changing?
 end

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

@@ -106,7 +106,7 @@ end
 def preference_card_id_lookups setting_code, options={}
   user_id = options[:user_id] || options[:user]&.id || Auth.current_id
   return unless user_id
-  ["#{setting_code}+#{AllID}", "#{setting_code}+#{user_id}"]
+  ["#{setting_code}+#{Card::AllID}", "#{setting_code}+#{user_id}"]
 end
 
 def related_sets with_self=false
@@ -190,8 +190,8 @@ module ClassMethods
         "#{set_class_code}+#{setting_code}"
       end
     user_ids = user_ids_cache[key] || []
-    if user_ids.include? AllID  # rule for all -> return all user ids
-      Card.where(type_id: UserID).pluck(:id)
+    if user_ids.include? Card::AllID  # rule for all -> return all user ids
+      Card.where(type_id: Card::UserID).pluck(:id)
     else
       user_ids
     end
@@ -201,7 +201,7 @@ module ClassMethods
     Card.search(
       { right: { codename: setting_code },
         left: {
-          left: { type_id: SetID }, right: user_name
+          left: { type_id: Card::SetID }, right: user_name
         },
         return: :name }, "preference cards for user: #{user_name}"
     )

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

@@ -70,8 +70,18 @@ def clear_subcards
   subcards.clear
 end
 
+# ensures subfield is present
+# does NOT override subfield content if already present
+def ensure_subfield field_name, args={}
+  if subfield_present? field_name
+    subfield field_name
+  else
+    add_subfield field_name, args
+  end
+end
+
 def subfield_present? field_name
-  (field_card = subfield(field_name)) && field_card.content.present?
+  subfield(field_name)&.content&.present?
 end
 
 def deep_clear_subcards
@@ -99,3 +109,28 @@ event :reject_empty_subcards, :prepare_to_validate do
     director.subdirectors.delete(subcard)
   end
 end
+
+# check when deleting field that left has not also been deleted
+def trashed_left?
+  l = left
+  !l || l.trash
+end
+
+# check when renaming field that it is not actually the same field
+# (eg on a renamed trunk)
+def same_field?
+  same_field_trunk? && same_field_tag?
+end
+
+private
+
+# left is same card (even if renamed)
+def same_field_trunk?
+  l = superleft || Card[left_id]
+  lkey = name.left_name&.key
+  lkey.present? && l&.name&.key == lkey
+end
+
+def same_field_tag?
+  name.right_name.key == name_before_act.to_name.right_name.key
+end

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

@@ -1,7 +1,7 @@
 
 module ClassMethods
   def default_type_id
-    @@default_type_id ||= Card[:all].fetch(trait: :default, skip_modules: true).type_id
+    @@default_type_id ||= Card[:all].fetch(:default, skip_modules: true).type_id
   end
 end