card 1.92.2 → 1.93.0

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

@@ -27,7 +27,7 @@ describe Card::Set::All::Name do
       end.to increase_card_count.by(3)
       expect(Card["Peach"]).to be_a(Card)
       expect(Card["Pear"]).to be_a(Card)
-      expect(Card["Peach+Pear"]).to have_content "juicy"
+      expect(Card["Peach+Pear"]).to have_db_content "juicy"
     end
   end
 

data/mod/core/spec/set/all/permissions/reader_rules_spec.rb

@@ -25,7 +25,7 @@ describe Card::Set::All::Permissions do
     end
 
     it "updates to user ('Joe Admin')" do
-      @perm_card.content = "[[Joe Admin]]"
+      @perm_card.db_content = "[[Joe Admin]]"
       Card::Auth.as_bot { @perm_card.save! }
 
       card = Card.fetch("Home")

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

@@ -326,7 +326,7 @@ describe Card::Set::All::Permissions do
       Card::Auth.as_bot do
         @delete_rule_card = Card.fetch "*all+*delete", new: {}
         @delete_rule_card.type_id = Card::PointerID
-        @delete_rule_card.content = "[[Joe_User]]"
+        @delete_rule_card.db_content = "[[Joe_User]]"
         @delete_rule_card.save!
       end
     end
@@ -366,7 +366,7 @@ describe Card::Set::All::Permissions do
 
   describe "cardtypes and permissions" do
     specify "cardtype b has create role r1" do
-      expect(Card["Cardtype B+*type+*create"]).to have_content("[[r3]]")
+      expect(Card["Cardtype B+*type+*create"]).to have_db_content("[[r3]]")
                                                     .and have_type :pointer
     end
 

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

@@ -3,7 +3,7 @@
 module RenameMethods
   def name_invariant_attributes card
     {
-      content: card.content,
+      content: card.db_content,
       # updater_id:  card.updater_id,
       # revisions:   card.actions.count,
       referers: card.referers.map(&:name).sort,
@@ -117,9 +117,9 @@ RSpec.describe Card::Set::All::Rename do
       Card.create! name: "Orange", type: "Fruit", content: "[[Pit]]"
       Card.create! name: "Fruit+*type+*structure", content: "this [[Pit]]"
 
-      assert_equal "this [[Pit]]", Card["Orange"].raw_content
+      assert_equal "this [[Pit]]", Card["Orange"].content
       c.update_attributes! name: "Seed", update_referers: true
-      assert_equal "this [[Seed]]", Card["Orange"].raw_content
+      assert_equal "this [[Seed]]", Card["Orange"].content
     end
   end
 
@@ -129,13 +129,15 @@ RSpec.describe Card::Set::All::Rename do
 
   context "self references" do
     example "renaming card with self link should nothang" do
+      pre_content = Card["self_aware"].content
       update "self aware", name: "buttah", update_referers: true
-      expect_content_of("Buttah").to eq "[[/new/{{_self|name}}|new]]"
+      expect_content_of("Buttah").to eq pre_content
     end
 
     it "renames card without updating references" do
+      pre_content = Card["self_aware"].content
       update "self aware", name: "Newt", update_referers: false
-      expect_content_of("Newt").to eq "[[/new/{{_self|name}}|new]]"
+      expect_content_of("Newt").to eq pre_content
     end
   end
 

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

@@ -37,7 +37,7 @@ describe Card::Set::All::Templating do
         @bt.save!
       end
       jb = @jb.refresh true
-      expect(jb.format.render(:raw)).to eq("Tomorrow")
+      expect(jb.format.render!(:raw)).to eq("Tomorrow")
       expect(jb.type_id).to eq(Card::PhraseID)
     end
 
@@ -48,7 +48,7 @@ describe Card::Set::All::Templating do
                      content: "Yesterday"
       end
       jb = @jb.refresh true
-      expect(jb.raw_content).to eq("Yesterday")
+      expect(jb.content).to eq("Yesterday")
       expect(jb.type_id).to eq(Card::PlainTextID)
     end
   end
@@ -74,7 +74,7 @@ describe Card::Set::All::Templating do
 
     it "applies to new cards" do
       pb = Card.new name: "Pete+birthday"
-      expect(pb.raw_content).to eq("Today!")
+      expect(pb.content).to eq("Today!")
       expect(pb.content).to eq("Today!")
     end
   end
@@ -104,7 +104,7 @@ describe Card::Set::All::Templating do
       end
 
       it "*right setting should override *type setting" do
-        expect(Card["Jim+birthday"].raw_content).to eq("Today")
+        expect(Card["Jim+birthday"].content).to eq("Today")
       end
 
       it "defers to normal content " \
@@ -112,7 +112,7 @@ describe Card::Set::All::Templating do
         Card::Auth.as_bot do
           Card.create! name: "Jim+birthday+*self+*structure", content: "_self"
         end
-        expect(Card["Jim+birthday"].raw_content).to eq("Yesterday")
+        expect(Card["Jim+birthday"].content).to eq("Yesterday")
       end
     end
   end

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

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::All::Type do
-  describe "card with wagneered type" do
+  describe "card with deckered type" do
     before do
       Card::Auth.as_bot do
         @type = Card.create! name: "Hat", type: "Cardtype"

data/mod/developer/set/all/event_viz.rb

@@ -1,5 +1,3 @@
-require_dependency "active_support/callbacks_ext"
-
 # the events method is a developer's tool for visualizing the event order
 # for a given card.
 # For example, from a console you might run
@@ -11,7 +9,7 @@ require_dependency "active_support/callbacks_ext"
 #
 # Note: as of yet, the functionality is a bit rough.  It does not display events
 # that are called directly from within other events,
-# and certain event requirements (like the presence of a 'current_act') may
+# and certain event requirements (like the presence of an 'act') may
 # prevent events from showing up in the tree.
 def events action
   @action = action

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

@@ -1,13 +1,9 @@
 # -*- encoding : utf-8 -*-
 
 class Card
-  # An "act" is a group of recorded {Card::Action actions} on {Card cards}.
-  # Together, {Act acts}, {Action actions}, and {Change changes} comprise a
-  # comprehensive {Card card} history tracking system.
+  # An "act" is a group of recorded {Card::Action actions} on {Card cards}. Together, {Act acts}, {Action actions}, and {Change changes} comprise a comprehensive {Card card} history tracking system.
   #
-  # For example, if a given web form submissions updates the contents of
-  # three cards, then the submission will result in the recording of three
-  # {Action actions}, each of which is tied to one {Act act}.
+  # For example, if a given web form submissions updates the contents of three cards, then the submission will result in the recording of three {Action actions}, each of which is tied to one {Act act}.
   #
   # Each act records:
   #

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

@@ -155,7 +155,7 @@ class Card
       def act_accordion_body
         wrap_with :div, id: collapse_id,
                   class: "collapse #{collapse_id}" do
-          wrap_with :div, details, class: "card-block"
+          wrap_with :div, details, class: "card-body"
         end
       end
 
@@ -171,7 +171,7 @@ class Card
       #   not current, not deletion
       def rollback_link
         return unless card.ok? :update
-        wrap_with :div, class: "act-link collapse #{collapse_id} pull-right" do
+        wrap_with :div, class: "act-link collapse #{collapse_id} float-right" do
           revert_link
 
 
@@ -190,15 +190,10 @@ class Card
       end
 
       def revert_actions_link link_text, revert_to: :this, slot_selector: nil, html_args: {}
-        return unless card.ok? :update
-        html_args.merge! remote: true, method: :post, rel: "nofollow",
-                         path: { action: :update, view: :open, look_in_trash: true,
-                                 revert_actions: @act.actions.map(&:id),
-                                 revert_to: revert_to }
-
-        html_args[:path]["data-slot-selector"] = slot_selector if slot_selector
-        add_class html_args, "slotter"
-        link_to link_text, html_args
+        @format.revert_actions_link @act, link_text,
+                                    revert_to: revert_to,
+                                    slot_selector: slot_selector,
+                                    html_args: html_args
       end
 
       def deletion_act?

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

@@ -41,7 +41,7 @@ class Card
         bs_panel do
           if header
             heading do
-              div type_diff, class: "pull-right"
+              div type_diff, class: "float-right"
               div name_diff
             end
           end

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

@@ -33,7 +33,7 @@ class Card
           "card_actions.id is null"
         ).pluck_in_batches(:id) do |group_ids|
           # used to be .delete_all here, but that was failing on large dbs
-          puts "deleting batch of changes"
+          Rails.logger.info "deleting batch of changes"
           where("id in (#{group_ids.join ','})").delete_all
         end
       end

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

@@ -55,7 +55,7 @@ format :html do
     other_view_type = view_type == :expanded ? :summary : :expanded
     link_to_view "action_#{other_view_type}",
                  icon_tag(arrow_dir(view_type)),
-                 class: "slotter revision-#{action.card_act_id} pull-right",
+                 class: "slotter revision-#{action.card_act_id} float-right",
                  path: { action_id: action.id, look_in_trash: true }
   end
 

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

@@ -28,11 +28,12 @@ def nth_action index
         .order(:id).limit(1).offset(index - 1).first
 end
 
-def revision action
+def revision action, before_action=false
   # a "revision" refers to the state of all tracked fields
   # at the time of a given action
   action = Card::Action.fetch(action) if action.is_a? Integer
   return unless action
+  return revision_before_action action if before_action
   Card::Change::TRACKED_FIELDS.each_with_object({}) do |field, attr_changes|
     last_change = action.change(field) ||
                   last_change_on(field, not_after: action)
@@ -40,6 +41,14 @@ def revision action
   end
 end
 
+def revision_before_action action
+  if (prev_action = action.previous_action)
+    revision prev_action
+  else
+    { trash: true }
+  end
+end
+
 # Delete all changes and old actions and make the last action the create action
 # (that way the changes for that action will be created with the first update)
 def make_last_action_the_initial_action

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

@@ -3,15 +3,15 @@
 #  methods, but we need a distict module so that super will be able to refer to
 # the base methods.
 def content
-  if @selected_action_id
-    @selected_content ||= begin
-      change = last_change_on :db_content, not_after: @selected_action_id,
-                                           including_drafts: true
-      (change && change.value) || db_content
-    end
-  else
-    super
-  end
+  @selected_action_id ? selected_content : super
+end
+
+def selected_content
+  @selected_content ||= content_at_time_of_selected_action || db_content
+end
+
+def content_at_time_of_selected_action
+  last_change_on(:db_content, not_after: @selected_action_id, including_drafts: true)&.value
 end
 
 def content= value

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

@@ -12,9 +12,9 @@ def actionable?
 end
 
 event :assign_action, :initialize, when: proc { |c| c.actionable? } do
-  @current_act = director.need_act
+  act = director.need_act
   @current_action = Card::Action.create(
-    card_act_id: @current_act.id,
+    card_act_id: act.id,
     action_type: @action,
     draft: (Env.params["draft"] == "true")
   )
@@ -74,19 +74,18 @@ def finalize_action?
   actionable? && current_action
 end
 
-event :finalize_act,
-      after: :finalize_action,
-      when: proc { |c|  c.act_card? } do
-  @current_act.update_attributes! card_id: id
+event :finalize_act, after: :finalize_action, when: :act_card? do
+  Card::ActManager.act.update_attributes! card_id: id
 end
 
 event :remove_empty_act,
-      :integrate_with_delay_final,
-      when: proc { |c|  c.act_card? } do
-  if @current_act&.actions&.reload&.empty?
-      @current_act.delete
-      @current_act = nil
-  end
+      :integrate_with_delay_final, when: :remove_empty_act? do
+  #Card::ActManager.act.delete
+  #Card::ActManager.act = nil
+end
+
+def remove_empty_act?
+  act_card? && ActManager.act&.actions&.reload&.empty?
 end
 
 
@@ -96,28 +95,29 @@ end
 
 event :rollback_actions,
       :prepare_to_validate, on: :update, when: :rollback_request? do
-  revision = { subcards: {} }
-
-  rollback_actions.each do |action|
+  update_args = { subcards: {} }
+  revert_actions.each do |action|
+    rev = action.card.revision(action, revert_to_previous_action?)
     if action.card_id == id
-      revision.merge!(revision(action))
+      update_args.merge! rev
     else
-      revision[:subcards][action.card.name] = revision(action)
+      update_args[:subcards][action.card.name] = rev
     end
   end
-  Env.params["action_ids"] = nil
-  update_attributes! revision
+  Env.params["revert_actions"] = nil
+  update_attributes! update_args
   clear_drafts
   abort :success
 end
 
-def rollback_actions
-  actions =
-    Env.params["revert_actions"].map do |a_id|
-      Action.fetch(a_id) || nil
-    end.compact
-  actions.map! { |a| a.previous_action } if Env.params["revert_to"] == "previous"
-  actions.compact
+def revert_to_previous_action?
+  Env.params["revert_to"] == "previous"
+end
+
+def revert_actions
+  Env.params["revert_actions"].map do |a_id|
+    Action.fetch(a_id) || nil
+  end.compact
 end
 
 def rollback_request?
@@ -172,7 +172,7 @@ format :html do
     class_up "d0-card-body",  "history-slot"
     frame do
       bs_layout container: true, fluid: true do
-        html _optional_render_history_legend(with_drafts: true)
+        html _render_history_legend(with_drafts: true)
         row 12 do
           html _render_act_list acts: history_acts
         end
@@ -192,6 +192,19 @@ format :html do
     end
   end
 
+  def revert_actions_link act, link_text,
+                          revert_to: :this, slot_selector: nil, html_args: {}
+    return unless card.ok? :update
+    html_args.merge! remote: true, method: :post, rel: "nofollow",
+                     path: { action: :update, view: :open, look_in_trash: true,
+                             revert_actions: act.actions.map(&:id),
+                             revert_to: revert_to }
+
+    html_args[:path]["data-slot-selector"] = slot_selector if slot_selector
+    add_class html_args, "slotter"
+    link_to link_text, html_args
+  end
+
   def history_acts
     card.intrusive_acts.page(page_from_params).per(ACTS_PER_PAGE)
   end

data/mod/machines/lib/javascript/decko.js.coffee

@@ -217,7 +217,7 @@ $(window).ready ->
         input = $(this).find '.file-upload'
         if input[1]
           $(this).notify(
-            "Wagn does not yet support multiple files in a single form.",
+            "Decko does not yet support multiple files in a single form.",
             "error"
           )
           return false

data/mod/machines/lib/javascript/decko_filter.js.coffee

@@ -0,0 +1,40 @@
+$(window).ready ->
+  $('body').on "change", "._filter_input_field", ->
+    form = $(this).closest("._filter_form")
+    form.submit()
+
+  $('body').on "click", "._filter_category_select", ->
+    addFilterDropdown = $(this).closest("._add_filter_dropdown")
+    category = $(this).data("category")
+    label = $(this).data("label")
+    filterCategorySelected(addFilterDropdown, category, label)
+
+  $('body').on "click", "._delete_filter_input", ->
+    form = $(this).closest("._filter_form")
+    input = $(this).closest("._filter_input")
+    addCategoryOption(form, input.data("category"))
+    input.remove()
+    form.submit()
+
+filterCategorySelected = (addFilterDropdown, selectedCategory, label) ->
+  removeCategoryOption(addFilterDropdown, selectedCategory)
+
+  widget = addFilterDropdown.closest("._filter_widget")
+
+  # add new search input field
+  $searchInputField = $(widget.find("._filter_input_field_prototypes > ._filter_input_field.#{selectedCategory}")[0])
+
+  # deal with select2
+  # $searchInputField.find(".select2-hidden-accessible").select2("destroy")
+  # $searchInputField = $($searchInputField.html()).clone(true)
+  # $searchInputField.find("select").select2()
+
+  $(widget.find("._add_filter_dropdown")).before($searchInputField)
+  $searchInputField.find("._filter_input_field").focus()
+
+
+addCategoryOption = (form, option) ->
+  form.find("._filter_category_select[data-category='#{option}']").show()
+
+removeCategoryOption = (form, option) ->
+  form.find("._filter_category_select[data-category='#{option}']").hide()