card 1.97.0.1 → 1.98.0

data/mod/bootstrap/vendor/bootswatch/package.json

@@ -20,7 +20,7 @@
     "autoprefixer": "^7.1.2",
     "bootstrap": "^4.3.1",
     "font-awesome": "~4.7.0",
-    "grunt": "^1.0.3",
+    "grunt": "^1.0.4",
     "grunt-contrib-clean": "^1.0.0",
     "grunt-contrib-concat": "^1.0.1",
     "grunt-contrib-connect": "^1.0.2",
@@ -28,10 +28,10 @@
     "grunt-contrib-uglify": "^2.0.0",
     "grunt-contrib-watch": "^1.0.0",
     "grunt-exec": "^1.0.1",
-    "grunt-sass": "^2.0.0",
-    "jquery": ">=1.9.1",
+    "grunt-sass": "^3.0.2",
+    "jquery": "^3.4.1",
+    "node-sass": "^4.12.0",
     "popper.js": "^1.14.3",
-    "postcss-cli": "^4.1.0",
-    "postcss-flexbugs-fixes": "^2.0.0"
+    "postcss-cli": "^6.1.2"
   }
 }

data/mod/carrierwave/set/abstract/attachment/paths.rb

@@ -16,7 +16,7 @@ end
 # place for files of mod file cards
 def coded_dir new_mod=nil
   dir = File.join mod_dir(new_mod), MOD_FILE_DIR, codename.to_s
-  FileUtils.mkdir_p dir
+  FileUtils.mkdir_p(dir) unless File.directory?(dir)
   dir
 end
 

data/mod/carrierwave/set/type/file.rb

@@ -36,7 +36,8 @@ format do
     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
 
@@ -46,7 +47,7 @@ format do
 end
 
 format :file do
-  # returns send_file args.  not in love with this...
+  # NOCACHE because returns send_file args.  not in love with this...
   view :core, cache: :never do
     # this means we only support known formats.  dislike.
     attachment_format = card.attachment_format(params[:format])
@@ -108,7 +109,7 @@ format :html do
     tr :delete
   end
 
-  view :preview_editor, tags: :unknown_ok, cache: :never do
+  view :preview_editor, unknown: true, cache: :never do
     haml :preview_editor
   end
 end

data/mod/carrierwave/set/type/image.rb

@@ -66,76 +66,6 @@ format do
   end
 end
 
-format :html do
-  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
-
 format do
   view :inline do
     _render_core

data/mod/carrierwave/set/type/image/html_views.rb

@@ -0,0 +1,104 @@
+IMAGE_BOX_SIZE_MAP = {
+  icon: :icon, small: :small, medium: :small, large: :medium, xlarge: :medium
+}.freeze
+
+format :html do
+  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
+
+  view :boxed, unknown: true do
+    image_box { |size| render_core size: size }
+  end
+
+  view :boxed_link, unknown: true do
+    image_box { |size| link_to_card image_box_link_target, render_core(size: size) }
+  end
+
+  def image_box
+    voo.size ||= :medium
+    wrap_with :div, title: image_box_title, class: "image-box #{voo.size}" do
+      yield image_box_size
+    end
+  end
+
+  def image_box_size
+    IMAGE_BOX_SIZE_MAP[voo.size.to_sym] || :medium
+  end
+
+  def image_box_card_name
+    card.name.junction? ? card.name.left : card.name
+  end
+
+  def image_box_link_target
+    image_box_card_name
+  end
+
+  def image_box_title
+    image_box_card_name
+  end
+end

data/mod/core/chunk/link.rb

@@ -8,8 +8,8 @@ module Card::Content::Chunk
     attr_reader :link_text
     # Groups: $1, [$2]: [[$1]] or [[$1|$2]] or $3, $4: [$3][$4]
     Card::Content::Chunk.register_class self,
-                                        prefix_re: '\\[',
-                                        full_re:   /^\[\[([^\]]+)\]\]/,
+                                        prefix_re: '\\[\\[',
+                                        full_re:   /\A\[\[([^\]]+)\]\]/,
                                         idx_char:  "["
     def reference_code
       CODE
@@ -59,14 +59,14 @@ module Card::Content::Chunk
       end
     end
 
-    def render_link
+    def render_link view: :link, explicit_link_opts: {}
       @link_text = render_obj @link_text
 
       if @explicit_link
         @explicit_link = render_obj @explicit_link
