card 1.99.4 → 1.99.5

data/mod/core/spec/chunk/{literal_spec.rb → escaped_literal_spec.rb}

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 
-describe Card::Content::Chunk::EscapedLiteral, "literal chunk tests" do
+describe Card::Content::Chunk::EscapedLiteral do
   it "handles escaped link" do
     expect(render_content('write this: \[[text]]'))
       .to eq("write this: <span>[</span>[text]]")

data/mod/core/spec/chunk/keep_escaped_literal_spec.rb

@@ -0,0 +1,21 @@
+# -*- encoding : utf-8 -*-
+
+RSpec.describe Card::Content::Chunk::KeepEscapedLiteral do
+  context "when parsing syntax" do
+    def apply_chunk content
+      Card::Content.new(content, Card.new, chunk_list: :references_keep_escaping).to_s
+    end
+
+    it "duplicates backslashes before nests" do
+      expect(apply_chunk('\{{A}}')).to eq('\\\\{{A}}')
+    end
+
+    it "duplicates backslacses before links" do
+      expect(apply_chunk('\[[A]]')).to eq('\\\\[[A]]')
+    end
+
+    it "doesn't duplicate random backslashes " do
+      expect(apply_chunk('\ \[A]')).to eq('\ \[A]')
+    end
+  end
+end

data/mod/core/spec/set/all/chunk_spec.rb

@@ -31,6 +31,7 @@ RSpec.describe Card::Set::All::Chunk do
 
     example "absolute option", as_bot: true do
       format = format_with_edit_fields [[:self, { absolute: true }]]
+
       expect(format.render_edit).to have_tag ".card-editor", with: { card_name: "*self" }
     end
 

data/mod/core/spec/set/all/event_conditions_spec.rb

@@ -177,7 +177,9 @@ RSpec.describe Card::Set::All::EventConditions do
       def add_logging_test_event allowed, for_name
         event_args = { on: :update, skip: allowed }
         event_args[:for] = for_name if for_name
-        test_event(:validate, event_args) { add_to_log "#{name} executed" }
+        test_event(:validate, event_args) do
+          add_to_log "#{name} executed"
+        end
       end
 
       def update_with_skip force, changes, skip_key

data/mod/edit/set/all/form.rb

@@ -108,10 +108,10 @@ format :html do
   end
 
   def multi_card_edit fields_only=false
-    nested_cards = nested_cards_for_edit(fields_only)
-    return structure_link if nested_cards.empty?
+    field_configs = edit_field_configs fields_only
+    return structure_link if field_configs.empty?
 
-    nested_cards.map do |name, options|
+    field_configs.map do |name, options|
       nest name, options || {}
     end.join "\n"
   end

data/mod/edit/set/all/form_buttons.rb

@@ -5,7 +5,7 @@ format :html do
 
   def standard_save_button opts={}
     return if voo&.hide?(:save_button)
-    add_class opts, "submit-button btn-sm mr-3"
+    add_class opts, "submit-button btn-sm mr-3 _update-history-pills"
     opts[:text] ||= "Save"
     opts["data-cy"] = "save"
     submit_button opts

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

@@ -44,7 +44,7 @@ RSpec.describe Card::Set::All::Form do
       no_edit_card = Card["cardtype a"]
       expect(no_edit_card.format.render_type)
         .to match(/<a[^>]* class="([^"]*)?\bcardtype\b[^"]*"/)
-        .and match(/<a[^>]* class="([^"]*)?\bno-edit\b[^"]*"/)
+      # .and match(/<a[^>]* class="([^"]*)?\bno-edit\b[^"]*"/)
     end
   end
 end

data/mod/follow/set/all/notify.rb

@@ -27,7 +27,7 @@ event :notify_followers_after_delete, :integrate, on: :delete, when: :notable_ch
 end
 
 def notify_followers
-  return unless (act = ActManager.act)
+  return unless (act = Card::ActManager.act)
 
   act.reload
   notify_followers_of act
@@ -71,7 +71,7 @@ def silent_change
 end
 
 def current_act_card?
-  return false unless (act_card = ActManager.act_card)
+  return false unless (act_card = Card::ActManager.act_card)
 
   act_card.id.nil? || act_card.id == id
   # FIXME: currently card_id is nil for deleted acts (at least

data/mod/history/lib/card/act/act_renderer/relative_act_renderer.rb

@@ -49,8 +49,9 @@ class Card
 
         def revert_link
           revert_actions_link "revert to this",
-                              { revert_actions: actions.map(&:id), view: :bridge },
-                              "data-slot-selector": ".bridge-view"
+                              { revert_actions: actions.map(&:id) },
+                              class: "_close-modal",
+                              "data-slotter-mode": "update-modal-origin"
         end
       end
     end

