card-mod-history 0.11.3 → 0.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a1d89c343986c8b5b5fd554d51c7f807904bfe8763f69e30de7e1593e8755c9
-  data.tar.gz: d9aa53b9b9c3537ea17d69ca84971f7368c6fb8262d8f7e3364afac78d23d56a
+  metadata.gz: 41d0178f2fba9cab5cbdd1292ec4c4599850a29edbc1070bffb0376940cf73d4
+  data.tar.gz: c80f042afcd381951625363007624bacb5667ea529387566ed6dd55c434ffd46
 SHA512:
-  metadata.gz: 517b9c124ec692933254249d3fb233745c61cba8ae8e7807a42375d5625cda53a3998109004410b9f6c6e27e846529b24d8ae626b41bbb075d86a9c1a1143d61
-  data.tar.gz: 409968007818d718ac9b529eecbb15e5a489026c2e01483ba4586732e93b3466ad2e16e433a0aaf87b1c79c24edea96dac502fc3ee076e654e5a1760878e5e95
+  metadata.gz: bb75bb9ce90265eadc285d2da4e8537ae8abee8d61cf08297cb62e65c00fecba385c7eb063e1149c734668068d8c0f8f38eaa112927638b27a7f5433fb01ee23
+  data.tar.gz: 80b069164b605b311639905435a654ec54fd6034bc28ef88716e6586d4fdaf5e5d9700a11678f2bc2cebeaa2612cd1f0938203408eb037af570cc3cbb0a1cefa

data/lib/card/action.rb

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

data/set/all/history/actions.rb

@@ -6,13 +6,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?

data/set/all/history_bridge.rb

@@ -7,25 +7,11 @@ format :html do
   end
 
   view :updated_by, wrap: { div: { class: "text-muted" } } do
-    return "" unless card.id
-    updaters = Card.search(updater_of: { id: card.id })
+    updaters = Card.search(updater_of: { id: card.id }) if 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
-    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 +48,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.3
+  version: 0.11.4
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-01 00:00:00.000000000 Z
+date: 2021-05-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.3
+        version: 1.101.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.3
+        version: 1.101.4
 description: ''
 email:
 - info@decko.org