card-mod-list 0.13.2 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1bb86ee48fd896283c6f8d1100ca96249087e0d80cffb5ce0acf90d6b4e187ba
-  data.tar.gz: 105487db182f650539a3b0ec9e387cc58c41f720e5e219607abbdc5a8eacc3f4
+  metadata.gz: 128513caa820067dcf1ec3e1cd0b389c530cb2be8c6c317aabf8827c2ba6ccb4
+  data.tar.gz: 9673c5da3b5838ceabe9a135f7a227204179e1f4e3260c3a44d4eb2ad7d747dd
 SHA512:
-  metadata.gz: 165cf0bdfb93b2dd73e9f0b612a3c7964488927a8a2f86d1e59ecf13d3fde29f933bee98f8e9426141e5f140e94cf906a8cba8bfc5dd4890d69c995c38092fa6
-  data.tar.gz: '073548d105eca9e109c53b60d5a677eb4554bd5eac74504008ba5192bdf2a0a4757e89e9997c6d6ac8d45436db5f23404616533a5b5af6cab84aaa62ac677eaf'
+  metadata.gz: 746ad6da3fe5424df83c2db9c244401a93b2d15e703928c9b3b82f433fe906c0a6d3a6581f38e7f40371befeeb4fc2c5ce3f8d6389c71ae4345550de9cdca00e
+  data.tar.gz: 4bb16393c851b9f5db6e4f7bcbc488806a9fcf2c27e0ff3cc016dbc3cdc2a5ad43ee4298d250a3c7151930362c7b04901c40feac02ccbc4905dfa0a5aa77ad62

data/db/migrate_core_cards/20211107155032_out_with_the_brackets.rb

@@ -0,0 +1,15 @@
+# -*- encoding : utf-8 -*-
+
+# delete brackets from card content
+class OutWithTheBrackets < Cardio::Migration
+  def up
+    Card["*getting started links"]&.update_column :type_id, :link_list.card_id
+
+    list_type_ids = %i[pointer list].map(&:card_id)
+    ["[[", "]]"].each do |brackets|
+      Card.where(type_id: list_type_ids).in_batches.update_all(
+        "db_content = REPLACE(db_content, '#{brackets}', '')"
+      )
+    end
+  end
+end

data/set/abstract/01_pointer/events.rb

@@ -14,22 +14,6 @@ def item_to_insert
   Env.params["insert_item"]
 end
 
-# If a card's type and content are updated in the same action, the new module
-# will override the old module's events and functions. But this event is only
-# on pointers -- other type cards do not have this event,
-# Therefore if something is changed from a pointer and its content is changed
-# in the same action, this event will be run and will treat the content like
-# it' still pointer content.  The "when" clause helps with that (but is a hack)
-event :standardize_items, :prepare_to_validate,
-      on: :save, changed: :content, when: :still_pointer? do
-  items_to_content item_strings
-end
-
-def still_pointer?
-  type_id == PointerID
-  # Card.new(type_id: type_id).is_a? Abstract::Pointer
-end
-
 def changed_item_names
   dropped_item_names + added_item_names
 end

data/set/abstract/01_pointer/html_views/filter/filtered_list_input.haml

@@ -1,5 +1,5 @@
 %div.filtered-list-editor
-  %ul.pointer-list.filtered-list-review._pointer-filtered-list.list-group.vertical.nopadding
+  %ul.pointer-list.filtered-list-review._pointer-filtered-list.list-group.vertical.p-0
     - card.item_cards(context: :raw).each do |item_card|
       %li._filtered-list-item.clearfix{ data: item_card.format.wrap_data(false) }
         %span._handle.float-left.m-2
@@ -13,9 +13,4 @@
   %br
   .clearfix
     = add_item_modal_link
--# "data-target": "#modal-filtered-list"
--# = modal_slot "filtered-list", "modal-lg"
 
