card-mod-collection 0.13.1 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c59d763c599f7e9b51ebcb2b5ae32408c88c46e6832684fa31918dcdd1aed20
-  data.tar.gz: 8b399b450fa43ad145660185f1e1a9b64d7d05dff050d70dc7392a8dec8b4b03
+  metadata.gz: 676ab2305586fd9e10fe00cc8fc8cb5efa98a1efd30e99d72a6aa65a91457a4c
+  data.tar.gz: 1f887be2fad2ef27879e1080ada1ccbbfb316a39921d2fd055811be8b3b1df0b
 SHA512:
-  metadata.gz: da5238514f9ea637bd4e228b9cfa8e93d888a0929819407495da8a78291a5fe8fcd79a7f37eaf3dc597aea8df6baabd2838083e3aee782128a11380563770924
-  data.tar.gz: 88d63f2279e2d2d082d3eae7390bade21525f45a9044827be4877b4c5148272900e2b6d4b9c6f8d069a3fc678057097afe6c8dd9e12c25b539ca6a15133e8d33
+  metadata.gz: a5a331529bc20615d6afa6422581bbc21ebc95cd80320882f04716de8ae32977463a9e18bbcc77d81f1f09a289e4fb265f8bc31651747c59f69383d7e377f55f
+  data.tar.gz: cbe75b23d73de4fe9669ab8c67e4a42dc625f852187cb6a0343f7661a2e07dc01921a0ed683465173cf54cd5156e448aef9c96dc5c621258de64ae3764ba2bfe

data/set/abstract/items.rb

@@ -43,12 +43,16 @@ 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 item_cards args={}
+def standard_item_cards args={}
   return item_cards_search(args) if args[:complete]
   return known_item_cards(args) if args[:known_only]
 
@@ -72,7 +76,7 @@ end
 # set card content based on array and save card
 # @param array [Array] list of strings/names (Cardish)
 def items= array
-  items_to_content array
+  self.content = array
   save!
 end
 
@@ -88,8 +92,7 @@ end
 def add_item cardish, allow_duplicates=false
   return if !allow_duplicates && include_item?(cardish)
 
-  items = item_strings << cardish
-  items_to_content items
+  self.content = (item_strings << cardish)
 end
 
 # append item to list and save card
@@ -102,7 +105,7 @@ end
 # @param cardish [String, Card::Name] item to drop
 def drop_item cardish
   drop_item_name = Card::Name[cardish]
-  items_to_content(item_names.reject { |item_name| item_name == drop_item_name })
+  self.content = (item_names.reject { |item_name| item_name == drop_item_name })
 end
 
 # remove item from list and save card
@@ -119,7 +122,7 @@ def insert_item index, name
   new_names = item_names
   new_names.delete name
   new_names.insert index, name
-  items_to_content new_names
+  self.content = new_names
 end
 
 # insert item into list at specified location and save
@@ -152,7 +155,7 @@ end
 # TODO: support type_code and type_id. (currently type)
 # uses name, because its most common use is from CQL
 def item_type
-  opt = options_rule_card
+  opt = options_card
   # FIXME: need better recursion prevention
   return if !opt || opt == self
 

data/set/abstract/paging/paging_links.rb

@@ -2,6 +2,8 @@
 
 # render paging links
 class PagingLinks
+  MAX_PAGES = 100
+
   def initialize total_pages, current_page
     @total = total_pages
     @current = current_page
@@ -44,11 +46,10 @@ class PagingLinks
   end
 
   def right_part
-    [
-      (ellipse if @total > @window_end + 1),
-      (direct_page_link @total if @total > @window_end),
-      next_page_link
-    ].compact
+    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

data/set/abstract/paging.rb

@@ -39,20 +39,14 @@ format do
   end
 
   def env_search_param param
-    enforcing_legal_limit param do
-      val = Env.params[param]
-      val.to_i if focal? && val.present?
-    end
-  end
+    val = Env.params[param]
+    return unless focal? && val.present?
 
-  def enforcing_legal_limit param
-    yield.tap do |val|
-      enforce_legal_limit! val if param == :limit
-    end
+    legal_search_param val.to_i
   end
 
-  def enforce_legal_limit! val
-    return if Card::Auth.signed_in? || !val || val <= MAX_ANONYMOUS_SEARCH_PARAM
+  def legal_search_param val
+    return val if Card::Auth.signed_in? || val <= MAX_ANONYMOUS_SEARCH_PARAM
 
     raise Card::Error::PermissionDenied,
           "limit parameter exceeds maximum for anonymous users " \

data/set/all/extended.rb

@@ -18,11 +18,11 @@ private
 
 def extend_item_list items, list, book
   item = items.shift
-  return if already_extended? item, book
+  return if already_extended?(item, book)
 
   if item.collection?
     # keep items in order
-    items.unshift(*item.item_cards)
+    items.unshift(*item.item_cards.compact)
   else  # no further level of items
     list << item
   end

data/set/all/item.rb

@@ -21,13 +21,18 @@ def item_count args={}
   item_names(args).size
 end
 
-def items_to_content array
-  items = array.map { |i| standardize_item i }.reject(&:blank?)
-  self.content = items.to_pointer_content
+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
 
 def include_item? item
@@ -35,23 +40,19 @@ def include_item? item
 end
 
 def add_item item
-  return if include_item? item
-
-  items_to_content(items_strings << item)
+  self.content = (item_strings << item) unless include_item? item
 end
 
 def drop_item item
   item = Card::Name[item]
-  return unless include_item? item
-
-  items_to_content(item_names.reject { |i| i == item })
+  self.content = (item_names.reject { |i| i == item }) if include_item? item
 end
 
 def insert_item index, name
   new_names = item_names
   new_names.delete name
   new_names.insert index, name
-  items_to_content new_names
+  self.content = new_names
 end
 
 def replace_item old, new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-collection
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.14.0
 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: 2021-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.103.1
+        version: 1.104.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.103.1
+        version: 1.104.0
 description: ''
 email:
 - info@decko.org
@@ -64,7 +64,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: collection (list and search)