card-mod-content 0.11.2 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 924c9165d4f2bd5dec0210aafa00f0bb13a5cbcfe0e46f07f1e8edc85ee3234b
-  data.tar.gz: f89c4acfefe8254f96a8116d2408badfaf093de3385ed4ad4f3f6a99d7713296
+  metadata.gz: c70d983eed31e1e69a646f97bfd617e414f4fc58f4e12b2e78779f4518911869
+  data.tar.gz: 66fe32d82cd73cb8fbae02ef8e2bf568dad409d79f7430eddbce3d9be9836871
 SHA512:
-  metadata.gz: 0dd2b2825eeba8508d9d1c0a5bacd0083ce448eff195c3b694bddd7aebbc86441695633ddba076823ce75e2be6916fadcce1e25bf43e9af85a4a2599bceed6b8
-  data.tar.gz: c5de82f8b83c926609ea0f48cec180c02426808978124a89351e16621aacedfa1b5d00eefaf690fe1bcbe90460de056dbea2914fc752237f53f960c60929fb37
+  metadata.gz: 58e6df74fa73efe4804c8a178da5aa1aca3e53d426b858d1a234510956061d93e3f6eee5194ba8c355006bcc8583447d70ab258d0c354443aa480acc61f4e168
+  data.tar.gz: f912d472dcc0a6e6721f89045c94516510e1ceb47ffa65aacc74a25eb70b1bbef447f9999f19ac91d39cedfdc7044d29e0664c51ff3fca9d3026c178e2d3c96b

data/lib/card/content/chunk/escaped_literal.rb

@@ -9,10 +9,10 @@ class Card
       # and within HTML tags.
       class EscapedLiteral < Abstract
         FULL_RE = { "[" => /\A\\\[\[[^\]]*\]\]/,
-                    "{" => /\A\\\{\{[^\}]*\}\}/ }.freeze
+                    "{" => /\A\\\{\{[^}]*\}\}/ }.freeze
         Card::Content::Chunk.register_class self,
                                             prefix_re: '\\\\(?:\\[\\[|\\{\\{)',
-                                            idx_char:  '\\'
+                                            idx_char: "\\"
 
         def self.full_re prefix
           FULL_RE[prefix[1, 1]]

data/lib/card/content/chunk/keep_escaped_literal.rb

@@ -8,10 +8,10 @@ class Card
       # the escaping survives the markdown rendering.
       class KeepEscapedLiteral < Abstract
         FULL_RE = { "[" => /\A\\\[\[[^\]]*\]\]/,
-                    "{" => /\A\\\{\{[^\}]*\}\}/ }.freeze
+                    "{" => /\A\\\{\{[^}]*\}\}/ }.freeze
         Card::Content::Chunk.register_class self,
                                             prefix_re: '\\\\(?:\\[\\[|\\{\\{)',
-                                            idx_char:  '\\'
+                                            idx_char: "\\"
 
         def self.full_re prefix
           FULL_RE[prefix[1, 1]]

data/lib/card/content/chunk/link.rb

@@ -1,26 +1,80 @@
 # -*- encoding : utf-8 -*-
 
 # require File.expand_path("../reference", __FILE__)
-load File.expand_path("../reference.rb", __FILE__)
+load File.expand_path("reference.rb", __dir__)
 
 class Card
   class Content
     module Chunk
-      # extend ActiveSupport::Autoload
-      # autoload :Reference , "reference"
-
-      class Link < Card::Content::Chunk::Reference
+      class Link < Reference
         CODE = "L".freeze # L for "Link"
         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:   /\A\[\[([^\]]+)\]\]/,
-                                            idx_char:  "["
+
+        Chunk.register_class self, prefix_re: '\\[\\[',
+                                   full_re: /\A\[\[([^\]]+)\]\]/,
+                                   idx_char: "["
+
         def reference_code
           CODE
         end
 
