card-mod-content 0.14.2 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8528619b98ef26320d7f86bebc8dc8572ed79b19c0aa573f6f4224b316a321b
-  data.tar.gz: f9fd038d25f1c16d9326745a6acee570135a93795943d36664b0a8c21a9f59ce
+  metadata.gz: af70b2c7dd6325fddf41719756af50e5c495b579e5f07d8b6099aa97df929135
+  data.tar.gz: 478c8eb7b8df2e7a1482cbc31422c2c9f55b34c1e19e37343c0380405797cb25
 SHA512:
-  metadata.gz: 6daffffe944bf9b2b505f430086a42cc755415c949a54167b837dc2a7f2c4fc7acd492a634f82d2aa9510db0478ab0edf03c84f8119c0e6c3a50d216b5a7e1e3
-  data.tar.gz: 4725a7beab0aa2b8bc7d2f6f59d46e6b31575ee8ab346b1a5d1fedf6ca898c61ea7b868a049ed14460775db7d56e4a5fa509ff5219fc8bbbc2e6b75d464f885d
+  metadata.gz: 23920a9f1ce7783de6e6fc29a69235b2e04b5c3fafba390279e9e646c31095a7472513d55ca701aa8dd5b67d5efb3aa1a202a5474fb389e89da28327dcfe3f62
+  data.tar.gz: 9eb909a81cd2e2dd4eb38f14e6fd3d6d135882e3765b27ad9814f3a48e3f09c911d60fb7a7f060bb4a386f4560d50c3df61b8f4a9e0003b9278f0b26d68c07b0

data/data/real.yml

@@ -0,0 +1,27 @@
+- :name: "*default"
+  :type: :setting
+  :codename: default
+- :name: "*structure"
+  :type: :setting
+  :codename: structure
+- :name:
+    - :all
+    - :default
+
+- :name:
+    - :cardtype
+    - :type
+    - :structure
+  :content: |
+    {{+:description|content}}
+    {{_|add_button}}{{_|configure_button}}
+    {{+:type+:by_name|content}}
+
+- :name:
+    - :cardtype
+    - :self
+    - :structure
+  :content: |-
+    {{+description|content}}
+    {{_|add_button}}{{_|configure_button}}\n
+    {{_|grouped_list}}\n"

data/data/test.yml

@@ -0,0 +1,32 @@
+---
+- :name: UserForm
+  :type: :cardtype
+- :name: Book
+  :type: :cardtype
+- :name: Author
+  :type: :cardtype
+
+- :name:
+  - UserForm
+  - :type
+  - :structure
+  :type: :nest_list
+  :content: "{{+name}} {{+age}} {{+description}}"
+- :name:
+  - Book
+  - :type
+  - :structure
+  :type: :nest_list
+  :content: by {{+author}}, design by {{+illustrator}}
+
+- :name: Stam Broker
+  :type: Author
+- :name: Darles Chickens
+  :type: Author
+
+- :name: Iliad
+  :type: Book
+- :name: Parry Hotter
+  :type: Book
+- :name: 50 grades of shy
+  :type: Book

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

@@ -1,6 +1,5 @@
 # -*- encoding : utf-8 -*-
 
-# require File.expand_path("../reference", __FILE__)
 load File.expand_path("reference.rb", __dir__)
 
 class Card

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

@@ -1,7 +1,5 @@
 # -*- encoding : utf-8 -*-
 
-# require File.expand_path("../reference", __FILE__)
-
 class Card
   class Content
     module Chunk

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

@@ -2,26 +2,26 @@
 
 require "uri"
 
-# This wiki chunk matches arbitrary URIs, using patterns from the Ruby URI
-# modules.
-# It parses out a variety of fields that could be used by formats to format
-# the links in various ways (shortening domain names, hiding email addresses)
-# It matches email addresses and host.com.au domains without schemes (http://)
-# but adds these on as required.
-#
-# The heuristic used to match a URI is designed to err on the side of caution.
-# That is, it is more likely to not autolink a URI than it is to accidently
-# autolink something that is not a URI. The reason behind this is it is easier
-# to force a URI link by prefixing 'http://' to it than it is to escape and
-# incorrectly marked up non-URI.
-#
-# I'm using a part of the [ISO 3166-1 Standard][iso3166] for country name
-# suffixes.
-# The generic names are from www.bnoack.com/data/countrycode2.html)
-#   [iso3166]: http://geotags.com/iso3166/
 class Card
   class Content
     module Chunk
+      # This wiki chunk matches arbitrary URIs, using patterns from the Ruby URI
+      # modules.
+      # It parses out a variety of fields that could be used by formats to format
+      # the links in various ways (shortening domain names, hiding email addresses)
+      # It matches email addresses and host.com.au domains without schemes (http://)
+      # but adds these on as required.
+      #
+      # The heuristic used to match a URI is designed to err on the side of caution.
+      # That is, it is more likely to not autolink a URI than it is to accidently
+      # autolink something that is not a URI. The reason behind this is it is easier
+      # to force a URI link by prefixing 'http://' to it than it is to escape and
+      # incorrectly marked up non-URI.
+      #
+      # I'm using a part of the [ISO 3166-1 Standard][iso3166] for country name
+      # suffixes.
+      # The generic names are from www.bnoack.com/data/countrycode2.html)
+      #   [iso3166]: http://geotags.com/iso3166/
       class Uri < Abstract
         SCHEMES = %w[irc http https ftp ssh git sftp file ldap ldaps mailto].freeze
 

data/set/abstract/01_code_content.rb

@@ -0,0 +1,19 @@
+format :html do
+  view :input do
+    # Localize
+    "Content is stored in file and can't be edited."
+  end
+
+  view :bar_middle do
+    short_content
+  end
+
+  def short_content
+    icon_tag(:warning, class: "text-muted pe-2") +
+      wrap_with(:span, "file", class: "text-muted")
+  end
+
+  def standard_submit_button
+    multi_card_editor? ? super : ""
+  end
+end

data/set/abstract/02_code_file.rb

@@ -0,0 +1,32 @@
+include_set Abstract::Sources
+include_set Abstract::CodeContent
+
+class << self
+  def included host_class
+    track_mod_name host_class, caller
+  end
+
+  def track_mod_name host_class, caller
+    host_class.mattr_accessor :file_content_mod_name
+    host_class.file_content_mod_name = Card::Set.mod_name(caller)
+  end
+end
+
+def source_paths
+  # OVERRIDE to use paths for content
+end
+
+def content
+  Array.wrap(source_paths).map do |path|
+    if (source_path = find_file path)
+      Rails.logger.debug "reading file: #{source_path}"
+      ::File.read source_path
+    end
+  end.compact.join "\n"
+end
+
+format :html do
+  view :file_size do
+    "#{card.name}: #{number_to_human_size card.content.bytesize}"
+  end
+end

data/set/abstract/read_only.rb

@@ -4,7 +4,7 @@ format :html do
   end
 
   def short_content
-    fa_icon("exclamation-circle", class: "text-muted pr-2") +
+    icon_tag(:warning, class: "text-muted pe-2") +
       wrap_with(:span, "read-only", class: "text-muted")
   end
 

data/set/all/chunk.rb

@@ -124,21 +124,24 @@ format do
 
   def explicit_edit_fields_config
     edit_fields.map do |cardish, options|
-      field_mark = normalized_edit_field_mark cardish, options
-      options = normalized_edit_field_options options, Card::Name[field_mark]
-      [field_mark, options]
+      normalized_edit_field_config cardish, options
     end
   end
 
-  def normalized_edit_field_options options, cardname
-    options ||= cardname
-    options.is_a?(String) ? { title: options } : options
+  def normalized_edit_field_config cardish, options={}
+    options ||= {}
+    field_mark = normalized_edit_field_mark cardish, options
+    options[:title] ||= Card::Name[field_mark]
+    [field_mark, options]
   end
 
-  def normalized_edit_field_mark cardish, options
-    return cardish if cardish.is_a?(Card) ||
-                      (options.is_a?(Hash) && options.delete(:absolute))
+  def normalized_edit_field_mark cardish, options={}
+    return cardish if options.delete(:absolute) || normalized_edit_field_mark?(cardish)
 
     card.name.field cardish
   end