-        format.link_to_resource @explicit_link, @link_text
+        format.link_to_resource @explicit_link, @link_text, explicit_link_opts
       elsif @name
-        format.nest referee_name, options.merge(view: :link)
+        format.nest referee_name, options.merge(view: view)
       end
     end
 
@@ -103,5 +103,9 @@ module Card::Content::Chunk
         @link_text = old_name.to_name.sub_in(@link_text, with: new_name)
       end
     end
+
+    def explicit_link?
+      @explicit_link
+    end
   end
 end

data/mod/core/chunk/literal.rb

@@ -8,8 +8,8 @@ class Card
       # occuring within literal areas such as <code> and <pre> blocks
       # and within HTML tags.
       class EscapedLiteral < Abstract
-        FULL_RE = { "[" => /^\\\[\[[^\]]*\]\]/,
-                    "{" => /^\\\{\{[^\}]*\}\}/ }.freeze
+        FULL_RE = { "[" => /\A\\\[\[[^\]]*\]\]/,
+                    "{" => /\A\\\{\{[^\}]*\}\}/ }.freeze
         Card::Content::Chunk.register_class self,
                                             prefix_re: '\\\\(?:\\[\\[|\\{\\{)',
                                             idx_char:  '\\'

data/mod/core/chunk/nest.rb

@@ -11,7 +11,7 @@ class Card
         DEFAULT_OPTION = :view # a value without a key is interpreted as view
 
         Chunk.register_class(self, prefix_re: '\\{\\{',
-                                   full_re:    /^\{\{([^\}]*)\}\}/,
+                                   full_re:    /\A\{\{([^\}]*)\}\}/,
                                    idx_char:  "{")
 
         def interpret match, _content
@@ -72,7 +72,7 @@ class Card
           return @process_chunk if @process_chunk
 
           referee_name
-          @processed = yield @options
+          @processed = format.content_nest(@options)
           # this is not necessarily text, sometimes objects for json
         end
 
@@ -100,6 +100,12 @@ class Card
           options&.dig :nest_name
         end
 
+        def self.gsub string
+          string.gsub(/\{\{([^\}]*)\}\}/) do |_match|
+            yield(Regexp.last_match[1])
+          end
+        end
+
         private
 
         def each_option attr_string

data/mod/core/chunk/query_reference.rb

@@ -32,7 +32,7 @@ module Card::Content::Chunk
             # we have to use a lookbehind, otherwise
             # if the colon matches it would be
             # identified mistakenly as an URI chunk
-            full_re:   /"([^"]+)"/,
+            full_re:   /\A\s*"([^"]+)"/,
             idx_char:  '"'
     )
 

data/mod/core/chunk/uri.rb

@@ -30,7 +30,7 @@ module Card::Content::Chunk
 
     Card::Content::Chunk.register_class(
       self, prefix_re: "(?:(?!#{REJECTED_PREFIX_RE})(?:#{SCHEMES * '|'})\\:)",
-            full_re: /^#{::URI.regexp(SCHEMES)}/,
+            full_re: /\A#{::URI.regexp(SCHEMES)}/,
             idx_char: ":"
     )
 
@@ -93,7 +93,7 @@ module Card::Content::Chunk
 
     Card::Content::Chunk.register_class(
       self, prefix_re: "(?:(?!#{REJECTED_PREFIX_RE})#{EMAIL})\\b",
-            full_re: /^#{::URI.regexp(SCHEMES)}/,
+            full_re: /\A#{::URI.regexp(SCHEMES)}/,
             prepend_str: PREPEND_STR,
             idx_char: "@"
     )
@@ -133,7 +133,7 @@ module Card::Content::Chunk
 
     Card::Content::Chunk.register_class(
       self, prefix_re: "(?:(?!#{REJECTED_PREFIX_RE})#{HOST})\\b",
-            full_re: /^#{::URI.regexp(SCHEMES)}/,
+            full_re: /\A#{::URI.regexp(SCHEMES)}/,
             prepend_str: PREPEND_STR
     )
 

data/mod/core/chunk/view_stub.rb

