optic-rails 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 839393a02e1ac1355010b1f72749cb9ef4c225afb5d448b73b43c01f2fc3031a
-  data.tar.gz: 935ddbf9996bd050150c1e6a2444330710a1dc87d263d4a945f90267ea30ba99
+  metadata.gz: 06b399f733fcb87bf9a26a5fc1902e064b4ce7e5b32a35253e2b63b88cad331e
+  data.tar.gz: bfaff9398cf437369963fde66ac45adfd6d6f2886ea6888dfb411865943492a0
 SHA512:
-  metadata.gz: a3a55432f89f9aff3dd29272325b81d9992e7e6af1530f61b881b946e8c67375dc6c6eb02dabcde5ec972a02a7ebceee7fd79c4e984f93200a7d232788445af4
-  data.tar.gz: 184cb515429f62a679310b459b9f43d80febc16bdbf1abb5cf05c696a7a5ba472eb85bb181afbe56240c4eef8c89db854d90a60434e2fe9a20c86f2424fdebf3
+  metadata.gz: '0682290823c71deaf2f14433fc8c0ed0323c9f2c5756f5e6c24c6a8f292bb1abf4591cc37b6eb50a111c5145c520e14c180f653f9285713576c66107b72961e1'
+  data.tar.gz: a9502628fcb48228d913fc337eb0cf4cc73c82f56cae10c685f1224b9639325a2259d37ff0396104eed772860226db6eede29a56b3c4d52f7399e48c45e055b7

data/lib/optic/rails.rb

@@ -119,17 +119,15 @@ module Optic
 
     def self.get_metrics(pivot_name)
       with_connection do |connection|
-        pivot = pivot_name.constantize
-        pivot_values = connection.execute(pivot.unscoped.select("*").to_sql).to_a
-
-        result = {
-          entity_totals: [],
-          pivot_name: pivot.name,
-          # TODO filter columns, spread over multiple queries
-          pivot_values: pivot_values,
-          pivoted_totals: []
-          # TODO also return computed "spanning" tree of objects from the pivot's POV (using the dijkstra paths from below)
-        }
+        result = {entity_totals: []}
+        pivot = nil
+
+        if pivot_name
+          pivot = pivot_name.constantize
+          result[:pivot_name] = pivot.name
+          result[:pivot_values] = connection.execute(pivot.unscoped.select("*").to_sql).to_a
+          result[:pivoted_totals] = []
+        end
 
         graph = entity_graph
 
@@ -141,32 +139,31 @@ module Optic
           count_query = vertex.unscoped.select("COUNT(*)").to_sql
           result[:entity_totals] << { name: vertex.name, total: connection.execute(count_query).first["count"] }
 
-          next if vertex == pivot # Skip pivoted metrics if this is the pivot
-
-          # TODO weight edges to give preference to non-optional belongs_to (and other attributes?)
-          path = graph.dijkstra_shortest_path(edge_weights, vertex, pivot)
-          if path
-            # Generate a SQL query to count the number of vertex instances grouped by pivot id, with appropriate joins from the path
-            belongs_to_names = path.each_cons(2).map do |join_from, join_to|
-              # TODO we shouldn't have to look up the edge again - use a graph model that allows us to annotate the edges with the reflections
-              reflections = join_from.reflect_on_all_associations(:belongs_to).find_all { |reflection| !reflection.options[:polymorphic] && reflection.klass == join_to }
-              # TODO warn if more than one reflection
-              reflection = reflections.min_by { |r| r.options.size }
-              reflection.name
+          if pivot && vertex != pivot
+            # TODO weight edges to give preference to non-optional belongs_to (and other attributes?)
+            path = graph.dijkstra_shortest_path(edge_weights, vertex, pivot)
+            if path
+              # Generate a SQL query to count the number of vertex instances grouped by pivot id, with appropriate joins from the path
+              belongs_to_names = path.each_cons(2).map do |join_from, join_to|
+                # TODO we shouldn't have to look up the edge again - use a graph model that allows us to annotate the edges with the reflections
+                reflections = join_from.reflect_on_all_associations(:belongs_to).find_all { |reflection| !reflection.options[:polymorphic] && reflection.klass == join_to }
+                # TODO warn if more than one reflection
+                reflection = reflections.min_by { |r| r.options.size }
+                reflection.name
+              end
+
+              joins = belongs_to_names.reverse.inject { |acc, elt| { elt => acc } }
+              query = vertex.unscoped.joins(joins).group(qualified_primary_key(pivot)).select(qualified_primary_key(pivot), "COUNT(*)").to_sql
+
+              result[:pivoted_totals] << { entity_name: vertex.name, totals: Hash[connection.execute(query).map { |record| [record["id"], record["count"]] }] }
+            else
+              # TODO print warning that we couldn't find a path from the pivot to the vertex
             end
-
-            joins = belongs_to_names.reverse.inject { |acc, elt| { elt => acc } }
-            query = vertex.unscoped.joins(joins).group(qualified_primary_key(pivot)).select(qualified_primary_key(pivot), "COUNT(*)").to_sql
-
-            result[:pivoted_totals] << { entity_name: vertex.name, totals: Hash[connection.execute(query).map { |record| [record["id"], record["count"]] }] }
-          else
-            p "WARNING: No path from #{vertex.name} to #{pivot.name}"
           end
         end
 
         result
       end
     end
-
   end
 end

data/lib/optic/rails/railtie.rb

@@ -25,7 +25,7 @@ module Optic
             end
 
             api_key = app.config.optic_api_key
-            uri = app.config.respond_to?(:optic_uri) ? app.config.optic_uri : "wss://tikal-api-staging.herokuapp.com"
+            uri = app.config.respond_to?(:optic_uri) ? app.config.optic_uri : "wss://tikal-api-staging.herokuapp.com/cable"
 
             logger.debug "Starting worker thread"
             worker = Thread.new do

data/lib/optic/rails/version.rb

@@ -1,5 +1,5 @@
 module Optic
   module Rails
-    VERSION = '0.3.0'
+    VERSION = '0.3.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: optic-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Anton Vaynshtok