card 1.99.2 → 1.100.0

data/tmpsets/set/mod017-follow/all/notify/base_views.rb

@@ -33,7 +33,7 @@ module Format; parent.send :register_set_format, Card::Format, self; extend Card
     end
   end
 
-  view :followed, perms: :none, closed: true do
+  view :followed, perms: :none, compact: true do
     if (set_card = followed_set_card) && (option_card = follow_option_card)
       option_card.description set_card
     else
@@ -41,20 +41,18 @@ module Format; parent.send :register_set_format, Card::Format, self; extend Card
     end
   end
 
-  view :follower, perms: :none, closed: true do
+  view :follower, perms: :none, compact: true do
     active_notice(:follower) || "follower"
   end
 
   view :last_action_verb, cache: :never do
-    return unless notification_act
-
-    "#{notification_act.main_action.action_type}d"
+    "#{notification_act&.main_action&.action_type || 'edite'}d"
   end
 
-  view :unfollow_url, perms: :none, closed: true, cache: :never do
+  view :unfollow_url, perms: :none, compact: true, cache: :never do
     return "" unless (rule_name = live_follow_rule_name)
 
-    card_url path(mark: "#{active_notice(:follower)}+#{Card[:follow].name}",
+    card_url path(mark: "#{active_notice(:follower)}+#{:follow.cardname}",
                   action: :update,
                   card: { subcards: { rule_name => Card[:never].name } })
   end
@@ -96,7 +94,6 @@ module Format; parent.send :register_set_format, Card::Format, self; extend Card
 
   def edit_info_for field, action
     return nil unless (value = action.value field)
-
     value = action.previous_value if action.action_type == :delete
     wrap_list_item "  #{notification_action_label action} #{field}: #{value}"
   end

data/tmpsets/set/mod017-follow/right/account.rb

@@ -6,15 +6,17 @@ module Account;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/follow/set/right/account.rb"; end
 def send_change_notice act, followed_set, follow_option
-  return unless changes_visible?(act)
+  return unless email.present? && changes_visible?(act)
 
+  notify_of_act act do
+    { follower: left.name, followed_set: followed_set, follow_option: follow_option }
+  end
+end
+
+def notify_of_act act
   Auth.as(left.id) do
     Card[:follower_notification_email].deliver(
-      act.card, { to: email },
-      auth: left,
-      active_notice: { follower: left.name,
-                       followed_set: followed_set,
-                       follow_option: follow_option }
+      act.card, { to: email }, auth: left, active_notice: yield
     )
   end
 end

data/tmpsets/set/mod017-follow/right/followers.rb

@@ -18,18 +18,15 @@ module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, s
 end
 
 def content
-  return "" unless left
-
-  item_names.map { |item| "[[#{item}]]" }.join "\n"
+  left ? item_names.to_pointer_content : ""
 end
 
 def item_names _args={}
-  return [] unless left
-  left.follow_set_card.prototype.follower_names
+  left ? left.follow_set_card.prototype.follower_names : []
 end
 
 def virtual?
-  !real?
+  new?
 end
 end;end;end;end;
 # ~~ generated from /Users/ethan/dev/decko/gem/card/mod/follow/set/right/followers.rb ~~

data/tmpsets/set/mod017-follow/right/following.rb

@@ -6,7 +6,7 @@ module Following;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/follow/set/right/following.rb"; end
 def virtual?
-  !real?
+  new?
 end
 
 module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
@@ -30,7 +30,7 @@ module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, s
     end
   end
 
-  view :closed_content do
+  view :one_line_content do
     ""
   end
 

data/tmpsets/set/mod017-follow/self/edited.rb

@@ -11,7 +11,7 @@ restrictive_follow_opts position: 2
 
 follower_candidate_ids do |card|
   # FIXME? - could optimize by not using cards table...
-  Card.search editor_of: card.name, return: :id
+  card.id ? Card.search(editor_of: card.id, return: :id) : []
 end
 
 def title

data/tmpsets/set/mod017-follow/self/follow_defaults.rb

@@ -55,7 +55,7 @@ module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, s
     frame_and_form :update, hidden: { success: "_self",
                                       card: { update_all_users: false } } do
       [
-        _render_content_formgroup,
+        _render_content_formgroups,
         _render_confirm_update_all,
         _render_edit_buttons
       ]

data/tmpsets/set/mod017-follow/type/cardtype.rb

@@ -20,5 +20,11 @@ end
 def list_direct_followers?
   true
 end
+
+module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
+  def related_by_type_items
+    super.unshift ["#{card.name} cards", [card, :type, :by_name], mark: :absolute]
+  end
+end
 end;end;end;end;
 # ~~ generated from /Users/ethan/dev/decko/gem/card/mod/follow/set/type/cardtype.rb ~~

data/tmpsets/set/mod017-follow/type_plus_right/user/follow.rb

@@ -2,25 +2,23 @@
 class Card; module Set; class TypePlusRight; module User;
 # Set: All "+Follow" cards on "User" cards
 #
-# a virtual pointer to the sets that a user is following.
 module Follow;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/follow/set/type_plus_right/user/follow.rb"; end
+FOLLOW_TABS = { "Follow" => "follow_tab", "Ignore" => "ignore_tab" }.freeze
+
+# a virtual pointer to the sets that a user is following.
 # (data is stored in preferences: `[Set]+[User]+:follow`)
 
 include_set Abstract::Pointer
 def virtual?
-  !real?
+  new?
 end
 
-# def content
-#   item_names.map { |name| "[[#{name}]]" }
-# end
-
 # overrides pointer default
 def item_names _args={}
   if (user = left)
-    Card.preference_names user.name, "follow"
+    Card::Rule.preference_names user.name, "follow"
   else
     []
   end
@@ -35,7 +33,7 @@ def current_user?
 end
 
 module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
-  view :closed_content do
+  view :one_line_content do
     ""
   end
 
@@ -45,8 +43,7 @@ module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, s
 
   # renders follow tab and ignore tab
   view :core do
-    lazy_loading_tabs({ "follow_tab" => "Follow", "ignore_tab" => "Ignore" },
-                      "follow_tab") do
+    tabs FOLLOW_TABS, "follow_tab", load: :lazy do
       render_follow_tab
     end
   end

data/tmpsets/set/mod018-developer/right/debug.rb

@@ -6,27 +6,26 @@ module Debug;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/developer/set/right/debug.rb"; end
 def virtual?
-  true
+  new?
 end
 
 module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
   view :core do
-    subject = card.left
+    core_section_config(card.left).map do |item|
+      section(*item)
+    end
+  end
 
-    output [
-      ["Sets",
-       static_tabs("set modules" => set_modules_accordion(subject),
+  def core_section_config subject
+    [["Sets", tabs("set modules" => set_modules_accordion(subject),
                    "all modules" => singleton_modules_list(subject),
-                   "patterns" => set_patterns_breadcrumb(subject))],
-      ["Views",
-       static_tabs("by format" => subformat(subject)._render_views_by_format,
-                   "by name" => subformat(subject)._render_views_by_name)],
-      ["Events",
-       static_tabs(create: "<pre>#{subject.events(:create)}</pre>",
-                   update: "<pre>#{subject.events(:update)}</pre>",
-                   delete: "<pre>#{subject.events(:delete)}</pre>")],
-      ["Cache/DB Comparison", cache_comparison_table(subject)]
-    ].map { |item| section(*item) }
+                   "patterns"    => set_patterns_breadcrumb(subject))],
+     ["Views", tabs("by format" => subformat(subject)._render_views_by_format,
+                    "by name" => subformat(subject)._render_views_by_name)],
+     ["Events", tabs(create: "<pre>#{subject.events(:create)}</pre>",
+                     update: "<pre>#{subject.events(:update)}</pre>",
+                     delete: "<pre>#{subject.events(:delete)}</pre>")],
+     ["Cache/DB Comparison", cache_comparison_table(subject)]]
   end
 
   # rubocop:disable AccessorMethodName

data/tmpsets/set/mod019-carrierwave/abstract/attachment.rb

@@ -5,8 +5,6 @@ class Card; module Set; class Abstract
 module Attachment;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/carrierwave/set/abstract/attachment.rb"; end
-require "carrier_wave/cardmount"
-
 attr_writer :empty_ok
 
 def self.included host_class
@@ -19,8 +17,7 @@ end
 
 # we need a card id for the path so we have to update db_content when we have
 # an id
-event :correct_identifier, :finalize,
-      on: :create, when: proc { |c| !c.web? } do
+event :correct_identifier, :finalize, on: :create, when: proc { |c| !c.web? } do
   update_column(:db_content, attachment.db_content)
   expire
 end
@@ -30,7 +27,7 @@ event :save_original_filename, :prepare_to_store, on: :save, when: :file_ready_t
   @current_action.update! comment: original_filename
 end
 
-event :validate_file_exist, :validate, on: :save do
+event :validate_file_exist, :validate, on: :create do
   return if empty_ok?
   if will_be_stored_as == :web
     errors.add "url is missing" if content.blank?
@@ -105,7 +102,7 @@ def revision action, before_action=false
 end
 
 def attachment_format ext
-  if ext.present? && attachment && (original_ext = attachment.extension)
+  if ext.present? && attachment && (original_ext = attachment.extension.sub(/^\./, ""))
     if ["file", original_ext].member? ext
       original_ext
     elsif (exts = MIME::Types[attachment.content_type])

data/tmpsets/set/mod019-carrierwave/abstract/attachment/storage_type.rb

@@ -7,8 +7,7 @@ extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/carrierwave/set/abstract/attachment/storage_type.rb"; end
 attr_writer :bucket, :storage_type
 
-event :storage_type_change, :store,
-      on: :update, when: :storage_type_changed? do
+event :storage_type_change, :store, on: :update, when: :storage_type_changed? do
   # carrierwave stores file if @cache_id is not nil
   attachment.cache_stored_file!
   # attachment.retrieve_from_cache!(attachment.cache_name)

data/tmpsets/set/mod019-carrierwave/abstract/attachment/upload_cache.rb

@@ -61,8 +61,7 @@ end
 
 # at some point uploaded files of canceled file card creation
 # should be deleted. We do this when ever an new file is created.
-event :clear_draft_files, :integrate_with_delay,
-      on: :create do
+event :clear_draft_files, :integrate_with_delay, priority: 100, on: :create do
   Card.delete_tmp_files_of_cached_uploads
 end
 

data/tmpsets/set/mod019-carrierwave/all/file_utils.rb

@@ -7,7 +7,7 @@ extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/carrierwave/set/all/file_utils.rb"; end
 module ClassMethods
   def update_all_storage_locations
-    Card.search(type_id: ["in", FileID, ImageID])
+    Card.search(type_id: ["in", Card::FileID, Card::ImageID])
         .each(&:update_storage_location!)
   end
 
@@ -41,6 +41,10 @@ module ClassMethods
         "AND card_actions.draft = true"
     )
   end
+
+  def count_cards_with_attachment
+    Card.search type_id: ["in", Card::FileID, Card::ImageID], return: :count
+  end
 end
 end;end;end;end;
 # ~~ generated from /Users/ethan/dev/decko/gem/card/mod/carrierwave/set/all/file_utils.rb ~~

data/tmpsets/set/mod019-carrierwave/self/admin.rb

@@ -11,7 +11,7 @@ add_to_basket(
   execute_policy: -> { Card.update_all_storage_locations },
   stats: {
     title: "cards with attachment",
-    count: -> { Card.search(type_id: ["in", FileID, ImageID], return: :count) }
+    count: -> { Card.count_cards_with_attachment }
     # link_text: "update storage locations",
     # task: "update_file_storage_locations"
   }

data/tmpsets/set/mod019-carrierwave/self/favicon.rb

@@ -15,6 +15,11 @@ module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, s
     return unless (source = render :source, size: :small)
     tag :link, rel: "shortcut icon", href: source
   end
+
+  def raw_help_text
+    "A favicon (or shortcut icon) is a small image used by browsers to help identify "\
+    "your website. [[http://www.decko.org/favicon|How to customize your favicon]]"
+  end
 end
 end;end;end;end;
 # ~~ generated from /Users/ethan/dev/decko/gem/card/mod/carrierwave/set/self/favicon.rb ~~

data/tmpsets/set/mod019-carrierwave/self/new_file.rb

@@ -14,7 +14,7 @@ module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, s
     super()
   end
 
-  view :editor, cache: :never do
+  view :input, cache: :never do
     super()
   end
 end

data/tmpsets/set/mod019-carrierwave/self/new_image.rb

@@ -14,7 +14,7 @@ module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, s
     super()
   end
 
-  view :editor, cache: :never do
+  view :input, cache: :never do
     super()
   end
 end

data/tmpsets/set/mod019-carrierwave/type/file.rb

@@ -43,7 +43,8 @@ module Format; parent.send :register_set_format, Card::Format, self; extend Card
     source = _render_source
     return "" if source.blank?
     block_given? ? yield(source) : source
-  rescue
+  rescue => e
+    Rails.logger.info "Error with file source: #{e.message}"
     tr :file_error
   end
 
@@ -92,7 +93,7 @@ module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, s
     "#{action} #{humanized_attachment_name}..."
   end
 
-  view :editor do
+  view :input do
     if card.web? || card.no_upload?
       return text_field(:content, class: "d0-card-content")
     end

data/tmpsets/set/mod019-carrierwave/type/image.rb

@@ -20,7 +20,7 @@ end
 module Format; parent.send :register_set_format, Card::Format, self; extend Card::Set::AbstractFormat
   include File::Format
 
-  view :closed_content do
+  view :one_line_content do
     _render_core size: :icon
   end
 
@@ -64,7 +64,7 @@ module Format; parent.send :register_set_format, Card::Format, self; extend Card
     voo.size =
       case
       when nest_mode == :closed then closed_size
-      when voo.size             then voo.size.to_sym
+      when voo.size.present?    then voo.size.to_sym
       when main?                then main_size
       else                           default_size
       end
@@ -73,76 +73,6 @@ module Format; parent.send :register_set_format, Card::Format, self; extend Card
   end
 end
 
-module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
-  include File::HtmlFormat
-
-  # core HTML image view.
-  view :core do
-    return card.attachment.read if card.svg?
-    with_valid_source do |source|
-      image_tag source, alt: card.name
-    end
-  end
-
-  def with_valid_source
-    handle_source do |source|
-      if source.blank? || source == "missing"
-        # FIXME: these images should be "broken", not "missing"
-        invalid_image source
-      else
-        yield source
-        # consider title..
-      end
-    end
-  end
-
-  view :full_width do
-    with_valid_source do |source|
-      image_tag source, alt: card.name, class: "w-100"
-    end
-  end
-
-  def invalid_image source
-    # ("missing" is the view for "unknown" now, so we shouldn't further confuse things)
-    "<!-- invalid image for #{safe_name}; source: #{source} -->"
-  end
-
-  def preview
-    return if card.new_card? && !card.preliminary_upload?
-    wrap_with :div, class: "attachment-preview",
-                    id: "#{card.attachment.filename}-preview" do
-      _render_core size: :medium
-    end
-  end
-
-  def show_action_content_toggle? _action, _view_type
-    true
-  end
-
-  view :content_changes do
-    content_changes card.last_action, :expanded
-  end
-
-  def content_changes action, diff_type, hide_diff=false
-    voo.size = diff_type == :summary ? :icon : :medium
-    [old_image(action, hide_diff), new_image(action)].compact.join
-  end
-
-  def old_image action, hide_diff
-    return if hide_diff || !action
-    return unless (last_change = card.last_change_on(:db_content, before: action))
-    card.with_selected_action_id last_change.card_action_id do
-      Card::Content::Diff.render_deleted_chunk _render_core
-    end
-  end
-
-  def new_image action
-    card.with_selected_action_id action.id do
-      Card::Content::Diff.render_added_chunk _render_core
-    end
-  end
-end
-
 module Format; parent.send :register_set_format, Card::Format, self; extend Card::Set::AbstractFormat
   view :inline do
     _render_core