card 1.99.1 → 1.99.2

data/mod/machines/set/abstract/machine/output_cache.rb

@@ -1,5 +1,5 @@
 def fetch_cache_card input_card, new=nil
-  new &&= { type_id: PlainTextID }
+  new &&= { type_id: Card::PlainTextID }
   Card.fetch input_card.name, name, :machine_cache, new: new
 end
 

data/mod/machines/set/abstract/machine/output_update.rb

@@ -19,7 +19,7 @@ def update_machine_output
 end
 
 def ensure_machine_output
-  output = fetch trait: :machine_output
+  output = fetch :machine_output
   return if output&.selected_content_action_id
   update_machine_output
 end

data/mod/machines/set/all/reset_machines.rb

@@ -5,7 +5,7 @@ module ClassMethods
       if card
         card.update_columns trash: true
         card.expire
-        Card::Virtual.where(right_id: MachineCacheID).delete_all
+        Card::Virtual.where(right_id: Card::MachineCacheID).delete_all
       end
     end
   end
@@ -16,7 +16,7 @@ module ClassMethods
         card.update_columns trash: true
         card.expire
       end
-      Card::Virtual.where(right_id: MachineCacheID).delete_all
+      Card::Virtual.where(right_id: Card::MachineCacheID).delete_all
     end
   end
 end

data/mod/machines/set/self/script_decko.rb

@@ -4,6 +4,7 @@ def source_files
   %w[mod editor name_editor autosave doubleclick layout navbox upload
      slot modal overlay recaptcha slotter bridge
      nest_editor nest_editor_rules nest_editor_options nest_editor_name
+     link_editor
      components decko follow card_menu slot_ready
      filter filter_links filter_items].map do |n|
     "decko/#{n}.js.coffee"

data/mod/media/set/abstract/media.rb

@@ -1,6 +1,6 @@
 format :html do
   def image_card
-    @image_card ||= card.fetch(trait: :image, new: {})
+    @image_card ||= card.fetch(:image, new: {})
   end
 
   def text_with_image opts={}

data/mod/media/set/type/image.rb

@@ -33,6 +33,6 @@ format :html do
   end
 
   def image_box_title
-    image_box_card_name
+    voo.title || image_box_card_name
   end
 end

data/mod/navbar/set/abstract/account_dropdown.rb

@@ -8,11 +8,15 @@ format :html do
     split_button link_to_mycard, nil do
       [
         link_to_card([Auth.current, :account_settings], "Account"),
-        (["Roles", role_items(&render_role_item)] unless Auth.no_special_roles?)
+        (["Roles", role_items(&render_role_item)] if special_roles?)
       ]
     end
   end
 
+  def special_roles?
+    Auth.current_roles.size > 1
+  end
+
   def role_items
     Auth.current_roles.map do |role_name|
       yield role_name

data/mod/navbar/set/right/enabled_roles.rb

@@ -43,7 +43,7 @@ format :html do
   end
 
   def hidden_form_tags _action, opts
-    "#{super} #{hidden_tags card: { type_id: SessionID }}"
+    "#{super} #{hidden_tags card: { type_id: Card::SessionID }}"
   end
 
   def checkbox_input

data/mod/navbar/set/self/account_links.rb

@@ -67,7 +67,7 @@ format :html do
   end
 
   def enabled_roles_card
-    Auth.current.fetch trait: :enabled_roles, new: { type_id: SessionID }
+    Auth.current.fetch :enabled_roles, new: { type_id: Card::SessionID }
   end
 
   def role_list

data/mod/pointer/set/abstract/02_pointer.rb

@@ -5,5 +5,5 @@ def diff_args
 end
 
 def count
-  all_raw_item_strings.size
+  item_strings.size
 end

data/mod/pointer/set/abstract/02_pointer/events.rb

@@ -22,29 +22,49 @@ end
 # it' still pointer content.  The "when" clause helps with that (but is a hack)
 event :standardize_items, :prepare_to_validate,
       on: :save, changed: :content, when: :still_pointer? do
-  self.content = item_names(context: :raw).map do |name|
-    "[[#{name}]]"
-  end.join "\n"
+  items_to_content item_strings
 end
 
 def still_pointer?
   type_id == Card::PointerID
 end
 
-stage_method :changed_item_names do
+def changed_item_names
   dropped_item_names + added_item_names
 end
 
-stage_method :dropped_item_names do
-  old_items = item_names content: db_content_before_act
+def dropped_item_names
+  return item_names if trash
+  return [] unless (old_content = db_content_before_act)
+
+  old_items = item_names content: old_content
   old_items - item_names
 end
 
-stage_method :added_item_names do
-  old_items = item_names content: db_content_before_act
+def added_item_names
+  return [] if trash
+  return item_names unless (old_content = db_content_before_act)
+
+  old_items = item_names content: old_content
   item_names - old_items
 end
 
-stage_method :changed_item_cards do
-  item_cards content: changed_item_names
+# TODO: refactor. many of the above could be written more elegantly with improved
+# handling of :content in item_names. If content is nil here, we would expect an
+# empty set of cards, but in fact we get items based on self.content.
+
+def changed_item_cards
+  dropped_item_cards + added_item_cards
+end
+
+def dropped_item_cards
+  return [] unless db_content_before_act
+
+  all_item_cards item_names: dropped_item_names
+end
+
+def added_item_cards
+  return item_cards unless db_content_before_act
+
+  all_item_cards item_names: added_item_names
 end

data/mod/pointer/set/abstract/02_pointer/html_views.rb

@@ -98,14 +98,18 @@ format :html do
                        slot_selector: filtered_list_slot_class,
                        item_selector: "_filtered-list-item",
                        slot: { hide: [:modal_footer] },
-                       filter: { not_ids: card.item_ids.map(&:to_s).join(",") } }
+                       filter: { not_ids: not_ids_value } }
+  end
+
+  def not_ids_value
+    card.item_ids.map(&:to_s).join(",")
   end
 
   def add_item_overlay_link; end
 
   def one_line_content
     if count == 1
-      card.item_names.first
+      card.first_name
     else
       short_content
     end

data/mod/pointer/set/abstract/02_pointer/html_views/autocomplete_input.haml

@@ -1,3 +1,3 @@
 .pointer-list-editor.pointer-list-ul
   = text_field_tag 'pointer_item', item, class: "pointer-item-text form-control",
-                                         "data-options-card": @options_card
+                                         "data-options-card": options_card

data/mod/pointer/set/abstract/02_pointer/html_views/filter.rb

@@ -48,7 +48,7 @@ format :html do
     fcard = card.options_rule_card || Card[:all]
     return fcard if fcard.respond_to? :wql_hash
 
-    fcard.fetch trait: :referred_to_by, new: {}
+    fcard.fetch :referred_to_by, new: {}
   end
 
   def filter_card_from_params

data/mod/pointer/set/abstract/02_pointer/item_api.rb

@@ -13,11 +13,24 @@
 # @option args [String, Integer] :limit max number of cards to return
 # @option args [String, Integer] :offset begin after the offset-th item
 def item_names args={}
-  raw_item_strings(args[:content], args[:limit], args[:offset]).map do |item|
-    clean_item_name item, args[:context]
+  context = args[:context]
+  item_strings(args).map do |item|
+    clean_item_name item, context
   end.compact
 end
 
+def first_name args={}
+  item_names(args).first
+end
+
+def first_card args={}
+  fetch_item_card first_name, args
+end
+
+def first_code
+  first_card&.codename
+end
+
 # @return [Array] list of integers (card ids of items)
 # @param args [Hash] see #item_names
 def item_ids args={}
@@ -47,23 +60,24 @@ end
 # set card content based on array and save card
 # @param array [Array] list of strings/names (Cardish)
 def items= array
-  self.content = ""
-  array.each { |i| self << i }
+  items_to_content array
   save!
 end
 
 # append item to list (does not save)
 # @param item [Cardish]
-def << item
-  add_item Card::Name[item]
+def << cardish
+  add_item cardish
 end
 
 # append item to list (does not save)
-# @param name [String, Card::Name] item name
+# @param cardish [String, Card::Name] item name
 # @param allow_duplicates [True/False] permit duplicate items (default is False)
-def add_item name, allow_duplicates=false
-  return if !allow_duplicates && include_item?(name)
-  self.content = "[[#{(item_names << name).reject(&:blank?) * "]]\n[["}]]"
+def add_item cardish, allow_duplicates=false
+  return if !allow_duplicates && include_item?(cardish)
+
+  items = item_strings << cardish
+  items_to_content items
 end
 
 # append item to list and save card
@@ -74,11 +88,9 @@ end
 
 # remove item from list
 # @param name [String, Card::Name] item name
-def drop_item name
-  return unless include_item? name
-  key = name.to_name.key
-  new_names = item_names.reject { |n| n.to_name.key == key }
-  self.content = new_names.empty? ? "" : "[[#{new_names * "]]\n[["}]]"
+def drop_item cardish
+  drop_item_name = Card::Name[cardish]
+  items_to_content(item_names.reject { |item_name| item_name == drop_item_name })
 end
 
 # remove item from list and save card
@@ -95,7 +107,7 @@ def insert_item index, name
   new_names = item_names
   new_names.delete name
   new_names.insert index, name
-  self.content = new_names.map { |new_name| "[[#{new_name}]]" }.join "\n"
+  items_to_content new_names
 end
 
 # insert item into list at specified location and save
@@ -121,14 +133,8 @@ def known_item_cards args={}
 end
 
 def all_item_cards args={}
-  item_names(args).map do |name|
-    Card.fetch name, new: new_unknown_item_args(args)
-  end
-end
-
-def new_unknown_item_args args
-  itype = args[:type] || item_type
-  itype ? { type: itype } : {}
+  names = args[:item_names] || item_names(args)
+  names.map { |name| fetch_item_card name, args }
 end
 
 # TODO: support type_code and type_id. (currently type)
@@ -140,24 +146,38 @@ def item_type
   opt.item_type
 end
 
-# #item_names helpers
+def item_strings args={}
+  items = raw_item_strings(args[:content] || content)
+  return items unless args.present?
+
+  filtered_items items, args.slice(:limit, :offset)
+end
+
+def raw_item_strings content
+  content.to_s.split(/\n+/).map { |i| strip_item i }
+end
+
+private
 
-def raw_item_strings content, limit, offset
-  items = all_raw_item_strings content
+def filtered_items items, limit: 0, offset: 0
   limit = limit.to_i
   offset = offset.to_i
   return items unless limit.positive? || offset.positive?
+
   items[offset, (limit.zero? ? items.size : limit)] || []
 end
 
-def all_raw_item_strings content=nil
-  (content || self.content).to_s.split(/\n+/)
+def fetch_item_card name, args={}
+  Card.fetch name, new: new_unknown_item_args(args)
 end
 
-private
+def new_unknown_item_args args
+  itype = args[:type] || item_type
+  itype ? { type: itype } : {}
+end
 
 def clean_item_name item, context
-  item = strip_item(item).to_name
+  item = item.to_name
   return item if context == :raw
   context ||= context_card.name
   item.absolute_name context

data/mod/pointer/set/abstract/id_pointer.rb

@@ -0,0 +1,21 @@
+# store items as ids, not names
+
+def standardize_item cardish
+  if (id = Card.fetch_id cardish)
+    "~#{id}"
+  else
+    Rails.logger.info "no id for '#{cardish}' added to id pointer"
+    nil
+  end
+end
+
+def item_ids args={}
+  item_strings(args).map do |item|
+    item = standardize_item item unless item.match?(/^~/)
+    item.to_s.tr("~", "").to_i
+  end.compact
+end
+
+def item_names args={}
+  item_ids(args).map(&:cardname).compact
+end

data/mod/pointer/set/type/link_list.rb

@@ -1,6 +1,6 @@
 include_set Abstract::Pointer
 
-def all_raw_item_strings content=nil
+def raw_item_strings content
   reference_chunks(content).map(&:referee_name)
 end
 

data/mod/pointer/set/type/mirror_list.rb

@@ -1,7 +1,7 @@
 include_set Abstract::Pointer
 
 event :validate_listed_by_name, :validate, on: :save, changing: :name do
-  if !junction? || !right || right.type_id != CardtypeID
+  if !junction? || !right || right.type_id != Card::CardtypeID
     errors.add :name, tr(:cardtype_right)
   end
 end

data/mod/pointer/set/type/mirrored_list.rb

@@ -1,7 +1,7 @@
 include_set Abstract::Pointer
 
 event :validate_list_name, :validate, on: :save, changed: :name do
-  errors.add :name, tr(:cardtype_right) unless right&.type_id == CardtypeID
+  errors.add :name, tr(:cardtype_right) unless right&.type_id == Card::CardtypeID
 end
 
 event :validate_list_item_type_change, :validate,
@@ -30,7 +30,7 @@ event :create_listed_by_cards, :prepare_to_validate,
     listed_by_name = "#{item_name}+#{left.type_name}"
     next if director.main_director.card.key == listed_by_name.to_name.key
     if !Card[listed_by_name]
-      add_subcard listed_by_name, type_id: MirrorListID
+      add_subcard listed_by_name, type_id: Card::MirrorListID
     else
       Card[listed_by_name].update_references_out
     end

data/mod/pointer/spec/set/abstract/paging_params_spec.rb

@@ -1,7 +1,7 @@
 RSpec.describe Card::Set::Abstract::PagingParams do
   describe "offset_param" do
     it "doesn't allow anonymous users to use extremely high values" do
-      Card::Auth.current_id = Card::AnonymousID
+      Card::Auth.signin Card::AnonymousID
       with_params offset: 10_000 do
         expect { Card[:all].format(:json).offset_param }
           .to raise_error(Card::Error::PermissionDenied,

data/mod/pointer/spec/set/abstract/pointer/item_api_spec.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 
-describe Card::Set::Abstract::Pointer do
+RSpec.describe Card::Set::Abstract::Pointer do
   let(:pointer) { Card.new type: "Pointer", content: "[[Busy]]\n[[Body]]" }
 
   context "with two items" do

data/mod/recaptcha/set/all/recaptcha.rb

@@ -13,17 +13,12 @@ def human?
   add_recaptcha_errors result["error-codes"]
 end
 
-def consider_recaptcha?
-  true
-end
-
 def recaptcha_on?
-  consider_recaptcha?  &&
-    recaptcha_keys?    &&
-    Env[:controller]   &&
-    !Auth.signed_in?   &&
+  recaptcha_keys? &&
+    Env[:controller] &&
+    !Auth.signed_in? &&
+    !Auth.always_ok? &&
     !Auth.needs_setup? &&
-    !Auth.always_ok?   &&
     Card.toggle(rule(:captcha))
 end