card-mod-help 0.13.2 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4146218384d1f3b039de761cd4747df39c8bad4c670d0ab8fa2406561d74563
-  data.tar.gz: 29a81756b702323caa66d6cf205b6e733af7aa0fc0fed49dd1ecbd07f8b2a215
+  metadata.gz: 16e9b37580d88e9ad9641f8fd854078305a02f2973d649add6a3e0920dad6eb3
+  data.tar.gz: b60f0263979bb1cbd17f738da66a3e0b4b332470f56d44fc1b1a0ceba3bd6766
 SHA512:
-  metadata.gz: f6a8645074994940a498463eb8417cdf3b518b0d8eb8baa8a273fc7261c48f4065ae80efc12eb8bb867befa445085116d329c5d64c892b65be5bfffd43c3ddd6
-  data.tar.gz: c01aab2d964850646640518e530c75ff31a4aa39f552815fe62d5d54c44e52e5735be5e887d09f67e9775afb8a31764225cde12153b4bdb4eded5ee0897b229a
+  metadata.gz: a583f3e65bda3a2f69c8ea4e31582a63efc964f5829ffd4f2a5bdee87895687ac90766233430b0b4232ed20edae8910a4a5d21949e6ad3cc55509410907eb9ba
+  data.tar.gz: b45a9ae4afa42400d2c86d508279c3be52cf3a92f83d4a6d434b57b99e7288ad5eb79c230c2890580e5bc3d54b3ab3f10d75991bead59b2922ebeded7d738aab

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.2
+  version: 0.14.1
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-06 00:00:00.000000000 Z
+date: 2022-01-04 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.2
+        version: 1.104.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.103.2
+        version: 1.104.1
 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