card-mod-content 0.11.3 → 0.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74cbf1dcef645ab34406c6138d06ffd3c2dcbb98b5d88ac46008db352b6cfc9b
-  data.tar.gz: 485b2594e366cf12cf4b2eef928503b415067b1d5d0a059db642013be9a718c8
+  metadata.gz: e9917d5bafaf177dfb0cf51f5b0e4a03f813ee2d1e06dae87d4544a4bd8c2dbf
+  data.tar.gz: 62bb2508ff022bdf31fb268577c8277e6fbdc88cf5348fe0c31fd0ab68248e9a
 SHA512:
-  metadata.gz: 678e02d0f46924e97521805039faacccca9af06b2a20b279d17f622f4ed4c16ba16ebcf96ae7af6cd60183b2b9a3f73f2aba311794b10f0d298ab5e2ee5271c1
-  data.tar.gz: 621d130f34094bffaa4768ac62253d6f159e4b9ed9e79126ac6cba5c8f5da35741553005ab70eb7dd044d6805cb68e89058b2288388ce98e3fe2969c2039b35c
+  metadata.gz: 2f80c399e98d4191f749e3fb1eb6fb9c8eb29f37eb7c80f330ba0e05ab67d1406cd2148459b532ba9ec92b65421d7e7cc1451486eca6e5fe522c99825964a1e8
+  data.tar.gz: ef15f9bb7f4b9877e53b5fa1217bf903d2f1e56a97e244ca845e8c637854125f88670b6c115d68898a0227d2778aa961339b84f9ff7663e5b69643165b44ba8a

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

@@ -107,7 +107,7 @@ class Card
 
         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|
+            @link_text.find_chunks(:Reference).each do |chunk|
               chunk.replace_reference old_name, new_name
             end
           elsif @link_text.present?

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

@@ -9,26 +9,27 @@ 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 +38,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/set/all/chunk.rb

@@ -1,23 +1,22 @@
 
-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

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]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-content
 version: !ruby/object:Gem::Version
-  version: 0.11.3
+  version: 0.11.4
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-01 00:00:00.000000000 Z
+date: 2021-05-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.3
+        version: 1.101.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.3
+        version: 1.101.4
 description: ''
 email:
 - info@decko.org