card-mod-history 0.14.2 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccbd92284193d3ae18f7362eda4df4ec5cb3dbc39d51acb7736e576ac3d98055
-  data.tar.gz: 94dbede1221b6bca09d18cede43d48061b0628aae53a780190b529aa4ebf1feb
+  metadata.gz: a606a572b68b98bddd7dd1c0b66b305973568563e10313bb1606552a3edcbd28
+  data.tar.gz: 524823e9fd9881733620b6d84b4299f2b14e9e97e26f07e7d62b54b94c91bf8c
 SHA512:
-  metadata.gz: 6fafda9dac52772d2c109098ae5973f4311f441e5cc7050244ddb9adff1fef21b4874a7d6a183b506c1c1ab75fced8dbe9252d2911db3fb77eab53dc1914078b
-  data.tar.gz: 9fcae7b3223dfeb9243d8ba89bbd667f7757702e9b49d050b8e84718eac6d2874c684082b548d58c932d6f478b91b38f4d4b5e3915f5a232d2c85706d669e958
+  metadata.gz: 62a0a2b2aadde8097310d918f3ff52664138d33807eeba577b63756c14934f6f7c3a5ceb1c80eafa097da303e38ab5a5430ba8d15279290f8623208e97c8fd40
+  data.tar.gz: c6a0344f4580149810ecab2652e481a154ec6ad0f58709079adaf79c824f50bee04320feae1659a61c1b4d2c98e7168c54166cc55bcbba2ba0b2784803c60bdc

data/assets/style/history.scss

@@ -0,0 +1,92 @@
+.history-slot {
+  overflow: hidden;
+  clear: both;
+}
+
+ul.action-list {
+  list-style-type: none;
+  padding-left: 15px;
+  li {
+    border: 1px solid $border-color;
+  }
+  li:before {
+    font-family: 'Material Icons';
+    font-weight: normal;
+    font-style: normal;
+    display: inline-block;
+    line-height: 1;
+    text-transform: none;
+    letter-spacing: normal;
+    word-wrap: normal;
+    white-space: nowrap;
+    direction: ltr;
+    -webkit-font-smoothing: antialiased;
+    text-rendering: optimizeLegibility;
+    -moz-osx-font-smoothing: grayscale;
+    font-feature-settings: 'liga';
+
+
+    float: left;
+    margin-top: 8px;
+    margin-left: -2rem;
+    font-size: 120%;
+    padding-left: 4px;
+    max-height: 30px;
+  }
+
+  li.update:before {
+    content: "edit";
+    color: $gray-600;
+  }
+
+  li.create:before {
+    content: "add_circle";
+    color: $green;
+  }
+
+  li.delete:before {
+    content: "remove_circle";
+    color: $red;
+  }
+
+  li.draft:before {
+    content: "build";
+    color: $gray-600;
+  }
+}
+
+
+/*----------- Change View ---------*/
+
+.change-view {
+  padding: 5px 0px;
+  clear: both;
+  .change-card{
+    font-weight: bold;
+  }
+  .last-update {
+    float:right;
+    text-align: right;
+    a {
+      white-space: nowrap;
+    }
+  }
+}
+
+.diff-deleted {
+  text-decoration: line-through;
+  color: $red;
+  background: $red-200;
+  img {
+    border: 2px solid $red;
+  }
+}
+.diff-added {
+  color: $green;
+  background: $green-200;
+  text-decoration: none;
+  img {
+    margin: 0px 4px 0px 4px;
+    border: 2px solid $green;
+  }
+}

data/data/test.yml

@@ -0,0 +1,11 @@
+---
+- :name: First
+  :content: egg
+- :name: First
+  :content: chicken
+- :name: First
+  :content: chick
+  :user: Joe User
+  :time: "+1"
+  # note: user and time change ensures card is not considered pristine and won't be
+  # updated.

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

@@ -9,13 +9,7 @@ class Card
         end
 
         def subtitle
-          wrap_with :small do
-            [
-              @format.link_to_card(@act.actor, nil, class: "_stop_propagation"),
-              edited_ago,
-              rollback_link
-            ]
-          end
+          actor_and_ago
         end
 
         # FIXME: how do we know we need main here??

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

