card-mod-content 0.11.5 → 0.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20ef16ab1cd68c60cef87aac784c6e59e693653c1dd83824c41836c779241dbc
-  data.tar.gz: af181919b1be08412e2f1a58e114ee1bd5f58fd115d23fd1f4971b8bbe0b2e40
+  metadata.gz: f2291c460c993a049e0a2f34017937f1e3277da3772b417a6b66fcea70cbfc18
+  data.tar.gz: c417b2ef2edba1ca4d68358a11e54774f5efd6074b19a2e75531207864083dda
 SHA512:
-  metadata.gz: e4a460218fb818da58cfc64fdd5bee8ad0a88901833d03fa2a2bb7291386986dbb9acc0130b8f8a1ad9091ef779cd8d22d9f3537003d1ddc3b07a09a1a0c2c50
-  data.tar.gz: 6dfa5408e034673b954087356ee7f9c90f2e331c584e7b6761ae559b9571b487267091a4334346d80dc7edb0e13813200387d5108f271dc90b7b84901041f8e4
+  metadata.gz: 808f4ab388779bb84ddb82290aaf2aaf86c554e66d77716baf45b4da5a812aa60845ebf0f277fbd19b3db34059aaac8d935e1a845aaf3b0bb0f8c4d5e4c000c5
+  data.tar.gz: d22f792f974626167e3f76e6b5c24e5cf2782b7ddfd364e7b9c585cf4186a09d4e0b3b9928d08a42fa9cd79629644196caeaec0720842c9f4c7a7c5d28c52787

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

@@ -6,22 +6,75 @@ 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]
 
@@ -36,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
@@ -55,61 +108,21 @@ class Card
           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)
+          if @link_text.is_a?(Content)
             @link_text.find_chunks(:Reference).each do |chunk|
               chunk.replace_reference old_name, new_name
             end
@@ -117,10 +130,6 @@ class Card
             @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/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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-content
 version: !ruby/object:Gem::Version
-  version: 0.11.5
+  version: 0.11.6
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-10 00:00:00.000000000 Z
+date: 2021-05-21 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.5
+        version: 1.101.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.5
+        version: 1.101.6
 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