card 1.99.5 → 1.99.6

data/lib/card/set/event/options.rb

@@ -48,6 +48,7 @@ class Card
           opts = normalize_opts stage_or_opts, opts
           process_stage_opts opts
           process_action_opts opts
+          process_delayed_job_opts opts
           opts
         end
 

data/lib/card/set/pattern/base.rb

@@ -134,6 +134,24 @@ class Card
           end
         end
       end
+
+      module Helper
+        private
+
+        def left_type card
+          card.superleft&.type_name || quick_type(card.name.left_name)
+        end
+
+        def quick_type name
+          if name.present?
+            card = Card.fetch name, skip_modules: true, new: {}
+            card.include_set_modules if card.new? && name.to_name.junction?
+            card&.type_name
+          else
+            "RichText"
+          end
+        end
+      end
     end
   end
 end

data/lib/card/subcards.rb

@@ -63,16 +63,19 @@ class Card
       @keys.send method, *args
     end
 
-    def each_card
-      # fetch all cards first to avoid side effects
-      # e.g. deleting a user adds follow rules and +*account to subcards
-      # for deleting but deleting follow rules can remove +*account from the
-      # cache if it belongs to the rule cards
-      cards = @keys.map do |key|
+    # fetch all cards first to avoid side effects
+    # e.g. deleting a user adds follow rules and +*account to subcards
+    # for deleting but deleting follow rules can remove +*account from the
+    # cache if it belongs to the rule cards
+    def cards
+      @keys.map do |key|
         fetch_subcard key
-      end
+      end.compact
+    end
+
+    def each_card
       cards.each do |card|
-        yield(card) if card
+        yield card
       end
     end
 

data/lib/card/subcards/add.rb

@@ -73,7 +73,7 @@ class Card
       end
 
       def initialize_by_attributes name, attributes
-        Card.assign_or_initialize_by name, attributes, local_only: true
+        Card.assign_or_newish name, attributes, local_only: true
       end
 
       # TODO: this method already exists as card instance method in
@@ -105,12 +105,15 @@ class Card
       def multi_add args
         args.each_pair do |key, val|
           case val
-          when String then new_by_attributes key, content: val
+          when String, Array, Integer
+            new_by_attributes key, content: val
           when Card
             val.name = absolutize_subcard_name key
             new_by_card val
-          when nil then next
-          else new_by_attributes key, val
+          when nil
+            next
+          else
+            new_by_attributes key, val
           end
         end
       end

data/lib/card/view/cache/cache_action.rb

@@ -113,7 +113,7 @@ class Card
         # @return [True/False]
         def clean_enough_to_cache?
           #  requested_view == ok_view && !card.unknown? && !card.db_content_changed?
-          requested_view == ok_view && !card.db_content_changed?
+          requested_view == ok_view && card.view_cache_clean?
         end
       end
     end

data/lib/card/view/classy.rb

@@ -97,6 +97,15 @@ class Card
 
       private
 
+      def ancestor_extra_classes klass, space
+        if parent
+          parent_space = space == :self ? :self_format : :ancestor_format
+          parent.deep_extra_classes(klass, parent_space)
+        else
+          next_format_ancestor&.deep_extra_classes(klass, :ancestor_format)
+        end
+      end
+
       def storage_voo scope
         # When we climb up the voo tree and cross a nest boundary then we can jump only
         # to the root voo of the parent format. Hence we have to add classes to the root
@@ -117,15 +126,6 @@ class Card
         [classes, class_list(:single_use).delete(klass)]
       end
 
-      def ancestor_extra_classes klass, space
-        if parent
-          parent_space = space == :self ? :self_format : :ancestor_format
-          parent.deep_extra_classes(klass, parent_space)
-        else
-          next_format_ancestor&.deep_extra_classes(klass, :ancestor_format)
-        end
-      end
-
       def ok_types space
         case space
         when :ancestor_format then [:public]

data/lib/card/view/options/voo_api.rb

@@ -52,14 +52,6 @@ class Card
           normalized_options.merge(view: requested_view).slice(*Options.slot_keys)
         end
 
-        # def inherit key
-        #   if live_options.key? key
-        #     live_options[key]
-        #   elsif (ancestor = next_ancestor)
-        #     ancestor.inherit key
-        #   end
-        # end
-
         # ACCESSOR_HELPERS
         # methods that follow the normalize_#{key} pattern are called by accessors
         # (arguably that should be done during normalization!)

