card-mod-history 0.11.2 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 286bded3a208950a302fd702d114bcc8282b9c99c78842e0c9869cce83c0b19f
-  data.tar.gz: 79163beb623d989a421a58e980b9e240d473bb85d8e59e299233e4b2df2c4847
+  metadata.gz: d848324e8a24e138fcc1ec9f18e99ecfd18f7ea5e0ff9799e2b82f0f5a2becca
+  data.tar.gz: 505d838330e918f31384618fe6ec82464f13a28cd62027194d8a10ddcad99eee
 SHA512:
-  metadata.gz: aa183bb4950d1f6c21251a690348718d8df8380428564dfa1718bfd8963a5dcf71fa027c71ffd66bfd2fbc0af9d95662057291c0a1d7558900ecd6f742f041ea
-  data.tar.gz: a2e9354cd5fc2c789f439aa5c764c49e023f3289d51663e7a79620ecc3e8fb0255e40a5b84c41b2be5d63b2aad6803260a74e44ba6e3f9dc496769f1d7f6adb7
+  metadata.gz: 2188ff8e94fc293926720efdc1577ac67f57c311388ff0f2aea52ebe237ad27b52a10c64519bd58cc700f5bc6a56eda3129af9e5648127af9a053d3b73d5fa79
+  data.tar.gz: d1fd88f32ba0976226a5722e76542f3c83a934c2bcd2c4ac103b22feee3be0c2bbcd42b69092837dae111dcfc7030fead37e4ce75bbc65026c37fe5032005816

data/lib/card/act.rb

@@ -16,7 +16,7 @@ class Card
   # - _acted_at_, a timestamp of the action
   # - the _ip_address_ of the actor where applicable.
   #
-  class Act < ApplicationRecord
+  class Act < Cardio::Record
     before_save :assign_actor
     has_many :ar_actions, -> { order :id }, foreign_key: :card_act_id,
                                             inverse_of: :act,
@@ -108,7 +108,7 @@ class Card
     end
 
     def draft?
-      main_action.draft
+      main_action&.draft
     end
 
     # time (in words) since act took place

data/lib/card/act/act_renderer.rb

@@ -10,7 +10,7 @@ class Card
         @context = @args[:act_context]
       end
 
-      include ::Bootstrapper
+      include Card::Bootstrapper
 
       def method_missing method_name, *args, &block
         if block_given?
@@ -31,7 +31,7 @@ class Card
       end
 
       def header
-        #::Bootstrap.new(self).render do
+        # Card::Bootstrap.new(self).render do
         bs_layout do
           row xs: [10, 2] do
             column do
@@ -123,7 +123,7 @@ class Card
       #   here. The problem is that here we have extra links in the title
       #   that are not supposed to expand the accordion
       def act_accordion
-        context = @act.main_action.draft ? :warning : :default
+        context = @act.main_action&.draft ? :warning : :default
         <<-HTML
         <div class="card card-#{context} nodblclick">
           #{act_accordion_panel}
@@ -173,7 +173,7 @@ class Card
       # save as current:
       #   not current, not deletion
       def rollback_link
-        return unless card.ok? :update
+        return unless @card.ok? :update
 
         wrap_with :div, class: "act-link collapse #{collapse_id} float-right" do
           content_tag(:small, revert_link)

data/lib/card/act/act_renderer/absolute_act_renderer.rb

@@ -22,7 +22,7 @@ class Card
         def revert_link
           revert_actions_link "revert to previous",
                               { revert_to: :previous, revert_act: @act.id },
-                              "data-slot-selector": "#main > .card-slot"
+                              { "data-slot-selector": "#main > .card-slot" }
         end
 
         def actions

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

@@ -6,9 +6,8 @@ class Card
       # for the card of the format that renders the act.
       class RelativeActRenderer < ActRenderer
         def title