+        def process_chunk
+          @process_chunk ||= render_link
+        end
+
+        def inspect
+          "<##{self.class}:e[#{@explicit_link}]n[#{@name}]l[#{@link_text}]" \
+          "p[#{@process_chunk}] txt:#{@text}>"
+        end
+
+        # view options
+        def options
+          link_text ? { title: link_text } : {}
+        end
+
+        def replace_reference old_name, new_name
+          replace_name_reference old_name, new_name
+          replace_link_text old_name, new_name
+          link_text_syntax = "|#{@link_text}" if @link_text.present?
+          @text = "[[#{referee_name}#{link_text_syntax}]]"
+        end
+
+        def explicit_link?
+          @explicit_link
+        end
+
+        def render_link view: :link, explicit_link_opts: {}
+          @link_text = render_obj @link_text
+
+          if @explicit_link
+            render_explicit_link explicit_link_opts
+          elsif @name
+            render_name_link view
+          end
+        end
+
+        def link_target
+          if @explicit_link
+            render_obj @explicit_link
+          elsif @name
+            referee_name
+          end
+        end
+
+        private
+
+        def render_explicit_link explicit_link_opts
+          @explicit_link = render_obj @explicit_link
+          format.link_to_resource @explicit_link, @link_text, explicit_link_opts
+        end
+
+        def render_name_link view
+          format.with_nest_mode :normal do
+            format.nest referee_name, options.merge(view: view)
+          end
+        end
+
+        # interpret a chunk matching
         def interpret match, _content
           target, @link_text = target_and_link_text match[1]
 
@@ -35,9 +89,9 @@ class Card
         def target_and_link_text raw_syntax
           return unless raw_syntax
 
-          if (i = divider_index raw_syntax)                    # [[A | B]]
+          if (i = divider_index raw_syntax)                    # if [[A | B]]
             [raw_syntax[0..(i - 1)], raw_syntax[(i + 1)..-1]]  # [A, B]
-          else                                                 # [[ A ]]
+          else                                                 # else must be [[ A ]]
             [raw_syntax, nil]                                  # [A, nil]
           end
         end
@@ -46,78 +100,36 @@ class Card
           # there's probably a better way to do the following.
           # point is to find the first pipe that's not inside an nest
           return unless string.index "|"
+
           string_copy = string.dup
-          string.scan(/\{\{[^\}]*\}\}/) do |incl|
+          string.scan(/\{\{[^}]*\}\}/) do |incl|
             string_copy.gsub! incl, ("x" * incl.length)
           end
           string_copy.index "|"
         end
 
-        # view options
-        def options
-          link_text ? { title: link_text } : {}
-        end
-
+        # turn a string into a Content object if it looks like it might have more
+        # chunks in it
         def objectify raw
           return unless raw
+
           raw.strip!
           if raw.match?(/(^|[^\\])\{\{/)
-            Card::Content.new raw, format
+            Content.new raw, format
           else
             raw
           end
         end
 
-        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, explicit_link_opts
-          elsif @name
-            format.with_nest_mode :normal do
-              format.nest referee_name, options.merge(view: view)
-            end
-          end
-        end
-
-        def link_target
-          if @explicit_link
-            render_obj @explicit_link
-          elsif @name
-            referee_name
-          end
-        end
-
-        def process_chunk
-          @process_chunk ||= render_link
-        end
-
-        def inspect
-          "<##{self.class}:e[#{@explicit_link}]n[#{@name}]l[#{@link_text}]" \
-      "p[#{@process_chunk}] txt:#{@text}>"
-        end
-
-        def replace_reference old_name, new_name
-          replace_name_reference old_name, new_name
-          replace_link_text old_name, new_name
-          @text =
-            @link_text.nil? ? "[[#{referee_name}]]" : "[[#{referee_name}|#{@link_text}]]"
-        end
-
         def replace_link_text old_name, new_name
-          if @link_text.is_a?(Card::Content)
-            @link_text.find_chunks(Card::Content::Chunk::Reference).each do |chunk|
+          if @link_text.is_a?(Content)
+            @link_text.find_chunks(:Reference).each do |chunk|
               chunk.replace_reference old_name, new_name
             end
           elsif @link_text.present?
             @link_text = old_name.to_name.sub_in(@link_text, with: new_name)
           end
         end
-
-        def explicit_link?
-          @explicit_link
-        end
       end
     end
   end

data/lib/card/content/chunk/nest.rb

@@ -8,11 +8,12 @@ class Card
       # Handler for nest chunks: {{example}}
       class Nest < Reference
         attr_reader :options
+
         DEFAULT_OPTION = :view # a value without a key is interpreted as view
 
         Chunk.register_class(self, prefix_re: '\\{\\{',
-                                   full_re:    /\A\{\{([^\{\}]*)\}\}/,
-                                   idx_char:  "{")
+                                   full_re: /\A\{\{([^{}]*)\}\}/,
+                                   idx_char: "{")
 
         def interpret match, _content
           in_brackets = strip_tags match[1]
@@ -27,9 +28,9 @@ class Card
         end
 
         def strip_tags string
-          # note: not using ActionView's strip_tags here
+          # NOTE: not using ActionView's strip_tags here
           # because this needs to be super fast.
-          string.gsub(/\<[^\>]*\>/, "")
+          string.gsub(/<[^>]*>/, "")
         end
 
         def visible_comment message
@@ -83,6 +84,7 @@ class Card
 
         def explicit_view= view
           return if @options[:view]
+
           # could check to make sure it's not already the default...
           if @text.match?(/\|/)
             @text.sub! "|", "|#{view};"
@@ -100,7 +102,7 @@ class Card
         end
 
         def self.gsub string
-          string.gsub(/\{\{([^\}]*)\}\}/) do |_match|
+          string.gsub(/\{\{([^}]*)\}\}/) do |_match|
             yield(Regexp.last_match[1])
           end
         end
