logidze 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9891b1ba6517c7aa789e2244ebed0cac9c749704
-  data.tar.gz: 49ff3cab8003d957f19c8066a21b194095a5674a
+  metadata.gz: 309c5da695723e3a3f1c6e73b5c9ba71826880a8
+  data.tar.gz: bab3825e840c655022920bea787059d156643114
 SHA512:
-  metadata.gz: fa5d28d3d192210ca6e4b4a2640c075483e59f91cfc214c9211d256d386e733760a103b714135ba33e2bd37ea4e0cd783685f715894cdaa2ae6d3e55641b5e6f
-  data.tar.gz: 2caed3a94c1244734b3b4c095096152c005f7abce3ded77c4ac832b59dead51a726320e2d88dcb900489df146f5389d9471e8d7a0cf74a74f1ef92c60d87c338
+  metadata.gz: 32fc59a0145c74c8334c6990f90481ddece3c3045d79119a260a33d65d6d9236ad54e567fd92dd74705bfb51dc52cea8d0c08356fa1426f15624316a1f6fc882
+  data.tar.gz: '080f5c26aa1d1559bdb97b11d141be46e08f6b22f1a1282c07410e75b5b92633aecb2c179490552d1a9e3b61aa113d7c46333e72a753eb80d079fbea1a87c729'

data/CHANGELOG.md

@@ -1,6 +1,8 @@
 # Change log
 
-## master
+## 0.6.2 (2018-01-11)
+
+- [Fixes [#53](https://github.com/palkan/logidze/issues/53)] Fix storing empty log entries with blacklisting. ([@charlie-wasp][])
 
 ## 0.6.1 (2018-01-06)
 

data/circle.yml

@@ -1,6 +1,6 @@
 machine:
   ruby:
-    version: 2.3.0
+    version: 2.5.0
 
   environment:
     DATABASE_URL: postgres://postgres@127.0.0.1:5432/test_database

data/lib/generators/logidze/install/templates/migration.rb.erb

@@ -112,6 +112,8 @@ class <%= @migration_class_name %> < ActiveRecord::Migration<%= ActiveRecord::VE
       CREATE OR REPLACE FUNCTION logidze_logger() RETURNS TRIGGER AS $body$
         DECLARE
           changes jsonb;
+          version jsonb;
+          snapshot jsonb;
           new_v integer;
           size integer;
           history_limit integer;
@@ -127,13 +129,19 @@ class <%= @migration_class_name %> < ActiveRecord::Migration<%= ActiveRecord::VE
           columns_blacklist := TG_ARGV[2];
 
           IF TG_OP = 'INSERT' THEN
+            snapshot = logidze_snapshot(to_jsonb(NEW.*), ts_column, columns_blacklist);
 
-            NEW.log_data := logidze_snapshot(to_jsonb(NEW.*), ts_column, columns_blacklist);
+            IF snapshot#>>'{h, -1, c}' != '{}' THEN
+              NEW.log_data := snapshot;
+            END IF;
 
           ELSIF TG_OP = 'UPDATE' THEN
 
             IF OLD.log_data is NULL OR OLD.log_data = '{}'::jsonb THEN
-              NEW.log_data := logidze_snapshot(to_jsonb(NEW.*), ts_column, columns_blacklist);
+              snapshot = logidze_snapshot(to_jsonb(NEW.*), ts_column, columns_blacklist);
+              IF snapshot#>>'{h, -1, c}' != '{}' THEN
+                NEW.log_data := snapshot;
+              END IF;
               RETURN NEW;
             END IF;
 
@@ -175,11 +183,16 @@ class <%= @migration_class_name %> < ActiveRecord::Migration<%= ActiveRecord::VE
             new_v := (NEW.log_data#>>'{h,-1,v}')::int + 1;
 
             size := jsonb_array_length(NEW.log_data->'h');
+            version := logidze_version(new_v, changes, ts, columns_blacklist);
+
+            IF version->>'c' = '{}' THEN
+              RETURN NEW;
+            END IF;
 
             NEW.log_data := jsonb_set(
               NEW.log_data,
               ARRAY['h', size::text],
-              logidze_version(new_v, changes, ts, columns_blacklist),
+              version,
               true
             );
 

data/lib/logidze/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Logidze
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logidze
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - palkan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-06 00:00:00.000000000 Z
+date: 2018-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails