card 1.19.6 → 1.20.0

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

@@ -0,0 +1,25 @@
+class Card
+  class Act
+    class ActRenderer
+      class AbsoluteActRenderer < ActRenderer
+        def title
+          absolute_title
+        end
+
+        def subtitle
+          wrap_with :small do
+            [
+              @format.link_to_card(@act.actor),
+              edited_ago
+            ]
+          end
+        end
+
+        def actions
+          @act.actions
+        end
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,41 @@
+class Card
+  class Act
+    class ActRenderer
+      class RelativeActRenderer < ActRenderer
+        def title
+          "<span class=\"nr\">##{@args[:act_seq]}</span>" +
+            accordion_expand_link(@act.actor.name) +
+            " " +
+            wrap_with(:small, edited_ago)
+        end
+
+        def subtitle
+          return "" unless @act.card_id != @format.card.id
+          wrap_with :small, "act on #{absolute_title}"
+        end
+
+        def act_links
+          return unless (content = rollback_or_edit_link)
+          wrap_with :small, content
+        end
+
+        def rollback_or_edit_link
+          if @act.draft?
+            autosaved_draft_link text: "continue editing",
+                                 class: "collapse #{collapse_id}"
+          elsif !current_act?
+            rollback_link
+          end
+        end
+
+        def current_act?
+          @act.id == @format.card.last_act.id
+        end
+
+        def actions
+          @actions ||= @act.actions_affecting(@card)
+        end
+      end
+    end
+  end
+end

data/mod/history/lib/card/action.rb

@@ -81,6 +81,7 @@ class Card
     # retrieve action_type (create, update, or delete)
     # @return [Symbol]
     def action_type
+      return :draft if draft
       TYPE_OPTIONS[read_attribute(:action_type)]
     end
 

data/mod/history/lib/card/action/action_renderer.rb

@@ -0,0 +1,92 @@
+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
+        @header = header
+        @action_view = action_view
+        @hide_diff = hide_diff
+      end
+
+      include ::Bootstrapper
+      def method_missing(method_name, *args, &block)
+        if block_given?
+          @format.send(method_name, *args, &block)
+        else
+          @format.send(method_name, *args)
+        end
+      end
+
+      def respond_to_missing? method_name, _include_private=false
+        @format.respond_to? method_name
+      end
+
+      def render
+        bs_layout container: true, fluid: true do
+          row do
+            html <<-HTML
+              <ul class="action-list">
+                <li class="glyphicon-bullet #{action.action_type}">
+                  #{action_panel}
+                </li>
+              </ul>
+            HTML
+          end
+        end
+      end
+
+      def action_panel
+        bs_panel do
+          if header
+            heading do
+              div type_diff, class: "pull-right"
+              div name_diff
+            end
+          end
+          body do
+            content_diff
+          end
+        end
+      end
+
+      def name_diff
+        if @action.card == @format.card
+          name_changes
+        else
+          link_to_view(
+            :related, name_changes,
+            path: { related: { view: "history", name: @action.card.name } },
+            remote: true,
+            class: "slotter",
+            #"data-slot-selector" => ".card-slot.history-view"
+          )
+        end
+      end
+
+      def content_diff
+        return @action.raw_view if @action.action_type == :delete
+        @format.subformat(@action.card)._render_action_summary action: @action
+      end
+
+      def type_diff
+        return "" unless @action.new_type?
+        @hide_diff ? @action.value(:cardtype) : @action.cardtype_diff
+      end
+
+      def name_changes
+        return old_name unless @action.new_name?
+        @hide_diff ? new_name : Card::Content::Diff.complete(old_name, new_name)
+      end
+
+      def old_name
+        (name = @action.previous_value :name) && showname(name).to_s
+      end
+
+      def new_name
+        showname(@action.value(:name)).to_s
+      end
+    end
+  end
+end

data/mod/history/lib/card/action/differ.rb

@@ -44,6 +44,10 @@ class Card
         card.db_content = original_content
       end
 
+      def summary_diff_omits_content?
+        content_diff_object.summary_omits_content?
+      end
+
       private
 
       def diff_object field, opts
@@ -53,7 +57,8 @@ class Card
       def content_diff_object opts=nil
         @diff ||= begin
           diff_args = opts || card.include_set_modules.diff_args
