models_auditor 0.2.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8eefac2c75092c811395c67fbf5731b6bbf9cae0
-  data.tar.gz: fc29fe418d8f1943acb71da82388b802e7e15cd7
+  metadata.gz: c5052949bdc7e490427a00314160a258c9723482
+  data.tar.gz: b8e74cd2f69767f64068ca54fbab58cf9d1f04d1
 SHA512:
-  metadata.gz: a0fd677022be453b8d61bcde43aa491186c8e61f0accc2e4cbc4d17c50484be725d9366ca93354e03bf90ff23cd9ba18d171afc9ec2cf7ecb70eb1497d126e55
-  data.tar.gz: 06457a6d6ac6c0a9ef8e23e5b85153ecf82f606d77ef8e58af0411feaeca7d892c6f0ae1b4eed049cf99d88f1be6d74f5ab5e03458dcc4b4c4c2a3ec9900123d
+  metadata.gz: 1dfacc7dba0be169d3c815af3ffae7cb7cf4a52239ad73653098b29831f6a6f7ba55a63eeec2e6e7e8c7dbfd82b6e3724b07a598a5ef98a8afe34a8e27468010
+  data.tar.gz: 8403c277ebd5d53911f70d37c2113df4b07fd364da7d14bfe6d8e72e4afab72f4dde78eb278480de1ceab63cfa95642004cd93fed32e3e0e16879eb6190491fc

data/README.md

@@ -76,11 +76,11 @@
     
 3. Add to each association models
     
-    `enable_audit ModelsAuditor::Audit::AUDIT_MODE_JSON, bridge: {Author.name => :author_id, Post.name => :post_id}`
+    `enable_audit ModelsAuditor::Audit::AUDIT_MODE_JSON, bridge: {author_id: Author.name, post_id: Post.name}`
     
     ```ruby
     class AuthorsPost < ActiveRecord::Base
-      enable_audit ModelsAuditor::Audit::AUDIT_MODE_JSON, bridge: {Author.name => :author_id, Post.name => :post_id}
+      enable_audit ModelsAuditor::Audit::AUDIT_MODE_JSON, bridge: {author_id: Author.name, post_id: Post.name}
     end
     ``` 
 

data/app/controllers/models_auditor/audit_controller.rb

@@ -76,14 +76,34 @@ module ModelsAuditor
     end
 
     def get_relations(record, records)
-      rel_records = records.select { |r| !r.bridge.nil? && r.bridge.keys.include?(record.object_type) }
+      rel_records = records.select do |r|
+        !r.bridge.nil? && r.bridge.any? do |_, v|
+          v_type, v_id = v.to_a[0]
+          v_type.to_s == record.object_type && v_id.to_i == record.object_id.to_i
+        end
+      end
       rel_records.map do |i|
-        target_class = i.bridge.except(record.object_type).keys.first
-        next unless target_class
-        i.attributes.slice('id', 'object_type', 'object_id').merge(target: {target_class => i.bridge[target_class].values.first})
+        target_info = except_target_class(i.bridge, record.object_type, record.object_id)
+        next if target_info.empty?
+        t_key, klass_with_id = target_info.to_a[0]
+        target_klass, target_id = klass_with_id.to_a[0]
+        i.attributes.slice('id', 'object_type', 'object_id').merge(target: {
+          class: target_klass,
+          foreign_key: t_key,
+          foreign_id: target_id,
+        })
       end.compact
     end
 
+    # @return [Array]
+    def except_target_class(bridge, target_class, target_id)
+      target_id = target_id.to_i
+      bridge.select do |_, v|
+        klass, id = v.to_a[0]
+        !(klass.to_s == target_class.to_s && id.to_i == target_id.to_i)
+      end
+    end
+
     # @param [ActiveRecord::Relation|ModelsAuditor::AuditRequest|Array] data
     def structure_requests_data(data)
       requests =

data/lib/models_auditor/audit.rb

@@ -50,7 +50,7 @@ module ModelsAuditor
 
         bridge =
           if options[:bridge]
-            options[:bridge].each_with_object({}) { |(model_name, key), o| o[model_name] = {key => __send__(key)} }
+            options[:bridge].each_with_object({}) { |(key, model_name), o| o[key] = {model_name => __send__(key)} }
           end
 
         Thread.new do

data/lib/models_auditor/version.rb

@@ -1,3 +1,3 @@
 module ModelsAuditor
-  VERSION = '0.2.0'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: models_auditor
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Alexander Gorbunov