-          "<span class=\"nr\">##{@args[:act_seq]}</span>" +
+          %(<span class="nr">##{@args[:act_seq]}</span>) +
             accordion_expand_link(@act.actor.name) +
-            " " +
             wrap_with(:small, edited_ago)
         end
 
@@ -50,8 +49,8 @@ class Card
         def revert_link
           revert_actions_link "revert to this",
                               { revert_actions: actions.map(&:id) },
-                              class: "_close-modal",
-                              "data-slotter-mode": "update-modal-origin"
+                              { class: "_close-modal",
+                                "data-slotter-mode": "update-modal-origin" }
         end
       end
     end

data/lib/card/action.rb

@@ -20,7 +20,7 @@ class Card
   # * a boolean indicated whether the action is a _draft_
   # * a _comment_ (where applicable)
   #
-  class Action < ApplicationRecord
+  class Action < Cardio::Record
     include Differ
     extend Admin
 
@@ -48,7 +48,7 @@ class Card
       # @return [Action, nil]
       def fetch id
         cache.fetch id.to_s do
-          find id.to_i
+          where(id: id.to_i).take
         end
       end
 
@@ -177,9 +177,7 @@ class Card
 
     # all changed values in hash form. { field1: new_value }
     def changed_values
-      @changed_values ||= changes.each_with_object({}) do |(key, change), h|
-        h[key] = change.value
-      end
+      @changed_values ||= changes.transform_values(&:value)
     end
 
     # @return [Hash]

data/lib/card/action/action_renderer.rb

@@ -2,6 +2,7 @@ class Card
   class Action
     class ActionRenderer
       attr_reader :action, :header
+
       def initialize format, action, header=true, action_view=:summary, hide_diff=false
         @format = format
         @action = action
@@ -10,7 +11,7 @@ class Card
         @hide_diff = hide_diff
       end
 
-      include ::Bootstrapper
+      include Card::Bootstrapper
       def method_missing method_name, *args, &block
         if block_given?
           @format.send(method_name, *args, &block)
@@ -58,7 +59,7 @@ class Card
         else
           link_to_view(
             :related, name_changes,
-            path: { slot: { items: { view: "history", nest_name: @action.card.name } } },
+            path: { slot: { items: { view: "history", nest_name: @action.card.name } } }
             # "data-slot-selector" => ".card-slot.history-view"
           )
         end

data/lib/card/change.rb

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
-require 'activerecord-import'
+
+require "activerecord-import"
 
 class Card
   # A _change_ is an alteration to a card's name, type, content, or trash state.
@@ -16,7 +17,7 @@ class Card
   # * the new _value_ of that field
   # * the {Action action} of which the change is part
   #
-  class Change < ApplicationRecord
+  class Change < Cardio::Record
     belongs_to :action, foreign_key: :card_action_id,
                         inverse_of: :card_changes
 

data/set/all/history.rb

@@ -1,6 +1,7 @@
 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
@@ -24,7 +25,7 @@ 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) }
+        history_parent_ids.map { |id| Card[id].history_ancestor_ids(recursion_level + 1) }
   ids.flatten
 end
 

data/set/all/history/act_listing.rb

@@ -86,8 +86,11 @@ format :html do
 
   def act_paging acts, context
     return unless controller.request # paginate requires a request
+
     wrap_with :div, class: "slotter btn-sm" do
-      paginate current_page_acts(acts), act_paging_opts(context)
+      # normally we let method_missing handle the action_view stuff,
+      # but that doesn't handle **arguments yet
+      action_view.send :paginate, current_page_acts(acts), **act_paging_opts(context)
     end
   end
 

data/set/all/history/actions.rb

@@ -7,12 +7,16 @@ end
 def action_from_id action_id
   return unless action_id.is_a?(Integer) || action_id =~ /^\d+$/
 
-  # if not an integer revision id is probably a mod (e.g. if you request
+  # if not an integer, action_id is probably a mod (e.g. if you request
   # files/:logo/standard.png)
-  action = Action.fetch action_id
-  return unless action.card_id == id
 
-  action
+  action_if_on_self Action.fetch(action_id)
+end
+
+def action_if_on_self action
+  return unless action.is_a? Action
+
+  action if action.card_id == id
 end
 
 def old_actions

data/set/all/history/events.rb

@@ -18,7 +18,7 @@ def actionable?
 end
 
 event :detect_conflict, :validate, on: :update, when: :edit_conflict? do
-  errors.add :conflict, tr(:error_not_latest_revision)
+  errors.add :conflict, Cardio.t(:history_error_not_latest_revision)
 end
 
 def edit_conflict?