-          previous = raw_view previous_value(:content)
+          previous_value = previous_value(:content)
+          previous = previous_value ? raw_view(previous_value) : ""
           current = raw_view
           Card::Content::Diff.new previous, current, diff_args
         end

data/mod/history/set/all/act_view.rb

@@ -0,0 +1,64 @@
+ACTS_PER_PAGE = Card.config.acts_per_page
+
+format :html do
+  def default_act_args args
+    act = (args[:act]  ||= Act.find(params["act_id"]))
+    args[:act_seq]     ||= params["act_seq"]
+    args[:hide_diff]   ||= hide_diff?
+    args[:slot_class]  ||= "revision-#{act.id} history-slot list-group-item"
+    args[:action_view] ||= action_view
+    act_context args
+  end
+
+  view :act_list, cache: :never do |args|
+    acts = args.delete :acts
+    page = params["page"] || 1
+    count = acts.size + 1 - (page.to_i - 1) * ACTS_PER_PAGE
+    accordion_group(acts.map do |act|
+      if (act_card = act.card)
+        count -= 1
+        act_card.format(:html).render_act args.merge(act: act, act_seq: count)
+      else
+        Rails.logger.info "bad data, act: #{act}"
+        ""
+      end
+    end, nil, class: "clear-both")
+  end
+
+  view :act, cache: :never do |args|
+    act_renderer(args[:act_context]).new(self, args[:act], args).render
+  end
+
+  def action_icon action_type, extra_class=nil
+    icon = case action_type
+           when :create then "plus"
+           when :update then "pencil"
+           when :delete then "trash"
+           when :draft then "wrench"
+           end
+    glyphicon icon, extra_class
+  end
+
+  def action_view
+    (params["action_view"] || "summary").to_sym
+  end
+
+  def hide_diff?
+    params["hide_diff"].to_s.strip == "true"
+  end
+
+  private
+
+  def act_renderer context
+    if context == :absolute
+      Act::ActRenderer::AbsoluteActRenderer
+    else
+      Act::ActRenderer::RelativeActRenderer
+    end
+  end
+
+  def act_context args
+    args[:act_context] =
+      (args[:act_context] || params["act_context"] || :relative).to_sym
+  end
+end

data/mod/history/set/all/action_view.rb

@@ -0,0 +1,65 @@
+format :html do
+  def default_action_expanded_args args
+    args[:action] ||= action_from_params || card.last_action
+    args[:header] ||= params[:header]
+  end
+
+  view :action_expanded do |args|
+    render_action_content args[:action], :expanded
+  end
+
+  def default_action_summary_args args
+    default_action_expanded_args args
+  end
+
+  view :action_summary do |args|
+    render_action_content args[:action], :summary
+  end
+
+  view :action_content_toggle do |args|
+    toggle_action_content_link args[:action], args[:view_type]
+  end
+
+  def render_action_content action, view_type
+    return "" unless action.present?
+    wrap do
+      [
+        action_content_toggle(action, view_type),
+        content_diff(action, view_type)
+      ]
+    end
+  end
+
+  def content_diff action, view_type
+    diff = action.new_content? &&
+           _render_content_changes(action: action, diff_type: view_type) #, hide_diff: @hide_diff
+    return "<i>empty</i>" unless diff.present?
+    diff
+  end
+
+  def action_from_params
+    return unless (action_id = params[:action_id])
+    Action.find action_id
+  end
+
+  def action_content_toggle action, view_type
+    return unless show_action_content_toggle?(action, view_type)
+    toggle_action_content_link action, view_type
+  end
+
+  def show_action_content_toggle? action, view_type
+    action.summary_diff_omits_content? || view_type == :expanded
+  end
+
+  def toggle_action_content_link action, view_type
+    other_view_type = view_type == :expanded ? :summary : :expanded
+    link_to_view "action_#{other_view_type}",
+                 glyphicon(arrow_dir(view_type)),
+                 class: "slotter revision-#{action.card_act_id} pull-right",
+                 path: { action_id: action.id, look_in_trash: true }
+  end
+
+  def arrow_dir view_type
+    view_type == :expanded ? "triangle-left" : "triangle-right"
+  end
+end

