card-mod-content 0.13.3 → 0.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d4bf4c3d68999515a54cd1015fdd183cf8bf0a756ffd2bd171b4ff4723d50b8
-  data.tar.gz: d2cfd66cd9b4ef214c70743010616fdefe65662731d7a475bc9788604d522074
+  metadata.gz: c8528619b98ef26320d7f86bebc8dc8572ed79b19c0aa573f6f4224b316a321b
+  data.tar.gz: f9fd038d25f1c16d9326745a6acee570135a93795943d36664b0a8c21a9f59ce
 SHA512:
-  metadata.gz: b81064c8f3ccec506a7a244fcc8ba6a2e09174bf64c36378c93178c9997db0a34d70415892dfd4562984b9b8c439372c25642ede54a0c90923e09384b40b25cf
-  data.tar.gz: 850b39a36d0a179e39218cfcb2dd24c4f98bede5278bb1edebfb7fd1f9bf4a2da0fff5f7ab706f892a6967f1061df55c4c0026b38a1c8521d4727b7630e0a74b
+  metadata.gz: 6daffffe944bf9b2b505f430086a42cc755415c949a54167b837dc2a7f2c4fc7acd492a634f82d2aa9510db0478ab0edf03c84f8119c0e6c3a50d216b5a7e1e3
+  data.tar.gz: 4725a7beab0aa2b8bc7d2f6f59d46e6b31575ee8ab346b1a5d1fedf6ca898c61ea7b868a049ed14460775db7d56e4a5fa509ff5219fc8bbbc2e6b75d464f885d

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.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
@@ -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