optic-rails 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4862c212205f52f736e51c5b74da8d0bd141d941fe27adb6b872efa715a59aac
-  data.tar.gz: b77ac04f9ae6cccc80168fc5a77ef27c249c75a6767859611022e7aac941d1ef
+  metadata.gz: 318832502d533bdc4808c18673502e01d2d6328045d6584b2dfe50466bff7adb
+  data.tar.gz: ef480667fe0aedd7abd18d56b38dd29562f3718777bda9cc71c3705d066fc684
 SHA512:
-  metadata.gz: 93a490e91f071a3c1089b4072a6ef273f291115d27c828d5e73593329e6ca924833a64991fca2ad0a6534bc52dcef2c357bca92bee4c53b0dbd9959967451a1a
-  data.tar.gz: 5298316a14f2c3668c7a1f2968ee7d0ca5df05a797b8ea75d32f165d54672de3e5441233c327171f5d86b627fb6152e1615f45b3fc7cdc56e5a217de4448e0c1
+  metadata.gz: 7594caeb737ca76c140c718d8cecc85080f3a7c3b21c9c547602b98f56630df389c17e299610a9452015f5d1222a3f80a97f6c61bde4072f137f4addcf1ceb23
+  data.tar.gz: a02c3eac8e8f416c633961ff71e8cbe23c3193ca426ae80170436761d422a4ca1740c15fca08ca0ea46b0a09a213facef9a0a1e76d45ea10dae92d7b55555c39

data/lib/optic/rails.rb

@@ -13,7 +13,7 @@ module Optic
               {
                 name: klass.name,
                 table_name: klass.table_name,
-                attribute_names: klass.attribute_names,
+                entity_attribute_names: klass.attribute_names,
                 table_exists: klass.table_exists?,
                 associations: klass.reflect_on_all_associations.map do |reflection|
                   {
@@ -29,15 +29,35 @@ module Optic
         end
       end
 
-      def metrics
+      def metrics(instructions)
         with_connection do |connection|
-          result = { entity_totals: [] }
-          active_record_klasses.find_all(&:table_exists?).each do |klass|
-            count_query = klass.unscoped.select("COUNT(*)").to_sql
-            result[:entity_totals] << { name: klass.name, total: connection.execute(count_query).first["count"] }
+          instructions.map do |instruction|
+            name = instruction["entity"]
+            entity = name.constantize.unscoped
+
+            query =
+              if pivot_name = instruction["pivot"]
+                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
+              else
+                entity.select("COUNT(*)").to_sql
+              end
+
+            { metric_configuration_id: instruction["metric_configuration_id"], result: connection.execute(query).to_a }
           end
+        end
+      end
 
-          result
+      def instances(pivot_name)
+        with_connection do |connection|
+          pivot = pivot_name.constantize
+          { instances: connection.execute(pivot.unscoped.select("*").to_sql).to_a }
         end
       end
 
@@ -57,6 +77,14 @@ module Optic
         end
       end
 
+      def qualified_column(entity, attribute)
+        %Q|"#{entity.table_name}"."#{attribute}"|
+      end
+
+      def qualified_primary_key(entity)
+        qualified_column(entity, entity.primary_key)
+      end
+
       def active_record_klasses
         base_klass = ApplicationRecord rescue ActiveRecord::Base
         ObjectSpace.each_object(Class).find_all { |klass| klass < base_klass }

data/lib/optic/rails/railtie.rb

@@ -44,8 +44,8 @@ module Optic
                   EventMachine.stop
                 end
 
-                client.errored do |msg|
-                  logger.warn "Optic agent error: #{msg}"
+                client.errored do |data|
+                  logger.warn "Optic agent error: #{data}"
                   EventMachine.stop
                 end
 
@@ -53,28 +53,29 @@ module Optic
                   logger.debug "Optic agent subscribed"
                 end
 
-                client.pinged do |msg|
-                  logger.debug "Optic agent pinged: #{msg}"
+                client.pinged do |data|
+                  logger.debug "Optic agent pinged: #{data}"
                   client.perform "pong", message: {}
                 end
 
                 # called whenever a message is received from the server
-                client.received do |message|
-                  logger.debug "Optic agent received: #{message}"
-                  command = message["message"]["command"]
+                client.received do |data|
+                  logger.debug "Optic agent received: #{data}"
+                  message = data["message"]
+                  command = message["command"]
 
                   case command
                   when "request_schema"
-                    logger.debug "Optic agent got schema request"
                     client.perform "schema", message: Optic::Rails.entities
-                    logger.debug "Optic agent sent schema"
                   when "request_metrics"
-                    logger.debug "Optic agent got metrics request"
-                    client.perform "metrics", message: Optic::Rails.metrics
-                    logger.debug "Optic agent sent metrics"
+                    client.perform "metrics", message: Optic::Rails.metrics(message["instructions"])
+                  when "request_instances"
+                    client.perform "instances", message: Optic::Rails.instances(message["pivot"])
                   else
                     logger.warn "Optic agent got unknown command: #{command}"
                   end
+
+                  logger.debug "Optic agent completed command: #{command}"
                 end
               end
 

data/lib/optic/rails/version.rb

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

metadata

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