card-mod-content 0.11.5 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20ef16ab1cd68c60cef87aac784c6e59e693653c1dd83824c41836c779241dbc
-  data.tar.gz: af181919b1be08412e2f1a58e114ee1bd5f58fd115d23fd1f4971b8bbe0b2e40
+  metadata.gz: 199643e67c9b580e4b7e1d07fa1c4e6540581a3543a1ce40099a27367c0ff659
+  data.tar.gz: b9646360212c31dd400f05982f27e8b6641ad72bd1bfe26bfb98109934346103
 SHA512:
-  metadata.gz: e4a460218fb818da58cfc64fdd5bee8ad0a88901833d03fa2a2bb7291386986dbb9acc0130b8f8a1ad9091ef779cd8d22d9f3537003d1ddc3b07a09a1a0c2c50
-  data.tar.gz: 6dfa5408e034673b954087356ee7f9c90f2e331c584e7b6761ae559b9571b487267091a4334346d80dc7edb0e13813200387d5108f271dc90b7b84901041f8e4
+  metadata.gz: 8b6a60b6d20ca5cbf559f11e2251601316172f17cb811b8249d6c599449d96cee22c105c90ff48fc764e4235964d816109e17cfdf61d98c120a76aa8b647a658
+  data.tar.gz: cfbb2405eb833e001ad71cb9f946a4ace15dad15897c3b34dc76c46adef10dbc3f42abcf7659aac6133444d7b659e4c195181afea19d7332d4f39d8ec79ed456

data/db/migrate_core_cards/20201115133753_add_asset_file_card.rb

@@ -0,0 +1,7 @@
+# -*- encoding : utf-8 -*-
+
+class AddAssetFileCard < Cardio::Migration::Core
+  def up
+    ensure_code_card "Asset file", type_id: Card::CardtypeID
+  end
+end

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

@@ -6,22 +6,75 @@ load File.expand_path("reference.rb", __dir__)
 class Card
   class Content
     module Chunk
-      # extend ActiveSupport::Autoload
-      # autoload :Reference , "reference"
-
-      class Link < Card::Content::Chunk::Reference
+      class Link < Reference
         CODE = "L".freeze # L for "Link"
         attr_reader :link_text
 
-        # Groups: $1, [$2]: [[$1]] or [[$1|$2]] or $3, $4: [$3][$4]
-        Card::Content::Chunk.register_class self,
-                                            prefix_re: '\\[\\[',
-                                            full_re: /\A\[\[([^\]]+)\]\]/,
-                                            idx_char: "["
+        Chunk.register_class self, prefix_re: '\\[\\[',
+                                   full_re: /\A\[\[([^\]]+)\]\]/,
+                                   idx_char: "["
+
         def reference_code
           CODE
         end
 
+        def process_chunk
+          @process_chunk ||= render_link
+        end
+
+        def inspect
+          "<##{self.class}:e[#{@explicit_link}]n[#{@name}]l[#{@link_text}]" \
+          "p[#{@process_chunk}] txt:#{@text}>"
+        end
+
+        # view options
+        def options
+          link_text ? { title: link_text } : {}
+        end
+
+        def replace_reference 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?
+          @text = "[[#{referee_name}#{link_text_syntax}]]"
+        end
+
+        def explicit_link?
+          @explicit_link
+        end
+
+        def render_link view: :link, explicit_link_opts: {}
+          @link_text = render_obj @link_text
+
+          if @explicit_link
+            render_explicit_link explicit_link_opts
+          elsif @name
+            render_name_link view
+          end
+        end
+
+        def link_target
+          if @explicit_link
+            render_obj @explicit_link
+          elsif @name
+            referee_name
+          end
+        end
+
+        private
+
+        def render_explicit_link explicit_link_opts
+          @explicit_link = render_obj @explicit_link
+          format.link_to_resource @explicit_link, @link_text, explicit_link_opts
+        end
+
+        def render_name_link view
+          format.with_nest_mode :normal do
+            format.nest referee_name, options.merge(view: view)
+          end
+        end
+
+        # interpret a chunk matching
         def interpret match, _content
           target, @link_text = target_and_link_text match[1]
 