@@ -34,7 +34,7 @@ event :finalize_action, :finalize, when: :finalize_action? do
   if changed_fields.present?
     @current_action.update! card_id: id
 
-    # Note: #last_change_on uses the id to sort by date
+    # NOTE: #last_change_on uses the id to sort by date
     # so the changes for the create changes have to be created before the first change
     store_card_changes_for_create_action if first_change?
     store_card_changes unless first_create?
@@ -64,7 +64,7 @@ def store_each_history_field action_id, fields=nil
   if false # Card::Change.supports_import?
     # attach.feature fails with this
     values = fields.map.with_index { |field, index| [index, yield(field), action_id] }
-    Card::Change.import [:field, :value, :card_action_id], values #, validate: false
+    Card::Change.import %i[field value card_action_id], values # , validate: false
   else
     fields.each do |field|
       Card::Change.create field: field,

data/set/all/history/selected.rb

@@ -24,7 +24,7 @@ def select_action action_id
 end
 
 def selected_action_id
-  @selected_action_id || (@current_action&.id) || last_action_id
+  @selected_action_id || @current_action&.id || last_action_id
 end
 
 def selected_action_id= action_id
@@ -41,8 +41,8 @@ def selected_content
 end
 
 def content_at_time_of_selected_action
-  lc = last_change_on(:db_content, not_after: @selected_action_id, including_drafts: true)
-  lc&.value
+  last_change_on(:db_content, not_after: selected_action_id,
+                              including_drafts: true)&.value
 end
 
 def with_selected_action_id action_id

data/set/all/history_bridge.rb

@@ -2,30 +2,17 @@ format :html do
   view :creator_credit,
        wrap: { div: { class: "text-muted creator-credit" } }, cache: :never do
     return "" unless card.real?
+
     "Created by #{nest card.creator, view: :link} "\
     "#{time_ago_in_words(card.created_at)} ago"
   end
 
   view :updated_by, wrap: { div: { class: "text-muted" } } do
-    return "" unless card.id
-    updaters = Card.search(updater_of: { id: card.id })
-    return "" unless updaters.present?
-
-    updaters = updater_links updaters, others_target: Card.fetch(card, :editors)
-    "Updated by #{updaters}"
-  end
-
-  def updater_links updaters, item_view: :link, max_count: 3, others_target: card
+    updaters = Card.search(updater_of: { id: card.id }) if card.id
     return "" unless updaters.present?
 
-    total = updaters.size
-    fetch_count = total > max_count ? max_count - 1 : max_count
-
-    reduced = first_card(fetch_count).map { |c| nest c, view: item_view }
-    if total > max_count
-      reduced << link_to_card(others_target, "#{total - fetch_count} others")
-    end
-    reduced.to_sentence
+    links = updater_links updaters, others_target: card.fetch(:editors)
+    "Updated by #{links}"
   end
 
   def acts_bridge_layout acts, context=:bridge
@@ -62,4 +49,31 @@ format :html do
       act_listing(act, opts[:act_seq], :bridge)
     end
   end
+
+  private
+
+  def updater_links updaters, item_view: :link, max_count: 3, others_target: card
+    total = updaters.size
+    num_to_show = number_of_updaters_to_show total, max_count
+
+    links =
+      links_to_updaters(updaters, num_to_show, item_view) +
+      link_to_other_updaters(total, others_target, num_to_show)
+
+    links.to_sentence
+  end
+
+  def number_of_updaters_to_show total, max_count
+    total > max_count ? max_count - 1 : max_count
+  end
+
+  def links_to_updaters updaters, num_to_show, item_view
+    updaters[0..(num_to_show - 1)].map { |c| nest c, view: item_view }
+  end
+
+  def link_to_other_updaters total, target, num_to_show
+    return [] unless total > num_to_show
+
+    link_to_card target, "#{total - num_to_show} others"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-history
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.12.0
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-15 00:00:00.000000000 Z
+date: 2021-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.2
+        version: 1.102.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.2
+        version: 1.102.0
 description: ''
 email:
 - info@decko.org
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Revision histories in acts, actions, and changes