card-mod-content 0.14.1 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e83c52ae5a7b63e5428fc38eb57574761a3814613bd2212f39babc7aa38f08b
-  data.tar.gz: da7f30ddfd337f834f3fe41d3e00f33791b5da453470ad342f4cb7aa306127fe
+  metadata.gz: 898002af2198d1a60f682509cd6fe7b47c37ea54a4a9b6f97d31625d26e37c82
+  data.tar.gz: 48f24b7e2f812f29e320cfb3dd2b15c8bd043bddc192e8c96ab0a10dde9bd255
 SHA512:
-  metadata.gz: dca59e29bd5f962a070b6f03ece3abcf6c4646b3005ddef65e32625f4373f631ad43540c6a3e6b77ccada3b5958abc1752f6d191ec790a33f6dafd902f0048e4
-  data.tar.gz: 74ba35afd802b77b039021d230def87f043b656ef057cc34bba7697b3c3e1a6fe9125229e7f0a7c72e041f6030a6b4b0914e4fbe000dcc0dd50edf0f2ff9e107
+  metadata.gz: 5b5f809221507e2ba3b23fc19bf2e8754511df1d1189c1b1e8c5857047b799aa3dc0dedfa43c4d07440232af20b0058377ba2d2842504dcd6b68e74ab158d163
+  data.tar.gz: c74a4d90f21bb0f5b27335d9f8c637f9ca0ebd7ea02fada1b9572fe967e401c55ff48590a4b65559627c1ff1ab07b6187d71216375140872a7ef792fd094afb5

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/set/abstract/01_code_file.rb

@@ -11,40 +11,8 @@ class << self
   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
+  # OVERRIDE to use paths for content
 end
 
 def content
@@ -66,8 +34,12 @@ format :html do
     "#{card.name}: #{number_to_human_size card.content.bytesize}"
   end
 
+  view :bar_middle do
+    short_content
+  end
+
   def short_content
-    fa_icon("exclamation-circle", class: "text-muted pr-2") +
+    fa_icon("exclamation-circle", class: "text-muted pe-2") +
       wrap_with(:span, "file", class: "text-muted")
   end
 
@@ -75,11 +47,3 @@ format :html do
     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/read_only.rb

@@ -4,7 +4,7 @@ format :html do
   end
 
   def short_content
-    fa_icon("exclamation-circle", class: "text-muted pr-2") +
+    fa_icon("exclamation-circle", 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.1
+  version: 0.15.0
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-04 00:00:00.000000000 Z
+date: 2023-01-04 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.1
+        version: 1.105.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.104.1
+        version: 1.105.0
 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
@@ -47,7 +48,6 @@ files:
 - 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 +65,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 +81,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/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