Merge pull request #25 from optimalworkshop/make_deidentify_associati…

…ons_appendable

Aggregate associations when calling deidentify_associations more than once per class

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    deidentify (2.0.0)
+    deidentify (2.0.1)
       rails (>= 5.0.0)
 
 GEM

deidentify.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'deidentify'
-  s.version     = '2.0.0'
+  s.version     = '2.0.1'
   s.summary     = 'Deidentify a rails model'
   s.description = 'A gem to allow deidentification of certain fields'
   s.authors     = ['Lucy Dement']

lib/deidentify.rb

@@ -38,6 +38,7 @@ def configure
     self.deidentify_configuration = {}
 
     class_attribute :associations_to_deidentify
+    self.associations_to_deidentify = []
 
     define_model_callbacks :deidentify
     after_deidentify :deidentify_associations!, if: -> { associations_to_deidentify.present? }
@@ -53,7 +54,7 @@ def deidentify(column, method:, **options)
     end
 
     def deidentify_associations(*associations)
-      self.associations_to_deidentify = associations
+      self.associations_to_deidentify += associations
     end
   end
 

spec/deidentify_spec.rb

@@ -145,6 +145,25 @@
       end
     end
 
+    context 'when called more than once' do
+      let(:second_bubble) { Bubble.create!(colour: 'red') }
+      let(:party) { Party.create! }
+
+      before do
+        Party.deidentify_associations :bubbles
+        Party.deidentify_associations :main_bubble
+        Bubble.deidentify :colour, method: :replace, new_value: new_value
+
+        party.update!(bubbles: [second_bubble], main_bubble: bubble)
+      end
+
+      it 'call deidentify on all associations' do
+        party.deidentify!
+        expect(bubble.reload.colour).to eq new_value
+        expect(second_bubble.reload.colour).to eq new_value
+      end
+    end
+
     context 'when a loop is created by deidentifing associations' do
       let(:party) { Party.create! }
       let(:second_bubble) { Bubble.create!(party: party, colour: 'red') }

spec/spec_helper.rb

@@ -19,6 +19,7 @@ class Party < ActiveRecord::Base
   include Deidentify
 
   has_many :bubbles
+  belongs_to :main_bubble, class_name: 'Bubble'
 end
 
 RSpec.configure do |config|
@@ -30,15 +31,15 @@ class Party < ActiveRecord::Base
       'CREATE TABLE bubbles (id INTEGER NOT NULL PRIMARY KEY, party_id INTEGER, colour VARCHAR(32), quantity INTEGER)'
     )
     ActiveRecord::Base.connection.execute(
-      'CREATE TABLE parties (id INTEGER NOT NULL PRIMARY KEY, name VARCHAR(32))'
+      'CREATE TABLE parties (id INTEGER NOT NULL PRIMARY KEY, name VARCHAR(32), main_bubble_id INTEGER)'
     )
   end
 
   config.before(:each) do
     Bubble.deidentify_configuration = {}
-    Bubble.associations_to_deidentify = nil
+    Bubble.associations_to_deidentify = []
 
     Party.deidentify_configuration = {}
-    Party.associations_to_deidentify = nil
+    Party.associations_to_deidentify = []
   end
 end