card 1.96.8 → 1.97.0

data/mod/search/set/abstract/03_filter.rb

@@ -11,6 +11,7 @@ end
 
 def filter_wql
   return {} if filter_hash.empty?
+
   filter_wql_from_params
 end
 
@@ -20,8 +21,7 @@ def filter_wql_from_params
 end
 
 def sort_wql
-  return {} if !sort? || sort_param.blank?
-  sort_hash
+  sort? ? sort_hash : {}
 end
 
 def sort?
@@ -77,6 +77,7 @@ format :html do
 
   def filter_label field
     return "Keyword" if field.to_sym == :name
+
     filter_label_from_method(field) || filter_label_from_name(field)
   end
 

data/mod/search/set/abstract/04_right_filter_form.rb

@@ -12,9 +12,8 @@ format :html do
     path mark: card.name.left, view: filter_view
   end
 
-  # FIXME: wikirate-specific reference in selector
   view :core, cache: :never do
-    filter_fields slot_selector: ".RIGHT-all_metric_value.filter_result-view"
+    filter_fields slot_selector: ".filter_result-view"
   end
 
   def filter_view

data/mod/search/set/abstract/search.rb

@@ -69,7 +69,7 @@ format do
   def implicit_item_view view_from_query_params=nil
     view = voo_items_view || view_from_query_params || default_item_view
     Card::View.canonicalize view
-  end
+    end
 
   def with_results
     return render_no_search_results if search_with_params.empty?

data/mod/search/set/abstract/search/views.rb

@@ -42,6 +42,8 @@ format :json do
 
   def complete_or_match_search limit: AUTOCOMPLETE_LIMIT
     starts_with = complete_search limit: limit
+    return starts_with if Card.config.navbox_match_start_only
+
     remaining_slots = limit - starts_with.size
     return starts_with if remaining_slots.zero?
     starts_with + match_search(not_names: starts_with, limit: remaining_slots)

data/mod/search/set/abstract/wql_search.rb

@@ -103,3 +103,9 @@ format do
     query_with_params.limit
   end
 end
+
+format :html do
+  def default_limit
+    card_content_limit || super
+  end
+end

data/mod/search/set/self/navbox.rb

@@ -18,7 +18,7 @@ format :html do
   end
 
   view :navbar do
-    class_up "navbox-form", "form-inline col-md-3"
+    class_up "navbox-form", "form-inline col-md-6"
     _render_core
   end
 

data/mod/search/set/self/search.rb

@@ -63,7 +63,7 @@ format :json do
                   exact.name.valid? &&
                   !exact.virtual? &&
                   exact.ok?(:create)
-    [exact.name, exact.name.url_key]
+    [h(exact.name), exact.name.url_key]
   end
 
   def new_item_of_type exact
@@ -76,7 +76,7 @@ format :json do
     goto_names = complete_or_match_search
     goto_names.unshift exact.name if add_exact_to_goto_names? exact, goto_names
     goto_names.map do |name|
-      [name, name.to_name.url_key, highlight(name, term)]
+      [name, name.to_name.url_key, h(highlight(name, term, sanitize: false))]
     end
   end
 

data/mod/settings/lib/card/setting.rb

@@ -13,7 +13,11 @@ class Card
     mattr_accessor :groups, :group_names, :user_specific
     def self.extended host_class
       # accessible in E and O