@@ -113,6 +115,7 @@ class Card
 
         def each_option attr_string
           return if attr_string.blank?
+
           attr_string.strip.split(";").each do |pair|
             # key is optional for view option
             value, key = pair.split(":", 2).reverse

data/lib/card/content/chunk/reference.rb

@@ -9,26 +9,28 @@ class Card
 
         def referee_name
           return if name.nil?
-          @referee_name ||= referee_name_from_rendered(render_obj(name))
-          @referee_name = @referee_name.absolute(card.name).to_name
+
+          @referee_name ||= referee_raw_name
+          @referee_name = @referee_name.absolute_name card.name
         rescue Card::Error::NotFound
           # do not break on missing id/codename references.
         end
 
-        def referee_name_from_rendered rendered_name
-          ref_card = fetch_referee_card rendered_name
-          ref_card ? ref_card.name : rendered_name.to_name
+        def referee_raw_name
+          Name[render_obj(name)]
         end
 
         def referee_card
           @referee_card ||= referee_name && Card.fetch(referee_name)
         end
 
+        private
+
         def replace_name_reference old_name, new_name
           @referee_card = nil
           @referee_name = nil
-          if name.is_a? Card::Content
-            name.find_chunks(Chunk::Reference).each do |chunk|
+          if name.is_a? Content
+            name.find_chunks(:Reference).each do |chunk|
               chunk.replace_reference old_name, new_name
             end
           else
@@ -37,22 +39,9 @@ class Card
         end
 
         def render_obj raw
-          if format && raw.is_a?(Card::Content)
-            format.process_content raw
-          else
-            raw
-          end
-        end
-
-        private
+          return raw unless format && raw.is_a?(Content)
 
-        def fetch_referee_card rendered_name
-          case rendered_name # FIXME: this should be standard fetch option.
-          when /^\~(\d+)$/ # get by id
-            Card.fetch Regexp.last_match(1).to_i
-          when /^\:(\w+)$/ # get by codename
-            Card.fetch Regexp.last_match(1).to_sym
-          end
+          format.process_content raw
         end
       end
     end

data/lib/card/content/chunk/uri.rb

@@ -19,127 +19,132 @@ require "uri"
 # suffixes.
 # The generic names are from www.bnoack.com/data/countrycode2.html)
 #   [iso3166]: http://geotags.com/iso3166/