@@ -5,7 +5,7 @@ class Card
         Chunk.register_class(
           self,
           prefix_re: Regexp.escape("(stub)"),
-          full_re: /\(stub\)([^\(]*)\(\/stub\)/,
+          full_re: /\A\(stub\)([^\(]*)\(\/stub\)/,
           idx_char: "("
         )
 
@@ -38,10 +38,11 @@ class Card
           hash.symbolize_keys!
           hash[:nest_mode] = hash[:nest_mode].to_sym
           hash[:override] = hash[:override] == "true"
+          hash[:context_names].map!(&:to_name)
         end
 
         def process_chunk
-          @processed = yield @stub_hash
+          @processed = format.stub_nest @stub_hash
         end
 
         def result

data/mod/core/format/html_format.rb

@@ -16,7 +16,7 @@ class Card
 
       # is the current card the requested card?
       def focal?
-        show_layout? ? main? : depth.zero?
+        @focal ||= show_layout? ? main? : depth.zero?
       end
 
       def default_nest_view

data/mod/core/set/abstract/haml_file.rb

@@ -1,7 +1,7 @@
 
 def self.included host_class
   host_class.mattr_accessor :template_path
-  host_class.extend Card::Set::Format::HamlViews
+  host_class.extend Card::Set::Format::HamlPaths
   host_class.template_path = host_class.haml_template_path
 end
 

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

@@ -26,7 +26,7 @@ format do
 end
 
 format :html do
-  view :hidden_content_field, tags: :unknown_ok, cache: :never do
+  view :hidden_content_field, unknown: true, cache: :never do
     hidden_field :content, class: "d0-card-content"
   end
 end

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

@@ -1,5 +1,5 @@
 def event_applies? event
-  return unless set_condition_applies? event.set_module, event.opts.key?(:changing)
+  return unless set_condition_applies? event.set_module, event.opts[:changing]
 
   Card::Set::Event::CONDITIONS.all? do |key|
     send "#{key}_condition_applies?", event, event.opts[key]
@@ -8,13 +8,9 @@ end
 
 private
 
-# existing card is being changed in a way that alters its sets
-def updating_sets?
-  @action == :update && real? && (type_id_is_changing? || name_is_changing?)
-end
-
 def set_condition_applies? set_module, old_sets
   return true if set_module == Card
+
   set_condition_card(old_sets).singleton_class.include? set_module
 end
 
@@ -35,6 +31,11 @@ def set_condition_card old_sets
     updating_sets? ? set_condition_card_with_new_set_modules : self
 end
 
+# existing card is being changed in a way that alters its sets
+def updating_sets?
+  @action == :update && real? && (type_id_is_changing? || name_is_changing?)
+end
+
 # prevents locking in set_condition_card
 def no_current_action?
   return false if @current_action

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

@@ -36,7 +36,7 @@ module ClassMethods
 
   # fetch only real (no virtual) cards
   #
-  # @params *mark - see #fetch
+  # @param mark - see #fetch
   # @return [Card]
   def [] *mark
     fetch(*mark, skip_virtual: true)
@@ -46,7 +46,7 @@ module ClassMethods
   # @example
   #   quick_fetch "A", :self, :structure
   #
-  # @params *mark - see #fetch
+  # @param mark - see #fetch
   # @return [Card]
   def quick_fetch *mark
     fetch mark, skip_virtual: true, skip_modules: true
@@ -54,7 +54,7 @@ module ClassMethods
 
   # fetch only from the soft cache
   #
-  # @params *args - see #fetch
+  # @param args - see #fetch
   # @return [Card]
   def fetch_soft *args
     mark, opts = normalize_fetch_args args
@@ -80,7 +80,7 @@ module ClassMethods
     end
   end
 
-  # @params *mark - see #fetch
+  # @param mark - see #fetch
   # @return [Integer]
   def fetch_id *mark
     mark, _opts = normalize_fetch_args mark
@@ -89,7 +89,7 @@ module ClassMethods
     card && card.id
   end
 
-  # @params *mark - see #fetch
+  # @param mark - see #fetch
   # @return [Card::Name]
   def fetch_name *mark
     if (card = quick_fetch(mark))
@@ -103,7 +103,7 @@ module ClassMethods
     block_given? ? yield.to_name : raise(e)
   end
 
-  # @params *mark - see #fetch
+  # @param mark - see #fetch
   # @return [Integer]
   def fetch_type_id *mark
     (card = quick_fetch(mark)) && card.type_id