card 1.91 → 1.92

data/mod/core/spec/set/all/trash_spec.rb

@@ -1,81 +1,104 @@
 # -*- encoding : utf-8 -*-
 
-describe Card::Set::All::Trash do
-  subject do
-    card = Card[@name]
+describe Card, "deleted card" do
+  before do
     Card::Auth.as_bot do
-      card.delete
+      @c = Card["A"]
+      @c.delete!
     end
-    card.errors[:delete].first
-  end
-
-  it "certain 'all rules' should be indestructable" do
-    @name = "*all+*default"
-    is_expected.to eq("#{@name} is an indestructible rule")
-    expect(Card[@name]).to be
   end
-
-  it "does not delete account with edits" do
-    @name = "Joe User"
-    is_expected.to match("Edits have been made with #{@name}'s user account")
-    expect(Card[@name]).to be
+  it "is in the trash" do
+    expect(@c.trash).to be_truthy
   end
-
-  it "deletes account without edits" do
+  it "comes out of the trash when a plus card is created" do
     Card::Auth.as_bot do
-      name = "born to die"
-      card = Card.create! name: name, type_code: :user
-      card.delete
-      expect(Card[name]).not_to be
+      Card.create(name: "A+*acct")
+      c = Card["A"]
+      expect(c.trash).to be_falsey
     end
   end
+end
 
-  it "deletes children" do
-    Card::Auth.as_bot do
-      name = "born to die"
-      card = Card.create! name: name, "+sub" => "a subcard"
-      expect(Card["#{name}+sub"]).to be
-      card.delete
-      expect(Card["#{name}+sub"]).not_to be
-    end
+describe Card::Set::All::Trash do
+  it "dependent removal" do
+    create! "born to die"
+    create! "born to die+slowly"
+    create! "slowly+born to die"
+    create! "born to die+slowly+without regrets"
+
+    Card["born to die"].delete!
+
+    expect(Card["born to die"]).to be_nil
+    expect(Card["born to die+slowly"]).to be_nil
+    expect(Card["slowly+born to die"]).to be_nil
+    expect(Card["born to die+slowly+without regrets"]).to be_nil
+    expect(Card["slowly"]).to be_a Card
+    expect(Card["without regrets"]).to be_a Card
+
+    trashed_dependant = Card.find_by_name "born to die+slowly+without regrets"
+    expect(trashed_dependant.trash).to be_truthy
   end
 
-  it "deletes children under a set" do
-    Card::Auth.as_bot do
-      type = Card.create! name: "Metric Value", type_id: Card::CardtypeID
-      Card.create! name: "Metric value+value+*type plus right",
-                   type_id: Card::SetID
-      mv1_name = "Richard Mills+Annual Sales+CA+2014"
-      mv2_name = "Richard Mills+Annual Profits+CA+2014"
-      Card.create! name: mv1_name, type_id: type.id
-      Card.create! name: mv2_name, type_id: type.id
-      Card.create! name: "#{mv1_name}+value", type_id: Card::BasicID
-      Card.create! name: "#{mv2_name}+value", type_id: Card::BasicID
+  it "deletes children under a set", as_bot: true do
+    create_set "Book+value+*type plus right",
+               book1 = "Richard Mills+Annual Sales+CA+2014"
+    book2 = "Richard Mills+Annual Profits+CA+2014"
+    create_book book1
+    create_book book2
+    create! "#{book1}+value"
+    create! "#{book2}+value"
 
-      expect(Card["CA"]).to be
-      Card["CA"].delete
-      expect(Card["CA"]).not_to be
-      expect(Card[mv1_name]).not_to be
-      expect(Card["#{mv1_name}+value"]).not_to be
-      expect(Card[mv2_name]).not_to be
-      expect(Card["#{mv2_name}+value"]).not_to be
-    end
+    expect(Card["CA"]).to be
+
+    Card["CA"].delete!
+
+    expect(Card["CA"]).not_to be
+    expect(Card[book1]).not_to be
+    expect(Card["#{book1}+value"]).not_to be
+    expect(Card[book2]).not_to be
+    expect(Card["#{book2}+value"]).not_to be
   end
 
-  it "deletes account of user" do
-    Card::Auth.as_bot do
-      @signup = Card.create!(
-        name: "born to die", type_id: Card::SignupID,
-        "+*account" => { "+*email" => "wolf@wagn.org", "+*password" => "wolf" }
-      )
-      @signup.update_attributes!({})
+  it "deletes account of user", as_bot: true do
+    expect(Card["Sample User", :account]).to be_a Card
+    Card["Sample User"].delete!
+    expect(Card["Sample User", :account]).not_to be
+    # @signup =
+    #   create_signup "born to die",
+    #                 "+*account" => { "+*email" => "wolf@wagn.org", "+*password" => "wolf" }
+    # @signup.update_attributes!({})
+    # Card::Cache.reset_all
+    #
+    # Card::Auth.as_bot do
+    #   expect(Card.search(right: "*account")).not_to be_empty
+    #   Card["born to die"].delete!
+    # end
+    # expect(Card["born to die+*account"]).not_to be
+  end
+
+  describe "event: validate_delete" do
+    it "certain 'all rules' should be indestructable" do
+      rule = "*all+*default"
+      expect { Card[rule].delete! }
+        .to raise_error(/is an indestructible rule/)
+
+      expect(Card[rule]).to be_a Card
     end