data/mod/history/set/all/content_history.rb

@@ -22,29 +22,33 @@ end
 def save_content_draft content
   super
   acts.create do |act|
-    act.actions.build(draft: true, card_id: id)
+    act.actions.build(draft: true, card_id: id, action_type: :update)
        .card_changes.build(field: :db_content, value: content)
   end
 end
 
 def last_change_on field, opts={}
-  where_sql = "card_actions.card_id = :card_id AND field = :field"
-  where_sql += " AND (draft is not true)" unless opts[:including_drafts]
-  if opts[:before]
-    where_sql += " AND card_action_id < :action_id"
-  elsif opts[:not_after]
-    where_sql += " AND card_action_id <= :action_id"
-  end
-
-  action_arg = opts[:before] || opts[:not_after]
-  action_id = action_arg.is_a?(Card::Action) ? action_arg.id : action_arg
   Change.joins(:action).where(
-    where_sql, card_id: id,
-               field: Card::Change.field_index(field),
-               action_id: action_id
+    last_change_sql_conditions(opts),
+    card_id: id,
+    action_id: extract_action_id(opts[:before] || opts[:not_after]),
+    field: Card::Change.field_index(field)
   ).order(:id).last
 end
 
+def extract_action_id action_arg
+  action_arg.is_a?(Card::Action) ? action_arg.id : action_arg
+end
+
+def last_change_sql_conditions opts
+  cond = "card_actions.card_id = :card_id AND field = :field"
+  cond += " AND (draft is not true)" unless opts[:including_drafts]
+  operator = "<" if opts[:before]
+  operator = "<=" if opts[:not_after]
+  cond += " AND card_action_id #{operator} :action_id" if operator
+  cond
+end
+
 def selected_action_id
   @selected_action_id || (@current_action && @current_action.id) ||
     last_action_id
@@ -61,14 +65,16 @@ end
 
 def with_selected_action_id action_id
   current_action_id = @selected_action_id
-  run_callbacks :select_action do
-    self.selected_action_id = action_id
-  end
+  select_action_id action_id
   result = yield
+  select_action_id current_action_id
+  result
+end
+
+def select_action_id action_id
   run_callbacks :select_action do
-    self.selected_action_id = current_action_id
+    self.selected_action_id = action_id
   end
-  result
 end
 
 def selected_content_action_id
@@ -76,10 +82,12 @@ def selected_content_action_id
 end
 
 def new_content_action_id
-  if @current_action && (new_card? || @current_action.new_content? ||
-     db_content_changed?)
-    @current_action.id
-  end
+  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_changed?
 end
 
 def last_action_id
@@ -108,7 +116,7 @@ def last_act
   @last_act ||=
     if (action = last_action)
       last_act_on_self = acts.last
-      if last_act_on_self &&
+      if last_act_on_self && action.act &&
          (action.act == last_act_on_self ||
          last_act_on_self.acted_at > action.act.acted_at)
         last_act_on_self
@@ -123,12 +131,9 @@ def acted_at
 end
 
 def previous_action action_id
-  if action_id
-    action_index = actions.find_index do |a|
-      a.id == action_id
-    end
-    actions[action_index - 1] if action_index.to_i != 0
-  end
+  return unless action_id
+  action_index = actions.find_index { |a| a.id == action_id }
+  actions[action_index - 1] if action_index.to_i.nonzero?
 end
 
 def revised_at
@@ -151,11 +156,13 @@ def draft_acts
   drafts.created_by(Card::Auth.current_id).map(&:act)
 end
 
-event :detect_conflict, :validate,
-      on: :update, when: proc { |c| c.history? } do
-  if last_action_id_before_edit &&
-     last_action_id_before_edit.to_i != last_action_id &&
-     last_action.act.actor_id != Auth.current_id
-    errors.add :conflict, "changes not based on latest revision"
-  end
+event :detect_conflict, :validate, on: :update,
+                                   when: proc { |c| c.edit_conflict? } do
+  errors.add :conflict, "changes not based on latest revision"
+end
+
+def edit_conflict?
+  last_action_id_before_edit &&
+    last_action_id_before_edit.to_i != last_action_id &&
+    last_action.act.actor_id != Auth.current_id
 end