+
+  def normalized_edit_field_mark? cardish
+    cardish.is_a?(Card) || (cardish.is_a?(String) && cardish.to_name.compound?)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-content
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.15.1
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-08 00:00:00.000000000 Z
+date: 2023-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.104.2
+        version: 1.105.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.104.2
+        version: 1.105.1
 description: ''
 email:
 - info@decko.org
@@ -33,7 +33,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- db/migrate_core_cards/20201115133753_add_asset_file_card.rb
+- data/real.yml
+- data/test.yml
 - lib/card/content/chunk/escaped_literal.rb
 - lib/card/content/chunk/link.rb
 - lib/card/content/chunk/nest.rb
@@ -42,12 +43,12 @@ files:
 - lib/card/content/chunk/uri.rb
 - lib/card/content/chunk/view_stub.rb
 - set/abstract/00_sources.rb
-- set/abstract/01_code_file.rb
+- set/abstract/01_code_content.rb
+- set/abstract/02_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
@@ -65,6 +66,7 @@ metadata:
   wiki_uri: https://decko.org
   documentation_url: http://docs.decko.org/
   card-mod: content
+  card-mod-group: gem-defaults
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -80,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.11
 signing_key:
 specification_version: 4
 summary: card content handling

data/db/migrate_core_cards/20201115133753_add_asset_file_card.rb

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

data/set/abstract/01_code_file.rb

@@ -1,85 +0,0 @@
-include_set Abstract::Sources
-
-class << self
-  def included host_class
-    track_mod_name host_class, caller
-  end
-
-  def track_mod_name host_class, caller
-    host_class.mattr_accessor :file_content_mod_name
-    host_class.file_content_mod_name = Card::Set.mod_name(caller)
-  end
-end
-
-# FIXME: these should abstracted and configured on the types
-# (same codes for `rake card:create:codefile`)
-
-# @return [Array<String>, String] the name of file(s) to be loaded
-def source_files
-  case type_id
-  when CoffeeScriptID then "#{codename}.js.coffee"
-  when JavaScriptID   then "#{codename}.js"
-  when CssID          then "#{codename}.css"
-  when ScssID         then "#{codename}.scss"
-  end
-end
-
-def source_dir
-  case type_id
-  when CoffeeScriptID, JavaScriptID then "lib/javascript"
-  when CssID, ScssID then "lib/stylesheets"
-  else
-    "lib"
-  end
-end
-
-def mod_path
-  modname = file_content_mod_name
-  if (match = modname.match(/^card-mod-(\w*)/))
-    modname = match[1]
-  end
-  Cardio::Mod.dirs.path modname
-end
-
-def source_paths
-  Array.wrap(source_files).map do |filename|
-    ::File.join mod_path, source_dir, filename
-  end
-end
-
-def content
-  Array.wrap(source_paths).map do |path|
-    if (source_path = find_file path)
-      Rails.logger.debug "reading file: #{source_path}"
-      ::File.read source_path
-    end
-  end.compact.join "\n"
-end
-
-format :html do
-  view :input do
-    # Localize
-    "Content is stored in file and can't be edited."
-  end
-
-  view :file_size do
-    "#{card.name}: #{number_to_human_size card.content.bytesize}"
-  end
-
-  def short_content
-    fa_icon("exclamation-circle", class: "text-muted pr-2") +
-      wrap_with(:span, "file", class: "text-muted")
-  end
-
-  def standard_submit_button
-    multi_card_editor? ? super : ""
-  end
-end
-
-def coffee_files files
-  files.map { |f| "script_#{f}.js.coffee" }
-end
-
-def scss_files files
-  files.map { |f| "style_#{f}.scss" }
-end

data/set/abstract/vendor_code_file.rb

@@ -1,9 +0,0 @@
-include_set Abstract::CodeFile
-
-def self.included host_class
-  Abstract::CodeFile.track_mod_name host_class, caller
-end
-
-def source_dir
-  "vendor"
-end