data/mod/history/set/all/history.rb

@@ -8,6 +8,19 @@ def history_card_ids
   includee_ids << id
 end
 
+# all cards who are considered updated if this card's was updated
+def history_parent_ids
+  includer_ids
+end
+
+def history_ancestor_ids recursion_level=0
+  return [] if recursion_level > 5
+
+  ids = history_parent_ids +
+    history_parent_ids.map { |id| Card[id].history_ancestor_ids(recursion_level + 1) }
+  ids.flatten
+end
+
 # ~~FIXME~~: optimize (no need to instantiate all actions and changes!)
 # Nothing is instantiated here. ActiveRecord is much smarter than you think.
 # Methods like #empty? and #size make sql queries if their receivers are not already
@@ -42,6 +55,13 @@ def includee_ids
     ).pluck("referee_id").compact.uniq
 end
 
+def includer_ids
+  @includer_ids ||=
+    Card::Reference.select(:referer_id).where(
+      ref_type: "I", referee_id: id
+    ).pluck("referer_id").compact.uniq
+end
+
 def diff_args
   { diff_format: :text }
 end
@@ -74,3 +94,10 @@ def save_content_draft content
        .card_changes.build(field: :db_content, value: content)
   end
 end
+
+event :update_ancestor_timestamps, :integrate do
+  ids = history_ancestor_ids
+  return unless ids.present?
+  Card.where(id: ids).update_all(updater_id: Auth.current_id, updated_at: Time.now)
+  ids.map { |anc_id| Card.expire anc_id.cardname }
+end

data/mod/history/set/all/history/act_listing.rb

@@ -87,7 +87,7 @@ format :html do
   end
 
   def act_paging acts, context
-    wrap_with :span, class: "slotter" do
+    wrap_with :div, class: "slotter btn-sm" do
       acts = current_page_acts acts
       opts = { remote: true, theme: "twitter-bootstrap-4" }
       opts[:total_pages] = 10 if limited_paging? context

data/mod/history/set/all/history/events.rb

@@ -47,6 +47,7 @@ end
 
 # changes for the create action are stored after the first update
 def store_card_changes_for_create_action
+  Card::Action.cache.delete "#{create_action.id}-changes"
   store_each_history_field create_action.id do |field|
     attribute_before_act field
   end

data/mod/machines/file/all_script_machine_output/file.js