-    Card::Cache.reset_all
 
-    Card::Auth.as_bot do
-      expect(Card.search(right: "*account")).not_to be_empty
-      Card["born to die"].delete!
+    context "card with account" do
+      context "with edits" do
+        it "is not removable" do
+          expect { Card["Joe User"].delete! }
+            .to raise_error(/Edits have been made with Joe User's user account/)
+        end
+      end
+
+      context "without edits" do
+        it "is removable" do
+          expect { Card["Sample User"].delete! }
+            .not_to raise_error
+        end
+      end
     end
-    expect(Card["born to die+*account"]).not_to be
   end
 end

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

@@ -16,7 +16,7 @@ class Card
   # - _acted_at_, a timestamp of the action
   # - the _ip_address_ of the actor where applicable.
   #
-  class Act < ActiveRecord::Base
+  class Act < ApplicationRecord
     before_save :assign_actor
     has_many :actions, -> { order :id }, foreign_key: :card_act_id,
                                          inverse_of: :act,
@@ -48,7 +48,7 @@ class Card
         sql = "card_actions.card_id IN (:card_ids) AND ( (draft is not true) "
         sql << (args[:with_drafts] ? "OR actor_id = :current_user_id)" : ")")
         vars = { card_ids: card_ids, current_user_id: Card::Auth.current_id }
-        joins(:actions).where(sql, vars).uniq.order(:id).reverse_order
+        joins(:actions).where(sql, vars).distinct.order(:id).reverse_order
       end
 
       # all actions that current user has permission to view
@@ -117,8 +117,9 @@ class Card
     end
 
     # used by rails time_ago
-    def timestamp_attributes_for_create
-      super << :acted_at
+    # timestamp is set by rails on create
+    def self.timestamp_attributes_for_create
+      super << "acted_at"
     end
   end
 end

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

@@ -1,5 +1,3 @@
-# require_dependency File.expand_path("../../action/action_renderer", __FILE__)
-
 class Card
   class Act
     class ActRenderer
@@ -33,18 +31,14 @@ class Card
 
       def header
         #::Bootstrap.new(self).render do
-        #::Boo.bs do
         bs_layout do
           row 10, 2 do
             column do
               html title
-              tag(:span, "text-muted") { summary }
+              tag(:span, "text-muted pl-1 badge") {summary}
             end
             column act_links, class: "text-right"
           end
-          row 12 do
-            column subtitle
-          end
         end
         # end
       end
@@ -75,17 +69,18 @@ class Card
       end
 
       def link_to_act_card
-        link_to_card @act_card, icon_tag(:new_window)
+        link_to_card @act_card, icon_tag(:new_window), class: "_stop_propagation"
       end
 
       def link_to_history
         link_to_card @act_card, icon_tag(:history),
                      path: { view: :history, look_in_trash: true },
+                     class: "_stop_propagation",
                      rel: "nofollow"
       end
 
       def approved_actions
-        @approved_actions ||= actions.select { |a| a.card && a.card.ok?(:read) }
+        @approved_actions ||= actions #.select { |a| a.card && a.card.ok?(:read) }
         # FIXME: should not need to test for presence of card here.
       end
 
@@ -98,13 +93,14 @@ class Card
       def count_types
         @count_types ||=
           approved_actions.each_with_object(
-            Hash.new { |h, k| h[k] = 0 }
+            Hash.new {|h, k| h[k] = 0}
           ) do |action, type_cnt|
             type_cnt[action.action_type] += 1
           end
       end
 
       def edited_ago
+        return "" unless @act.acted_at
         "#{time_ago_in_words(@act.acted_at)} ago"
       end
 
@@ -126,7 +122,7 @@ class Card
       def act_accordion
         context = @act.main_action.draft ? :warning : :default
         <<-HTML
-        <div class="panel panel-#{context}">
+        <div class="card card-#{context}">
           #{act_accordion_panel}
         </div>
         HTML
@@ -143,7 +139,7 @@ class Card
       end
 
       def act_panel_options
-        { class: "panel-heading", role: "tab", id: "heading-#{collapse_id}" }
+        { class: "card-header", role: "tab", id: "heading-#{collapse_id}" }
       end
 
       def act_accordion_panel
@@ -152,33 +148,64 @@ class Card
 
       def act_accordion_heading
         wrap_with :div, act_panel_options.merge(accordion_expand_options) do
-          wrap_with :h4, header, class: "panel-title"
+          wrap_with(:h5, header, class: "mb-0") + subtitle
         end
       end
 
       def act_accordion_body
         wrap_with :div, id: collapse_id,
-                        class: "panel-collapse collapse #{collapse_id}" do
-          wrap_with :div, details, class: "panel-body"
+                  class: "collapse #{collapse_id}" do
+          wrap_with :div, details, class: "card-block"
         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
-        return unless (prior = previous_action)
-        wrap_with :div, class: "act-link collapse #{collapse_id}" do
-          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 }
+        wrap_with :div, class: "act-link collapse #{collapse_id} pull-right" do
+          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 previous_action
-        # TODO: optimize
-        actions.reject { |action| action.card.last_action_id == action.id }
+      def revert_link
+        revert_actions_link "revert to this", revert_to: :this,
+                                              slot_selector: ".card-slot.history-view"
+      end
+
+      def revert_actions_link link_text, revert_to: :this, slot_selector:
+        return unless card.ok? :update
+        args = { remote: true, method: :post, rel: "nofollow",
+                    path: { action: :update, view: :open, look_in_trash: true,
+                            revert_actions: @act.actions.map(&:id),
+                            "data-slot-selector" => slot_selector } }
+        add_class args, "slotter"
+        args[:path][:revert_to] = revert_to
+        link_to link_text, args
+      end
+
+      def deletion_act?
+        act_type == :delete
+      end
+
+      def act_type
+        @act.main_action.action_type
       end
 
       def show_or_hide_changes_link
@@ -186,8 +213,8 @@ class Card
           @format.link_to_view(
             :act, "#{@args[:hide_diff] ? 'Show' : 'Hide'} changes",
             class: "slotter",
-            path: { act_id:      @args[:act].id,      act_seq: @args[:act_seq],
-                    hide_diff:  !@args[:hide_diff],   action_view: :expanded,
+            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

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

@@ -1,6 +1,8 @@
 class Card
   class Act
     class ActRenderer
+      # Used for recent changes.
+      # It shows all actions of an act
       class AbsoluteActRenderer < ActRenderer
         def title
           absolute_title
@@ -9,12 +11,18 @@ class Card
         def subtitle
           wrap_with :small do
             [
-              @format.link_to_card(@act.actor),
-              edited_ago
+              @format.link_to_card(@act.actor, nil, class: "_stop_propagation"),
+              edited_ago,
+              rollback_link
             ]
           end
         end
 
+        def revert_link
+          revert_actions_link "revert to previous version", revert_to: :previous,
+                              slot_selector: "#main > .card-slot"
+        end
+
         def actions
           @act.actions
         end

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

@@ -1,6 +1,9 @@
 class Card
   class Act
     class ActRenderer
+      # Use for the history for one specific card
+      # It shows only the actions of an act that are relevant
+      # for the card of the format that renders the act.
       class RelativeActRenderer < ActRenderer
         def title
           "<span class=\"nr\">##{@args[:act_seq]}</span>" +
@@ -23,11 +26,15 @@ class Card
           if @act.draft?
             autosaved_draft_link text: "continue editing",
                                  class: "collapse #{collapse_id}"
-          elsif !current_act?
+          elsif show_rollback_link?
             rollback_link
           end
         end
 
+        def show_rollback_link?
+          !current_act?
+        end
+
         def current_act?
           return unless @format.card.last_act && @act
           @act.id == @format.card.last_act.id

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

@@ -20,7 +20,7 @@ class Card
   # * a boolean indicated whether the action is a _draft_
   # * a _comment_ (where applicable)
   #
-  class Action < ActiveRecord::Base
+  class Action < ApplicationRecord
     include Card::Action::Differ
     extend Card::Action::Admin
 
@@ -85,6 +85,10 @@ class Card
       TYPE_OPTIONS[read_attribute(:action_type)]
     end
 
+    def previous_action
+      Card::Action.where("id < ? AND card_id = ?", id, card_id).last
+    end
+
     # value set by action's {Change} to given field
     # @see #interpret_field #interpret_field for field param
     # @see #interpret_value #interpret_value for return values
@@ -113,6 +117,7 @@ class Card
     # @see #interpret_field #interpret_field for field param
     # @return [Change]
     def previous_change field
+      return nil if action_type == :create
       field = interpret_field field
       if @previous_changes && @previous_changes.key?(field)
         @previous_changes[field]
@@ -126,8 +131,30 @@ class Card
     # @return [Hash]
     def changes
       @changes ||=
-        card_changes.each_with_object({}) do |change, hash|
-          hash[change.field.to_sym] = change
+        if sole?
+          current_changes
+        else
+          card_changes.each_with_object({}) do |change, hash|
+            hash[change.field.to_sym] = change
+          end
+        end
+    end
+
+    # all action in hash form. { field1: new_value }
+    def changed_values
+      @changed_values ||= changes.each_with_object({}) do |(key,change), h|
+        h[key] = change.value
+      end
+    end
+
+    # @return [Hash]
+    def current_changes
+      return {} unless card
+      @current_changes ||=
+        Card::Change::TRACKED_FIELDS.each_with_object({}) do |field, hash|
+          hash[field.to_sym] = Card::Change.new field: field,
+                                                value: card.send(field),
+                                                card_action_id: id
         end
     end
 
@@ -177,5 +204,10 @@ class Card
       else value
       end
     end
+
+    def sole?
+      card_changes.empty? &&
+        (action_type == :create || Card::Action.where(card_id: card_id).count == 1)
+    end
   end
 end