card 1.98.3 → 1.99.0

data/mod/bootstrap/set/type/customized_bootswatch_skin.rb

@@ -115,7 +115,7 @@ format :html do
      [:stylesheets, { title: "Styles" }]]
   end
 
-  view :closed_content do
+  view :one_line_content do
     ""
   end
 end

data/mod/bootstrap/set/type_plus_right/customized_bootswatch_skin/colors.rb

@@ -57,7 +57,7 @@ def variable_group_with_values group
 end
 
 format :html do
-  view :editor, template: :haml do
+  view :input, template: :haml do
     @colors = card.colors
     @theme_colors = card.theme_colors
   end

data/mod/bootstrap/spec/set/all/bootstrap/form_spec.rb

@@ -3,14 +3,14 @@
 RSpec.describe Bootstrap::Component::Form do
   describe "input" do
     it "has form-group css class" do
-      assert_view_select render_editor("Phrase"),
+      assert_view_select render_input("Phrase"),
                          'input[type="text"][class~="form-control"]'
     end
   end
 
   describe "textarea" do
     it "has form-group css class" do
-      assert_view_select render_editor("Plain Text"),
+      assert_view_select render_input("Plain Text"),
                          'textarea[class~="form-control"]'
     end
   end

data/mod/carrierwave/set/self/favicon.rb

@@ -8,4 +8,9 @@ format :html do
     return unless (source = render :source, size: :small)
     tag :link, rel: "shortcut icon", href: source
   end
+
+  def raw_help_text
+    "A favicon (or shortcut icon) is a small image used by browsers to help identify "\
+    "your website. [[http://www.decko.org/favicon|How to customize your favicon]]"
+  end
 end

data/mod/carrierwave/set/self/new_file.rb

@@ -7,7 +7,7 @@ format :html do
     super()
   end
 
-  view :editor, cache: :never do
+  view :input, cache: :never do
     super()
   end
 end

data/mod/carrierwave/set/self/new_image.rb

@@ -7,7 +7,7 @@ format :html do
     super()
   end
 
-  view :editor, cache: :never do
+  view :input, cache: :never do
     super()
   end
 end

data/mod/carrierwave/set/type/file.rb

@@ -86,7 +86,7 @@ format :html do
     "#{action} #{humanized_attachment_name}..."
   end
 
-  view :editor do
+  view :input do
     if card.web? || card.no_upload?
       return text_field(:content, class: "d0-card-content")
     end

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

@@ -13,7 +13,7 @@ end
 format do
   include File::Format
 
-  view :closed_content do
+  view :one_line_content do
     _render_core size: :icon
   end
 
@@ -57,7 +57,7 @@ format do
     voo.size =
       case
       when nest_mode == :closed then closed_size
-      when voo.size             then voo.size.to_sym
+      when voo.size.present?    then voo.size.to_sym
       when main?                then main_size
       else                           default_size
       end

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

@@ -10,6 +10,10 @@ 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
@@ -79,7 +83,8 @@ 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
@@ -115,6 +120,7 @@ end
 
 def standard_skip_event? event, allowed
   return false unless allowed == :allowed
+
   skip_events.include? event.to_s
 end
 
@@ -134,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/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/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