card-mod-help 0.13.3 → 0.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfe05348f8a18b1e6022a53fc4a48ebe696c80ba5e013750d6cd62c47861274b
-  data.tar.gz: 28041a1c70519884040764014ccccbd93801aceab8308356b46af197727d1534
+  metadata.gz: 3364f3a7aae4024565185c5bfe94bcd3af0b4e917b1a7124f331eba9f3ce3ba6
+  data.tar.gz: c4d748bbd16578129e908cf4b5cecfe937a3b29ed03307951645d38acc3867b2
 SHA512:
-  metadata.gz: dcf7d7f15e88fbd8db10197429549b8f122c6430fa2a75b88013250292ca115b07ba36b153b1001b80e94889d889f782e96cda75d950379dd161922fe233e594
-  data.tar.gz: dd4a9dfe8146f37e970bce751c486665d06720cc38154a36a80e96ad0fdaf598dfae1cd7891b2dfc365067eeb28f3b2694cfc0fbc2fb83602bf7045b70029219
+  metadata.gz: 0cec43048936cf6c430755fd5a94863058996bcf4b90743941bed282519d5b2b749124636020d33deb167c007d17ca7db118e2598df6ec44ce21749a1de7c2af
+  data.tar.gz: 03003a18cfe8bbb4546e6e86549bd77f031f9a7e7b9f36059aa908944ef1eb7e412084a2606b0f55adffd6e6ec3bb3a31f6ac384a8d00efefae2cbfd426ed49d

data/set/all/guide.rb

@@ -1,9 +1,5 @@
 def guide_card
-  guide_card = rule_card(:guide)
-  return unless guide_card
-
-  guide_card = guide_card.first_card if guide_card.type_id == Card::PointerID
-  guide_card if guide_card.ok?(:read)
+  @guide_card ||= determine_guide_card
 end
 
 format :html do
@@ -12,40 +8,46 @@ format :html do
   end
 
   def guide
-    guide_text = rule_based_guide
-    return "" unless guide_text.present?
+    return "" unless (text = guide_text).present?
 
-    if (rule_card = card.help_rule_card)
-      edit_link = with_nest_mode(:normal) { nest(rule_card, view: :edit_link) }
-      guide_text = "<span class='d-none'>#{edit_link}</span>#{guide_text}"
+    wrap_with :div, class: classy("guide-text") do
+      prepend_guide_edit_link text
     end
-    wrap_with :div, guide_text, class: classy("guide-text")
   end
 
   def alert_guide
-    guide_text = guide
-    return "" unless guide_text.present?
+    rendered = guide
+    return "" unless rendered.present?
 
-    alert(:secondary, true, false, class: "guide") { guide_text }
+    alert(:secondary, true, false, class: "guide") { rendered }
   end
 
-  def raw_guide_text
-    false
+  private
+
+  def prepend_guide_edit_link guide_text
+    return guide_text unless guide_card.ok?(:update)
+
+    edit_link = with_nest_mode(:normal) { nest(guide_card, view: :edit_link) }
+    "<span class='d-none'>#{edit_link}</span>#{guide_text}"
   end
 
-  def rule_based_guide
-    if raw_guide_text
-      with_nest_mode :normal do
-        process_content raw_guide_text, chunk_list: :references
-        # render guide text with current card's format
-        # so current card's context is used in guide card nests
-      end
-    elsif card.guide_card
-      with_nest_mode :normal do
-        nest card.guide_card, view: :core
-      end
-    else
-      ""
+  def guide_text
+    return "" unless guide_card
+
+    with_nest_mode :normal do
+      nest guide_card, view: :core
     end
   end
+
+  delegate :guide_card, to: :card
+end
+
+private
+
+def determine_guide_card
+  guide_card = rule_card :guide
+  return unless guide_card
+
+  guide_card = guide_card.first_card if guide_card.type_id == PointerID
+  guide_card if guide_card.ok?(:read)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-help
 version: !ruby/object:Gem::Version
-  version: 0.13.3
+  version: 0.14.2
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-24 00:00:00.000000000 Z
+date: 2022-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.103.3
+        version: 1.104.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.103.3
+        version: 1.104.2
 description: ''
 email:
 - info@decko.org
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: card help text and guides