card 1.101.5 → 1.101.6

data/tmpsets/set/{mod025-card-mod-follow → mod026-card-mod-follow}/all/notify.rb

@@ -6,6 +6,7 @@ module Notify;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-follow/set/all/notify.rb"; end
 attr_accessor :follower_stash
+
 mattr_accessor :force_notifications
 
 event :silence_notifications, :initialize, when: :silence_notifications? do

data/tmpsets/set/{mod025-card-mod-follow → mod026-card-mod-follow}/all/notify/base_views.rb

@@ -94,6 +94,7 @@ module Format; module_parent.send :register_set_format, Card::Format, self; exte
 
   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/{mod025-card-mod-follow → mod026-card-mod-follow}/right/follow.rb

@@ -9,7 +9,7 @@ extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-follow/set/right/follow.rb"; end
 # customizations are handled in TypePlusRight::User::Follow
 
-event :cache_expired_for_new_preference, :integrate, when: :is_preference? do
+event :cache_expired_for_new_preference, :integrate, when: :preference? do
   Card.follow_caches_expired
 end
 

data/tmpsets/set/{mod025-card-mod-follow → mod026-card-mod-follow}/self/follow_defaults.rb

@@ -4,14 +4,16 @@ class Card; module Set; class Self
 #
 # DEPRECATED
 #
-# Despite its name (*follow defaults)card does not influence defaults for *follow rules.
+# The card "*follow defaults"
+#
+# Despite its name, this card does not influence defaults for *follow rules.
 # What it does is provide a mechanism (with interface) for updating all users so that
 # they follow the items that are its content.
 #
-# PLAN:
 module FollowDefaults;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-follow/set/self/follow_defaults.rb"; end
+# PLAN:
 # - actual defaults should be handled as much as possible with something like
 #   the *defaults rule
 # - on the *admin page, we can have a link so sharks can update all the pristine cards
@@ -52,8 +54,7 @@ end
 
 module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
   view :edit, perms: :update, unknown: true do
-    frame_and_form :update, hidden: { success: "_self",
-                                      card: { update_all_users: false } } do
+    frame_and_form :update, hidden: { card: { update_all_users: false } } do
       [
         _render_content_formgroups,
         _render_confirm_update_all,

data/tmpsets/set/{mod025-card-mod-follow → mod026-card-mod-follow}/type/cardtype.rb

@@ -23,7 +23,7 @@ end
 
 module HtmlFormat; module_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]
+    super.unshift ["#{card.name} cards", [card, :type, :by_name], { mark: :absolute }]
   end
 end
 end;end;end;end;

data/tmpsets/set/{mod025-card-mod-follow → mod026-card-mod-follow}/type_plus_right/user/follow.rb

@@ -5,7 +5,8 @@ class Card; module Set; class TypePlusRight; module User;
 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
+FOLLOW_TABS = { "Follow" => { view: "follow_tab" },
+                "Ignore" => { view: "ignore_tab" } }.freeze
 
 # a virtual pointer to the sets that a user is following.
 # (data is stored in preferences: `[Set]+[User]+:follow`)
@@ -43,7 +44,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
 
   # renders follow tab and ignore tab
   view :core do
-    tabs FOLLOW_TABS, "follow_tab", load: :lazy do
+    tabs FOLLOW_TABS, "Follow", load: :lazy do
       render_follow_tab
     end
   end

data/tmpsets/set/{mod027-card-mod-help → mod028-card-mod-help}/right/help.rb

@@ -16,7 +16,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
     # TODO: refactor when voo.input_type is ready.  (and use class_up)
     formgroup "Content", input: :content, help: false do
       text_field :content, value: card.content,
-                 class: "d0-card-content _submit-after-typing"
+                           class: "d0-card-content _submit-after-typing"
     end
   end
 end

data/tmpsets/set/{mod030-card-mod-layout → mod031-card-mod-layout}/abstract/account_dropdown.rb

@@ -24,10 +24,8 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
     Auth.current_roles.size > 1
   end
 
-  def role_items
-    Auth.current_roles.map do |role_name|
-      yield role_name
-    end
+  def role_items &block
+    Auth.current_roles.map(&block)
   end
 end
 end;end;end;end;

data/tmpsets/set/{mod030-card-mod-layout → mod031-card-mod-layout}/all/modal.rb

@@ -21,6 +21,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
   def normalize_modal_option key, opts
     val = opts[key]
     return render("modal_#{key}") unless val
+
     cast_model_option val
   end
 

data/tmpsets/set/{mod030-card-mod-layout → mod031-card-mod-layout}/all/overlay.rb

@@ -66,8 +66,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
   end
 
   def overlay_delete_button
-    opts = { no_success: true }.merge OVERLAY_CLOSE_OPTS
-    delete_button opts
+    delete_button OVERLAY_CLOSE_OPTS.merge(success: {})
   end
 
   def overlay_save_and_close_button
@@ -87,26 +86,24 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
     header_wrap [title, _render_overlay_menu]
   end
 
-  def overlay_frame slot=true, header=render_overlay_header, slot_opts=nil
+  def overlay_frame slot=true, header=render_overlay_header, slot_opts=nil, &block
     slot_opts ||= {}
     overlay_framer slot, header, slot_opts do
-      wrap_body { yield }
+      wrap_body(&block)
     end
   end
 
-  def haml_overlay_frame slot=true, header=render_overlay_header
+  def haml_overlay_frame slot=true, header=render_overlay_header, &block
     overlay_framer slot, header, {} do
-      haml_wrap_body { yield }
+      haml_wrap_body(&block)
     end
   end
 
   private
 
-  def overlay_framer slot, header, slot_opts
+  def overlay_framer slot, header, slot_opts, &block
     class_up "card-slot", "_overlay"
-    with_frame slot, header, slot_opts do
-      yield
-    end
+    with_frame slot, header, slot_opts, &block
   end
 end
 end;end;end;end;

data/tmpsets/set/{mod030-card-mod-layout → mod031-card-mod-layout}/all/process_layout.rb

@@ -21,13 +21,6 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
     end
   end
 
-  def main_render_args view, args
-    args[:view] = view if view
-    args[:main] = true
-    args[:main_view] = true
-    args
-  end
-
   def page_layout
     params[:layout] || layout_name_from_rule || :default
   end
@@ -40,28 +33,43 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
     render! view, view_opts.reverse_merge(args)
   end
 
-  def render_outside_of_layout view, args
-    body = render_with_layout(nil, page_layout, {})
-    modal = render!(view, args)
-    if body.include?("</body>")
-      # a bit hacky
-      # the problem is that the body tag has to be in the layout
-      # so that you can add layout css classes like <body class="right-sidebar">
-      body.sub!("</body>", "#{modal}</body>")
-    else
-      body += modal
-    end
-    body
-  end
-
   def show_layout?
     !Env.ajax? || params[:layout]
   end
 
   def explicit_modal_wrapper? view
-    return unless view_setting(:wrap, view)
+    return unless (wrap_view = view_setting :wrap, view)
+
+    (wrapper_names(wrap_view) & %i[modal bridge]).any?
+  end
+
+  private
+
+  def main_render_args view, args
+    args[:view] = view if view
+    args[:main] = true
+    args[:main_view] = true
+    args
+  end
+
+  def layout_name_from_rule
+    card.rule_card(:layout)&.try :item_name
+  end
+
+  def render_outside_of_layout view, args
+    body = render_with_layout nil, page_layout, {}
+    body_with_modal body, render!(view, args)
+  end
 
-    wrapper_names(view_setting(:wrap, view)).any? { |n| n == :modal || n == :bridge }
+  def body_with_modal body, modal
+    if body.include? "</body>"
+      # a bit hacky
+      # the problem is that the body tag has to be in the layout
+      # so that you can add layout css classes like <body class="right-sidebar">
+      body.sub "</body>", "#{modal}</body>"
+    else
+      body + modal
+    end
   end
 
   def wrapper_names wrappers
@@ -72,12 +80,6 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
     end
   end
 
-  def layout_name_from_rule
-    card.rule_card(:layout)&.try :item_name
-  end
-
-  private
-
   def wrapper_names_from_array wrapper_array
     wrapper_array.map { |w| w.is_a?(Array) ? w.first : w }
   end

data/tmpsets/set/{mod030-card-mod-layout → mod031-card-mod-layout}/all/tabs.rb

@@ -28,6 +28,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
       path: nest_path(name, tab_options).html_safe
     }
     return unless tabs[:active].empty?
+
     tabs[:active] = { name: name, content: nest(name, tab_options) }
   end
 

data/tmpsets/set/{mod030-card-mod-layout → mod031-card-mod-layout}/self/account_links.rb

@@ -23,7 +23,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
     # removed invite for now
     links =
       %i[my_card sign_out sign_up sign_in].map do |link_view|
-        render(link_view)
+        render link_view
       end.compact
 
     links.map do |link|
@@ -31,9 +31,9 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
     end
   end
 
-  def self.link_options opts={}
+  def self.link_options opts={}, &block
     options = { denial: :blank, cache: :never }.merge opts
-    options[:perms] = ->(r) { yield r } if block_given?
+    options[:perms] = block if block_given?
     options.clone
   end
 
@@ -65,8 +65,8 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
   end
 
   def interactive_roles_dropdown
-    nest(enabled_roles_card,
-         view: :edit_inline, hide: %i[edit_inline_buttons name_formgroup])
+    nest enabled_roles_card,
+         view: :edit_inline, hide: %i[edit_inline_buttons name_formgroup]
   end
 
   def simple_roles_dropdown
@@ -87,8 +87,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
   end
 
   def account_link_text purpose
-    voo.title ||
-      I18n.t(purpose, scope: "mod.card-mod-account.set.self.account_links")
+    voo.title || t("account_#{purpose}")
   end
 
   def nav_link_class type

data/tmpsets/set/{mod030-card-mod-layout → mod031-card-mod-layout}/self/foot.rb

@@ -5,7 +5,6 @@ class Card; module Set; class Self
 module Foot;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-layout/set/self/foot.rb"; end
-
 def content
   "<!-- *foot is deprecated. please remove from layout -->"
 end

data/tmpsets/set/{mod030-card-mod-layout → mod031-card-mod-layout}/self/head.rb

@@ -16,7 +16,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
   view :core, cache: :never do
     escape_in_main do
       nest root.card, view: :head
-      # note that the head tag for each card is different
+      # NOTE: that the head tag for each card is different
       # (different title, different style rules, etc)
       # so we don't cache the core of *head, but we _do_ cache some
       # views within each head (see all/head.rb)

data/tmpsets/set/{mod031-card-mod-legacy → mod032-card-mod-legacy}/abstract/table_of_contents.rb

@@ -24,10 +24,12 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
     toc = toc_items content
     return unless toc.flatten.length >= toc_minimum
 
-    content.replace(
-      %( <div class="table-of-contents"> <h5>#{tr(:toc)}</h5> ) +
-        make_table_of_contents_list(toc) + "</div>" + content
-    )
+    content.replace(%(
+      <div class="table-of-contents">
+        <h5>#{t :legacy_toc}</h5>
+        #{make_table_of_contents_list toc}
+      </div>#{content}
+    ))
   end
 
   def toc_minimum
@@ -37,11 +39,12 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
   def toc_items content
     toc = []
     dep = 1
-    content.gsub!(/<(h\d)>(.*?)<\/h\d>/i) do |match|
+    content.gsub!(%r{<(h\d)>(.*?)</h\d>}i) do |match|
       if $LAST_MATCH_INFO
         tag, value = $LAST_MATCH_INFO[1, 2]
         value = strip_tags(value).strip
         next if value.empty?
+
         item = { value: value, uri: URI.escape(value) }
         case tag.downcase
         when "h1"
@@ -66,7 +69,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
         %(<li><a href="##{i[:uri]}"> #{i[:value]}</a></li>)
       end
     end.join("\n")
-    "<ol>" + list + "</ol>"
+    "<ol>#{list}</ol>"
   end
 end
 end;end;end;end;