card-mod-history 0.16.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0eadd287d28611d17a7e670cc86f530020f3fb1a033f3caa4669d98ae890799
-  data.tar.gz: 21fbfc6e2a38807ebed7e1d40b47d2382c8195298bcf394e3f5b484363d16255
+  metadata.gz: 1a20f2d9eec3fe3db61fd2812e78f4bb8565cda58e0b1fc7a0688c8cb5765109
+  data.tar.gz: 7be6fe76ba77beee613bc340de7177403c98caf3e818d15f8b58a70b4d67fa37
 SHA512:
-  metadata.gz: 6df8845d3cd17b190f7512f39e2e49d52ef8fbe17f56b29795d04d37ed9032f923f3e281049ca0cfcefad4951d15e20e3ebe8401941e8c03275f1ae8cc3c08bd
-  data.tar.gz: 5135f6f03178e172430558b00e99841fa236be5c833c11d59a4d95dd5dc21c58ec92846bb5fca23a6c4cb8947f7303b4d7445fb843205a8fc4dbaf960999ffa2
+  metadata.gz: cb259274b48f051e5e793142d26efe926eb1fcb66d0204586f8d459c99b0d1307538683ff8936a84969ccbdef56daa8ddf3cc0a9f22e3754de0ded3328878c48
+  data.tar.gz: d1c77b5e3e5db4f7788d1e985986d0fcf4d1caf0005201e66a0ac949b560e059834aac159b71ea6e9806e275121595b696441bbb14d0fab2b0cfe677b36005b6

data/config/admin.yml

@@ -0,0 +1,3 @@
+views:
+  - creator_credit
+  - updated_by

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

@@ -9,10 +9,14 @@ class Card
           %(<span class="nr">##{@args[:act_seq]}</span> #{actor_and_ago})
         end
 
+        def relative_title
+          @act_card.name.from @card.name
+        end
+
         def subtitle
           return "" unless @act.card_id != @format.card.id
 
-          wrap_with :small, "act on #{absolute_title}"
+          wrap_with :small, "act on #{relative_title}"
         end
 
         def act_links

data/lib/card/act.rb

@@ -122,7 +122,7 @@ class Card
     def actions_affecting card
       actions.select do |action|
         (card.id == action.card_id) ||
-          card.nestee_ids.include?(action.card_id)
+          card.history_card_ids.include?(action.card_id)
       end
     end
 

data/lib/card/action/action_renderer.rb

@@ -53,19 +53,29 @@ class Card
         end
       end
 
+      def relative_name
+        @action.card.name.from @format.card.name
+      end
+
       def name_diff
-        return @action.card.name if @action.card.name.compound?
+        return relative_name if @action.card.name.compound?
         # TODO: handle compound names better
 
-        if @action.card == @format.card
-          name_changes
-        else
-          link_to_view(
-            :related, name_changes,
-            path: { slot: { items: { view: "history", nest_name: @action.card.name } } }
-            # "data-slot-selector" => ".card-slot.history-view"
-          )
-        end
+        # if @action.card == @format.card
+        name_changes
+
+        # I commented out the following because it's hard to imagine it working; there
+        # no "related" view! But perhaps we do still need handling for this case, which
+        # is evidently for when there is a change involving a simple card that is not the
+        # act card??
+        #
+        # else
+        #   link_to_view(
+        #     :related, name_changes,
+        #     path: { slot: { items: { view: "history", nest_name: @action.card.name } } }
+        #     # "data-slot-selector" => ".card-slot.history-view"
+        #   )
+        # end
       end
 
       def content_diff

data/lib/card/action/changes.rb

@@ -102,11 +102,9 @@ class Card
       # @return [True/False] for :trash
       def interpret_value field, value
         case field.to_sym
-        when :type_id
-          value&.to_i
-        when :cardtype
-          Card.fetch_name(value&.to_i)
-        else value
+        when :type_id   then value&.to_i
+        when :cardtype  then value&.to_i&.cardname
+        else                 value
         end
       end
     end

data/lib/card/action.rb

@@ -31,8 +31,8 @@ class Card
                             inverse_of: :action,
                             dependent: :delete_all,
                             class_name: "Card::Change"
-    belongs_to :super_action, class_name: "Action", inverse_of: :sub_actions
-    has_many :sub_actions, class_name: "Action", inverse_of: :super_action
+    belongs_to :super_action, class_name: "Card::Action", inverse_of: :sub_actions
+    has_many :sub_actions, class_name: "Card::Action", inverse_of: :super_action
 
     scope :created_by, lambda { |actor_id|
                          joins(:act).where "card_acts.actor_id = ?", actor_id

data/set/all/history/events.rb

@@ -6,18 +6,14 @@ event :update_ancestor_timestamps, :integrate do
   ids.map { |anc_id| Card.expire anc_id.cardname }
 end
 
+# event :update_temporary_cache, :initialize do
+#   Card.cache.temp.write key, self if key.present?
+# end
+
 # must be called on all actions and before :set_name, :process_subcards and
 # :delete_children
 event :assign_action, :initialize, when: :actionable? do
-  act = director.need_act
-  @current_action = Card::Action.create(
-    card_act_id: act.id,
-    action_type: action,
-    draft: (Env.params["draft"] == "true")
-  )
-  if @supercard && @supercard != self
-    @current_action.super_action = @supercard.current_action
-  end
+  @current_action = new_action
 end
 
 event :detect_conflict, :validate, on: :update, when: :edit_conflict? do
@@ -53,12 +49,6 @@ event :finalize_act, after: :finalize_action, when: :act_card? do
   Card::Director.act.update! card_id: id
 end
 
-event :remove_empty_act, :integrate_with_delay_final,
-      priority: 100, when: :remove_empty_act? do
-  # Card::Director.act.delete
-  # Card::Director.act = nil
-end
-
 # can we store an action? (can be overridden, eg in files)
 def actionable?
   history?
@@ -81,6 +71,26 @@ end
 
 private
 
+def new_action
+  Card::Action.new(
+    act: director.need_act,
+    # ar_card: self,
+    action_type: action,
+    draft: draft_action?,
+    super_action: super_action
+  )
+end
+
+def draft_action?
+  Env.params["draft"] == "true"
+end
+
+def super_action
+  return unless @supercard && @supercard != self
+
+  @supercard.current_action
+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"

data/set/all/history.rb

@@ -3,6 +3,10 @@ def history?
   true
 end
 
+def no_history?
+  !history?
+end
+
 # all cards whose acts are considered part of this card's history
 def history_card_ids
   nestee_ids << id

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-history
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-18 00:00:00.000000000 Z
+date: 2024-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.106.0
+        version: 1.108.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.106.0
+        version: 1.108.0
 description: ''
 email:
 - info@decko.org
@@ -36,6 +36,7 @@ files:
 - LICENSE
 - README.md
 - assets/style/history.scss
+- config/admin.yml
 - config/locales/de.yml
 - config/locales/en.yml
 - data/test.yml
@@ -64,7 +65,7 @@ files:
 - set/all/history_board.rb
 homepage: https://decko.org
 licenses:
-- GPL-3.0
+- GPL-3.0-or-later
 metadata:
   source_code_uri: https://github.com/decko-commons/decko
   homepage_uri: https://decko.org
@@ -81,14 +82,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.7
 signing_key:
 specification_version: 4
 summary: Revision histories in acts, actions, and changes