recourse 5.9.2 → 5.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25dc12a1680c270205fc1db7405ac15f34b7b1be1185a340520ba0bfb9e442ec
-  data.tar.gz: cebe2b2a13e11b31f49019be4bde68c62b7f297b996ba0042e2ba4d00ac59257
+  metadata.gz: fc1fa907947fab5a125008b4ce6d190f8fc10cbcc5e5a07f8645230adc81d056
+  data.tar.gz: 7b08aaa5c77bb19c27f144e24888ed641c118666fa408ff877bc59e1345fb0c9
 SHA512:
-  metadata.gz: d96675d0ce0922948410a1e13835bb19d9354c1b1e85710e5c8f01b942b83e77547367552ca4f234bd6bfe0d710b21306e105b025b9845ce8c4aa0b4b0a4c023
-  data.tar.gz: a0cbef102e56493def2d5e105f3bb463952a5aa636106ac8272d7eefb436fff3dfd50db469f42173acf4f202b329cb191b2c915866b10deef92b954d23882dee
+  metadata.gz: aab672ef3d982d5b36eef34813c4d140ab4c3ad0267db0ae87b6e87b6304d3cc179ef5e9c6fe58160f62675390297c81c8ee0423c14fcbd811fea14840100560
+  data.tar.gz: a867787db27e144331de96386609e64a3b18241e42ac1c773ee91799c41bc28e98bad8afa0cefd55dfed433ace537d117c0ccb60506e90c02cfd5197b3951969

data/app/views/recourses/_table.html.erb

@@ -16,8 +16,9 @@
     the fragment when a square is clicked. And the zone, for the same reason again:
     a timestamp is drawn against the reader's own clock, so without it the first
     person to load a table would settle what hour everybody else read. -%>
-<% key = [recourses, rows_version(recourses), counters_version(recourses), row_digest,
-          resource_columns, bookmark_digest, Time.zone.name] -%>
+<% key = [recourses, rows_version(recourses), counters_version(recourses),
+          selected_version(recourses), row_digest, resource_columns, bookmark_digest,
+          Time.zone.name] -%>
 <% cache_if cacheable_table?, key do %>
   <% actions = resource_actions %>
   <%# Read once for the whole table: every row of it is positioned or none is. -%>

data/lib/recourse/helpers/rows.rb

@@ -45,6 +45,18 @@ module Recourse
         rows.map { |row| row.attributes.values_at(*columns) }
       end
 
+      # And whatever the rows carry beyond their own columns. A host's relation may select
+      # a value worked out from another table -- whether this ZIP is in this market, which
+      # a join answers -- and nothing on the ZIP itself moves when the answer changes, so
+      # neither the version above nor the counts beside it see it. Read off the rows in
+      # memory like both of those, so this costs no query either.
+      def selected_version(rows)
+        extra = rows.first.attributes.keys - resource_model.column_names if rows.first
+        return if extra.blank?
+
+        rows.map { |row| row.attributes.values_at(*extra) }
+      end
+
       # Every record the rows reach along `includes`, in any shape `includes` accepts:
       # a name, a list of them, or a hash naming what to follow from there.
       def reached(rows, names)

data/lib/recourse/version.rb

@@ -1,4 +1,4 @@
 module Recourse
   # Version of the gem, read by the gemspec and by hosts checking compatibility.
-  VERSION = '5.9.2'
+  VERSION = '5.10.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: recourse
 version: !ruby/object:Gem::Version
-  version: 5.9.2
+  version: 5.10.0
 platform: ruby
 authors:
 - claudiob