-// note: passing item and filter card because in some cases (eg Project+Metric on wikirate)
-// the link was losing set-identifying information (type of left)
-// would be preferable to have a more general solution to retain set-identifying info.

data/set/abstract/01_pointer/html_views/filter.rb

@@ -43,7 +43,7 @@ format :html do
   end
 
   def default_filter_card
-    fcard = card.options_rule_card || Card[:all]
+    fcard = card.options_card
     return fcard if fcard.respond_to? :cql_hash
 
     fcard.fetch :referred_to_by, new: {}

data/set/abstract/01_pointer/html_views.rb

@@ -22,7 +22,7 @@ format :html do
   view :one_line_content do
     item_view = implicit_item_view
     item_view = item_view == "name" ? "name" : "link"
-    wrap_with :div, class: "pointer-list" do
+    wrap_with :div, class: "pointer-list one-line-pointer-list" do
       # limit to first 10 items to optimize
       pointer_items(view: item_view, limit: 10, offset: 0).join ", "
     end
@@ -44,10 +44,6 @@ format :html do
     list_input
   end
 
-  # view :nav_item do
-  #   nav_dropdown
-  # end
-
   def list_input args={}
     items = items_for_input args[:item_list]
     extra_class = "pointer-list-ul"

data/set/abstract/01_pointer/options_api.rb

@@ -29,10 +29,6 @@ def option_cards
   end
 end
 
-def options_rule_card
-  rule_card :content_options
-end
-
 def standard_option_names
   if json_options?
     options_hash.values.map(&:to_name)
@@ -44,21 +40,30 @@ end
 def option_names_from_items
   o_card = options_card
   limit = o_card.try(:default_limit).to_i
-  o_card.item_names context: name, limit: limit
+  context_name = right_type? ? nil : name
+  o_card.item_names context: context_name, limit: limit
 end
 
 def options_card
-  options_rule_card || Card[:all]
+  @options_card ||= rule_card(:content_options) || right_type_options || Card[:all]
 end
 
 def options_card_name
-  options_rule_card&.name&.url_key || ":all"
+  options_card&.name&.url_key
+end
+
+private
+
+def right_type_options
+  Card.fetch [right.name, :type, :by_name] if right_type?
+end
+
+def right_type?
+  right&.type_id == CardtypeID
 end
 
 format do
-  def options_card_name
-    card.options_card_name
-  end
+  delegate :options_card, :options_card_name, to: :card
 end
 
 format :html do

data/set/abstract/01_pointer/other_views.rb

@@ -58,18 +58,6 @@ format :json do
     params[:max_depth] || 1
   end
 
-  def items_for_export
-    card.item_cards
-  end
-
-  def essentials
-    return {} if depth > max_depth
-
-    card.item_cards.map do |item|
-      nest item, view: :essentials
-    end
-  end
-
   view :links do
     []
   end

data/set/abstract/01_pointer.rb

@@ -8,3 +8,32 @@ end
 def count
   item_strings.size
 end
+
+def standardize_content value
+  value = item_strings(content: value) unless value.is_a? Array
+  super value
+end
+
+def each_item_name_with_options _content=nil
+  item_names.each { |name| yield name, {} }
+end
+
+def swap_names old_name, new_name
+  item_strings.map do |string|
+    if string.match?(/^[:~]/)
+      string
+    else
+      string.to_name.swap old_name, new_name
+    end
+  end
+end
+
+private
+
+def chunk_class
+  Card::Content::Chunk::Link
+end
+
+def each_reference_out
+  item_names.each { |name| yield name, chunk_class::CODE }
+end

data/set/abstract/code_pointer.rb

@@ -1,35 +1,13 @@
 include_set Abstract::Pointer
 
-abstract_basket :item_codenames
-
-# simplify api
-# Self::MyCodePointerSet.add_item :my_item_codename
-# instead of
-# Self::MyCodePointerSet.add_to_basket :item_codenames, :my_item_codename
-module ClassMethods
-  def add_item codename
-    valid_codename codename do
-      add_to_basket :item_codenames, codename
-    end
-  end
-
-  def unshift_item codename
-    valid_codename codename do
-      unshift_basket :item_codenames, codename
-    end
-  end
+def self.included host_class
+  basket[host_class.basket_name] = []
+end
 