data/mod/account/set/all/account.rb

@@ -34,8 +34,8 @@ def fetch_read_rules
   return [] if id == WagnBotID # always_ok, so not needed
 
   ([AnyoneID] + parties).each_with_object([]) do |party_id, rule_ids|
-    next unless self.class.read_rule_cache[party_id]
-    rule_ids.concat self.class.read_rule_cache[party_id]
+    next unless (cache = Card::Rule.read_rule_cache[party_id])
+    rule_ids.concat cache
   end
 end
 

data/mod/account/spec/set/right/account_spec.rb

@@ -65,7 +65,7 @@ RSpec.describe Card::Set::Right::Account do
 
     it "contains deck title" do
       body = @mail.parts[0].body.raw_source
-      expect(body).to match(Card.global_setting(:title))
+      expect(body).to match(Card::Rule.global_setting(:title))
     end
 
     it "contains link to verify account" do
@@ -111,7 +111,7 @@ RSpec.describe Card::Set::Right::Account do
 
     it "contains deck title" do
       body = @mail.parts[0].body.raw_source
-      expect(body).to match(Card.global_setting(:title))
+      expect(body).to match(Card::Rule.global_setting(:title))
     end
 
     it "contains password reset link" do

data/mod/account/spec/set/type/signup_spec.rb

@@ -64,7 +64,7 @@ RSpec.describe Card::Set::Type::Signup do
     it "sends email with an appropriate link" do
       @mail = ActionMailer::Base.deliveries.last
       body = @mail.parts[0].body.raw_source
-      expect(body).to match(Card.global_setting(:title))
+      expect(body).to match(Card::Rule.global_setting(:title))
     end
 
     it "notifies someone" do

data/mod/basic_formats/set/all/head.rb

@@ -1,6 +1,8 @@
 format do
   view :page_title, unknown: true, perms: :none do
-    [(safe_name if card.name.present?), Card.global_setting(:title)].compact.join " - "
+    title_parts = [Card::Rule.global_setting(:title)]
+    title_parts.unshift safe_name if card.name.present?
+    title_parts.join " - "
   end
 end
 
@@ -126,7 +128,7 @@ format :html do
 
   def mod_js_configs
     mod_js_config.map do |codename, js_decko_function|
-      config_json = escape_javascript Card.global_setting(codename)
+      config_json = escape_javascript Card::Rule.global_setting(codename)
       "decko.#{js_decko_function}('#{config_json}')"
     end
   end

data/mod/basic_formats/set/all/rss.rb

@@ -43,7 +43,7 @@ format :rss do
   end
 
   view :feed_title do
-    Card.global_setting(:title) + " : " + card.name.gsub(/^\*/, "")
+    Card::Rule.global_setting(:title) + " : " + card.name.gsub(/^\*/, "")
   end
 
   view :feed_item do

data/mod/bootstrap/lib/card/lazy_tab.rb

@@ -0,0 +1,37 @@
+class Card
+  class LazyTab < Tab
+    def url
+      @url ||= (config_hash? && @config[:path]) || format.path(view: view)
+    end
+
+    def view
+      @view ||= (config_hash? && @config[:view]) || @config
+    end
+
+    def tab_button
+      if url
+        super
+      else
+        wrap_with(:li, label, role: "presentation")
+      end
+    end
+
+    def button_attrib
+      @button_attrib ||= super.merge("data-url" => url.html_safe)
+    end
+
+    def tab_button_link
+      add_class button_attrib, "load" unless active?
+      super
+    end
+
+    def content
+      @content ||= ""
+    end
+
+    def tab_pane args=nil, &block
+      @content = yield if active? && block_given?
+      super
+    end
+  end
+end

data/mod/bootstrap/lib/card/tab.rb

