card 1.98.0 → 1.99.1

data/mod/carrierwave/set/type/image/html_views.rb

@@ -1,7 +1,3 @@
-IMAGE_BOX_SIZE_MAP = {
-  icon: :icon, small: :small, medium: :small, large: :medium, xlarge: :medium
-}.freeze
-
 format :html do
   include File::HtmlFormat
 
@@ -70,35 +66,4 @@ format :html do
       Card::Content::Diff.render_added_chunk _render_core
     end
   end
-
-  view :boxed, unknown: true do
-    image_box { |size| render_core size: size }
-  end
-
-  view :boxed_link, unknown: true do
-    image_box { |size| link_to_card image_box_link_target, render_core(size: size) }
-  end
-
-  def image_box
-    voo.size ||= :medium
-    wrap_with :div, title: image_box_title, class: "image-box #{voo.size}" do
-      yield image_box_size
-    end
-  end
-
-  def image_box_size
-    IMAGE_BOX_SIZE_MAP[voo.size.to_sym] || :medium
-  end
-
-  def image_box_card_name
-    card.name.junction? ? card.name.left : card.name
-  end
-
-  def image_box_link_target
-    image_box_card_name
-  end
-
-  def image_box_title
-    image_box_card_name
-  end
 end

data/mod/carrierwave/spec/set/type/image_spec.rb

@@ -2,7 +2,7 @@
 
 RSpec.describe Card::Set::Type::Image do
   it "has special editor" do
-    assert_view_select render_editor("Image"), 'div[class="choose-file"]' do
+    assert_view_select render_input("Image"), 'div[class="choose-file"]' do
       assert_select 'input[class~="file-upload slotter"]'
     end
   end

data/mod/core/chunk/link.rb

@@ -26,7 +26,7 @@ module Card::Content::Chunk
         end
 
       @link_text = objectify @link_text
-      if target =~ %r{/|mailto:}
+      if target.match? %r{^(/|https?:|mailto:)}
         @explicit_link = objectify target
       else
         @name = target
@@ -66,7 +66,9 @@ module Card::Content::Chunk
         @explicit_link = render_obj @explicit_link
         format.link_to_resource @explicit_link, @link_text, explicit_link_opts
       elsif @name
-        format.nest referee_name, options.merge(view: view)
+        format.with_nest_mode :normal do
+          format.nest referee_name, options.merge(view: view)
+        end
       end
     end
 

data/mod/core/chunk/view_stub.rb

@@ -1,11 +1,13 @@
+require "msgpack"
+
 class Card
   class Content
     module Chunk
       class ViewStub < Abstract
         Chunk.register_class(
           self,
-          prefix_re: Regexp.escape("(stub)"),
-          full_re: /\A\(stub\)([^\(]*)\(\/stub\)/,
+          prefix_re: Regexp.escape("(StUb"),
+          full_re: /\A\(StUb(.*?)sTuB\)/m,
           idx_char: "("
         )
 
@@ -14,8 +16,7 @@ class Card
         end
 
         def interpret match, _content
-          @options_json = match[1]
-          @stub_hash = JSON.parse(Card::View::Stub.unescape @options_json).symbolize_keys
+          @stub_hash = JSON.parse(match[1]).symbolize_keys
           interpret_hash_values
         end
 

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

@@ -55,7 +55,7 @@ def content
 end
 
 format :html do
-  view :editor do
+  view :input do
     "Content is stored in file and can't be edited."
   end
 

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

@@ -55,6 +55,7 @@ def with_transaction_returning_status
   status = nil
   self.class.transaction do
     add_to_transaction
+    remember_transaction_record_state
     status = abortable { yield }
     raise ActiveRecord::Rollback unless status
   end

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

@@ -16,7 +16,8 @@ end
 private
 
 def validate_codename_permission
-  return if Auth.always_ok?
+  return if Auth.always_ok? || Auth.as_id == creator_id
+
   errors.add :codename, tr(:only_admins_codename)
 end
 

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

@@ -20,9 +20,65 @@ def structured_content
 end
 
 format do
+  ONE_LINE_CHARACTER_LIMIT = 60
+
   def chunk_list # override to customize by set
     :default
   end
+
+  view :one_line_content do
+    with_nest_mode :compact do
+      one_line_content
+    end
+  end
+
+  # DEPRECATED
+  view :closed_content, :one_line_content
+
+  view :raw_one_line_content do
+    raw_one_line_content
+  end
+
+  view :label do
+    card.label
+  end
+
+  view :smart_label, cache: :never, unknown: true do
+    label_with_description render_label, label_description
+  end
+
+  def label_with_description label, description
+    return label unless description
+
+    "#{label} #{popover_link description}"
+  end
+
+  # TODO: move this into a nest once popovers are stub safe
+  def label_description
+    return unless (desc = card.field :description)
+
+    desc.format.render_core
+  end
+
+  def raw_one_line_content
+    cut_with_ellipsis render_raw
+  end
+
+  def one_line_content
+    Card::Content.smart_truncate render_core
+  end
+
+  def cut_with_ellipsis text, limit=one_line_character_limit
+    if text.size <= limit
+      text
+    else
+      text[0..(limit - 3)] + "..."
+    end
+  end
+
+  def one_line_character_limit
+    voo.size || ONE_LINE_CHARACTER_LIMIT
+  end
 end
 
 format :html do
@@ -31,6 +87,9 @@ format :html do
   end
 end
 
+# seems like this should be moved to format so we can fall back on title
+# rather than name. (In fact, name, title, AND label is a bit much.
+# Trim to 2?)
 def label
   name
 end

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

@@ -6,6 +6,14 @@ def event_applies? event
   end
 end
 
+def skip_event! *events
+  forced_skip_events.merge events
+end
+
+def trigger_event! *events
+  forced_trigger_events.merge events
+end
+
 private
 
 def set_condition_applies? set_module, old_sets
@@ -68,14 +76,15 @@ def when_condition_applies? _event, block
 end
 
 def skip_condition_applies? event, allowed
-  return true if skip_events.empty?
-  event = event.name.to_s
-  !(standard_skip_event?(event, allowed) || force_skip_event?(event))
+  return true if never_skip?
+
+  !(standard_skip_event?(event.name, allowed) || force_skip_event?(event.name))
 end
 
 def trigger_condition_applies? event, required
   return true unless required == :required
-  trigger_event? event
+
+  trigger_event?(event.name) || force_trigger_event?(event.name)
 end
 
 def single_changed_condition_applies? db_column
@@ -103,17 +112,25 @@ def wrong_action action
   "on: #{action} method #{method} called on #{@action}"
 end
 
+def never_skip?
+  return @never_skip unless @never_skip.nil?
+
+  @never_skip = skip_events.empty? && forced_skip_events.empty?
+end
+
 def standard_skip_event? event, allowed
   return false unless allowed == :allowed
-  skip_events.include? event
+
+  skip_events.include? event.to_s
 end
 
 def force_skip_event? event
   forced_skip_events.include? event
 end
 
+# holder for skip_event! (with bang) events
 def forced_skip_events
-  @forced_skip_events ||= ::Set.new(skip_events.find_all { |e| e.last == "!" })
+  @forced_skip_events ||= ::Set.new([])
 end
 
 def skip_events
@@ -123,12 +140,21 @@ def skip_events
   end
 end
 
+# holder for trigger_event! (with bang) events
+def forced_trigger_events
+  @forced_trigger_events ||= ::Set.new([])
+end
+
 def trigger_event? event
   @names_of_triggered_events ||= triggered_events
-  @names_of_triggered_events.include? event.name
+  @names_of_triggered_events.include? event
 end
 
 def triggered_events
   events = Array.wrap(trigger_event_in_action) + Array.wrap(act_card.trigger_event)
   ::Set.new events.map(&:to_sym)
 end
+
+def force_trigger_event? event
+  forced_trigger_events.include? event
+end

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

@@ -27,8 +27,11 @@ module ClassMethods
 
   def standard_controller_fetch args, card_opts
     mark = args[:mark] || card_opts[:name]
-    card = Card.fetch mark, look_in_trash: args[:look_in_trash], new: card_opts
+    card = Card.fetch mark, skip_modules: true,
+                            look_in_trash: args[:look_in_trash],
+                            new: card_opts
     card.assign_attributes card_opts if args[:assign] && card&.real?
+    card&.include_set_modules
     card
   end
 

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

@@ -12,7 +12,7 @@ end
 def configure_successful_deletion
   if Env.ajax?
     success.card = self
-    success.view = :missing unless success.view
+    success.view = :unknown unless success.view
   else
     success.target = :previous
   end

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

@@ -97,7 +97,7 @@ end
 def left *args
   case
   when simple?    then nil
-  when @superleft then @superleft
+  when superleft then superleft
   when attribute_is_changing?(:name) && name.to_name.trunk_name.key == name_before_act.to_name.key
     nil # prevent recursion when, eg, renaming A+B to A+B+C
   else

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

@@ -14,6 +14,7 @@ end
 event :validate_name, :validate, on: :save, changed: :name do
   validate_legality_of_name
   return if errors.any?
+  Card.write_to_soft_cache self
   validate_uniqueness_of_name
 end
 
@@ -50,8 +51,8 @@ end
 
 # STAGE: store
 
-event :set_name, :store, changed: :name do
-  expire
+event :expire_old_name, :store, changed: :name, on: :update do
+  ActManager.expirees << name_before_act
 end
 
 event :set_left_and_right, :store,

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

@@ -109,15 +109,10 @@ def deny_because why
 end
 
 def permitted? action
-  return if Card.config.read_only
-  return true if action != :comment && Auth.always_ok?
-  permitted_ids = who_can action
-  if action == :comment && Auth.always_ok?
-    # admin can comment if anyone can
-    !permitted_ids.empty?
-  else
-    Auth.as_card.among? permitted_ids
-  end
+  return false if Card.config.read_only # :read does not call #permit
+  return true if Auth.always_ok?
+
+  Auth.as_card.among? who_can(action)
 end
 
 def permit action, verb=nil
@@ -135,7 +130,7 @@ def ok_to_create
 
   %i[left right].each do |side|
     # left is supercard; create permissions will get checked there.
-    next if side == :left && @superleft
+    next if side == :left && superleft
     part_card = send side, new: {}
     # if no card, there must be other errors
     next unless part_card && part_card.new_card?
@@ -164,13 +159,6 @@ def ok_to_delete
   permit :delete
 end
 
-def ok_to_comment
-  permit :comment, "comment on"
-  return unless @action_ok
-  deny_because "No comments allowed on templates" if is_template?
-  deny_because "No comments allowed on structured content" if structure
-end
-
 # don't know why we introduced this
 # but we have to preserve read rules to make
 # delete acts visible in recent changes -pk
@@ -240,7 +228,7 @@ event :check_permissions, :validate do
 end
 
 def action_for_permission_check
-  commenting? ? :comment : @action
+  commenting? ? :update : @action
 end
 
 def track_permission_errors
@@ -250,21 +238,3 @@ def track_permission_errors
   @permission_errors = nil
   result
 end
-
-module Accounts
-  # This is a short-term hack that is used in account-related cards to allow a
-  # permissions pattern where permissions are restricted to the owner of the
-  # account (and, by default, Admin)
-  # That pattern should be permitted by our card representation
-  # (without creating separate rules for each account holder) but is not yet.
-
-  def permit action, verb=nil
-    case action
-    when :comment then @action_ok = false
-    when :create  then @superleft ? true : super(action, verb)
-    # restricts account creation to subcard handling on permitted card
-    # (unless explicitly permitted)
-    else own_account? ? true : super(action, verb)
-    end
-  end
-end

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

@@ -130,12 +130,19 @@ end
 # invokes the given block for each reference in content with
 # the reference name and reference type
 def each_reference_out
-  content_obj = Card::Content.new content, self
-  content_obj.find_chunks(Card::Content::Chunk::Reference).each do |chunk|
+  content_object.find_chunks(Card::Content::Chunk::Reference).each do |chunk|
     yield(chunk.referee_name, chunk.reference_code)
   end
 end
 
+def has_nests?
+  content_object.has_chunk? Card::Content::Chunk::Nest
+end
+
+def content_object
+  Card::Content.new content, self
+end
+
 protected
 
 # test for updating referer content & preload referer list
@@ -166,9 +173,9 @@ event :update_referer_content, :finalize,
       on: :update, after: :name_change_finalized, when: :update_referers do
   referers.each do |card|
     next if card.structure
-    card.skip_in_action = %i[validate_renaming check_permissions!]
-    attach_subcard card.name,
-                   content: card.replace_reference_syntax(name_before_last_save, name)
+    card.skip_event! :validate_renaming, :check_permissions
+    card.content = card.replace_reference_syntax name_before_last_save, name
+    attach_subcard card
   end
 end