card-mod-collection 0.14.1 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d5e60454dce875711bdae859b3e125f98dfeba6168a5f4c4aa5a1cbb0a2557c
-  data.tar.gz: 119712ab680e5e89409a0174c5d2d4afbef2ba8e8e4e131eef02bc88f0b4b0d4
+  metadata.gz: 4f1fef608d54b9031f5d6184c0c8a9b9c00fd18ef81023695a007c1255c1fead
+  data.tar.gz: 879867adb8f43b2baa1c4ca3951ee8d033ce77c90e6835607d772a05b03f173c
 SHA512:
-  metadata.gz: ac0e9901966dfc46137561312733e8aae562de83efc5a96ed53e2cb94b32a53b1ded063040a605bd567bfdb5621fdf5151fa56f93663e6e32522bc52802b9ce8
-  data.tar.gz: 41e672cd8fbf173109cc35a4c34f84e35d549fb89c3c7e521cc74d3390fbf98054f0f39374c1542fcbba7995affc055f80906c10b70c2c4e4c2a47626e6f679d
+  metadata.gz: 0aafb06363d4fcf50451b0580b811a971b697f74b2994d3d149522126ab79f271dd2550c10a1157a89571915dd224f43a940c7e45b54d6aaac096e1c33fd82a5
+  data.tar.gz: 8d5c01287de77db8166125477ced1c518c1491a2ab5a03b8f966ff40a979a8aea1f573372735d182ac41531cd47169246745c005ec90b597f1d8d564c869cc9b

data/lib/card/paging_links.rb

@@ -0,0 +1,96 @@
+class Card
+  # generates pagination links
+  class PagingLinks
+    MAX_PAGES = 100
+
+    def initialize total_pages, current_page
+      @total = total_pages
+      @current = current_page
+    end
+
+    # @param window [integer] number of page links shown left and right
+    #   of the current page
+    # @example: current page = 5, window = 2
+    #   |<<|1|...|3|4|[5]|6|7|...|10|>>|
+    # @yield [text, page, status, options] block to build single paging link
+    # @yieldparam status [Symbol] :active (for current page) or :disabled
+    # @yieldparam page [Integer] page number, first page is 0
+    # @return [Array<String>]
+    def build window=2, &block
+      @render_item = block
+      links window
+    end
+
+    private
+
+    def links window
+      @window_start = [@current - window, 0].max
+      @window_end = [@current + window, @total].min
+      left_part + window_part + right_part
+    end
+
+    # the links around the current page
+    def window_part
+      (@window_start..@window_end).map do |page|
+        direct_page_link page
+      end.compact
+    end
+
+    def left_part
+      [
+        previous_page_link,
+        (direct_page_link 0 if @window_start.positive?),
+        (ellipse if @window_start > 1)
+      ].compact
+    end
+
+    def right_part
+      parts = [next_page_link]
+      parts.unshift direct_page_link(@total) if add_final_page?
+      parts.unshift ellipse if @total > @window_end + 1
+      parts
+    end
+
+    def add_final_page?
+      @total <= MAX_PAGES && @total > @window_end
+    end
+
+    def previous_page_link
+      paging_item '<span aria-hidden="true">&laquo;</span>', previous_page,
+                  "aria-label" => "Previous", status: :previous
+    end
+
+    def next_page_link
+      paging_item '<span aria-hidden="true">&raquo;</span>', next_page,
+                  "aria-label" => "Next", status: :next
+    end
+
+    def direct_page_link page
+      return unless page >= 0 && page <= @total
+
+      paging_item page + 1, page
+    end
+
+    def ellipse
+      paging_item "<span>...</span>", nil, status: :ellipses
+    end
+
+    def paging_item text, page, options={}
+      status =
+        if page == @current
+          :current
+        else
+          options.delete :status
+        end
+      @render_item.call text, page, status, options
+    end
+
+    def previous_page
+      @current.positive? ? @current - 1 : false
+    end
+
+    def next_page
+      @current < @total ? @current + 1 : false
+    end
+  end
+end

data/set/abstract/items.rb