@@ -12185,9 +12185,12 @@ return jQuery;
   });
 
   $(window).ready(function() {
-    return $('body').on("select2:select", "._close-rule-overlay-on-select", function(event) {
+    $('body').on("select2:select", "._close-rule-overlay-on-select", function(event) {
       return $(".overlay-container > ._overlay.card-slot.overlay_rule-view.RULE").removeOverlay();
     });
+    return $('body').on("click", "._update-history-pills", function(event) {
+      return $(this).closest(".slotter").data("update-foreign-slot", ".card-slot.history_tab-view");
+    });
   });
 
   $(document).ready(function() {

data/mod/machines/lib/javascript/decko/bridge.js.coffee

@@ -26,3 +26,6 @@ jQuery.fn.extend
 $(window).ready ->
   $('body').on "select2:select", "._close-rule-overlay-on-select", (event) ->
     $(".overlay-container > ._overlay.card-slot.overlay_rule-view.RULE").removeOverlay()
+
+  $('body').on "click", "._update-history-pills", (event) ->
+    $(this).closest(".slotter").data("update-foreign-slot", ".card-slot.history_tab-view")

data/mod/machines/lib/javascript/decko/slotter.js.coffee

@@ -28,7 +28,7 @@
 #        updated after the request.
 #    update-foreign-slot-url
 #        a url to fetch the new content for the additional slot
-#        if not given the slot is updated with the same card and view that used before
+#        if not given the slot is updated with the same card and view that was used before
 #    update-origin
 #        if present then the slot from where the current modal or overlay slot was opened
 #        will be updated
@@ -45,7 +45,7 @@
 #          update-origin
 #             update closest slot of the slotter that opened the modal or overlay
 #             (assumes that the request was triggered from a modal or overlay)
-#             If you need the update origin together with another mode then use
+#             If you need the update-origin mode together with another mode then use
 #             data-update-origin="true".
 #          silent-success
 #             do nothing
@@ -117,6 +117,9 @@ jQuery.fn.extend
     if @data("reload")
       window.locacation.reload(true)
 
+    if @data("update-modal-origin")
+      @updateModalOrigin()
+
     if @data("update-origin")
       @updateOrigin()
 
@@ -145,6 +148,8 @@ jQuery.fn.extend
   showSuccessResponse: (data, mode) ->
     if mode == "silent-success"
       return
+    else if mode == "update-modal-origin"
+      @updateModalOrigin()
     else if mode == "update-origin"
       @updateOrigin()
     else if data.redirect
@@ -167,6 +172,14 @@ jQuery.fn.extend
           @slot().find('.new-current-revision-id').text()
         )
 
+  updateModalOrigin: () ->
+    debugger
+    if @overlaySlot()
+      overlayOrigin = @findOriginSlot("overlay")
+      overlayOrigin.updateOrigin()
+    else if @closest("#modal-container")[0]
+      @updateOrigin()
+
   updateOrigin: () ->
     type = if @overlaySlot()
       "overlay"

data/mod/search/set/abstract/03_filter/form_helper.rb

@@ -49,23 +49,12 @@ format :html do
     text_filter_with_name_and_value name, value, opts
   end
 
-  def select_filter_type_based type_codename, order="asc"
-    # take the card name as default label
-    options = type_options type_codename, order, 80
-    select_filter type_codename, nil, options
-  end
-
   def autocomplete_filter type_code, options_card=nil
     options_card ||= Card::Name[type_code, :type, :by_name]
     text_filter type_code, "", class: "#{type_code}_autocomplete",
                                "data-options-card": options_card
   end
 
-  def multiselect_filter_type_based type_codename
-    options = type_options type_codename
-    multiselect_filter type_codename, nil, options
-  end
-
   def multiselect_filter_tag field, default, options, html_options={}
     html_options[:multiple] = true
     select_filter_tag field, default, options, html_options
@@ -104,11 +93,10 @@ format :html do
   end
 
   def type_options type_codename, order="asc", max_length=nil
-    type_card = Card[type_codename]
-    res = Card.search type_id: type_card.id, return: :name, sort: "name", dir: order
-    return res unless max_length
-
-    res.map { |i| [trim_option(i, max_length), i] }
+    Card.cache.fetch "#{type_codename}-#{order}-#{max_length}-TYPE-OPTIONS" do
+      res = Card.search type: type_codename, return: :name, sort: "name", dir: order
+      max_length ? (res.map { |i| [trim_option(i, max_length), i] }) : res
+    end
   end
 
   def trim_option option, max_length

data/mod/standard/set/all/rich_html/content.rb

@@ -141,7 +141,7 @@ format :html do
 
   def short_content_fields
     return unless voo.structure || card.structure
-    fields = nested_fields.size
+    fields = nested_field_names.size
     return if fields.zero?
     "#{fields} #{'field'.pluralize fields}"
   end

data/mod/standard/set/type/cardtype.rb

@@ -12,9 +12,7 @@ end
 
 format :html do
   view :type, unknown: true do
-    link_args = { class: "cardtype" }
-    add_class link_args, "no-edit" if card.cards_of_type_exist?
-    link_to_card card.type_card, nil, link_args
+    link_to_card card.type_card, nil, class: "cardtype"
   end
 
   def type_formgroup args={}

data/mod/standard/spec/set/all/history_spec.rb

@@ -236,4 +236,19 @@ RSpec.describe Card::Set::All::History do
       end
     end
   end
+
+  describe "timestamping" do
+    # note: B includes Z, so updates to Z stamp B
+    example "includers get a new timestamp",
+            with_user: "Sample User", aggregate_failures: true do
+      time = Time.now - 1.second
+      expect(Card["B"].updated_at).to be < time
+      expect(Card["B"].updater_id).not_to eq Card.fetch_id("Sample User")
+
+      Card["Z"].update! content: "new content"
+
+      expect(Card["B"].updated_at).to be > time
+      expect(Card["B"].updater_id).to eq Card.fetch_id("Sample User")
+    end
+  end
 end

data/tmpsets/set/{mod002-admin → mod001-admin}/self/admin.rb

@@ -1,55 +1,31 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; class Self
-# Set: The card "Admin"
-#
+class Card; module Set; class Self; module Admin; extend Card::Set
+# ~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/admin/set/self/admin.rb ~~
 # collect arrays of the form
-module Admin;
-extend Card::Set
-def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/admin/set/self/admin.rb"; end
 # [task symbol, { execute_policy: block, stats_policy: block }]
 basket :tasks
 
-def run_task_from_task_basket task
-  task = task.to_sym
-  task_data = tasks.find {|h| h[:name].to_sym == task.to_sym}
-  if !irreversibles_tasks_allowed? && task_data[:irreversible]
-    not_allowed task_data[:stats][:link_text]
-  else
-    task_data[:execute_policy].call if task_data
-  end
-end
-
 event :admin_tasks, :initialize, on: :update do
   return unless (task = Env.params[:task])
   raise Card::Error::PermissionDenied, self unless Auth.always_ok?
+
   case task.to_sym
   when :clear_cache          then Card::Cache.reset_all
   when :repair_references    then Card::Reference.repair_all
+  when :clear_view_cache     then Card::Cache::ViewCache.reset
+  when :delete_old_revisions then Card::Action.delete_old
   when :repair_permissions   then Card.repair_all_permissions
   when :clear_solid_cache    then Card.clear_solid_cache
   when :clear_machine_cache  then Card.reset_all_machines
-  when :clear_script_cache   then Card.reset_script_machine
-  when :clear_history
-    not_allowed "clear history" unless irreversibles_tasks_allowed?
-    Card::Action.delete_old
   else
-    run_task_from_task_basket task
+    task_data = tasks.find { |h| h[:name].to_sym == task }
+    task_data[:execute_policy].call if task_data
   end
   abort :success
 end
 
-def not_allowed task
-  raise Card::Error::PermissionDenied,
-        "The admin task '#{task}' is disabled for security reasons.<br>"\
-        "You can enable it with the config option 'allow_irreversible_admin_tasks'"
-end
-
-def irreversibles_tasks_allowed?
-  Cardio.config.allow_irreversible_admin_tasks
-end
-
-module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
-  view :core, cache: :never do
+format :html do
+  view :core do |_args|
     stats = card_stats
     stats += cache_stats
     stats += memory_stats
@@ -57,7 +33,7 @@ module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, s
       stats += Array.wrap task[:stats]
     end
     table_content = stats.map { |args| stat_row(args) }
-    table table_content, header: %w[Stat Value Action]
+    table table_content, header: %w(Stat Value Action)
   end
 
   def card_stats
@@ -65,32 +41,32 @@ module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, s
       { title: "cards",
         count: Card.where(trash: false) },
       { title: "actions",
-        count: Card::Action },
-      #  link_text: "clear history",
-      #  task: "clear_history" },
+        count: Card::Action,
+        link_text: "delete old",
+        task: "delete_old_revisions" },
       { title: "references",
-        count: Card::Reference }
-      # link_text: "repair all",
-      # task: "repair_references" }
+        count: Card::Reference,
+        link_text: "repair all",
+        task: "repair_references" }
     ]
   end
 
   def cache_stats
