revocare 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2b42e4bf37a6ecf4e245bc0dabdf675a9ea7237d27d1c810c048b47f65c56c7
-  data.tar.gz: 2b4a998e3b47c0df9219a506e2345b592ff5e2c863dc9ce6183c159437c832b5
+  metadata.gz: 8f929fa681bc6b0ada88fd4ff25836596e9994e1559b14bfc5c4f529a6beff99
+  data.tar.gz: ae32cfc85a2bdca4d5dd23eb21dbc4184cbdf2fe1e5c9ae459695c33cd3e99fb
 SHA512:
-  metadata.gz: 97bf8e3a739e1502efe39bb2b241b520f2c86055bebe9dd494aa86ce942dd31d9d119c5fe31e83670b22c95228349704f71385566bcb82aa83436aeea909f110
-  data.tar.gz: f7c6efa686dc23c788ab015ef47d8b07d38b860de55cb93f78cc6a9f1a9954ff8e223d603421d30f7d55f6f266d6d7865461255fdc60d604d0a5f2fc09c31a27
+  metadata.gz: 5678ed93ba7a0e5f691f0bf2d0cce4f7c68733a9d8ed13e569dce1b314ea70c5426da08fca50ddb3fc5d77e76d641e8ea8cdfe7cc2d07f350950c3f39e4cf72b
+  data.tar.gz: bc95dbf169d33c8de843ab0585a58630694cf2fa1d796041cd44c895dbe506e3cb76d6b1a1db4530122c6474dccf938e81ce2fce51ff871478e27b42fa1f2dda

data/CHANGELOG.md

@@ -1,4 +1,10 @@
 # `revocare`
 
+## [0.1.1]
+- Make each callback name and chain node unique as to not share nodes between models
+- Properly order callback methods in which they will be executed
+- Add sort order, instance method identifier, and symbol notation to diagram labels for better readability
+- Show validation type and attributes instead of stringified class name
+
 ## [0.1.0]
 - Initial release

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    revocare (0.1.0)
-      activerecord (>= 5.2.0, < 7.1)
+    revocare (0.1.1)
+      activerecord (>= 5.2, < 7.1)
+      activesupport (>= 5.2, < 7.1)
       ruby-graphviz (~> 1.2)
 
 GEM

data/lib/revocare/callback_data.rb

@@ -46,11 +46,12 @@ module Revocare
         model.__callbacks.each do |_key, callback_chain|
           callback_chain.each do |callback|
             type = [callback.kind, callback.name].join("_")
+            methods = extract_methods(callback.filter)
             callbacks_acc[type] ||= []
-            callbacks_acc[type] << callback.filter.to_s
+            callbacks_acc[type] += methods
           end
         end
-      end
+      end.transform_values(&:reverse)
     end
 
     def format_callbacks(callbacks)
@@ -61,5 +62,16 @@ module Revocare
         }
       end
     end
+
+    def extract_methods(callback_filter)
+      if callback_filter.is_a?(ActiveModel::Validator)
+        name = callback_filter.class.name.demodulize.underscore
+        callback_filter.attributes.map do |attr|
+          [name, attr].join(":")
+        end
+      else
+        [callback_filter.to_s]
+      end
+    end
   end
 end

data/lib/revocare/data_writer.rb

@@ -10,6 +10,7 @@ module Revocare
     DEFAULT_FILENAME = "callbacks.pdf"
 
     def initialize(data:, format: DEFAULT_FORMAT)
+      @graph = GraphViz.new(:G, type: :digraph)
       @data = data
       @format = format
       validate_format!
@@ -31,14 +32,16 @@ module Revocare
       extension = File.extname(filename).tr(".", "").to_sym
 
       if format == GRAPHVIZ_FORMAT
-        graph = GraphViz.new(:G, type: :digraph)
+        data.each_with_index do |model_data, index|
+          model_node = add_model_node(model_data[:model])
+          model_data[:callbacks].each do |callback|
+            name, chain = callback.values_at(:callback_name, :callback_chain)
+            name_node = add_callback_node(name, index)
+            method_nodes = chain.each_with_index.map do |method, order|
+              add_callback_chain_node(method, index, order)
+            end
 
-        data.each do |model_data|
-          model_node = graph.add_node(model_data[:model])
-          model_data[:callbacks].each do |c|
-            name_node = graph.add_node(c[:callback_name])
             graph.add_edge(model_node, name_node)
-            method_nodes = c[:callback_chain].map(&graph.method(:add_node))
             graph.add_edges(name_node, method_nodes)
           end
         end
@@ -49,12 +52,29 @@ module Revocare
 
     private
 
-    attr_reader :data
+    attr_reader :data, :graph
 
     def validate_format!
       if !SUPPORTED_FORMATS.include?(@format)
         raise ArgumentError, "Data format is not supported"
       end
     end
+
+    def add_model_node(name)
+      add_node(name, nil, :box)
+    end
+
+    def add_callback_node(name, index)
+      add_node(":#{name}", index, :diamond)
+    end
+
+    def add_callback_chain_node(name, index, order)
+      label = "#{order + 1}) ##{name}"
+      add_node(name, index, :ellipse, label)
+    end
+
+    def add_node(name, index, shape, label = nil)
+      graph.add_node("#{name}#{index}", label: label || name, shape: shape)
+    end
   end
 end

data/lib/revocare/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Revocare
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/revocare.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "active_support"
 require "ruby-graphviz"
 
 require_relative "revocare/callback_data"

data/revocare.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "activerecord", ">= 5.2", "< 7.1"
+  spec.add_runtime_dependency "activesupport", ">= 5.2", "< 7.1"
   spec.add_runtime_dependency "ruby-graphviz", "~> 1.2"
 
   spec.add_development_dependency "activerecord"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: revocare
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Tyler Ewing
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-01-16 00:00:00.000000000 Z
+date: 2023-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -30,6 +30,26 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.1'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: ruby-graphviz
   requirement: !ruby/object:Gem::Requirement