@@ -1,209 +1,11 @@
-# ~~~~~~~~~~~~ READING ITEMS ~~~~~~~~~~~~
-
-# While each of the three main methods for returning lists of items can handle arguments,
-# they are most commonly used without them.
-
-# @return [Array] list of Card::Name objects
-# @param args [Hash]
-# @option args [String] :content override card content
-# @option args [String, Card::Name, Symbol] :context name in whose context relative items
-#         will be interpreted. For example. +A in context of B is interpreted as B+A
-#         context defaults to pointer card's name. If value is `:raw`, then name is not
-#         contextualized
-# @option args [String, Integer] :limit max number of cards to return
-# @option args [String, Integer] :offset begin after the offset-th item
-def item_names args={}
-  context = args[:context]
-  item_strings(args).map do |item|
-    clean_item_name item, context
-  end.compact
-end
-
-def first_name args={}
-  item_names(args).first
-end
-
-def first_card args={}
-  return unless (name = first_name)
-
-  fetch_item_card name, args
-end
-
-def first_code
-  first_card&.codename
-end
-
-def first_id
-  first_card&.id
-end
-
-# @return [Array] list of integers (card ids of items)
-# @param args [Hash] see #item_names
-def item_ids args={}
-  item_names(args).map(&:card_id).compact
-end
-
-def item_cards args={}
-  standard_item_cards args
-end
-
-# @return [Array] list of Card objects
-# @param args [Hash] see #item_names for additional options
-# @option args [String] :complete keyword to use in searching among items
-# @option args [True/False] :known_only if true, return only known cards
-# @option args [String] :type name of type to be used for unknown cards
-def standard_item_cards args={}
-  return item_cards_search(args) if args[:complete]
-  return known_item_cards(args) if args[:known_only]
-
-  all_item_cards args
-end
-
-# #item_name, #item_id, and #item_card each return a single item, rather than an array.
-%i[name id card].each do |obj|
-  define_method "item_#{obj}" do |args={}|
-    send("item_#{obj}s", args.merge(limit: 1)).first
-  end
-end
-
-# for override, eg by json
-def item_value item_name
-  item_name
-end
-
-# ~~~~~~~~~~~~ ALTERING ITEMS ~~~~~~~~~~~~
-
-# set card content based on array and save card
-# @param array [Array] list of strings/names (Cardish)
-def items= array
-  self.content = array
-  save!
-end
-
-# append item to list (does not save)
-# @param cardish [Cardish]
-def << cardish
-  add_item cardish
-end
-
-# append item to list (does not save)
-# @param cardish [String, Card::Name] item name
-# @param allow_duplicates [True/False] permit duplicate items (default is False)
-def add_item cardish, allow_duplicates=false
-  return if !allow_duplicates && include_item?(cardish)
-
-  self.content = (item_strings << cardish)
-end
-
-# append item to list and save card
-# @param name [String, Card::Name] item name
-def add_item! name
-  add_item(name) && save!
-end
-
-# remove item from list
-# @param cardish [String, Card::Name] item to drop
-def drop_item cardish
-  drop_item_name = Card::Name[cardish]
-  self.content = (item_names.reject { |item_name| item_name == drop_item_name })
+def recursable_items?
+  true
 end
 
-# remove item from list and save card
-# @param cardish [String, Card::Name] item to drop
-def drop_item! cardish
-  drop_item cardish
-  save!
-end
-
-# insert item into list at specified location
-# @param index [Integer] Array index in which to insert item (0 is first)
-# @param name [String, Card::Name] item name
-def insert_item index, name
-  new_names = item_names
-  new_names.delete name
-  new_names.insert index, name
-  self.content = new_names
-end
-
-# insert item into list at specified location and save
-# @param index [Integer] Array index in which to insert item (0 is first)
-# @param name [String, Card::Name] item name
-def insert_item! index, name
-  insert_item index, name
-  save!
-end
-
-# ~~~~~~~~~~~~ READING ITEM HELPERS ~~~~~~~~~~~~
-
-# Warning: the following methods, while available for use, may be subject to change
-
-# #item_cards helpers
-
-def item_cards_search query
-  Card::Query.run query.reverse_merge(referred_to_by: name, limit: 0)
-end
-
-def known_item_cards args={}
-  item_names(args).map { |name| Card.fetch name }.compact
-end
-
-def all_item_cards args={}
-  names = args[:item_names] || item_names(args)
-  names.map { |name| fetch_item_card name, args }
-end
-
-# TODO: support type_code and type_id. (currently type)
-# uses name, because its most common use is from CQL
-def item_type
+def item_type_id
   opt = options_card
   # FIXME: need better recursion prevention
