models_auditor 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 798b2ce9bbeff3dcf829c00e38160fe960e4a859
-  data.tar.gz: 413c51cb3cd244947eaaa018a2888b8a0ec11b78
+  metadata.gz: 8259cff8a18e95707305268e2d5344f500c9c1ba
+  data.tar.gz: 3aaa9d4ab21d8c91016ff11f29ec18755708efc1
 SHA512:
-  metadata.gz: dc1360fbfa0a78fca9217e99610a56e121e6efcea0e617356e4ed01148586d6c29a30612bd225917efc8c7a2da846ce4b0d4827d115ecc525d8850db2e1fe8e4
-  data.tar.gz: f872f90f9657606ee1be07db44673172e05af11b11c90a75c4af2a802816cdf84e336df39870d4242748448a062f8f95958a8d1a37cc9db34d60df31b6164eb3
+  metadata.gz: 3949ea27aa765cfc676eb3934e275a060375e2a28c40e33e729d533287496170d40dcf78faf229f2e70bb578ccb4e60041fd0472b346d0f73acb86e85c525e01
+  data.tar.gz: 3974017de3335b66d217bf7f03ab899cb39fc915b1928b20f03aa51b3d069c16db54732a7ac37fe4c4ae31ea19c9fb3a945602ec998cc825c3b8a5bbfc21615c

data/lib/models_auditor/audit.rb

@@ -21,18 +21,49 @@ module ModelsAuditor
     end
 
     module InstanceMethods
+      def is_audit_enabled?
+        self.class.instance_variable_get(:@audit_enabled) ||
+          (self.class.column_names.include?(self.class.inheritance_column) &&
+            self.class.superclass.instance_variable_get(:@audit_enabled))
+      end
+
+      def get_audit_mode
+        mode = self.class.instance_variable_get(:@audit_mode)
+        if mode.nil?
+          self.class.column_names.include?(self.class.inheritance_column) &&
+            self.class.superclass.instance_variable_get(:@audit_enabled) ?
+            self.class.superclass.instance_variable_get(:@audit_mode) :
+            nil
+        else
+          mode
+        end
+      end
+
+      def get_audit_options
+        settings = self.class.instance_variable_get(:@audit_settings)
+        if settings.nil?
+          self.class.column_names.include?(self.class.inheritance_column) &&
+            self.class.superclass.instance_variable_get(:@audit_enabled) ?
+            self.class.superclass.instance_variable_get(:@audit_settings) :
+            {}
+        else
+          settings
+        end
+      end
+
       def do_audit_init_snapshot
         return unless ModelsAuditor.config.audit_enabled
-        mode = self.class.instance_variable_get(:@audit_mode)
-        return unless self.class.instance_variable_get(:@audit_enabled) && AUDIT_SNAPSHOT_MODES.include?(mode)
+        return unless is_audit_enabled?
+        mode = get_audit_mode
+        return unless AUDIT_SNAPSHOT_MODES.include?(mode)
         ma_store_initial_state(ModelsAuditor.store)
       end
 
       def do_audit_process
         return unless ModelsAuditor.config.audit_enabled
-        return unless self.class.instance_variable_get(:@audit_enabled)
-        mode    = self.class.instance_variable_get(:@audit_mode)
-        options = self.class.instance_variable_get(:@audit_settings) || {}
+        return unless is_audit_enabled?
+        mode    = get_audit_mode
+        options = get_audit_options
         store   = ModelsAuditor.store
 
         initial_data = ma_get_initial_state(store)
@@ -135,9 +166,9 @@ module ModelsAuditor
 
       # Получает сериализованные данные для аудита
       def ma_auditor_get_data
-        options      = self.class.instance_variable_get(:@audit_settings) || {}
+        options      = get_audit_options
         audit_params = options[:params]
-        mode         = self.class.instance_variable_get(:@audit_mode)
+        mode         = get_audit_mode
         case mode
           when AUDIT_MODE_JSON
             self.as_json(audit_params)
@@ -157,7 +188,7 @@ module ModelsAuditor
           when AUDIT_MODE_CHANGES_ONLY
             self.previous_changes
           else
-            raise ArgumentError.new('Incorrect value of argument audit_type')
+            raise ArgumentError.new("Incorrect value of argument audit_type #{mode}")
         end
       end
     end

data/lib/models_auditor/version.rb

@@ -1,3 +1,3 @@
 module ModelsAuditor
-  VERSION = '1.0.6'
+  VERSION = '1.0.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: models_auditor
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Alexander Gorbunov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-17 00:00:00.000000000 Z
+date: 2016-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails