card-mod-collection 0.11.2 → 0.12.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 623a90b53dd2548bf9f3b1f22d4910460b9fb1601f7847705846e1bfb3655ff1
4
- data.tar.gz: 2629d484f5e32f063b1cbe17782cd9183f346c9d6f5fd060d86bbf39c3ae988d
3
+ metadata.gz: aee4bfc9b355ba2c7d2a5e62946b0adec31f4927b9b4c548c1c1312bf88fcd4f
4
+ data.tar.gz: af9591c0ea7c22aa1a1fa75e611b68c25b4ffffda7dd8f6a9200d783fe81abc6
5
5
  SHA512:
6
- metadata.gz: e1d11a0c4fa6695d1d1da34f362aa4afc81bfd15ee6dde94cadcad194676e98ef8d285cd54f4e34cd6782ecf1c75af20acc7f65b6c4077d4f27f84a319dfd0c3
7
- data.tar.gz: f12aeeae867d881e1e1e709cab6f4d76407b877a66b02aa18d2010923f272fef505b6d6f9c9fcda5610ead1f65950514f6e14a479dc9d88f1a089469500a006e
6
+ metadata.gz: f380f9468e85c5f1f5977f3099c0d1948874d7740926fd694d1e7d80b1db28a8e5ca3efc1837b512fc100a06b8269b42c4e1fe92d023ad12dc25e2ed118bc675
7
+ data.tar.gz: 3c8be6a10533c2532b51b3ef1ef8c93aceec30fad45f93504e193ba4bbb71b514077a445138ee473b8dfb4a78a7ed06679ec60a290d96c9c309a27803deb68d3
@@ -25,6 +25,7 @@ end
25
25
 
26
26
  def first_card args={}
27
27
  return unless (name = first_name)
28
+
28
29
  fetch_item_card name, args
29
30
  end
30
31
 
@@ -39,7 +40,7 @@ end
39
40
  # @return [Array] list of integers (card ids of items)
40
41
  # @param args [Hash] see #item_names
41
42
  def item_ids args={}
42
- item_names(args).map { |name| Card.fetch_id name }.compact
43
+ item_names(args).map(&:card_id).compact
43
44
  end
44
45
 
45
46
  # @return [Array] list of Card objects
@@ -50,6 +51,7 @@ end
50
51
  def item_cards args={}
51
52
  return item_cards_search(args) if args[:complete]
52
53
  return known_item_cards(args) if args[:known_only]
54
+
53
55
  all_item_cards args
54
56
  end
55
57
 
@@ -153,6 +155,7 @@ def item_type
153
155
  opt = options_rule_card
154
156
  # FIXME: need better recursion prevention
155
157
  return if !opt || opt == self
158
+
156
159
  opt.item_type
157
160
  end
158
161
 
@@ -160,7 +163,7 @@ def item_strings args={}
160
163
  items = raw_item_strings(args[:content] || content)
161
164
  return items unless args.present?
162
165
 
163
- filtered_items items, args.slice(:limit, :offset)
166
+ filtered_items items, limit: args[:limit], offset: args[:offset]
164
167
  end
165
168
 
166
169
  def raw_item_strings content
@@ -189,6 +192,7 @@ end
189
192
  def clean_item_name item, context
190
193
  item = item.to_name
191
194
  return item if context == :raw
195
+
192
196
  context ||= context_card.name
193
197
  item.absolute_name context
194
198
  rescue Card::Error::NotFound
@@ -19,6 +19,7 @@ format do
19
19
 
20
20
  def total_pages
21
21
  return 1 if limit.zero?
22
+
22
23
  ((count_with_params - 1) / limit).to_i
23
24
  end
24
25
 
@@ -63,6 +63,7 @@ class PagingLinks
63
63
 
64
64
  def direct_page_link page
65
65
  return unless page >= 0 && page <= @total
66
+
66
67
  paging_item page + 1, page
67
68
  end
68
69
 
@@ -9,6 +9,7 @@ format :html do
9
9
 
10
10
  view :paging, cache: :never do
11
11
  return "" unless paging_needed?
12
+
12
13
  <<-HTML
13
14
  <nav>
14
15
  <ul class="pagination paging">
data/set/all/extended.rb CHANGED
@@ -1,4 +1,3 @@
1
-
2
1
  def extended_item_cards context=nil
3
2
  items = item_cards limit: "", context: (context || self).name
4
3
  list = []
@@ -20,6 +19,7 @@ private
20
19
  def extend_item_list items, list, book
21
20
  item = items.shift
22
21
  return if already_extended? item, book
22
+
23
23
  if item.collection?
24
24
  # keep items in order
25
25
  items.unshift(*item.item_cards)
@@ -30,6 +30,7 @@ end
30
30
 
31
31
  def already_extended? item, book
32
32
  return true if book.include? item
33
+
33
34
  book << item
34
35
  false
35
36
  end
data/set/all/item.rb CHANGED
@@ -2,7 +2,8 @@ def item_names _args={}
2
2
  format._render_raw.split(/[,\n]/)
3
3
  end
4
4
 
5
- def item_cards _args={} # FIXME: this is inconsistent with item_names
5
+ # FIXME: this is inconsistent with item_names
6
+ def item_cards _args={}
6
7
  [self]
7
8
  end
8
9
 
@@ -35,12 +36,14 @@ end
35
36
 
36
37
  def add_item item
37
38
  return if include_item? item
39
+
38
40
  items_to_content(items_strings << item)
39
41
  end
40
42
 
41
43
  def drop_item item
42
44
  item = Card::Name[item]
43
45
  return unless include_item? item
46
+
44
47
  items_to_content(item_names.reject { |i| i == item })
45
48
  end
46
49
 
@@ -53,6 +56,7 @@ end
53
56
 
54
57
  def replace_item old, new
55
58
  return unless include_item? old
59
+
56
60
  drop_item old
57
61
  add_item new
58
62
  end
@@ -89,6 +93,7 @@ format do
89
93
 
90
94
  def voo_items_view
91
95
  return unless voo && (items = voo.items)
96
+
92
97
  items[:view]
93
98
  end
94
99
 
@@ -106,6 +111,7 @@ format do
106
111
 
107
112
  def determine_item_view_options_type options
108
113
  return if options[:type]
114
+
109
115
  type_from_rule = card.item_type
110
116
  options[:type] = type_from_rule if type_from_rule
111
117
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: card-mod-collection
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.11.2
4
+ version: 0.12.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2021-03-15 00:00:00.000000000 Z
13
+ date: 2021-07-05 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: card
@@ -18,14 +18,14 @@ dependencies:
18
18
  requirements:
19
19
  - - '='
20
20
  - !ruby/object:Gem::Version
21
- version: 1.101.2
21
+ version: 1.102.0
22
22
  type: :runtime
23
23
  prerelease: false
24
24
  version_requirements: !ruby/object:Gem::Requirement
25
25
  requirements:
26
26
  - - '='
27
27
  - !ruby/object:Gem::Version
28
- version: 1.101.2
28
+ version: 1.102.0
29
29
  description: ''
30
30
  email:
31
31
  - info@decko.org
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
64
64
  - !ruby/object:Gem::Version
65
65
  version: '0'
66
66
  requirements: []
67
- rubygems_version: 3.0.3
67
+ rubygems_version: 3.2.15
68
68
  signing_key:
69
69
  specification_version: 4
70
70
  summary: collection (list and search)