-  def valid_codename codename
-    if Card::Codename.exist? codename
-      yield
-    else
-      Rails.logger.info "unknown codename '#{codename}' added to code pointer"
-    end
-  end
+def item_codenames
+  basket[basket_name]
 end
 
 def content
-  item_codenames.map do |codename|
-    Card.fetch_name codename
-  end.compact.to_pointer_content
+  item_codenames.map(&:cardname).compact.to_pointer_content
 end

data/set/abstract/id_pointer.rb

@@ -19,3 +19,7 @@ end
 def item_names args={}
   item_ids(args).map(&:cardname).compact
 end
+
+def export_content
+  item_names.join "\n"
+end

data/set/all/supports_content_options.rb

@@ -1,3 +1,13 @@
+basket[:list_input_options] = [
+  "radio",
+  "checkbox",
+  "select",
+  "multiselect",
+  "list",
+  "filtered list",
+  "autocomplete"
+]
+
 def supports_content_options?
   false
 end

data/set/self/input_options.rb

@@ -1,14 +1,5 @@
 include_set Abstract::Pointer
 
-basket :options
-add_to_basket :options, "radio"
-add_to_basket :options, "checkbox"
-add_to_basket :options, "select"
-add_to_basket :options, "multiselect"
-add_to_basket :options, "list"
-add_to_basket :options, "filtered list"
-add_to_basket :options, "autocomplete"
-
 def content
-  options.to_pointer_content
+  basket[:list_input_options].to_pointer_content
 end

data/set/type/link_list.rb

@@ -1,4 +1,4 @@
-include_set Abstract::Pointer
+include_set Abstract::Items
 
 def raw_item_strings content
   reference_chunks(content).map(&:referee_name)
@@ -34,7 +34,8 @@ format :html do
     items = items_for_input args[:item_list]
     extra_class = "pointer-link-list-ul"
     ul_classes = classy "pointer-list-editor", extra_class
-    haml :link_list_input, items: items, ul_classes: ul_classes,
-                           options_card: options_card_name
+    haml :link_list_input,
+         items: items, ul_classes: ul_classes,
+         options_card: :all.card # options_card_name
   end
 end

data/set/type/list.rb

@@ -1,11 +1,5 @@
 include_set Abstract::Pointer
 
-def each_reference_out
-  item_names.each do |name|
-    yield(name, Card::Content::Chunk::Link::CODE)
-  end
-end
-
 format :html do
   view :view_list do
     %i[info_bar bar box closed titled labeled].map do |view|

data/set/type/nest_list.rb

@@ -8,9 +8,8 @@ def item_options
   nest_chunks.map(&:raw_options)
 end
 
-def items_to_content array
-  items = array.map { |i| standardize_item i }.reject(&:blank?)
-  self.content = items.join("\n")
+def items_content array
+  standardized_items(array).join "\n"
 end
 
 format do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-list
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.14.1
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-06 00:00:00.000000000 Z
+date: 2022-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,42 +18,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.103.2
+        version: 1.104.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.103.2
+        version: 1.104.1
 - !ruby/object:Gem::Dependency
   name: card-mod-format
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: 0.14.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: 0.14.1
 - !ruby/object:Gem::Dependency
   name: card-mod-collection
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: 0.14.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: 0.14.1
 description: ''
 email:
 - info@decko.org
@@ -62,6 +62,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - db/migrate_core_cards/20160804112340_add_pointer_cards.rb
+- db/migrate_core_cards/20211107155032_out_with_the_brackets.rb
 - set/abstract/01_pointer.rb
 - set/abstract/01_pointer/events.rb
 - set/abstract/01_pointer/html_views.rb
@@ -114,7 +115,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: list of cards