@@ -4,8 +4,8 @@ class Card
       # Used for the bridge
       class BridgeActRenderer < RelativeActRenderer
         def title
-          wrap_with(:div, left_title, class: "mr-2") +
-            wrap_with(:div, right_title, class: "ml-auto act-summary")
+          wrap_with(:div, left_title, class: "me-2") +
+            wrap_with(:div, right_title, class: "ms-auto act-summary")
         end
 
         def left_title
@@ -25,7 +25,7 @@ class Card
         def bridge_link
           opts = @format.bridge_link_opts(
             path: { act_id: @act.id, view: :bridge_act, act_seq: @args[:act_seq] },
-            "data-toggle": "pill"
+            "data-bs-toggle": "pill"
           )
           add_class opts, "d-flex nav-link"
           opts[:path].delete :layout

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

@@ -6,9 +6,7 @@ class Card
       # for the card of the format that renders the act.
       class RelativeActRenderer < ActRenderer
         def title
-          %(<span class="nr">##{@args[:act_seq]}</span>) +
-            accordion_expand_link(@act.actor.name) +
-            wrap_with(:small, edited_ago)
+          %(<span class="nr">##{@args[:act_seq]}</span> #{actor_and_ago})
         end
 
         def subtitle
@@ -25,8 +23,7 @@ class Card
 
         def rollback_or_edit_link
           if @act.draft?
-            autosaved_draft_link text: "continue editing",
-                                 class: "collapse #{collapse_id}"
+            autosaved_draft_link text: "continue editing"
           elsif show_rollback_link?
             rollback_link
           end
@@ -52,6 +49,31 @@ class Card
                               { class: "_close-modal",
                                 "data-slotter-mode": "update-modal-origin" }
         end
+
+        # Revert:
+        #   current update
+        # Restore:
+        #   current deletion
+        # Revert and Restore:
+        #   old deletions
+        # blank:
+        #   current create
+        # save as current:
+        #   not current, not deletion
+        def rollback_link
+          return unless @card.ok? :update
+
+          wrap_with :div, class: "act-link float-end" do
+            content_tag(:small, revert_link)
+
+            # link_to "Save as current",
+            #         class: "slotter", remote: true,
+            #         method: :post, rel: "nofollow",
+            #         "data-slot-selector" => ".card-slot.history-view",
+            #         path: { action: :update, action_ids: prior,
+            #                 view: :open, look_in_trash: true }
+          end
+        end
       end
     end
   end

data/lib/card/act/act_renderer.rb

@@ -25,44 +25,50 @@ class Card
       end
 
       def render
-        return "" unless @act_card
-
-        act_accordion
+        @act_card ? accordion_item : ""
       end
 
       def header
         # Card::Bootstrap.new(self).render do
         bs_layout do
-          row xs: [10, 2] do
+          row xs: [8, 4], class: "w-100" do
             column do
               html title
-              tag(:span, "text-muted pl-1 badge") { summary }
+              tag(:span, "text-muted ps-1 badge") { summary }
             end
-            column act_links, class: "text-right"
+            column subtitle, class: "text-end"
           end
         end
         # end
       end
 
       def absolute_title
-        accordion_expand_link(@act_card.name)
+        @act_card.name
+      end
+
+      def actor_and_ago
+        wrap_with(:small) { [@format.link_to_card(@act.actor), edited_ago] }
       end
 
       def details
         approved_actions[0..20].map do |action|
-          Action::ActionRenderer.new(@format, action, action_header?,
-                                     :summary).render
+          Action::ActionRenderer.new(@format, action, true, :summary).render
         end.join
       end
 
       def summary
         %i[create update delete draft].map do |type|
-          next unless count_types[type].positive?
-
-          "#{@format.action_icon type}<small> #{count_types[type]}</small>"
+          action_summary type
         end.compact.join "<small class='text-muted'> | </small>"
       end
 
+      def action_summary type
+        count = count_types[type]
+        return unless count.positive?
+
+        "#{@format.action_icon type}<small> #{count if count > 1}</small>"
+      end
+
       def act_links
         [
           link_to_history,
@@ -86,12 +92,6 @@ class Card
         # FIXME: should not need to test for presence of card here.
       end
 
-      def action_header?
-        true
-        # @action_header ||= approved_actions.size != 1 ||
-        #                   approved_actions[0].card_id != @format.card.id
-      end
-
       def count_types
         @count_types ||=
           approved_actions.each_with_object(
@@ -107,104 +107,28 @@ class Card
         "#{time_ago_in_words(@act.acted_at)} ago"
       end
 
-      def collapse_id
-        "act-id-#{@act.id}"
-      end
-
-      def accordion_expand_link text
-        <<-HTML
-          <a>
-            #{text}
-          </a>
-        HTML
-      end
-
-      # TODO: change accordion API in bootstrap/helper.rb so that it can be used
-      #   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
-        <<-HTML
-        <div class="card card-#{context} nodblclick">
-          #{act_accordion_panel}
-        </div>
-        HTML
-      end
-
-      def accordion_expand_options
-        {
-          "data-toggle" => "collapse",
-          "data-target" => ".#{collapse_id}",
-          "aria-expanded" => true,
-          "aria-controls" => collapse_id
-        }
-      end
-
-      def act_panel_options
-        { class: "card-header", role: "tab", id: "heading-#{collapse_id}" }
-      end
-
-      def act_accordion_panel
-        act_accordion_heading + act_accordion_body
-      end
-
-      def act_accordion_heading
-        wrap_with :div, act_panel_options.merge(accordion_expand_options) do
-          wrap_with(:h5, header, class: "mb-0") + subtitle
-        end
-      end
-
-      def act_accordion_body
-        wrap_with :div, id: collapse_id,
-                        class: "collapse #{collapse_id}",
-                        "data-parent": ".act-accordion-group" do
-          wrap_with :div, details, class: "card-body"
-        end
-      end
-
-      # Revert:
-      #   current update
-      # Restore:
-      #   current deletion
-      # Revert and Restore:
-      #   old deletions
-      # blank:
-      #   current create
-      # save as current:
-      #   not current, not deletion
-      def rollback_link
-        return unless @card.ok? :update
-
-        wrap_with :div, class: "act-link collapse #{collapse_id} float-right" do
-          content_tag(:small, revert_link)
-
-          # link_to "Save as current",
-          #         class: "slotter", remote: true,
-          #         method: :post, rel: "nofollow",
-          #         "data-slot-selector" => ".card-slot.history-view",
-          #         path: { action: :update, action_ids: prior,
-          #                 view: :open, look_in_trash: true }
-        end
-      end
-
-      def deletion_act?
-        act_type == :delete
+      def accordion_item
+        # context = @act.main_action&.draft ? :warning : :default
+        @format.accordion_item header,
+                               subheader: act_links,
+                               body: details, collapse_id: "act-id-#{@act.id}"
       end
 
       def act_type
         @act.main_action.action_type
       end
 
-      def show_or_hide_changes_link
-        wrap_with :div, class: "act-link" do
-          @format.link_to_view(
-            :act, "#{@args[:hide_diff] ? 'Show' : 'Hide'} changes",
-            path: { act_id: @args[:act].id, act_seq: @args[:act_seq],
-                    hide_diff: !@args[:hide_diff], action_view: :expanded,
-                    act_context: @args[:act_context], look_in_trash: true }
-          )
-        end
-      end
+      # TODO: get this working again, perhaps in action
+      # def show_or_hide_changes_link
+      #   wrap_with :div, class: "act-link" do
+      #     @format.link_to_view(
+      #       :act, "#{@args[:hide_diff] ? 'Show' : 'Hide'} changes",
+      #       path: { act_id: @act.id, act_seq: @args[:act_seq],
+      #               hide_diff: !@args[:hide_diff], action_view: :expanded,
+      #               act_context: @args[:act_context], look_in_trash: true }
+      #     )
+      #   end
+      # end
 
       def autosaved_draft_link opts={}
         text = opts.delete(:text) || "autosaved draft"

data/lib/card/action/action_renderer.rb

@@ -43,7 +43,7 @@ class Card
         bs_panel do
           if header
             heading do
-              div type_diff, class: "float-right"
+              div type_diff, class: "float-end"
               div name_diff
             end
           end
@@ -54,6 +54,9 @@ class Card
       end
 
       def name_diff
+        return @action.card.name if @action.card.name.compound?
+        # TODO: handle compound names better
+
         if @action.card == @format.card
           name_changes
         else

data/lib/card/action/differ.rb

@@ -2,13 +2,13 @@ class Card
   class Action
     # a collection of methods for comparing actions
     module Differ
-      # compare action's name value with previous name value
-      # @return [rendered diff]
-      def name_diff opts={}
-        return unless new_name?
-
-        diff_object(:name, opts).complete
-      end
+      # # compare action's name value with previous name value
+      # # @return [rendered diff]
+      # def name_diff opts={}
+      #   return unless new_name?
+      #
+      #   diff_object(:name, opts).complete
+      # end
 
       # does action change card's name?
       # @return [true/false]
@@ -45,17 +45,17 @@ class Card
         !value(:db_content).nil?
       end
 
-      # test whether content was visibly removed
-      # @return [true/false]
-      def red?
-        content_diff_object.red?
-      end
-
-      # test whether content was visibly added
-      # @return [true/false]
-      def green?
-        content_diff_object.green?
-      end
+      # # test whether content was visibly removed
+      # # @return [true/false]
+      # def red?
+      #   content_diff_object.red?
+      # end
+      #
+      # # test whether content was visibly added
+      # # @return [true/false]
+      # def green?
+      #   content_diff_object.green?
+      # end
 
       def raw_view content=nil
         original_content = card.db_content

data/lib/card/action.rb

@@ -77,23 +77,6 @@ class Card
     # @return [Card]
     def card
       Card.fetch card_id, look_in_trash: true
-
-      # I'm not sure what the rationale for the following was/is, but it was causing
-      # problems in cases where slot attributes are overridden (eg see #wrap_data in
-      # sources on wikirate).  The problem is the format object had the set modules but
-      # the card didn't.
-      #
-      # My guess is that the need for the following had something to do with errors
-      # associated with changed types. If so, the solution probably needs to handle
-      # including the set modules associated with the type at the time of the action
-      # rather than including no set modules at all.
-      #
-      # What's more, we _definitely_ don't want to hard code special behavior for
-      # specific types in here!
-
-      # , skip_modules: true
-      # return res unless res && res.type_id.in?([Card::FileID, Card::ImageID])
-      # res.include_set_modules
     end
 
     # remove action from action cache

data/lib/card/mod/history.rb

@@ -0,0 +1 @@
+Cardio::Railtie.config.acts_per_page = 10

data/set/all/history/act_listing.rb

@@ -16,7 +16,7 @@ format :html do
     bs_layout container: false, fluid: false do
       html _render_act_legend(draft_legend => :draft_legend)
       row(12) { act_list acts, context }
-      row(12) { act_paging acts, context }
+      # row(12) { act_paging acts, context }
     end
   end
 
@@ -43,7 +43,9 @@ format :html do
   end
 
   def act_accordion acts, context, &block
-    accordion_group acts_for_accordion(acts, context, &block), nil, class: "clear-both"
+    accordion do
+      acts_for_accordion(acts, context, &block).join
+    end
   end
 
   def acts_for_accordion acts, context
@@ -106,10 +108,10 @@ format :html do
 
   def action_icon action_type, extra_class=nil
     icon = case action_type
-           when :create then :add_circle
-           when :update then :pencil
-           when :delete then :remove_circle
-           when :draft then :wrench
+           when :create then :create_action
+           when :update then :update_action
+           when :delete then :delete_action
+           when :draft then :draft
            end
     icon_tag icon, extra_class
   end

data/set/all/history/actions.rb

@@ -4,21 +4,6 @@ def all_action_ids
   Card::Action.where(card_id: id).pluck :id
 end
 
-def action_from_id action_id
-  return unless action_id.is_a?(Integer) || action_id =~ /^\d+$/
-
-  # if not an integer, action_id is probably a mod (e.g. if you request
-  # files/:logo/standard.png)
-
-  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
   actions.where("id != ?", last_action_id)
 end
@@ -35,16 +20,6 @@ def nth_action index
         .order(:id).limit(1).offset(index - 1).first
 end
 
-def new_content_action_id
-  return unless @current_action && current_action_changes_content?
-
-  @current_action.id
-end
-
-def current_action_changes_content?
-  new_card? || @current_action.new_content? || db_content_is_changing?
-end
-
 format :html do
   def action_from_context
     if (action_id = voo.action_id || params[:action_id])
@@ -82,15 +57,15 @@ format :html do
 
   def toggle_action_content_link action, view_type
     other_view_type = view_type == :expanded ? :summary : :expanded
-    css_class = "revision-#{action.card_act_id} float-right"
+    css_class = "revision-#{action.card_act_id} float-end"
     link_to_view "action_#{other_view_type}",
-                 icon_tag(action_arrow_dir(view_type), class: "md-24"),
+                 icon_tag(action_arrow_dir(view_type)),
                  class: css_class,
                  path: { action_id: action.id, look_in_trash: true }
   end
 
   def action_arrow_dir view_type
-    view_type == :expanded ? :triangle_left : :triangle_right
+    view_type == :expanded ? :collapse : :expand
   end
 
   def revert_actions_link link_text, path_args, html_args={}

data/set/all/history/events.rb

@@ -1,5 +1,5 @@
 # must be called on all actions and before :set_name, :process_subcards and
-# :validate_delete_children
+# :delete_children
 event :assign_action, :initialize, when: :actionable? do
   act = director.need_act
   @current_action = Card::Action.create(
@@ -90,7 +90,8 @@ 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, when: :remove_empty_act? do
+event :remove_empty_act, :integrate_with_delay_final,
+      priority: 100, when: :remove_empty_act? do
   # Card::Director.act.delete
   # Card::Director.act = nil
 end

data/set/all/history/selected.rb

@@ -12,9 +12,7 @@ end
 
 def select_action_by_params params
   action = nth_action(params[:rev]) || action_from_id(params[:rev_id])
-  return unless action
-
-  select_action action.id
+  select_action action.id if action
 end
 
 def select_action action_id
@@ -62,3 +60,29 @@ end
 def selected_content_action_id
   @selected_action_id || new_content_action_id || last_content_action_id
 end
+
+private
+
+def new_content_action_id
+  return unless @current_action && current_action_changes_content?
+
+  @current_action.id
+end
+
+def current_action_changes_content?
+  new_card? || @current_action.new_content? || db_content_is_changing?
+end
+
+def action_from_id action_id
+  return unless action_id.is_a?(Integer) || action_id =~ /^\d+$/
+  # if not an integer, action_id is probably a mod (e.g. if you request
+  # files/:logo/standard.png)
+
+  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

data/set/all/history/views.rb

@@ -1,22 +1,26 @@
 # History views
 
 format :html do
-  view :history, cache: :never do
+  view :history, cache: :never do # why no cache?
     frame do
       class_up "d0-card-body",  "history-slot"
-      acts_layout card.history_acts, :relative, :show
+      render_relative_history
     end
   end
 
+  view :relative_history do
+    acts_layout card.history_acts, :relative, :show
+  end
+
   view :act, cache: :never do
     act_listing act_from_context
   end
 
   view :act_legend do
     bs_layout do
-      row md: [12, 12], lg: [7, 5] do
+      row md: [12, 12], lg: [7, 5], class: "pb-3" do
         col action_legend
-        col content_legend, class: "text-right"
+        col content_legend, class: "text-end"
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-history
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.15.1
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-08 00:00:00.000000000 Z
+date: 2023-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.104.2
+        version: 1.105.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.104.2
+        version: 1.105.1
 description: ''
 email:
 - info@decko.org
@@ -33,6 +33,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- assets/style/history.scss
+- config/locales/de.yml
+- config/locales/en.yml
+- data/test.yml
 - lib/card/act.rb
 - lib/card/act/act_renderer.rb
 - lib/card/act/act_renderer/absolute_act_renderer.rb
@@ -44,8 +48,7 @@ files:
 - lib/card/action/changes.rb
 - lib/card/action/differ.rb
 - lib/card/change.rb
-- locales/de.yml
-- locales/en.yml
+- lib/card/mod/history.rb
 - set/all/history.rb
 - set/all/history/act_listing.rb
 - set/all/history/actions.rb
@@ -66,6 +69,7 @@ metadata:
   wiki_uri: https://decko.org
   documentation_url: http://docs.decko.org/
   card-mod: history
+  card-mod-group: gem-defaults
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -81,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.11
 signing_key:
 specification_version: 4
 summary: Revision histories in acts, actions, and changes