-module Card::Content::Chunk
-  class Uri < Abstract
-    SCHEMES = %w[irc http https ftp ssh git sftp file ldap ldaps mailto].freeze
-
-    REJECTED_PREFIX_RE = %w{! ": " ' ](}.map { |s| Regexp.escape s } * "|"
-
-    attr_reader :uri, :link_text
-    delegate :to, :scheme, :host, :port, :path, :query, :fragment, to: :uri
-
-    Card::Content::Chunk.register_class(
-      self, prefix_re: "(?:(?!#{REJECTED_PREFIX_RE})(?:#{SCHEMES * '|'})\\:)",
-            full_re: /\A#{::URI.regexp(SCHEMES)}/,
-            idx_char: ":"
-    )
-
-    class << self
-      def full_match content, prefix
-        prepend_str = if prefix[-1, 1] != ":" && config[:prepend_str]
-                        config[:prepend_str]
-                      else
-                        ""
-                      end
-        content = prepend_str + content
-        match = super content, prefix
-        [match, prepend_str.length]
-      end
-
-      def context_ok? content, chunk_start
-        preceding_string = content[chunk_start - 2..chunk_start - 1]
-        preceding_string !~ /(?:#{REJECTED_PREFIX_RE})$/
-      end
-    end
-
-    def interpret match, _content
-      chunk = match[0]
-      last_char = chunk[-1, 1]
-      chunk.gsub!(/(?:&nbsp;)+/, "")
+class Card
+  class Content
+    module Chunk
+      class Uri < Abstract
+        SCHEMES = %w[irc http https ftp ssh git sftp file ldap ldaps mailto].freeze
+
+        REJECTED_PREFIX_RE = %w{! ": " ' ](}.map { |s| Regexp.escape s } * "|"
+
+        attr_reader :uri, :link_text
+
+        delegate :to, :scheme, :host, :port, :path, :query, :fragment, to: :uri
+
+        Card::Content::Chunk.register_class(
+          self, prefix_re: "(?:(?!#{REJECTED_PREFIX_RE})(?:#{SCHEMES * '|'})\\:)",
+                full_re: /\A#{::URI::DEFAULT_PARSER.make_regexp(SCHEMES)}/,
+                idx_char: ":"
+        )
+
+        class << self
+          def full_match content, prefix
+            prepend_str = if prefix[-1, 1] != ":" && config[:prepend_str]
+                            config[:prepend_str]
+                          else
+                            ""
+                          end
+            content = prepend_str + content
+            match = super content, prefix
+            [match, prepend_str.length]
+          end
+
+          def context_ok? content, chunk_start
+            preceding_string = content[chunk_start - 2..chunk_start - 1]
+            preceding_string !~ /(?:#{REJECTED_PREFIX_RE})$/
+          end
+        end
 
-      @trailing_punctuation =
-        if %w[, . ) ! ? :].member?(last_char)
-          @text.chop!
-          chunk.chop!
-          last_char
+        def interpret match, _content
+          chunk = match[0]
+          last_char = chunk[-1, 1]
+          chunk.gsub!(/(?:&nbsp;)+/, "")
+
+          @trailing_punctuation =
+            if %w[, . ) ! ? :].member?(last_char)
+              @text.chop!
+              chunk.chop!
+              last_char
+            end
+          chunk.sub!(/\.$/, "")
+
+          @link_text = chunk
+          @uri = ::URI.parse(chunk)
+          @process_chunk = process_uri_chunk
+        rescue ::URI::Error => e
+          # warn "rescue parse #{chunk_class}:
+          # '#{m}' #{e.inspect} #{e.backtrace*"\n"}"
+          Rails.logger.warn "rescue parse #{self.class}: #{e.inspect}"
         end
-      chunk.sub!(/\.$/, "")
-
-      @link_text = chunk
-      @uri = ::URI.parse(chunk)
-      @process_chunk = process_uri_chunk
-    rescue ::URI::Error => e
-      # warn "rescue parse #{chunk_class}:
-      # '#{m}' #{e.inspect} #{e.backtrace*"\n"}"
-      Rails.logger.warn "rescue parse #{self.class}: #{e.inspect}"
-    end
 
-    private
+        private
 
-    def process_text
-      @link_text
-    end
+        def process_text
+          @link_text
+        end
 
-    def process_uri_chunk
-      link = format.link_to_resource @link_text, process_text
-      "#{link}#{@trailing_punctuation}"
-    end
-  end
+        def process_uri_chunk
+          link = format.link_to_resource @link_text, process_text
+          "#{link}#{@trailing_punctuation}"
+        end
+      end
 
-  # FIXME: DRY, merge these two into one class
-  class EmailUri < Uri
-    PREPEND_STR = "mailto:".freeze
-    EMAIL = '[a-zA-Z\\d](?:[-a-zA-Z\\d.]*[a-zA-Z\\d])?\\@'.freeze
-
-    Card::Content::Chunk.register_class(
-      self, prefix_re: "(?:(?!#{REJECTED_PREFIX_RE})#{EMAIL})\\b",
-            full_re: /\A#{::URI.regexp(SCHEMES)}/,
-            prepend_str: PREPEND_STR,
-            idx_char: "@"
-    )
-
-    # removes the prepended string from the unchanged match text
-    def process_text
-      @text = @text.sub(/^mailto:/, "")
-    end
-  end
+      # FIXME: DRY, merge these two into one class
+      class EmailUri < Uri
+        PREPEND_STR = "mailto:".freeze
+        EMAIL = '[a-zA-Z\\d](?:[-a-zA-Z\\d.]*[a-zA-Z\\d])?\\@'.freeze
+
+        Card::Content::Chunk.register_class(
+          self, prefix_re: "(?:(?!#{REJECTED_PREFIX_RE})#{EMAIL})\\b",
+                full_re: /\A#{::URI::DEFAULT_PARSER.make_regexp(SCHEMES)}/,
+                prepend_str: PREPEND_STR,
+                idx_char: "@"
+        )
+
+        # removes the prepended string from the unchanged match text
+        def process_text
+          @text = @text.sub(/^mailto:/, "")
+        end
+      end
 
-  class HostUri < Uri
-    GENERIC = "aero|biz|com|coop|edu|gov|info|int|mil|" \
-              "museum|name|net|org".freeze
-
-    COUNTRY = "ad|ae|af|ag|ai|al|am|an|ao|aq|ar|as|at|au|aw|az|ba|bb|bd|be|" \
-              "bf|bg|bh|bi|bj|bm|bn|bo|br|bs|bt|bv|bw|by|bz|ca|cc|cf|cd|cg|" \
-              "ch|ci|ck|cl|cm|cn|co|cr|cs|cu|cv|cx|cy|cz|de|dj|dk|dm|do|dz|" \
-              "ec|ee|eg|eh|er|es|et|fi|fj|fk|fm|fo|fr|fx|ga|gb|gd|ge|gf|gh|" \
-              "gi|gl|gm|gn|gp|gq|gr|gs|gt|gu|gw|gy|hk|hm|hn|hr|ht|hu|id|ie|" \
-              "il|in|io|iq|ir|is|it|jm|jo|jp|ke|kg|kh|ki|km|kn|kp|kr|kw|ky|" \
-              "kz|la|lb|lc|li|lk|lr|ls|lt|lu|lv|ly|ma|mc|md|mg|mh|mk|ml|mm|" \
-              "mn|mo|mp|mq|mr|ms|mt|mu|mv|mw|mx|my|mz|na|nc|ne|nf|ng|ni|nl|" \
-              "no|np|nr|nt|nu|nz|om|pa|pe|pf|pg|ph|pk|pl|pm|pn|pr|pt|pw|py|" \
-              "qa|re|ro|ru|rw|sa|sb|sc|sd|se|sg|sh|si|sj|sk|sl|sm|sn|so|sr|" \
-              "st|su|sv|sy|sz|tc|td|tf|tg|th|tj|tk|tm|tn|to|tp|tr|tt|tv|tw|" \
-              "tz|ua|ug|uk|um|us|uy|uz|va|vc|ve|vg|vi|vn|vu|wf|ws|ye|yt|yu|" \
-              "za|zm|zr|zw|" \
-              "eu".freeze # made this separate, since it's not technically
-    # a country -efm
-    # These are needed otherwise HOST will match almost anything
-
-    TLDS = "(?:#{GENERIC}|#{COUNTRY})".freeze
-    # TLDS = "(?:#{GENERIC})"
-
-    PREPEND_STR = "http://".freeze
-    HOST = "(?:[a-zA-Z\\d](?:[-a-zA-Z\\d]*[a-zA-Z\\d])?\\.)+#{TLDS}".freeze
-
-    Card::Content::Chunk.register_class(
-      self, prefix_re: "(?:(?!#{REJECTED_PREFIX_RE})#{HOST})\\b",
-            full_re: /\A#{::URI.regexp(SCHEMES)}/,
-            prepend_str: PREPEND_STR
-    )
-
-    # removes the prepended string from the unchanged match text
-    def process_text
-      @text = @text.sub(%r{^http://}, "")
+      class HostUri < Uri
+        GENERIC = "aero|biz|com|coop|edu|gov|info|int|mil|" \
+                  "museum|name|net|org".freeze
+
+        COUNTRY = "ad|ae|af|ag|ai|al|am|an|ao|aq|ar|as|at|au|aw|az|ba|bb|bd|be|" \
+                  "bf|bg|bh|bi|bj|bm|bn|bo|br|bs|bt|bv|bw|by|bz|ca|cc|cf|cd|cg|" \
+                  "ch|ci|ck|cl|cm|cn|co|cr|cs|cu|cv|cx|cy|cz|de|dj|dk|dm|do|dz|" \
+                  "ec|ee|eg|eh|er|es|et|fi|fj|fk|fm|fo|fr|fx|ga|gb|gd|ge|gf|gh|" \
+                  "gi|gl|gm|gn|gp|gq|gr|gs|gt|gu|gw|gy|hk|hm|hn|hr|ht|hu|id|ie|" \
+                  "il|in|io|iq|ir|is|it|jm|jo|jp|ke|kg|kh|ki|km|kn|kp|kr|kw|ky|" \
+                  "kz|la|lb|lc|li|lk|lr|ls|lt|lu|lv|ly|ma|mc|md|mg|mh|mk|ml|mm|" \
+                  "mn|mo|mp|mq|mr|ms|mt|mu|mv|mw|mx|my|mz|na|nc|ne|nf|ng|ni|nl|" \
+                  "no|np|nr|nt|nu|nz|om|pa|pe|pf|pg|ph|pk|pl|pm|pn|pr|pt|pw|py|" \
+                  "qa|re|ro|ru|rw|sa|sb|sc|sd|se|sg|sh|si|sj|sk|sl|sm|sn|so|sr|" \
+                  "st|su|sv|sy|sz|tc|td|tf|tg|th|tj|tk|tm|tn|to|tp|tr|tt|tv|tw|" \
+                  "tz|ua|ug|uk|um|us|uy|uz|va|vc|ve|vg|vi|vn|vu|wf|ws|ye|yt|yu|" \
+                  "za|zm|zr|zw|" \
+                  "eu".freeze # made this separate, since it's not technically
+        # a country -efm
+        # These are needed otherwise HOST will match almost anything
+
+        TLDS = "(?:#{GENERIC}|#{COUNTRY})".freeze
+        # TLDS = "(?:#{GENERIC})"
+
+        PREPEND_STR = "http://".freeze
+        HOST = "(?:[a-zA-Z\\d](?:[-a-zA-Z\\d]*[a-zA-Z\\d])?\\.)+#{TLDS}".freeze
+
+        Card::Content::Chunk.register_class(
+          self, prefix_re: "(?:(?!#{REJECTED_PREFIX_RE})#{HOST})\\b",
+                full_re: /\A#{::URI::DEFAULT_PARSER.make_regexp(SCHEMES)}/,
+                prepend_str: PREPEND_STR
+        )
+
+        # removes the prepended string from the unchanged match text
+        def process_text
+          @text = @text.sub(%r{^http://}, "")
+        end
+      end
     end
   end
 end

data/lib/card/content/chunk/view_stub.rb

@@ -9,10 +9,6 @@ class Card
           idx_char: "("
         )
 
-        def initialize text, content
-          super
-        end
-
         def interpret match, _content
           @stub_hash = initial_stub_hash match[1]
           interpret_hash_values

data/set/abstract/code_file.rb

@@ -1,5 +1,4 @@
 class << self
-
   def included host_class
     track_mod_name host_class, caller
   end

data/set/abstract/haml_file.rb

@@ -1,4 +1,3 @@
-
 def self.included host_class
   host_class.mattr_accessor :template_path
   host_class.extend Card::Set::Format::HamlPaths

data/set/abstract/lock.rb

@@ -1,6 +1,7 @@
 def lock
   was_already_locked = locked?
   return if was_already_locked
+
   Auth.as_bot do
     lock!
     yield

data/set/all/chunk.rb

@@ -1,23 +1,21 @@
-
-def chunks content, type, named=false
+def chunks content, type=nil, named=false
   content ||= self.content
-  type ||= Card::Content::Chunk
   all_chunks = Card::Content.new(content, self).find_chunks type
   named ? all_chunks.select(&:referee_name) : all_chunks
 end
 
 def reference_chunks content=nil, named=true
-  chunks content, Card::Content::Chunk::Reference, named
+  chunks content, :Reference, named
 end
 
 # named=true rejects commented nests
 def nest_chunks content=nil, named=true
-  chunks content, Card::Content::Chunk::Nest, named
+  chunks content, :Nest, named
 end
 
 # named=true rejects external links (since the don't refer to a card name)
 def link_chunks content=nil, named=false
-  chunks content, Card::Content::Chunk::Link, named
+  chunks content, :Link, named
 end
 
 def each_item_name_with_options content=nil
@@ -76,6 +74,7 @@ format do
 
   def each_nested_chunk content: nil, fields: false, uniq: true, virtual: true, &block
     return unless block_given?
+
     chunks = prepare_nested_chunks content, fields, uniq
     process_nested_chunks chunks, virtual, &block
   end
@@ -111,14 +110,16 @@ format do
 
   def process_nested_chunk chunk, virtual, &block
     if chunk.referee_card&.virtual?
-      process_nested_virtual_chunk chunk, &block unless virtual
+      process_virtual_chunk chunk, virtual, &block
     else
       yield chunk
     end
   end
 
-  def process_virtual_chunk chunk
-    subformat(chunk.referee_card).each_nested_field_chunk { |sub_chunk| yield sub_chunk }
+  def process_virtual_chunk chunk, virtual, &block
+    return if virtual
+
+    subformat(chunk.referee_card).each_nested_field_chunk(&block)
   end
 
   def explicit_edit_fields_config
@@ -137,6 +138,7 @@ format do
   def normalized_edit_field_mark cardish, options
     return cardish if cardish.is_a?(Card) ||
                       (options.is_a?(Hash) && options.delete(:absolute))
+
     card.name.field cardish
   end
 end

data/set/all/contextual_content.rb

@@ -0,0 +1,20 @@
+def context_card
+  @context_card || self
+end
+
+def with_context context_card
+  old_context = @context_card
+  @context_card = context_card if context_card
+  yield
+ensure
+  @context_card = old_context
+end
+
+format do
+  delegate :context_card, :with_context, to: :card
+
+  def contextual_content context_card, options={}
+    view = options.delete(:view) || :core
+    with_context(context_card) { render! view, options }
+  end
+end

data/set/all/templating.rb

@@ -1,4 +1,3 @@
-
 def is_template?
   return @is_template unless @is_template.nil?
 
@@ -46,6 +45,7 @@ end
 
 def assign_type_to? structure
   return if type_id == structure.type_id
+
   structure.assigns_type?
 end
 

data/set/right/structure.rb

@@ -1,5 +1,9 @@
 include_set Abstract::TemplatedNests
 
+def item_names args={}
+  item_strings(args).compact.map(&:to_name)
+end
+
 format :rss do
   def raw_feed_items
     [card]
@@ -51,7 +55,7 @@ def structuree_names
 end
 
 def update_structurees args
-  # note that this is not smart about overriding templating rules
+  # NOTE: that this is not smart about overriding templating rules
   # for example, if someone were to change the type of a
   # +*right+*structure rule that was overridden
   # by a +*type plus right+*structure rule, the override would not be respected.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-content
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.12.0
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-15 00:00:00.000000000 Z
+date: 2021-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.2
+        version: 1.102.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.2
+        version: 1.102.0
 description: ''
 email:
 - info@decko.org
@@ -47,6 +47,7 @@ files:
 - set/abstract/templated_nests.rb
 - set/abstract/vendor_code_file.rb
 - set/all/chunk.rb
+- set/all/contextual_content.rb
 - set/all/templating.rb
 - set/right/default.rb
 - set/right/structure.rb
@@ -77,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: card content handling