@@ -0,0 +1,76 @@
+class Card
+  class Tab
+    attr_reader :format, :name, :label, :content, :button_attrib
+
+    class << self
+      def tab_objects format, tab_hash, active_name, klass=nil
+        klass ||= Card::Tab
+        active_name ||= tab_hash.keys.first
+        tab_hash.map do |name, config|
+          klass.new format, name, active_name, config
+        end
+      end
+    end
+
+    delegate :add_class, :wrap_with, :unique_id, :link_to, to: :format
+
+    def initialize format, name, active_name, config
+      @format = format
+      @name = name
+      @active_name = active_name
+      @config = config
+    end
+
+    def tab_button
+      add_class button_attrib, "active" if active?
+      wrap_with :li, tab_button_link,
+                role: :presentation,
+                class: "nav-item tab-li-#{name}"
+    end
+
+    def tab_pane args=nil
+      pane_attr = { role: :tabpanel, id: tab_id }
+      pane_attr.merge! args if args.present?
+      add_class pane_attr, "tab-pane tab-pane-#{name}"
+      add_class pane_attr, "active" if active?
+      wrap_with :div, content, pane_attr
+    end
+
+    private
+
+    def config_hash?
+      @config.is_a? Hash
+    end
+
+    def label
+      @label ||= (config_hash? && @config[:title]) || name
+    end
+
+    def content
+      @content ||= config_hash? ? @config[:content] : @config
+    end
+
+    def button_attrib
+      @button_attrib ||= (config_hash? && @config[:button_attr]) || {}
+    end
+
+    def tab_button_link
+      add_class button_attrib, "nav-link"
+
+      link_to label, button_attrib.merge(
+        path: "##{tab_id}",
+        role: "tab",
+        "data-toggle" => "tab",
+        "data-tab-name" => name
+      )
+    end
+
+    def tab_id
+      @tab_id ||= "#{unique_id}-#{name.to_name.safe_key}"
+    end
+
+    def active?
+      name == @active_name
+    end
+  end
+end

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

@@ -66,7 +66,6 @@ format :html do
   def dropdown_list_item item, active_test, active
     return unless item
 
-
     if item.is_a? Array
       [dropdown_header(item.first), dropdown_array_list(item.second)]
     else

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

@@ -1,131 +1,40 @@
-
-
 format :html do
-  # @param tab_type [String] 'tabs' or 'pills'
-  # @param tabs [Hash] keys are the labels, values the content for the tabs
+  # @param tab_hash [Hash] keys are the tab names
+  #   Each value can be either a String or a Hash.
+  #   If a Hash can contain the following keys:
+  #     :title - the label to appear in the clickable tab nav.
+  #        if title is not specified, the key is used
+  #     :content - body of tab pane
+  #     :button_attr - attributes for button link in tab nav.
+  #
+  #   If using lazy loading (see :load below), the following options also apply
+  #     :path - explicit path to use for tab pane
+  #     :view - card view from which to auto-construct path (if missing, uses key)
+  #
+  #   If the value is a String, it is treated as the tab content for static tabs and
+  #     the view for lazy tabs
+  #
   # @param active_name [String] label of the tab that should be active at the
+  #
+  # @param [Hash] args options
+  # @option args [String] :tab_type ('tabs') use pills or tabs
+  # @option args [Hash] :panel_attr html args used for the panel div
+  # @option args [Hash] :pane_attr html args used for the pane div
+  # @option args [Hash] :load. `:lazy` for lazy-loading tabs
+  #
+  # @param [Block] block content of the active tab (for lazy-loading)
   # beginning (default is the first)
+  #
   # @return [HTML] bootstrap tabs element with all content preloaded
-  def static_tabs tabs, active_name=nil, tab_type="tabs", args={}
-    tab_buttons = ""
-    tab_panes = ""
-    tabs.each do |tab_name, tab_content|
-      active_name ||= tab_name
-      active_tab = (tab_name == active_name)
-      id = tab_id tab_name
-      tab_content, button_attr =
-        if tab_content.is_a?(Hash)
-          [tab_content[:content], tab_content[:button_attr]]
-        else
-          [tab_content, {}]
-        end
-      tab_buttons += tab_button(id, tab_name, active_tab, button_attr)
-      tab_panes += tab_pane(id, tab_name, tab_content, active_tab, args[:pane])
-    end
-    tab_panel tab_buttons, tab_panes, tab_type
-  end
-
-  # @param [Hash] tabs keys are the views, values the title unless you pass a
-  #   hash as value
-  # @option tabs [String] :title
-  # @option tabs [path] :path
-  # @option tabs [Symbol] :view
-  # @option tabs [HTML] :html if present use value as inner html for li tag and
-  #   ignore the other tab options
-  # @param [String] active_name label of the tab that should be active at the
-  # beginning
-  # @param [String] active_content content of the active tab
-  #   can also be passed via a block
-  # @param [Hash] args options
-  # @option args [String] :type ('tabs') use pills or tabs
-  # @option args [Hash] :panel_args html args used for the panel div
-  # @option args [Hash] :pane_args html args used for the pane div
-  # @return [HTML] bootstrap tabs element with content only for the active
-  # tab; other tabs get loaded via ajax when selected
-  def lazy_loading_tabs tabs, active_name, active_content="", args={}, &block
-    tab_buttons = ""
-    tab_panes = ""
-    standardize_tabs(tabs, active_name) do |tab_name, url, id, active_tab|
-      tab_buttons += lazy_tab_button tab_name, id, url, active_tab
-      tab_panes += lazy_tab_pane id, tab_name, active_tab, active_content,
-                                 args[:pane_args], &block
-    end
-    tab_type = args.delete(:type) || "tabs"
-    tab_panel tab_buttons, tab_panes, tab_type, args[:panel_args]
-  end
-
-  def lazy_tab_button tab_name, id, url, active_tab
-    return wrap_with(:li, tab_name, role: "presentation") unless url
-    tab_button(
-      id, tab_name, active_tab,
-      "data-url" => url.html_safe,
-      class: (active_tab ? nil : "load")
+  def tabs tab_hash, active_name=nil, args={}, &block
+    klass = args[:load] == :lazy ? Card::LazyTab : Card::Tab
+    args.reverse_merge!(
+      panel_attr: {},
+      pane_attr: {},
+      tab_type: "tabs",
+      block: block,
+      tab_objects: Card::Tab.tab_objects(self, tab_hash, active_name, klass)
     )
-  end
-
-  def lazy_tab_pane id, tab_name, active_tab, active_content, args
-    tab_content =
-      if active_tab
-        block_given? ? yield : active_content
-      else
-        ""
-      end
-    tab_pane(id, tab_name, tab_content, active_tab, args)
-  end
-
-  def standardize_tabs tabs, active_name
-    tabs.each do |tab_view_name, tab_details|
-      tab_title, url = tab_title_and_url(tab_details, tab_view_name)
-      active_tab = (active_name == tab_view_name)
-      yield tab_title, url, tab_id(tab_view_name), active_tab
-    end
-  end
-
-  def tab_title_and_url tab_details, tab_view_name
-    if tab_details.is_a? Hash
-      tab_details[:html] ||
-        [tab_details[:title], tab_details[:path] || path(tab_details[:view])]
-    else
-      [tab_details, path(view: tab_view_name)]
-    end
-  end
-
-  def tab_panel tab_buttons, tab_panes, tab_type="tabs", args=nil
-    args ||= {}
-    add_class args, "tabbable"
-    args.reverse_merge! role: "tabpanel"
-    wrap_with :div, args do
-      [
-        wrap_with(:ul, tab_buttons, class: "nav nav-#{tab_type}",
-                                    role: "tablist"),
-        wrap_with(:div, tab_panes, class: "tab-content")
-      ]
-    end
-  end
-
-  def tab_id tab_name
-    "#{unique_id}-#{tab_name.to_name.safe_key}"
-  end
-
-  def tab_button target, text, active=false, link_attr={}
-    add_class link_attr, "active" if active
-    link = tab_button_link "##{target}", text, link_attr
-    li_args = { role: :presentation, class: "nav-item tab-li-#{target}" }
-    wrap_with :li, link, li_args
-  end
-
-  def tab_button_link target, text, link_attr={}
-    add_class link_attr, "nav-link"
-    link_to text, link_attr.merge(
-      path: target, role: "tab", "data-toggle" => "tab"
-    )
-  end
-
-  def tab_pane id, tab_name, content, active=false, args=nil
-    pane_args = { role: :tabpanel, id: id }
-    pane_args.merge! args if args.present?
-    add_class pane_args, "tab-pane tab-pane-#{tab_name.to_name.safe_key}"
-    add_class pane_args, "active" if active
-    wrap_with :div, content, pane_args
+    haml :tab_panel, args
   end
 end