-      host_class.mattr_accessor :restricted_to_type, :rule_type_editable
+      host_class.mattr_accessor :restricted_to_type, :rule_type_editable, :short_help_text
+    end
+
+    def self.codenames
+      Card::Setting.groups.values.flatten.compact.map(&:codename)
     end
 
     @@group_names = {
@@ -48,6 +52,7 @@ class Card
                   name.match(/::(\w+)$/)[1].underscore.to_sym
       self.rule_type_editable = opts[:rule_type_editable]
       self.restricted_to_type = permitted_type_ids opts[:restricted_to_type]
+      self.short_help_text = opts[:help_text]
       return unless opts[:user_specific]
       @@user_specific << @codename
     end

data/mod/settings/set/right/help.rb

@@ -1,3 +1,7 @@
 format :html do
   include AddHelp::HtmlFormat
+
+  view :popover do
+    popover_link _render_core
+  end
 end

data/mod/settings/set/right/read.rb

@@ -5,9 +5,19 @@ format :html do include Abstract::Permission::HtmlFormat end
 event :cascade_read_rule, :finalize, after: :update_rule_cache,
                                      when: :is_rule? do
   return unless name_is_changing? || trash_is_changing?
+
   update_read_ruled_cards rule_set
 end
 
+def reset_patterns_if_rule saving=false
+  return unless (set = super)
+  add_to_read_rule_update_queue set.item_cards(limit: 0) if saving
+end
+
+# TODO: the following really needs a refactor.
+#
+# It was written (long ago) to handle different kinds of changes, but this
+# could be significantly simplified with smarter events.
 
 def update_read_ruled_cards set
   self.class.clear_read_rule_cache
@@ -21,6 +31,7 @@ def update_read_ruled_cards set
   # then find all cards with me as read_rule_id that were not just updated
   # and regenerate their read_rules
   return if new_card?
+
   Card.search(read_rule_id: id) do |card|
     card.update_read_rule unless updated.include?(card.key)
   end
@@ -31,13 +42,11 @@ def update_read_rules_not_overridden_by_narrower_rules cur_index,
   set.item_cards(limit: 0).each_with_object(::Set.new) do |item_card, in_set|
     in_set << item_card.key
     next if cur_index < rule_class_index
+
     item_card.update_read_rule
   end
 end
 
-
-
-
 event :process_read_rule_update_queue, :finalize do
   Array.wrap(@read_rule_update_queue).each(&:update_read_rule)
   @read_rule_update_queue = []
@@ -45,6 +54,7 @@ end
 
 def update_read_rules_of_set_members set
   return ::Set.new if trash || !(class_id = id_of_set_class(set))
+
   rule_class_ids = set_patterns.map(&:pattern_id)
   Auth.as_bot do
     if (rule_class_index = rule_class_ids.index(class_id))
@@ -56,4 +66,4 @@ def update_read_rules_of_set_members set
       ::Set.new
     end
   end
-end
+end

data/mod/settings/set/right/structure.rb

@@ -10,6 +10,7 @@ end
 event :update_structurees_references, :integrate,
       when: :update_structurees_references? do
   return unless (query = structuree_query)
+
   Auth.as_bot do
     query.run.each(&:update_references_out)
   end
@@ -32,6 +33,7 @@ end
 
 def structuree_names
   return [] unless (query = structuree_query(return: :name))
+
   Auth.as_bot do
     query.run
   end
@@ -54,5 +56,6 @@ end
 def structuree_query args={}
   set_card = trunk
   return unless set_card.type_id == SetID
+
   set_card.fetch_query args
 end

data/mod/settings/set/right/style.rb

@@ -13,8 +13,9 @@ end
 format :html do
   HIDDEN_SKINS = %w[bootstrap_default_skin themeless_bootstrap_skin bootstrap_default_skin
                     classic_bootstrap_skin].freeze
+
   def default_item_view
-    :bar
+    :mini_bar
   end
 
   view :editor, template: :haml

data/mod/settings/set/self/create.rb

@@ -1,2 +1,3 @@
 extend Card::Setting
-setting_opts group: :permission, position: 1, rule_type_editable: false
+setting_opts group: :permission, position: 1, rule_type_editable: false,
+             help_text: "who can create cards"

data/mod/settings/set/self/default.rb

@@ -1,2 +1,3 @@
 extend Card::Setting
-setting_opts group: :templating, position: 2, rule_type_editable: true
+setting_opts group: :templating, position: 2, rule_type_editable: true,
+             help_text: "template for new cards"

data/mod/settings/set/self/delete.rb

@@ -1,2 +1,3 @@
 extend Card::Setting
-setting_opts group: :permission, position: 4, rule_type_editable: false
+setting_opts group: :permission, position: 4, rule_type_editable: false,
+             help_text: "who can delete cards"

data/mod/settings/set/self/head.rb

@@ -0,0 +1,2 @@
+extend Card::Setting
+setting_opts group: :webpage, position: 1, rule_type_editable: false

data/mod/settings/set/self/help.rb

@@ -1,2 +1,3 @@
 extend Card::Setting
-setting_opts group: :editing, position: 1, rule_type_editable: true
+setting_opts group: :editing, position: 1, rule_type_editable: true,
+             help_text: "help text people will see when editing"

data/mod/settings/set/self/input.rb

@@ -1,3 +1,3 @@
 extend Card::Setting
 setting_opts group: :editing, position: 3,
-             rule_type_editable: false
+             rule_type_editable: false, help_text: "edit interface for pointer cards"

data/mod/settings/set/self/read.rb

@@ -1,2 +1,3 @@
 extend Card::Setting
-setting_opts group: :permission, position: 2, rule_type_editable: false
+setting_opts group: :permission, position: 2, rule_type_editable: false,
+             help_text: "who can view cards"

data/mod/settings/set/self/structure.rb

@@ -1,2 +1,3 @@
 extend Card::Setting
-setting_opts group: :templating, position: 2, rule_type_editable: true
+setting_opts group: :templating, position: 2, rule_type_editable: true,
+             help_text: "control card's content / structure"

data/mod/settings/set/self/thanks.rb

@@ -1,2 +1,3 @@
 extend Card::Setting
-setting_opts group: :other, position: 3, rule_type_editable: false
+setting_opts group: :other, position: 3, rule_type_editable: false,
+             help_text: "destination after card is created"

data/mod/settings/set/self/update.rb

@@ -1,2 +1,3 @@
 extend Card::Setting
-setting_opts group: :permission, position: 3, rule_type_editable: false
+setting_opts group: :permission, position: 3, rule_type_editable: false,
+             help_text: "who can update cards"

data/mod/settings/set/type/setting.rb

@@ -49,7 +49,7 @@ format do
     haml do
       <<-'HAML'.strip_heredoc
         = _render_rule_help
-        %table.setting-rules
+        %table.table.table-borderless.setting-rules
           %tr
             %th Set
             %th Rule

data/mod/solid_cache/set/abstract/solid_cache.rb

@@ -68,8 +68,8 @@ module ClassMethods
   end
 
   def event_name set, args
-    changed_card_set = set.shortname.tr(":", "_").underscore
-    solid_cache_set = shortname.tr(":", "_").underscore + "__solid_cache"
+    changed_card_set = set.underscore
+    solid_cache_set = underscore + "__solid_cache"
     actions = Array.wrap(args[:on]).join("_")
     ["update", solid_cache_set,
      "changed_by", changed_card_set,

data/mod/standard/file/logo/image-original.svg

@@ -0,0 +1,59 @@
+<svg style="min-width: 75px; min-height: 55px;" viewBox="0 0 242 220" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <!-- Generator: Sketch 46.2 (44496) - http://www.bohemiancoding.com/sketch -->
+  <title>b&amp;w_logo</title>
+  <desc>Created with Sketch.</desc>
+  <defs>
+      <rect id="path-1" x="35.3297422" y="10.484836" width="157.279595" height="190.607432" rx="12.491335"></rect>
+      <filter x="-12.1%" y="-10.5%" width="125.4%" height="121.0%" filterUnits="objectBoundingBox" id="filter-2">
+          <feMorphology radius="1" operator="dilate" in="SourceAlpha" result="shadowSpreadOuter1"></feMorphology>
+          <feOffset dx="1" dy="0" in="shadowSpreadOuter1" result="shadowOffsetOuter1"></feOffset>
+          <feGaussianBlur stdDeviation="5.5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
+          <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.1 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
+      </filter>
+      <rect id="path-3" x="51.9878879" y="19.404077" width="123.9533" height="171.161486" rx="9.6888466"></rect>
+      <filter x="-15.3%" y="-11.7%" width="132.3%" height="123.4%" filterUnits="objectBoundingBox" id="filter-4">
+          <feMorphology radius="1" operator="dilate" in="SourceAlpha" result="shadowSpreadOuter1"></feMorphology>
+          <feOffset dx="1" dy="0" in="shadowSpreadOuter1" result="shadowOffsetOuter1"></feOffset>
+          <feGaussianBlur stdDeviation="5.5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
+          <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.1 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
+      </filter>
+      <path d="M70.1050368,35.6666109 L159.089911,35.6666109 L159.089911,35.6666109 C163.678051,35.6666109 167.397473,39.386033 167.397473,43.9741728 L167.397473,87.717145 L167.397473,166.808436 L167.397473,166.808436 C167.397473,171.396576 163.678051,175.115998 159.089911,175.115998 L70.1050368,175.115998 L70.1050368,175.115998 C65.516897,175.115998 61.7974749,171.396576 61.7974749,166.808436 L61.7974749,43.9741728 L61.7974749,43.9741728 C61.7974749,39.386033 65.516897,35.6666109 70.1050368,35.6666109 Z" id="path-5"></path>
+      <filter x="-18.0%" y="-14.3%" width="137.9%" height="128.7%" filterUnits="objectBoundingBox" id="filter-6">
+          <feMorphology radius="1" operator="dilate" in="SourceAlpha" result="shadowSpreadOuter1"></feMorphology>
+          <feOffset dx="1" dy="0" in="shadowSpreadOuter1" result="shadowOffsetOuter1"></feOffset>
+          <feGaussianBlur stdDeviation="5.5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
+          <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.1 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
+      </filter>
+      <rect id="path-7" x="70.7637805" y="49.8525134" width="92.149175" height="107.18743" rx="7.8659801"></rect>
+      <filter x="-20.6%" y="-18.7%" width="143.4%" height="137.3%" filterUnits="objectBoundingBox" id="filter-8">
+          <feMorphology radius="1" operator="dilate" in="SourceAlpha" result="shadowSpreadOuter1"></feMorphology>
+          <feOffset dx="1" dy="0" in="shadowSpreadOuter1" result="shadowOffsetOuter1"></feOffset>
+          <feGaussianBlur stdDeviation="5.5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
+          <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.102553216 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
+      </filter>
+  </defs>
+  <g id="Page-3" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+      <g id="b&amp;w_logo" fill-rule="nonzero">
+          <g id="Decko-Logo-" transform="translate(7.000000, 4.000000)">
+              <g id="g5642">
+                  <g id="svg-card-1" transform="translate(113.969540, 105.788552) scale(-1, 1) rotate(105.855860) translate(-113.969540, -105.788552) ">
+                      <use fill="black" fill-opacity="1" filter="url(#filter-2)" xlink:href="#path-1"></use>
+                      <use fill="#4D4D4D" fill-rule="evenodd" xlink:href="#path-1"></use>
+                  </g>
+                  <g id="svg-card-2" opacity="0.879999995" transform="translate(113.964538, 104.984820) scale(-1, 1) rotate(117.480003) translate(-113.964538, -104.984820) ">
+                      <use fill="black" fill-opacity="1" filter="url(#filter-4)" xlink:href="#path-3"></use>
+                      <use fill="#FFFFFF" fill-rule="evenodd" xlink:href="#path-3"></use>
+                  </g>
+                  <g id="svg-card-3" transform="translate(114.597474, 105.391304) scale(-1, 1) rotate(133.539993) translate(-114.597474, -105.391304) ">
+                      <use fill="black" fill-opacity="1" filter="url(#filter-6)" xlink:href="#path-5"></use>
+                      <use fill="#4C4C4C" fill-rule="evenodd" xlink:href="#path-5"></use>
+                  </g>
+                  <g id="svg-card-4" opacity="0.879999995" transform="translate(116.838368, 103.446228) scale(-1, 1) rotate(142.690002) translate(-116.838368, -103.446228) ">
+                      <use fill="black" fill-opacity="1" filter="url(#filter-8)" xlink:href="#path-7"></use>
+                      <use fill="#FFFFFF" fill-rule="evenodd" xlink:href="#path-7"></use>
+                  </g>
+              </g>
+          </g>
+      </g>
+  </g>
+</svg>

data/mod/standard/lib/card/layout.rb

@@ -0,0 +1,79 @@
+class Card
+  class Layout
+    class << self
+      def render layout, format
+        layout_class(layout).new(layout, format).render
+      end
+
+      def layout_class layout
+        if layout.respond_to?(:call)
+          Card::Layout::ProcLayout
+        elsif card_layout?(layout)
+          Card::Layout::CardLayout
+        elsif code_layout?(layout)
+          Card::Layout::CodeLayout
+        else
+          Card::Layout::UnknownLayout
+        end
+      end
+
+      def card_layout? name
+        Card.fetch_type_id(name).in? [Card::LayoutTypeID, Card::HtmlID, Card::BasicID]
+      rescue ArgumentError, Card::Error::CodenameNotFound => _e
+        false
+      end
+
+      def code_layout? name
+        built_in_layouts_hash.key? name.to_sym
+      end
+
+      def register_layout new_layout
+        return if layouts[new_layout]
+
+        layouts[new_layout] = block_given? ? yield : {}
+      end
+
+      def register_built_in_layout new_layout
+        register_layout new_layout
+        built_in_layouts_hash[new_layout] = true
+      end
+
+      def built_in_layouts_hash
+        @built_in_layouts ||= {}
+      end
+
+      def built_in_layouts
+        built_in_layouts_hash.keys
+      end
+
+      def layouts
+        @layouts ||= {}
+      end
+
+      def clear_cache
+        @built_in_layouts = @layouts = nil
+      end
+
+      def main_nest_opts layout_name, format
+        opts = layouts[layout_name] ||
+               register_layout(layout_name) do
+                 layout_class(layout_name).new(layout_name, format).fetch_main_nest_opts
+               end
+        opts.clone
+      end
+    end
+
+    def initialize layout, format
+      @layout = layout
+      @format = format
+    end
+
+    def fetch_main_nest_opts
+      {}
+    end
+
+    def main_nest_opts
+      self.class.main_nest_opts @layout, @format
+    end
+  end
+end

data/mod/standard/lib/card/layout/card_layout.rb

@@ -0,0 +1,44 @@
+class Card
+  class Layout
+    # Layout based on a card's content
+    class CardLayout < Layout
+      def layout_card
+        @layout_card ||= Card.quick_fetch @layout
+      end
+
+      def render
+        @format.process_content layout_card.content, chunk_list: :references
+      end
+
+      def fetch_main_nest_opts
+        main_nest = find_main_nest_chunk
+        # don't .& me !!
+        (main_nest && main_nest.options) ||
+          raise(Card::Error, "no main nest found in layout \"#{@layout}\"")
+      end
+
+      MAIN_NESTING_LIMIT = 5
+
+      def find_main_nest_chunk card=layout_card, depth=0
+        content = Card::Content.new(card.content, @format, chunk_list: :nest_only)
+        return false unless content.each_chunk.count.positive?
+
+        main_chunk(content) || go_deeper(content, depth)
+      end
+
+      def go_deeper content, depth
+        return false if depth > MAIN_NESTING_LIMIT
+
+        content.each_chunk do |chunk|
+          main_chunk = find_main_nest_chunk chunk.referee_card, depth + 1
+          return main_chunk if main_chunk
+        end
+        false
+      end
+
+      def main_chunk content
+        content.each_chunk.find(&:main?)
+      end
+    end
+  end
+end