-    [
+    stats = [
       { title: "solid cache",
         count: solid_cache_count, unit: " cards",
-        link_text: "clear solid cache",
+        link_text: "clear cache",
         task: "clear_solid_cache" },
       { title: "machine cache",
         count: machine_cache_count, unit: " cards",
-        link_text: "clear machine cache",
+        link_text: "clear cache",
         task: "clear_machine_cache" }
     ]
-    # return stats unless Card.config.view_cache#
-    # stats << { title: "view cache",
-    #            count: Card::View,
-    #            link_text: "clear view cache",
-    #            task: "clear_view_cache" }
+    return stats unless Card.config.view_cache
+    stats << { title: "view cache",
+               count: Card::Cache::ViewCache,
+               link_text: "clear view cache",
+               task: "clear_view_cache" }
   end
 
   def memory_stats
@@ -111,8 +87,8 @@ module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, s
     res = [(args[:title] || "")]
     res << "#{count(args[:count])}#{args[:unit]}"
     return res unless args[:task]
-    res << link_to_card(:admin, (args[:link_text] || args[:task]),
-                        path: { action: :update, task: args[:task] })
+    path = card_path("update/:admin?task=#{args[:task]}")
+    res << link_to(args[:link_text] || args[:task], path)
     res
   end
 
@@ -126,12 +102,12 @@ module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, s
   end
 
   def machine_cache_count
-    Card::Virtual.where(right_id: MachineCacheID).count
+    Card.search right: { codename: "machine_cache" }, return: "count"
   end
 
   def delete_sessions_link months
-    link_to_card :admin, months, path: { action: :update, months: months,
-                                         task: "delete_old_sessions" }
+    link_to months,
+            card_path("update/:admin?task=delete_old_sessions&months=#{months}")
   end
 end
 
@@ -148,5 +124,7 @@ def profile_memory &block
   end
   (current_memory_usage - before) / 1024.to_i
 end
+
+
+# ~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/admin/set/self/admin.rb ~~
 end;end;end;end;
-# ~~ generated from /Users/ethan/dev/decko/gem/card/mod/admin/set/self/admin.rb ~~