optic-rails 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 318832502d533bdc4808c18673502e01d2d6328045d6584b2dfe50466bff7adb
-  data.tar.gz: ef480667fe0aedd7abd18d56b38dd29562f3718777bda9cc71c3705d066fc684
+  metadata.gz: 0aa2f63c9f4f258d67ea8394f6cd7bade5bcdfa4bb8688b52797060224034e2d
+  data.tar.gz: 0211d9654d0bcde150cdaef99c44a69016a96ecf2f592c11b5c560b13a1b97a1
 SHA512:
-  metadata.gz: 7594caeb737ca76c140c718d8cecc85080f3a7c3b21c9c547602b98f56630df389c17e299610a9452015f5d1222a3f80a97f6c61bde4072f137f4addcf1ceb23
-  data.tar.gz: a02c3eac8e8f416c633961ff71e8cbe23c3193ca426ae80170436761d422a4ca1740c15fca08ca0ea46b0a09a213facef9a0a1e76d45ea10dae92d7b55555c39
+  metadata.gz: 1c211a4e662524ac0db1b2f858603de478d57b074a0959904f8a5142b5e56d12cc89d21aa653bf7509247132a2da5c803f34b6d51eacd122443203dc0739ae6d
+  data.tar.gz: 245695dd27b14e22afbdbd4aa5df1f08e0ee8f0635ccbe85aea7eacf98043958412414c48846001a13d4e22628c6c13b651232a198388eb6a2f84a2813b521c2

data/lib/optic/rails.rb

@@ -37,14 +37,34 @@ module Optic
 
             query =
               if pivot_name = instruction["pivot"]
+                # TODO this is a terrible hack to extract zero-valued pivot
+                # instances. The right thing to do is select from the pivot
+                # table and LEFT OUTER JOIN to the entity table, which results
+                # in a much simpler query, but it means we have to rewrite the
+                # pathfinding logic in the server to find paths using has_many
+                # associations instead of belongs_to associations, which might
+                # be less accurate for a bunch of reasons. For now, we're doing
+                # an INNER JOIN selecting from the entity table and then
+                # selecting every possible pivot value as a UNION, throwing out
+                # the duplicates.
                 pivot = pivot_name.constantize
                 join_path = instruction["join_path"]
                 joins = join_path.reverse.map(&:to_sym).inject { |acc, elt| { elt => acc } }
-                entity
-                  .joins(joins)
-                  .group(qualified_primary_key(pivot))
-                  .select(qualified_primary_key(pivot), qualified_column(pivot, instruction["pivot_attribute_name"]), "COUNT(*)")
-                  .to_sql
+                join_select = entity
+                              .joins(joins)
+                              .group(qualified_primary_key(pivot))
+                              .select(qualified_primary_key(pivot), qualified_column(pivot, instruction["pivot_attribute_name"]), "COUNT(*)")
+                              .to_sql
+
+                instance_select = pivot
+                                  .select(qualified_primary_key(pivot), qualified_column(pivot, instruction["pivot_attribute_name"]), "0 as count")
+                                  .to_sql
+
+                union_sql = <<~"SQL"
+                              SELECT "pivot_values"."id", "pivot_values"."name", MAX("pivot_values"."count") AS count
+                                FROM (#{join_select} UNION ALL #{instance_select}) AS pivot_values
+                                GROUP BY "pivot_values"."id", "pivot_values"."name"
+                            SQL
               else
                 entity.select("COUNT(*)").to_sql
               end

data/lib/optic/rails/version.rb

@@ -2,6 +2,6 @@
 
 module Optic
   module Rails
-    VERSION = "1.1.0"
+    VERSION = "1.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: optic-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Anton Vaynshtok
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-25 00:00:00.000000000 Z
+date: 2018-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: action_cable_client