card-mod-content 0.13.4 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ac708ca2b275e22da91e4563a6689a0e782541ce230338abc4d4ce173f050ad
-  data.tar.gz: 965a796f3fb24906039c36a3f99b1235edfe4b58f45e3607dc25906a5e8ee8c3
+  metadata.gz: 787c9c826bc3774c5768367aa580523fa4c9761bd5666f1e5f0f20bd63e232a1
+  data.tar.gz: 1502d97db6bf3f12eff75e092d709bfa182739cf26bb1e8407e60c1b835e0beb
 SHA512:
-  metadata.gz: a2746333bde208a73d5cf3e7d58b3dd739d563bb667cdb39e0e78a824eecdef9533481f85016ab68f8c3b5c79d2f432c76974180f29a7916b54009163265f060
-  data.tar.gz: 5243c7317d0ab6f4a34d223a5027fc440ee89b3af8f5bcd31d31325b699a4aaf73d45065ed6faa5e8561f699fbd22cf4beed5ff2eb7abfc4997331058f762a03
+  metadata.gz: 1dbc01b4028df133a64ecaaa11f623f39478fb0de84717c9935bd678f1a4ba21aee46dd50f2602481a976a74f8965a77a0bdddeec58f2c585e9645b56d5226ec
+  data.tar.gz: 3dbee3c56ee6c25477c2aa5f1d6d43f1030f8dff43c081b0621707f42b85145348532fb5fa6fc9313becfbc09a50a7a4232db76c6a0ba3767eae4cff676620e7

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

@@ -32,7 +32,7 @@ class Card
           link_text ? { title: link_text } : {}
         end
 
-        def replace_reference old_name, new_name
+        def swap_name 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?
@@ -122,11 +122,7 @@ class Card
         end
 
         def replace_link_text old_name, new_name
-          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?
+          replacing_content_object @link_text, old_name, new_name do
             @link_text = old_name.to_name.sub_in(@link_text, with: new_name)
           end
         end

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

@@ -76,7 +76,7 @@ class Card
           # this is not necessarily text, sometimes objects for json
         end
 
-        def replace_reference old_name, new_name
+        def swap_name old_name, new_name
           replace_name_reference old_name, new_name
           nest_body = [@name.to_s, @opt_lists].compact * "|"
           @text = "{{#{nest_body}}}"

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

@@ -81,7 +81,7 @@ class Card
           "<##{self.class}:n[#{@name}] p[#{@process_chunk}] txt:#{@text}>"
         end
 
-        def replace_reference old_name, new_name
+        def swap_name old_name, new_name
           replace_name_reference old_name, new_name
           @text = "\"#{@name}\""
         end

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

@@ -27,17 +27,22 @@ class Card
         private
 
         def replace_name_reference old_name, new_name
-          @referee_card = nil
-          @referee_name = nil
-          if name.is_a? Content
-            name.find_chunks(:Reference).each do |chunk|
-              chunk.replace_reference old_name, new_name
-            end
-          else
+          @referee_card = @referee_name = nil
+          replacing_content_object name, old_name, new_name do
             @name = name.to_name.swap old_name, new_name
           end
         end
 
+        def replacing_content_object obj, old_name, new_name
+          if obj.is_a? Content
+            obj.find_chunks(:Reference).each do |chunk|
+              chunk.swap_name old_name, new_name
+            end
+          elsif obj.present?
+            yield
+          end
+        end
+
         def render_obj raw
           return raw unless format && raw.is_a?(Content)
 

data/set/abstract/01_code_file.rb

@@ -58,6 +58,7 @@ end
 
 format :html do
   view :input do
+    # Localize
     "Content is stored in file and can't be edited."
   end
 

data/set/abstract/lock.rb

@@ -2,7 +2,7 @@ def lock
   was_already_locked = locked?
   return if was_already_locked
 
-  Auth.as_bot do
+  Card::Auth.as_bot do
     lock!
     yield
   end

data/set/all/templating.rb

@@ -1,13 +1,13 @@
 def is_template?
   return @is_template unless @is_template.nil?
 
-  @is_template = name.trait_name? :structure, :default
+  @is_template = name.right_name&.codename&.in? %i[structure default]
 end
 
 def is_structure?
   return @is_structure unless @is_structure.nil?
 
-  @is_structure = name.trait_name? :structure
+  @is_structure = name.right_name&.codename == :structure
 end
 
 def template
@@ -24,31 +24,6 @@ def template
   end
 end
 
-def default_type_id
-  Card.default_type_id
-end
-
-def new_card_template
-  default = rule_card :default, skip_modules: true
-  return default unless (structure = dup_structure default&.type_id)
-
-  @virtual = true if compound?
-  self.type_id = structure.type_id if assign_type_to?(structure)
-  structure
-end
-
-def dup_structure type_id
-  dup_card = dup
-  dup_card.type_id = type_id || default_type_id
-  dup_card.structure_rule_card
-end
-
-def assign_type_to? structure
-  return if type_id == structure.type_id
-
-  structure.assigns_type?
-end
-
 def assigns_type?
   # needed because not all *structure templates govern the type of set members
   # for example, X+*type+*structure governs all cards of type X,
@@ -68,3 +43,24 @@ def structure_rule_card
 
   card.db_content&.strip == "_self" ? nil : card
 end
+
+private
+
+def new_card_template
+  default = rule_card :default, skip_modules: true
+  return default unless (structure = dup_structure default&.type_id)
+
+  @virtual = true if compound?
+  self.type_id = structure.type_id if assign_type_to?(structure)
+  structure
+end
+
+def dup_structure type_id
+  dup_card = dup
+  dup_card.type_id = type_id || Card.default_type_id
+  dup_card.structure_rule_card
+end
+
+def assign_type_to? structure
+  type_id == structure.type_id && structure.assigns_type?
+end

data/set/right/default.rb

@@ -23,7 +23,7 @@ format :html do
   end
 
   def visible_cardtype_groups
-    hash = ::Card::Set::Self::Cardtype::GROUP.slice("Text",  "Data", "Upload")
+    hash = All::CardtypeGroups::GROUP.slice("Text",  "Data", "Upload")
     hash["Organize"] = ["List", "Pointer", "Link list", "Nest list"]
     hash
   end

data/set/right/structure.rb

@@ -16,7 +16,7 @@ format :html do
   end
 
   def visible_cardtype_groups
-    hash = ::Card::Set::Self::Cardtype::GROUP.slice("Text")
+    hash = All::CardtypeGroups::GROUP.slice("Text")
     hash["Organize"] = ["Search", "Nest list"]
     hash
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-content
 version: !ruby/object:Gem::Version
-  version: 0.13.4
+  version: 0.14.0
 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: 2021-12-22 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.4
+        version: 1.104.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.103.4
+        version: 1.104.0
 description: ''
 email:
 - info@decko.org
@@ -80,7 +80,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 content handling