recorder 1.2.1 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e0c1a0c2e47411273ae9c9ac9a8e285138a9c1db2013c606a32749fc869f1ef
-  data.tar.gz: bbfa653c96171b63dfa0b974c59cf7d6fad3d59c9b7e6454cf1b9cacf64e16b7
+  metadata.gz: 807b7bea0674cab9a3a39b1fa03f78a62f0313650bb7adf51860a98257273186
+  data.tar.gz: 175315c3c23acef56bd6f9545681b7525eb41a11cadacf5e671dd197352f31d2
 SHA512:
-  metadata.gz: 1607e4d11cdefe2dd50f8c7966018e4da2f068e894e148edf41b4e6816b720a1ec40a80b91c2a6c9095901bf610a99028f8c11c53dcb235340799067142b7bcd
-  data.tar.gz: 14f9ffe74d69077e3db56284e9dd15f7c304932de173eed0ffaceb85a3a5ea16fdcb71b74b0dc982afa1aabd0df73d8919deb782f7011313ccf2d2f8e958f925
+  metadata.gz: 8eb1a672f08d66c265f6d1b1dffd8d65703b4359f789febb42846f4bb0d89d860c49ffb383b78bd57f3bfefeb349fac6abd7ed8ecc890a22ffc45886087c91b7
+  data.tar.gz: b65ed4fc4d7fea8a5d442f301789e497d538fa57447a320328f89650e9c65f8773d7247c68e303d49cdbda5977786fb64a8841c1cb5ba65a1aaa638ce9f63a3c

data/.gitignore

@@ -9,6 +9,7 @@
 /tmp/
 
 /spec/dummy/config/database.yml
+/spec/dummy/log/*
 
 # Ignore vim swap files
 *.swp

data/lib/recorder/observer.rb

@@ -21,11 +21,13 @@ module Recorder
       recorder_dirty? && Recorder.store.recorder_enabled?
     end
 
-    module ClassMethods
+    class_methods do
+      define_method :recorder_options do
+        @recorder_options ||= {}
+      end
+
       def recorder(options = {})
-        define_method :recorder_options do
-          options
-        end
+        @recorder_options = options
 
         after_create do
           Recorder::Tape.new(self).record_create if recorder_record?

data/lib/recorder/revision.rb

@@ -18,6 +18,7 @@ module Recorder
       )
     end
 
+    belongs_to :item, polymorphic: true, inverse_of: :revisions
     belongs_to :user
 
     validates :item_type, presence: true
@@ -27,20 +28,20 @@ module Recorder
 
     scope :ordered_by_created_at, -> { order(created_at: :desc) }
 
-    def item
-      return @item if defined?(@item)
-      return if item_id.nil?
+    # def item
+    #   return @item if defined?(@item)
+    #   return if item_id.nil?
 
-      @item = item_type.classify.constantize.new(data['attributes'])
+    #   @item = item_type.classify.constantize.new(data['attributes'])
 
-      if data['associations'].present?
-        data['associations'].each do |name, association|
-          @item.send("build_#{name}", association['attributes'])
-        end
-      end
+    #   if data['associations'].present?
+    #     data['associations'].each do |name, association|
+    #       @item.send("build_#{name}", association['attributes'])
+    #     end
+    #   end
 
-      @item
-    end
+    #   @item
+    # end
 
     # Get changeset for an item
     # @return [Recorder::Changeset]
@@ -75,7 +76,7 @@ module Recorder
     # If `#recorder_changeset_class` method is not defined, then class name is generated as "#{class}Changeset"
     # @api private
     def changeset_class(object)
-      klass = defined?(Draper) && object.decorated? ? object.source.class : object.class
+      klass = (defined?(Draper) && object.decorated?) ? object.source.class : object.class
       klass = klass.base_class
 
       return klass.send(:recorder_changeset_class) if klass.respond_to?(:recorder_changeset_class)

data/lib/recorder/sidekiq/revisions_worker.rb

@@ -7,7 +7,8 @@ module Recorder
 
       sidekiq_options Recorder.config.sidekiq_options
 
-      def perform(**params)
+      def perform(params)
+        params['data'] = JSON.parse(params['data'])
         Recorder::Revision.create(params)
       end
     end

data/lib/recorder/tape/data.rb

@@ -10,11 +10,13 @@ module Recorder
       end
 
       def data_for(event, options = {})
-        {
+        data = {
           **attributes_for(event, options),
           **changes_for(event, options),
           **associations_for(event, options)
         }
+
+        record_changed?(data, event) ? data : {}
       end
 
       def attributes_for(_event, options)
@@ -22,11 +24,7 @@ module Recorder
       end
 
       def changes_for(event, options)
-        changes =
-          case event.to_sym
-          when :update
-            sanitize_attributes(item.saved_changes, options)
-          end
+        changes = sanitize_attributes(item.saved_changes, options)
 
         changes.present? ? {changes: changes} : {}
       end
@@ -78,6 +76,16 @@ module Recorder
           end
         end
       end
+
+      def record_changed?(data, event)
+        event.to_sym != :update || data[:changes] || associations_changed?(data)
+      end
+
+      def associations_changed?(data)
+        return if data[:associations].nil?
+
+        data[:associations].any? { |name, association| association[:changes] }
+      end
     end
   end
 end

data/lib/recorder/tape/record.rb

@@ -29,9 +29,12 @@ module Recorder
       end
 
       def record_async(params, options)
+        params[:data] = params[:data].to_json
+        params[:action_date] = params[:action_date].to_s
+
         Recorder::Sidekiq::RevisionsWorker.perform_in(
           options[:delay] || 2.seconds,
-          **params
+          params.stringify_keys
         )
       end
     end

data/lib/recorder/tape.rb

@@ -19,19 +19,19 @@ module Recorder
     def record_create
       data = data_for(:create, recorder_options)
 
-      record(event: :create, data: data) if data.any?
+      record(event: 'create', data: data) if data.any?
     end
 
     def record_update
       data = data_for(:update, recorder_options)
 
-      record(event: :update, data: data) if data.any?
+      record(event: 'update', data: data) if data.any?
     end
 
     def record_destroy
       data = data_for(:destroy, recorder_options)
 
-      record(event: :destroy, data: data) if data.any?
+      record(event: 'destroy', data: data) if data.any?
     end
 
     protected
@@ -51,7 +51,7 @@ module Recorder
           item_id: item.id,
           **params
         },
-        item.recorder_options
+        recorder_options
       )
     end
   end

data/lib/recorder/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Recorder
-  VERSION = '1.2.1'
+  VERSION = '1.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: recorder
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.3
 platform: ruby
 authors:
 - Igor Alexandrov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-16 00:00:00.000000000 Z
+date: 2023-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -206,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: Rails model auditor