card 1.96.1 → 1.96.2

data/mod/basic_formats/spec/set/all/json_spec.rb

@@ -13,12 +13,18 @@ RSpec.describe Card::Set::All::Json do
   end
 
   describe "molecule view" do
+    def basic_nucleus
+      Card["Basic"].format(:json).render :nucleus
+    end
+
     context "with internal link" do
       it "has link url" do
         expect_view(:molecule, format: :json)
           .to eq atom_values.merge items: [],
                                    links: [json_url("Z")],
-                                   ancestors: []
+                                   ancestors: [],
+                                   type: basic_nucleus,
+                                   html_url: "http://json.com/A"
       end
     end
 
@@ -33,7 +39,9 @@ RSpec.describe Card::Set::All::Json do
         expect_view(:molecule, format: :json)
           .to eq atom_values.merge items: [],
                                    links: ["http://xkcd.com", url("Z")],
-                                   ancestors: []
+                                   ancestors: [],
+                                   type: basic_nucleus,
+                                   html_url: "http://json.com/external_link"
       end
     end
 
@@ -46,7 +54,9 @@ RSpec.describe Card::Set::All::Json do
         expect_view(:molecule, format: :json)
           .to eq atom_values.merge items: [atom_values(Card["Z"])],
                                    links: [],
-                                   ancestors: []
+                                   ancestors: [],
+                                   type: basic_nucleus,
+                                   html_url: "http://json.com/B"
       end
     end
   end

data/mod/basic_formats/spec/shared_context/json_shared_context.rb

@@ -18,18 +18,13 @@ RSpec.shared_context "json context", shared_context: :json do
     {
       id: card.id,
       name: card.name,
-      url: json_url(card.name.url_key),
-      html_url: "#{root}/#{card.name.url_key}"
+      type: card.type_name,
+      url: json_url(card.name.url_key)
     }
   end
 
   def atom_values card=card_subject, structured: false
-    values = nucleus_values(card).merge(
-      type: card.type_name,
-      type_url: json_url(card.type_name),
-      atom_url: json_url(card.name.url_key, "view=atom"),
-      nucleus_url: json_url(card.name.url_key, "view=nucleus")
-    )
+    values = nucleus_values card
     values[:content] = card.content unless structured
     values
   end

data/mod/basic_types/set/type/json.rb

@@ -3,12 +3,24 @@ event :validate_json, :validate, on: :save, changed: :content do
 end
 
 def check_json_syntax
-  JSON.parse content
+  parse_content
 rescue JSON::ParserError => e
   errors.add tr(:invalid_json), e.message.sub(/^\d+: /, "").to_s
 end
 
+def parse_content
+  JSON.parse content
+end
+
+def item_names _args={}
+  parse_content.keys
+end
+
 format :html do
+  view :core do
+    process_content ::CodeRay.scan(_render_raw, :json).div
+  end
+
   def editor
     :ace_editor
   end

data/mod/bootstrap/set/abstract/bootswatch_theme/html_views.rb

@@ -3,7 +3,6 @@ include_set Abstract::BsBadge
 
 format :html do
   before :box do
-    super()
     voo.show! :customize_button, :box_middle
   end
 

data/mod/bootstrap/set/all/bootstrap/helper.rb

@@ -199,4 +199,11 @@ format :html do
     add_class options, "badge"
     wrap_with :span, content, options
   end
+
+  def popover_link text, title=nil
+    opts = { class: "pl-1 text-muted-link", path: "#", "data-toggle": "popover",
+             "data-trigger": :focus, "data-content": text }
+    opts["data-title"] = title if title
+    link_to fa_icon("question-circle"), opts
+  end
 end

data/mod/bootstrap/set/self/script_bootstrap.rb

@@ -6,8 +6,7 @@ def source_dir
 end
 
 def source_files
-  %w[vendor/bootstrap/assets/js/vendor/popper.min.js
-     vendor/bootstrap/dist/js/bootstrap.min.js
+  %w[vendor/bootstrap/dist/js/bootstrap.bundle.js
      lib/javascript/bootstrap_modal_wagn.js
      vendor/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.min.js]
 end

data/mod/core/set/all/content.rb

@@ -1,5 +1,3 @@
-::Card.error_codes[:conflict] = [:conflict, 409]
-
 def content= value
   self.db_content = value
 end
@@ -72,10 +70,6 @@ def updater
   Card[updater_id]
 end
 
-def clean_html?
-  true
-end
-
 def save_content_draft _content
   clear_drafts
 end
@@ -115,6 +109,10 @@ def prepare_content
   clean_html? ? Card::Content.clean!(cont) : cont
 end
 
+def clean_html?
+  true
+end
+
 def use_default_content?
   !db_content_changed? && template && template.db_content.present?
 end

data/mod/core/set/all/export.rb

@@ -1,30 +1,54 @@
 format :json do
-  before :export do
-    @export_depth = inherit(:export_depth).to_i + 1
-    @exported_keys = inherit(:exported_keys) || ::Set.new
-  end
-
+  # returns an array of Hashes (each in export_item view)
   view :export, cache: :never do
-    # avoid loops
-    return [] if @export_depth > max_export_depth || @exported_keys.include?(card.key)
-    @exported_keys << card.key
-    Array.wrap(render_atom).concat(render_export_items).flatten
+    exporting_uniques do
+      Array.wrap(render_export_item).concat(export_items_in_view(:export)).flatten
+    end
   end
 
   def max_export_depth
     Env.params[:max_export_depth].present? ? Env.params[:max_export_depth].to_i : 2
   end
 
-  before :export_items do
-    @exported_keys = inherit(:exported_keys) || ::Set.new
+  # returns an array of Hashes (each in export_item view)
+  view :export_items, cache: :never do
+    exporting_uniques do
+      export_items_in_view :export_item
+    end
   end
 
-  view :export_items, cache: :never do
-    valid_items_for_export.map do |item|
-      nest item, view: :export
+  # returns Hash with the essentials needed to import a card into a new database
+  view :export_item do
+    item = { name: card.name, type: card.type_name, content: card.content }
+    item[:codename] = card.codename if card.codename
+    track_exporting card
+    item
+  end
+
+  def export_items_in_view view
+    within_max_depth do
+      valid_items_for_export.map do |item|
+        nest item, view: view
+      end
     end
   end
 
+  def track_exporting card
+    return unless @exported_keys
+    @exported_keys << card.key
+  end
+
+  def exporting_uniques
+    @exported_keys ||= inherit(:exported_keys) || ::Set.new
+    yield
+  end
+
+  # prevent recursion
+  def within_max_depth
+    @export_depth ||= inherit(:export_depth).to_i + 1
+    @export_depth > max_export_depth ? [] : yield
+  end
+
   def items_for_export
     nest_chunks.map do |chunk|
       next if main_nest_chunk? chunk
@@ -39,7 +63,7 @@ format :json do
   end
 
   def valid_export_card? ecard
-    ecard.real? && ecard != card && !@exported_keys.include?(ecard.key)
+    ecard.real? && !@exported_keys.include?(ecard.key)
   end
 
   def main_nest_chunk? chunk

data/mod/core/set/all/fetch.rb

@@ -71,6 +71,15 @@ module ClassMethods
   # ATTRIBUTE FETCHING
   # The following methods optimize fetching of specific attributes
 
+  def id cardish
+    case cardish
+    when Integer then cardish
+    when Card then cardish.id
+    when Symbol then Card::Codename.id cardish
+    else fetch_id cardish
+    end
+  end
+
   # @params *mark - see #fetch
   # @return [Integer]
   def fetch_id *mark

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

@@ -1,7 +1,3 @@
-
-Card.error_codes.merge! permission_denied: [:denial, 403],
-                        captcha: [:errors, 449]
-
 module ClassMethods
   def repair_all_permissions
     Card.where("(read_rule_class is null or read_rule_id is null) and trash is false")

data/mod/core/set/all/phases.rb

@@ -12,5 +12,5 @@ delegate :storage_phase, to: :director
 delegate :integration_phase, to: :director
 
 # def clean_up
-#   Card::A# ctManager.clear
+#   Card::ActManager.clear
 # end

data/mod/core/set/all/subcards.rb

@@ -74,6 +74,7 @@ event :handle_subcard_errors do
     subcard.errors.each do |field, err|
       subcard_error subcard, field, err
     end
+    subcard.errors.clear
   end
 end
 

data/mod/core/set/all/trash.rb

@@ -112,11 +112,15 @@ event :validate_delete_children, after: :validate_delete, on: :delete do
     # prevents errors in cases where a child is deleted prior to this point
     # and thus is not returned by the fetch in #children
 
-    child.trash = true
-    add_subcard child
+    delete_as_subcard child
     # next if child.valid?
     # child.errors.each do |field, message|
     #   errors.add field, "can't delete #{child.name}: #{message}"
     # end
   end
 end
+
+def delete_as_subcard subcard
+  subcard.trash = true
+  add_subcard subcard
+end

data/mod/core/set/all/type.rb

@@ -52,7 +52,7 @@ event :validate_type_change, :validate, on: :update, changed: :type_id do
   end
 end
 
-event :validate_type, :validate, changed: :type_id do
+event :validate_type, :validate, changed: :type_id, on: :save do
   errors.add :type, tr(:error_no_such_type) unless type_name
 
   if (rt = structure) && rt.assigns_type? && type_id != rt.type_id

data/mod/core/set/all/utils.rb

@@ -33,7 +33,7 @@ module ClassMethods
     card = fetch name, new: {}
     return unless mergeable? card, opts[:pristine]
     resolve_file_attributes! attribs
-    card.update_attributes! attribs.reverse_merge(skip: :validate_renaming)
+    card.safe_update! attribs
   end
 
   private
@@ -50,3 +50,15 @@ module ClassMethods
     !card.pristine?
   end
 end
+
+# sepaarte name and other attributes
+def safe_update! attribs
+  separate_name_update! attribs.delete("name") unless new?
+  update_attributes! attribs if attribs.present?
+end
+
+def separate_name_update! new_name
+  return if new_name.to_s == name.to_s
+
+  update_attributes! name: new_name
+end

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

@@ -216,10 +216,8 @@ RSpec.describe Card::Set::All::Fetch do
       end
       context "when new card exist" do
         it "doesn't change content" do
-          Card.new name: "new card",
-                   "+sub" => { content: "some content" }
-          card = Card.fetch "new card+sub",
-                            new: { default_content: "new content" }
+          Card.new name: "new card", "+sub" => { content: "some content" }
+          card = Card.fetch "new card+sub", new: { default_content: "new content" }
           expect(card).to have_db_content "some content"
         end
       end
@@ -274,6 +272,21 @@ RSpec.describe Card::Set::All::Fetch do
     end
   end
 
+  describe "#id" do
+    it "handles integer args" do
+      expect(Card.id(1234)).to eq(1234)
+    end
+
+    it "handles card args" do
+      a = Card["A"]
+      expect(Card.id(a)).to eq(a.id)
+    end
+
+    it "handles symbols" do
+      expect(Card.id(:structure)).to eq(Card::StructureID)
+    end
+  end
+
   describe "#exists?" do
     it "is true for cards that are there" do
       expect(Card.exists?("A")).to eq(true)

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

@@ -3,70 +3,22 @@ def history?
   true
 end
 
-# all acts with actions on self and on cards included in self (ie, acts shown in history)
-def history_acts
-  @history_acts ||= Act.all_with_actions_on(history_card_ids, true).order id: :desc
-end
-
+# all cards whose acts are considered part of this card's history
 def history_card_ids
   includee_ids << id
 end
 
-format :html do
-  view :history, cache: :never do
-    frame do
-      voo.show :toolbar
-      class_up "d0-card-body",  "history-slot"
-      acts_layout card.history_acts, :relative, :show
-    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 action_legend
-    types = %i[create update delete]
-    legend = types.map do |action_type|
-      "#{action_icon(action_type)} #{action_type}d"
-    end
-    legend << _render_draft_legend if voo.show?(:draft_legend)
-    "<small>Actions: #{legend.join ' | '}</small>"
-  end
-
-  view :draft_legend do
-    "#{action_icon(:draft)} unsaved draft"
-  end
-
-  def content_legend
-    legend = [Card::Content::Diff.render_added_chunk("Additions"),
-              Card::Content::Diff.render_deleted_chunk("Subtractions")]
-    "<small>Content changes: #{legend.join ' | '}</small>"
-  end
-
-  def content_changes action, diff_type, hide_diff=false
-    if hide_diff
-      action.raw_view
-    else
-      action.content_diff diff_type
-    end
-  end
-end
-
+# FIXME: optimize (no need to instantiate all actions and changes!)
 def first_change? # = update or delete
   @current_action.action_type != :create && @current_action.card.actions.size == 2 &&
     create_action.card_changes.empty?
 end
 
+# card has account that is responsible for prior acts
+def has_edits?
+  Card::Act.where(actor_id: id).where("card_id IS NOT NULL").present?
+end
+
 def changed_fields
   Card::Change::TRACKED_FIELDS & (changed_attribute_names_to_save | saved_changes.keys)
 end
@@ -82,6 +34,31 @@ def diff_args
   { diff_format: :text }
 end
 
-def has_edits?
-  Card::Act.where(actor_id: id).where("card_id IS NOT NULL").present?
+# 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
+  delete_all_changes
+  old_actions.delete_all
+  last_action.update_attributes! action_type: :create
+end
+
+def clear_history
+  delete_all_changes
+  delete_old_actions
+end
+
+def delete_old_actions
+  old_actions.delete_all
+end
+
+def delete_all_changes
+  Card::Change.where(card_action_id: all_action_ids).delete_all
+end
+
+def save_content_draft content
+  super
+  acts.create do |act|
+    act.ar_actions.build(draft: true, card_id: id, action_type: :update)
+       .card_changes.build(field: :db_content, value: content)
+  end
 end