card-mod-history 0.11.0 → 0.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f748f6e48dcfe648aaa721a41135f026e064752ecf8cdb16f5a9bf2fdf7c845c
-  data.tar.gz: ab636c41792878cd5196ec6dd019d35b560d72c9ffe0d25e5a3e61b9d026229d
+  metadata.gz: e0f47cae6066494760ecaf1b743c450f83cdb64bb78b805d9a89ecdb4ce4b49c
+  data.tar.gz: 1960fde3b8ecbb5c81be55c3d58396c8102b9d5f08445aa67f76a9450638ed02
 SHA512:
-  metadata.gz: 42167bcf664c4de96c4966872df4211f5fbbb601ceee045e406b5445fed4ee73223c12712ad9aadd131af4382792702db7567703476559ab878b4bf6af15d092
-  data.tar.gz: 49a5f66ce214ccd87a86ffa99898267974c859563cf08d1fddb81dfe72422bec73d64694e8babd91ee6b9ced7ff0f33cae84668049519f4ea2cf8d20d3d3173f
+  metadata.gz: 1665db38b17b2161b58469430edb76ca1740040fd720d90d1fb0e795520c280df8d468cb9e1febe032c94c780dd88532d28aad030afc8dc759f4e92e644b0b08
+  data.tar.gz: cef187430a6a80a502f6b21d3592c6d0afb90739734808d19ba8a5d68ad9fe68133c58485eb1c70f00dd4e6ccb76ac98903314792b4b7ecebc4e8c8109c42546

data/lib/card/act.rb

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

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

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

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

@@ -1,5 +1,3 @@
-ACTS_PER_PAGE = Card.config.acts_per_page
-
 format :html do
   def act_from_context
     if (act_id = params["act_id"])
@@ -79,7 +77,7 @@ format :html do
   end
 
   def acts_per_page
-    @acts_per_page || ACTS_PER_PAGE
+    @acts_per_page ||= Card.config.acts_per_page || 10
   end
 
   def acts_page_from_params
@@ -87,11 +85,16 @@ format :html do
   end
 
   def act_paging acts, context
+    return unless controller.request # paginate requires a request
+
     wrap_with :div, class: "slotter btn-sm" do
-      acts = current_page_acts acts
-      opts = { remote: true, theme: "twitter-bootstrap-4" }
+      paginate current_page_acts(acts), act_paging_opts(context)
+    end
+  end
+
+  def act_paging_opts context
+    { remote: true, theme: "twitter-bootstrap-4" }.tap do |opts|
       opts[:total_pages] = 10 if limited_paging? context
-      paginate acts, opts
     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

data/set/all/history/views.rb

@@ -32,4 +32,35 @@ format :html do
   view :action_expanded do
     action_content action_from_context, :expanded
   end
+
+  view :change do
+    voo.show :title_link
+    voo.hide :menu
+    wrap do
+      [_render_title,
+       _render_menu,
+       _render_last_action]
+    end
+  end
+
+  view :last_action do
+    %(
+      <span class="last-update">
+        #{render_last_action_verb} #{render_acted_at} ago by
+        #{nest card.last_actor, view: :link}
+      </span>
+    )
+  end
+
+  view :last_action_verb, cache: :never do
+    return unless (act = card.last_act)
+    return unless (action = act.action_on card.id)
+
+    case action.action_type
+    when :create then "added"
+    when :delete then "deleted"
+    else
+      link_to_view :history, "edited", class: "last-edited", rel: "nofollow"
+    end
+  end
 end

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.0
+  version: 0.11.5
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-24 00:00:00.000000000 Z
+date: 2021-05-10 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.0
+        version: 1.101.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.0
+        version: 1.101.5
 description: ''
 email:
 - info@decko.org
@@ -53,10 +53,15 @@ files:
 - set/all/history/selected.rb
 - set/all/history/views.rb
 - set/all/history_bridge.rb
-homepage: http://decko.org
+homepage: https://decko.org
 licenses:
 - GPL-3.0
 metadata:
+  source_code_uri: https://github.com/decko-commons/decko
+  homepage_uri: https://decko.org
+  bug_tracker_uri: https://github.com/decko-commons/decko/issues
+  wiki_uri: https://decko.org
+  documentation_url: http://docs.decko.org/
   card-mod: history
 post_install_message:
 rdoc_options: []
@@ -73,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.1.4
 signing_key:
 specification_version: 4
 summary: Revision histories in acts, actions, and changes