@@ -36,9 +89,9 @@ class Card
         def target_and_link_text raw_syntax
           return unless raw_syntax
 
-          if (i = divider_index raw_syntax)                    # [[A | B]]
+          if (i = divider_index raw_syntax)                    # if [[A | B]]
             [raw_syntax[0..(i - 1)], raw_syntax[(i + 1)..-1]]  # [A, B]
-          else                                                 # [[ A ]]
+          else                                                 # else must be [[ A ]]
             [raw_syntax, nil]                                  # [A, nil]
           end
         end
@@ -55,61 +108,21 @@ class Card
           string_copy.index "|"
         end
 
-        # view options
-        def options
-          link_text ? { title: link_text } : {}
-        end
-
+        # turn a string into a Content object if it looks like it might have more
+        # chunks in it
         def objectify raw
           return unless raw
 
           raw.strip!
           if raw.match?(/(^|[^\\])\{\{/)
-            Card::Content.new raw, format
+            Content.new raw, format
           else
             raw
           end
         end
 
-        def render_link view: :link, explicit_link_opts: {}
-          @link_text = render_obj @link_text
-
-          if @explicit_link
-            @explicit_link = render_obj @explicit_link
-            format.link_to_resource @explicit_link, @link_text, explicit_link_opts
-          elsif @name
-            format.with_nest_mode :normal do
-              format.nest referee_name, options.merge(view: view)
-            end
-          end
-        end
-
-        def link_target
-          if @explicit_link
-            render_obj @explicit_link
-          elsif @name
-            referee_name
-          end
-        end
-
-        def process_chunk
-          @process_chunk ||= render_link
-        end
-
-        def inspect
-          "<##{self.class}:e[#{@explicit_link}]n[#{@name}]l[#{@link_text}]" \
-      "p[#{@process_chunk}] txt:#{@text}>"
-        end
-
-        def replace_reference old_name, new_name
-          replace_name_reference old_name, new_name
-          replace_link_text old_name, new_name
-          @text =
-            @link_text.nil? ? "[[#{referee_name}]]" : "[[#{referee_name}|#{@link_text}]]"
-        end
-
         def replace_link_text old_name, new_name
-          if @link_text.is_a?(Card::Content)
+          if @link_text.is_a?(Content)
             @link_text.find_chunks(:Reference).each do |chunk|
               chunk.replace_reference old_name, new_name
             end
@@ -117,10 +130,6 @@ class Card
             @link_text = old_name.to_name.sub_in(@link_text, with: new_name)
           end
         end
-
-        def explicit_link?
-          @explicit_link
-        end
       end
     end
   end

data/set/abstract/00_sources.rb

@@ -0,0 +1,24 @@
+def source_paths
+  []
+end
+
+def find_file file_path
+  unknown_file?(file_path) ? nil : file_path
+end
+
+def unknown_file? file_path
+  return false if File.exist? file_path
+
+  Rails.logger.info "couldn't locate file #{file_path}"
+  true
+end
+
+def existing_source_paths
+  Array.wrap(source_paths).reject do |file_path|
+    unknown_file?(file_path)
+  end.compact
+end
+
+def source_changed? since:
+  existing_source_paths.any? { |path| ::File.mtime(path) > since }
+end

data/set/abstract/{code_file.rb → 01_code_file.rb}

@@ -1,3 +1,5 @@
+include_set Abstract::Sources
+
 class << self
   def included host_class
     track_mod_name host_class, caller
@@ -31,12 +33,6 @@ def source_dir
   end
 end
 
-def find_file filename
-  File.join(mod_path, source_dir, filename).tap do |file_path|
-    return nil if unknown_file? filename, file_path
-  end
-end
-
 def mod_path
   modname = file_content_mod_name
   if (match = modname.match(/^card-mod-(\w*)/))
@@ -45,28 +41,17 @@ def mod_path
   Cardio::Mod.dirs.path modname
 end
 
-def unknown_file? filename, file_path
-  return false if File.exist? file_path
-
-  Rails.logger.info "couldn't locate file #{filename} at #{file_path}"
-  true
-end
-
-def existing_source_paths
+def source_paths
   Array.wrap(source_files).map do |filename|
-    find_file(filename)
-  end.compact
-end
-
-def source_changed? since:
-  existing_source_paths.any? { |path| ::File.mtime(path) > since }
+    ::File.join mod_path, source_dir, filename
+  end
 end
 
 def content
-  Array.wrap(source_files).map do |filename|
-    if (source_path = find_file filename)
+  Array.wrap(source_paths).map do |path|
+    if (source_path = find_file path)
       Rails.logger.debug "reading file: #{source_path}"
-      File.read source_path
+      ::File.read source_path
     end
   end.compact.join "\n"
 end

data/set/abstract/read_only.rb

@@ -0,0 +1,14 @@
+format :html do
+  view :input do
+    "Content can't be edited."
+  end
+
+  def short_content
+    fa_icon("exclamation-circle", class: "text-muted pr-2") +
+      wrap_with(:span, "read-only", class: "text-muted")
+  end
+
+  def standard_submit_button
+    multi_card_editor? ? super : ""
+  end
+end

data/set/all/chunk.rb

@@ -110,13 +110,15 @@ format do
 
   def process_nested_chunk chunk, virtual, &block
     if chunk.referee_card&.virtual?
-      process_nested_virtual_chunk chunk, &block unless virtual
+      process_virtual_chunk chunk, virtual, &block
     else
       yield chunk
     end
   end
 
-  def process_virtual_chunk chunk, &block
+  def process_virtual_chunk chunk, virtual, &block
+    return if virtual
+
     subformat(chunk.referee_card).each_nested_field_chunk(&block)
   end
 

data/set/all/contextual_content.rb

@@ -0,0 +1,20 @@
+def context_card
+  @context_card || self
+end
+
+def with_context context_card
+  old_context = @context_card
+  @context_card = context_card if context_card
+  yield
+ensure
+  @context_card = old_context
+end
+
+format do
+  delegate :context_card, :with_context, to: :card
+
+  def contextual_content context_card, options={}
+    view = options.delete(:view) || :core
+    with_context(context_card) { render! view, options }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-content
 version: !ruby/object:Gem::Version
-  version: 0.11.5
+  version: 0.13.0
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-10 00:00:00.000000000 Z
+date: 2021-08-06 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.5
+        version: 1.103.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.5
+        version: 1.103.0
 description: ''
 email:
 - info@decko.org
@@ -33,6 +33,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- db/migrate_core_cards/20201115133753_add_asset_file_card.rb
 - lib/card/content/chunk/escaped_literal.rb
 - lib/card/content/chunk/keep_escaped_literal.rb
 - lib/card/content/chunk/link.rb
@@ -41,12 +42,15 @@ files:
 - lib/card/content/chunk/reference.rb
 - lib/card/content/chunk/uri.rb
 - lib/card/content/chunk/view_stub.rb
-- set/abstract/code_file.rb
+- set/abstract/00_sources.rb
+- set/abstract/01_code_file.rb
 - set/abstract/haml_file.rb
 - set/abstract/lock.rb
+- set/abstract/read_only.rb
 - set/abstract/templated_nests.rb
 - set/abstract/vendor_code_file.rb
 - set/all/chunk.rb
+- set/all/contextual_content.rb
 - set/all/templating.rb
 - set/right/default.rb
 - set/right/structure.rb
@@ -77,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: card content handling