-  return if !opt || opt == self
-
-  opt.item_type
-end
-
-def item_strings args={}
-  items = raw_item_strings(args[:content] || content)
-  return items unless args.present?
-
-  filtered_items items, limit: args[:limit], offset: args[:offset]
-end
-
-def raw_item_strings content
-  content.to_s.split(/\n+/).map { |i| strip_item i }
-end
-
-private
-
-def filtered_items items, limit: 0, offset: 0
-  limit = limit.to_i
-  offset = offset.to_i
-  return items unless limit.positive? || offset.positive?
-
-  items[offset, (limit.zero? ? items.size : limit)] || []
-end
-
-def fetch_item_card name, args={}
-  Card.fetch name, new: new_unknown_item_args(args)
-end
-
-def new_unknown_item_args args
-  itype = args[:type] || item_type
-  itype ? { type: itype } : {}
-end
-
-def clean_item_name item, context
-  item = item.to_name
-  return item if context == :raw
-
-  context ||= context_card.name
-  item.absolute_name context
-rescue Card::Error::NotFound
-  # eg for invalid ids or codenames
-  # "Invalid Item: #{item}".to_name
-  nil
-end
+  return unless opt && opt != self
 
-def strip_item item
-  item.gsub(/\[\[|\]\]/, "").strip
+  opt.item_type_id
 end

data/set/abstract/paging/paging.haml

@@ -0,0 +1,12 @@
+- if paging_needed?
+  %nav.nav.justify-content-between.align-items-center
+    %ul.pagination.paging
+      = paging_links.join
+    .paging-context
+      = offset + 1
+      = "-"
+      = last_item_on_page
+      of
+      = count_with_params
+
+

data/set/abstract/paging/paging_views.rb

@@ -3,21 +3,11 @@ format :html do
 
   def with_paging path_args={}
     with_paging_path_args path_args do
-      output [yield(@paging_path_args), _render_paging]
+      output [yield(@paging_path_args), render_paging]
     end
   end
 
-  view :paging, cache: :never do
-    return "" unless paging_needed?
-
-    <<-HTML
-      <nav>
-        <ul class="pagination paging">
-          #{paging_links.join}
-        </ul>
-      </nav>
-    HTML
-  end
+  view :paging, cache: :never, template: :haml
 
   def paging_links
     PagingLinks.new(total_pages, current_page).build do |text, page, status, options|

data/set/abstract/paging.rb

@@ -17,6 +17,10 @@ format do
     @count_with_params ||= card.item_names.count
   end
 
+  def no_results?
+    count_with_params.zero?
+  end
+
   def total_pages
     return 1 if limit.zero?
 
@@ -32,6 +36,10 @@ format do
     {}
   end
 
+  def last_item_on_page
+    [count_with_params, (offset + limit)].min
+  end
+
   private
 
   def contextual_param param

data/set/all/item.rb

@@ -1,84 +1,114 @@
-def item_names _args={}
-  format._render_raw.split(/[,\n]/)
+# ITEM LISTS
+
+# Note: while most methods for returning lists of items can handle arguments,
+# they are most commonly used without them.
+
+# @return [Array] list of Card::Name objects
+# @param args [Hash]
+# @option args [String] :content override card content
+# @option args [String, Card::Name, Symbol] :context name in whose context relative items
+#         will be interpreted. For example. +A in context of B is interpreted as B+A
+#         context defaults to pointer card's name. If value is `:raw`, then name is not
+#         contextualized
+# @option args [String, Integer] :limit max number of cards to return
+# @option args [String, Integer] :offset begin after the offset-th item
+def item_names args={}
+  context = args[:context]
+  item_strings(args).map do |item|
+    clean_item_name item, context
+  end.compact
 end
 
-# FIXME: this is inconsistent with item_names
-def item_cards _args={}
-  [self]
+# @return [Array] list of cards
+# @param args [Hash] see #item_names
+def item_cards args={}
+  standard_item_cards args
 end
 
-def item_type
-  nil
+# @return [Array] list of integers (card ids of items)
+# @param args [Hash] see #item_names
+def item_ids args={}
+  item_names(args).map(&:card_id).compact
 end
 
+# @return [Array] of String objects
+# @param args [Hash] see #item_names
 def item_keys args={}
   item_names(args).map do |item|
     item.to_name.key
   end
 end
 
