Columns filtering: blacklisting or whitelisting #16
Conversation
| @@ -6,6 +6,11 @@ def successfully(command) | |||
| .to eq(true), "'#{command}' was unsuccessful" | |||
| end | |||
|
|
|||
| def unsuccessfully(command) | |||
| expect(system("RAILS_ENV=test #{command}")) | |||
| .to eq(false), "'#{command}' was successful" | |||
There was a problem hiding this comment.
Style/DotPosition: Place the . on the previous line, together with the method call receiver.
| @@ -6,6 +6,11 @@ def successfully(command) | |||
| .to eq(true), "'#{command}' was unsuccessful" | |||
| end | |||
|
|
|||
| def unsuccessfully(command) | |||
| expect(system("RAILS_ENV=test #{command}")) | |||
| .to eq(false), "'#{command}' was successful" | |||
There was a problem hiding this comment.
Style/DotPosition: Place the . on the previous line, together with the method call receiver.
| end | ||
|
|
There was a problem hiding this comment.
Style/EmptyLinesAroundBlockBody: Extra empty line detected at block body end.
| end | ||
|
|
There was a problem hiding this comment.
Style/EmptyLinesAroundBlockBody: Extra empty line detected at block body end.
| include_context "cleanup migrations" | ||
|
|
||
| before(:all) do | ||
| @whitelist = ["title", "rating"] |
There was a problem hiding this comment.
Style/WordArray: Use %w or %W for an array of words.
| include_context "cleanup migrations" | ||
|
|
||
| before(:all) do | ||
| @whitelist = ["title", "rating"] |
There was a problem hiding this comment.
Style/WordArray: Use %w or %W for an array of words.
| post.update!(rating: 5) | ||
| post.reload.undo! | ||
| before(:all) do | ||
| @blacklist = ["created_at", "active"] |
There was a problem hiding this comment.
Style/WordArray: Use %w or %W for an array of words.
| post.update!(rating: 5) | ||
| post.reload.undo! | ||
| before(:all) do | ||
| @blacklist = ["created_at", "active"] |
There was a problem hiding this comment.
Style/WordArray: Use %w or %W for an array of words.
| expect(post.reload.log_version).to eq 6 | ||
| expect(post.log_size).to eq 4 | ||
| expect(post.log_data.versions.first.changes) | ||
| .to include("title" => "Triggers", "rating" => 22, "active" => true) |
There was a problem hiding this comment.
Style/DotPosition: Place the . on the previous line, together with the method call receiver.
| expect(post.reload.log_version).to eq 6 | ||
| expect(post.log_size).to eq 4 | ||
| expect(post.log_data.versions.first.changes) | ||
| .to include("title" => "Triggers", "rating" => 22, "active" => true) |
There was a problem hiding this comment.
Style/DotPosition: Place the . on the previous line, together with the method call receiver.
| expect(post.reload.log_version).to eq 5 | ||
| expect(post.log_size).to eq 4 | ||
| expect(post.log_data.versions.first.changes) | ||
| .to include("title" => "Triggers", "rating" => 10, "active" => true) |
There was a problem hiding this comment.
Style/DotPosition: Place the . on the previous line, together with the method call receiver.
| expect(post.reload.log_version).to eq 5 | ||
| expect(post.log_size).to eq 4 | ||
| expect(post.log_data.versions.first.changes) | ||
| .to include("title" => "Triggers", "rating" => 10, "active" => true) |
There was a problem hiding this comment.
Style/DotPosition: Place the . on the previous line, together with the method call receiver.
| end | ||
|
|
||
| after(:all) { @old_post.destroy! } | ||
| context 'without blacklisting'do |
There was a problem hiding this comment.
Style/SpaceAroundKeyword: Space before keyword do is missing.
| end | ||
|
|
||
| after(:all) { @old_post.destroy! } | ||
| context 'without blacklisting'do |
There was a problem hiding this comment.
Style/SpaceAroundKeyword: Space before keyword do is missing.
| @@ -2,7 +2,7 @@ | |||
| require 'spec_helper' | |||
| require 'generators/logidze/model/model_generator' | |||
|
|
|||
| describe Logidze::Generators::ModelGenerator, type: :generator do | |||
| describe Logidze::Generators::ModelGenerator, type: :generator do | |||
There was a problem hiding this comment.
Style/TrailingWhitespace: Trailing whitespace detected.
| @@ -2,7 +2,7 @@ | |||
| require 'spec_helper' | |||
| require 'generators/logidze/model/model_generator' | |||
|
|
|||
| describe Logidze::Generators::ModelGenerator, type: :generator do | |||
| describe Logidze::Generators::ModelGenerator, type: :generator do | |||
There was a problem hiding this comment.
Style/TrailingWhitespace: Trailing whitespace detected.
| def columns_blacklist | ||
| array = if !options[:whitelist] | ||
| options[:blacklist] | ||
| else |
There was a problem hiding this comment.
Style/TrailingWhitespace: Trailing whitespace detected.
| def columns_blacklist | ||
| array = if !options[:whitelist] | ||
| options[:blacklist] | ||
| else |
There was a problem hiding this comment.
Style/TrailingWhitespace: Trailing whitespace detected.
|
@palkan it seems, that travis has some problems with Postgres, not with a code, am I right? :) |
| @@ -16,7 +16,7 @@ class <%= @migration_class_name %> < ActiveRecord::Migration | |||
| end | |||
|
|
|||
| execute <<-SQL | |||
| CREATE OR REPLACE FUNCTION logidze_version(v bigint, data jsonb) RETURNS jsonb AS $body$ | |||
| CREATE OR REPLACE FUNCTION logidze_version(v bigint, data jsonb, blacklist text[] DEFAULT '{}') RETURNS jsonb AS $body$ | |||
There was a problem hiding this comment.
When upgrading we have to drop previously defined function, 'cause we change the signature.
So, we should add here DROP FUNCTION IF EXISTS ... in case of upgrade (use update? helper).
| @@ -36,12 +36,12 @@ class <%= @migration_class_name %> < ActiveRecord::Migration | |||
| $body$ | |||
| LANGUAGE plpgsql; | |||
|
|
|||
| CREATE OR REPLACE FUNCTION logidze_snapshot(item jsonb) RETURNS jsonb AS $body$ | |||
| CREATE OR REPLACE FUNCTION logidze_snapshot(item jsonb, blacklist text[] DEFAULT '{}') RETURNS jsonb AS $body$ | |||
There was a problem hiding this comment.
My bad, didn't think about it. Added DROP FUNCTION... statement 👍 Don't know why only one comment now is marked as outdated, though.
|
@charlie-wasp Yep.
Pretty good attempt) 👍 |
|
@palkan about travis: I deleted postgres 9.1 related instruction, so build now goes further, but now travis gives me I am sorry, I've got no prior experience with Travis, so it may be not easy for me to figure things out :) About 9.5 support - I found this long conversation travis-ci/travis-ci#4264, it seems that there are some problems, but maybe it's not our case. There was a link https://docs.travis-ci.com/user/database-setup/#Using-a-different-PostgreSQL-Version, it's said there that for some Linux builds 9.5 is supported, but I don't know, which one we are using :( |
|
@charlie-wasp That's the way to use specific dist – link. I've updated |
charlie-wasp
force-pushed
the
columns_filtering
branch
from
2981df4 to
86db7e9
Compare
|
@palkan rebased! |
|
Great work, thanks! |
|
@palkan my pleasure! Should I update the docs next? |
|
@charlie-wasp Yep, please, open a new PR with readme and changelog updates. |
Hello there,
It's my attempt to resolve #13
I implemented two mutually exclusive options,
--whitelistand--blacklist, both accepts arrays, like this:--blacklist=title created_ator--whitelist active bodyI will be glad to fix any problems with this code and discuss any suggestions!