-def item_count args={}
-  item_names(args).size
-end
+# @return [Array] of String objects
+# @param args [Hash] see #item_names
+def item_strings args={}
+  items = raw_item_strings(args[:content] || content)
+  return items unless args.present?
 
-def items_content array
-  standardized_items(array).to_pointer_content
+  filtered_items items, limit: args[:limit], offset: args[:offset]
 end
 
-def standardized_items array
-  array.map { |i| standardize_item i }.reject(&:blank?)
-end
+# SINGLE ITEM
 
-def standardize_item item
-  Card::Name[item]
-rescue Card::Error::NotFound
-  item
+# @return [Card::Name]
+# @param args [Hash] see #item_names
+def first_name args={}
+  item_names(args).first
 end
 
-def include_item? item
-  item_names.include? Card::Name[item]
+# @return [Card]
+# @param args [Hash] see #item_names
+def first_card args={}
+  return unless (name = first_name)
+
+  fetch_item_card name, args
 end
 
-def add_item item
-  self.content = (item_strings << item) unless include_item? item
+# @return [Symbol]
+# @param args [Hash] see #item_names
+def first_code args={}
+  first_card(args)&.codename
 end
 
-def drop_item item
-  item = Card::Name[item]
-  self.content = (item_names.reject { |i| i == item }) if include_item? item
+# @return [Integer]
+# @param args [Hash] see #item_names
+def first_id args={}
+  first_name(args)&.card_id
 end
 
-def insert_item index, name
-  new_names = item_names
-  new_names.delete name
-  new_names.insert index, name
-  self.content = new_names
+# ITEM TYPES
+
+# typically override EITHER #item_type_id OR #item_type_name
+def item_type_id
+  @item_type_id ||= no_item_type_recursion { item_type_name&.card_id }
 end
 
-def replace_item old, new
-  return unless include_item? old
+def item_type_name
+  @item_type_name ||= no_item_type_recursion { item_type_id&.cardname }
+end
 
-  drop_item old
-  add_item new
+def item_type_card
+  item_type_id&.card
 end
 
-# I think the following should work as add_item...
-#
-def add_id id
-  add_item "~#{id}"
+# MISC
+
+def item_count args={}
+  item_names(args).size
 end
 
-def drop_id id
-  drop_item "~#{id}"
+def include_item? item
+  item_names.include? Card::Name[item]
 end
 
-def insert_id index, id
-  insert_item index, "~#{id}"
+# for override, eg by json
+def item_value item_name
+  item_name
 end
 
 format do
-  def item_links _args={}
-    raw(render_core).split(/[,\n]/)
+  view :count do
+    card.item_count
   end
 
   def nest_item cardish, options={}, &block
@@ -87,6 +117,12 @@ format do
     nest cardish, options, &block
   end
 
+  def item_links args={}
+    card.item_cards(args).map do |item_card|
+      nest_item item_card, view: :link
+    end
+  end
+
   def implicit_item_view
     view = voo_items_view || default_item_view
     Card::View.normalize view
@@ -113,8 +149,8 @@ format do
   def determine_item_view_options_type options
     return if options[:type]
 
-    type_from_rule = card.item_type
-    options[:type] = type_from_rule if type_from_rule
+    type_name = card.item_type_name
+    options[:type] = type_name if type_name
   end
 
   def listing listing_cards, item_args={}
@@ -135,3 +171,78 @@ format :html do
     %(<div class="item-#{item_view}">#{rendered}</div>)
   end
 end
+
+private
+
+def raw_item_strings content
+  content.to_s.split(/\n+/).map { |i| strip_item i }
+end
+
+# FIXME: complete should be handled at the name or string level
+# (and might not really need to use Card::Query here, though it
+# should in search cards)
+
+# @return [Array] list of Card objects
+# @param args [Hash] see #item_names for additional options
+# @option args [String] :complete keyword to use in searching among items
+# @option args [True/False] :known_only if true, return only known cards
+# @option args [String] :type name of type to be used for unknown cards
+def standard_item_cards args={}
+  return item_cards_search(args) if args[:complete]
+  return known_item_cards(args) if args[:known_only]
+
+  all_item_cards args
+end
+
+def no_item_type_recursion
+  return nil if @item_type_lookup
+
+  @item_type_lookup = true
+  yield
+end
+
+def item_cards_search query
+  Card::Query.run query.reverse_merge(referred_to_by: name, limit: 0)
+end
+
+def known_item_cards args={}
+  item_names(args).map { |name| Card.fetch name }.compact
+end
+
+def all_item_cards args={}
+  names = args[:item_names] || item_names(args)
+  names.map { |name| fetch_item_card name, args }
+end
+
+def fetch_item_card name, args={}
+  Card.fetch name, new: new_unknown_item_args(args)
+end
+
+def new_unknown_item_args args
+  itype = args[:type] || item_type_name
+  itype ? { type: itype } : {}
+end
+
+def filtered_items items, limit: 0, offset: 0
+  limit = limit.to_i
+  offset = offset.to_i
+  return items unless limit.positive? || offset.positive?
+
+  items[offset, (limit.zero? ? items.size : limit)] || []
+end
+
+def clean_item_name item, context
+  item = item.to_name
+  return item if context == :raw
+
+  context ||= context_card.name
+  item.absolute_name context
+rescue Card::Error::NotFound
+  # eg for invalid ids or codenames
+  # "Invalid Item: #{item}".to_name
+  nil
+end
+
+def strip_item item
+  item.gsub(/\[\[|\]\]/, "").strip
+end

data/set/all/item_assignment.rb

@@ -0,0 +1,80 @@
+# set card content based on array and save card
+# @param array [Array] list of strings/names (Cardish)
+def items= array
+  self.content = array
+  save!
+end
+
+# append item to list (does not save)
+# @param cardish [Cardish]
+def << cardish
+  add_item cardish
+end
+
+# append item to list (does not save)
+# @param cardish [String, Card::Name] item name
+# @param allow_duplicates [True/False] permit duplicate items (default is False)
+def add_item cardish, allow_duplicates=false
+  return if !allow_duplicates && include_item?(cardish)
+
+  self.content = (item_strings << cardish)
+end
+
+# append item to list and save card
+# @param name [String, Card::Name] item name
+def add_item! name
+  add_item(name) && save!
+end
+
+# remove item from list
+# @param cardish [String, Card::Name] item to drop
+def drop_item item
+  item_name = item.cardname
+  self.content = (item_names.reject { |i| i == item_name })
+end
+
+# remove item from list and save card
+# @param cardish [String, Card::Name] item to drop
+def drop_item! cardish
+  drop_item cardish
+  save!
+end
+
+# insert item into list at specified location
+# @param index [Integer] Array index in which to insert item (0 is first)
+# @param name [String, Card::Name] item name
+def insert_item index, name
+  new_names = item_names
+  new_names.delete name
+  new_names.insert index, name
+  self.content = new_names
+end
+
+# insert item into list at specified location and save
+# @param index [Integer] Array index in which to insert item (0 is first)
+# @param name [String, Card::Name] item name
+def insert_item! index, name
+  insert_item index, name
+  save!
+end
+
+def replace_item old, new
+  return unless include_item? old
+
+  drop_item old
+  add_item new
+end
+
+def items_content array
+  standardized_items(array).to_pointer_content
+end
+
+def standardized_items array
+  array.map { |i| standardize_item i }.reject(&:blank?)
+end
+
+def standardize_item item
+  Card::Name[item]
+rescue Card::Error::NotFound
+  item
+end

data/set/all/recursed.rb

@@ -0,0 +1,41 @@
+def recursed_item_cards context=nil
+  list = []
+  book = ::Set.new # avoid loops
+  items =
+    recursable_items? ? item_cards(limit: "", context: (context&.name || name)) : [self]
+  recurse_item_list items, list, book until items.empty?
+  list
+end
+
+def recursed_item_contents context=nil
+  recursed_item_cards(context).map(&:item_names).flatten
+end
+
+def recursable_items?
+  false
+end
+
+format do
+  delegate :recursed_item_contents, to: :card
+end
+
+private
+
+def recurse_item_list items, list, book
+  item = items.shift
+  return if already_recursed?(item, book)
+
+  if item.recursable_items?
+    # keep items in order
+    items.unshift(*item.item_cards.compact)
+  else  # no further level of items
+    list << item
+  end
+end
+
+def already_recursed? item, book
+  return true if book.include? item
+
+  book << item
+  false
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-collection
 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,12 +33,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/card/paging_links.rb
 - set/abstract/items.rb
 - set/abstract/paging.rb
-- set/abstract/paging/paging_links.rb
+- set/abstract/paging/paging.haml
 - set/abstract/paging/paging_views.rb
-- set/all/extended.rb
 - set/all/item.rb
+- set/all/item_assignment.rb
+- set/all/recursed.rb
 homepage: https://decko.org
 licenses:
 - GPL-3.0
@@ -49,6 +51,7 @@ metadata:
   wiki_uri: https://decko.org
   documentation_url: http://docs.decko.org/
   card-mod: collection
+  card-mod-group: gem-defaults
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -64,7 +67,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: collection (list and search)

data/set/abstract/paging/paging_links.rb

@@ -1,92 +0,0 @@
-#! no set module
-
-# render paging links
-class PagingLinks
-  MAX_PAGES = 100
-
-  def initialize total_pages, current_page
-    @total = total_pages
-    @current = current_page
-  end
-
-  # @param window [integer] number of page links shown left and right
-  #   of the current page
-  # @example: current page = 5, window = 2
-  #   |<<|1|...|3|4|[5]|6|7|...|10|>>|
-  # @yield [text, page, status, options] block to build single paging link
-  # @yieldparam status [Symbol] :active (for current page) or :disabled
-  # @yieldparam page [Integer] page number, first page is 0
-  # @return [Array<String>]
-  def build window=2, &block
-    @render_item = block
-    links window
-  end
-
-  private
-
-  def links window
-    @window_start = [@current - window, 0].max
-    @window_end = [@current + window, @total].min
-    left_part + window_part + right_part
-  end
-
-  # the links around the current page
-  def window_part
-    (@window_start..@window_end).map do |page|
-      direct_page_link page
-    end.compact
-  end
-
-  def left_part
-    [
-      previous_page_link,
-      (direct_page_link 0 if @window_start.positive?),
-      (ellipse if @window_start > 1)
-    ].compact
-  end
-
-  def right_part
-    parts = [next_page_link]
-    parts.unshift direct_page_link(@total) if @total <= MAX_PAGES && @total > @window_end
-    parts.unshift ellipse if @total > @window_end + 1
-    parts
-  end
-
-  def previous_page_link
-    paging_item '<span aria-hidden="true">&laquo;</span>', previous_page,
-                "aria-label" => "Previous", status: :previous
-  end
-
-  def next_page_link
-    paging_item '<span aria-hidden="true">&raquo;</span>', next_page,
-                "aria-label" => "Next", status: :next
-  end
-
-  def direct_page_link page
-    return unless page >= 0 && page <= @total
-
-    paging_item page + 1, page
-  end
-
-  def ellipse
-    paging_item "<span>...</span>", nil, status: :ellipses
-  end
-
-  def paging_item text, page, options={}
-    status =
-      if page == @current
-        :current
-      else
-        options.delete :status
-      end
-    @render_item.call text, page, status, options
-  end
-
-  def previous_page
-    @current.positive? ? @current - 1 : false
-  end
-
-  def next_page
-    @current < @total ? @current + 1 : false
-  end
-end

data/set/all/extended.rb

@@ -1,50 +0,0 @@
-def extended_item_cards context=nil
-  items = item_cards limit: "", context: (context || self).name
-  list = []
-  book = ::Set.new # avoid loops
-  extend_item_list items, list, book until items.empty?
-  list
-end
-
-def extended_item_contents context=nil
-  extended_item_cards(context).map(&:item_names).flatten
-end
-
-format do
-  delegate :extended_item_contents, to: :card
-end
-
-private
-
-def extend_item_list items, list, book
-  item = items.shift
-  return if already_extended?(item, book)
-
-  if item.collection?
-    # keep items in order
-    items.unshift(*item.item_cards.compact)
-  else  # no further level of items
-    list << item
-  end
-end
-
-def already_extended? item, book
-  return true if book.include? item
-
-  book << item
-  false
-end
-
-# def extended_list context=nil
-#   context = (context ? context.name : name)
-#   args = { limit: "" }
-#   item_cards(args.merge(context: context)).map do |x|
-#     x.item_cards(args)
-#   end.flatten.map do |x|
-#     x.item_cards(args)
-#   end.flatten.map do |y|
-#     y.item_names(args)
-#   end.flatten
-#   # this could go on and on.  more elegant to recurse until you don't have
-#   # a collection
-# end