mongoid_activity_tracker 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94dd8cbd82e867c4fe185a8bef77492a814481d0da50a26cf03d36375f0747fd
-  data.tar.gz: 9d676e598a9e75d47e5fabd836a86166b16e8cc1102be37029c0b41324c5208c
+  metadata.gz: b723478a7ba1e99b77eb60fb255cfde76de5e80382a25e4945b3a54b6517aee4
+  data.tar.gz: c3eefa74402cdf148777d0d42ae9f546a88b82c1fd2df1450c6930ead3e64d13
 SHA512:
-  metadata.gz: 45d6590df78a1ee718a86916d7b5e72216c82d0c74dbdcdbdd2f2326da68d6a77f952ebabbecb86a35aa5cb158513c72f310d2579ee77208bdb9a3b1c177d6f5
-  data.tar.gz: 21fe199dff8dc56708358ee1b51d6b245d70eb24b4540de4bb9f170d4bb9a73232202abb7ffb7494b955f3aa3b17cd3fcbfb764b0313f2329649cd9bd86ff7a0
+  metadata.gz: 47c1e0fcf15676c2c64994507c483bf649c5776925c137cf79cc6f3ca38e71d8ace2d0a35ab36d149da19168dcf70140b633f6091c2b434e639aa374e154b11e
+  data.tar.gz: b25734e19e8e241d39d146ff7d68c8e5e15ad94b28de791e9c3cb7bfc9c9d0ecc5e385fc124f7932b1e4b8d990de0f2d7caccff149b81015513d9f5879189512

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 0.2.5
+
+* tracker is valid even if `:actor` is not present, but `:to_s` is stored in `#actor_cache`
+  * renders past activity valid event if the actor model has been removed from the database
+
 ## 0.2.4
 
 * Mongoid 7 compatibility

data/lib/mongoid_activity_tracker/tracker.rb

@@ -14,9 +14,7 @@ module MongoidActivityTracker
         create!({ action: action, actor: actor }.merge(options))
       end
 
-      # ---------------------------------------------------------------------
-
-      def tracks(relation_name, cache_methods: %i(to_s))
+      def tracks(relation_name, cache_methods: %i[to_s])
         field_name = [relation_name, 'cache'].join('_')
         accessor_name = [relation_name, 'cache_methods'].join('_')
         instance_variable_name = ['@', accessor_name].join
@@ -36,12 +34,10 @@ module MongoidActivityTracker
           OpenStruct.new(send(field_name))
         end
 
-        before_save -> { set_cache(relation_name) }
+        before_validation -> { set_cache(relation_name) }
       end
     end
 
-    # ---------------------------------------------------------------------
-
     def self.included(base)
       base.extend ClassMethods
       base.class_eval do
@@ -51,18 +47,16 @@ module MongoidActivityTracker
 
         tracks :actor
 
-        validates :actor, presence: true
+        validates :actor, presence: true, unless: -> { actor_cache && actor_cache[:to_s].present? }
         validates :action, presence: true
       end
     end
 
-    # =====================================================================
-
     def created_at
       id.generation_time.in_time_zone(Time.zone)
     end
 
-    private # =============================================================
+    private
 
     def set_cache(relation_name)
       accessor_name = [relation_name, 'cache_methods'].join('_')
@@ -73,6 +67,7 @@ module MongoidActivityTracker
 
       send(accessor_name).each do |m|
         next if send(field_name)[m].present?
+
         send(field_name)[m] = send(relation_name).send(m) if send(relation_name).respond_to?(m)
       end
     end

data/lib/mongoid_activity_tracker/version.rb

@@ -1,3 +1,3 @@
 module MongoidActivityTracker
-  VERSION = '0.2.4'.freeze
+  VERSION = '0.2.5'.freeze
 end

data/mongoid_activity_tracker.gemspec

@@ -1,5 +1,4 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'mongoid_activity_tracker/version'
 

data/test/mongoid_activity_tracker/tracker_test.rb

@@ -1,112 +1,103 @@
 require 'test_helper'
 
-module MongoidActivityTracker
-  describe Tracker do
-    let(:actor) { TestActor.new }
-    let(:sub) { TestSubject.new }
-    subject { TestTracker.new }
-
-    describe 'associations' do
-      it 'belongs to :actor' do
-        subject.must_respond_to :actor
-      end
+describe MongoidActivityTracker::Tracker do
+  subject { TestTracker.new }
+
+  let(:actor) { TestActor.new }
+  let(:sub) { TestSubject.new }
+
+  describe 'associations' do
+    it { subject.must_respond_to :actor }
+  end
+
+  describe 'validations' do
+    describe 'by default' do
+      before { subject.valid? }
+
+      it { subject.errors.messages.keys.must_include :actor }
+      it { subject.errors.messages.keys.must_include :action }
     end
 
-    describe 'fields' do
-      it 'has :action' do
-        subject.must_respond_to :action
-      end
-      it 'has :actor_cache' do
-        subject.must_respond_to :actor_cache
-        subject.actor_cache.must_be_kind_of Hash
+    describe 'accepts to_s stored in actor_cache' do
+      before do
+        subject.actor_cache[:to_s] = 'John Doe'
+        subject.valid?
       end
+
+      it { subject.errors.messages.keys.wont_include :actor }
     end
+  end
 
-    # ---------------------------------------------------------------------
+  describe 'fields' do
+    it { subject.must_respond_to :action }
+    it { subject.must_respond_to :actor_cache }
+    it { subject.actor_cache.must_be_kind_of Hash }
+  end
 
-    describe '.track' do
-      let(:result) { TestTracker.track(actor, :create, subject: sub) }
+  describe '.track' do
+    let(:result) { TestTracker.track(actor, :create, subject: sub) }
 
-      it 'returns new object' do
-        result.must_be_kind_of TestTracker
-      end
-      it 'always sets the :actor' do
-        result.actor.must_equal actor
-      end
-      it 'sets the :actor_cache with :to_s by default' do
-        result.actor_cache.must_equal(to_s: actor.to_s)
-      end
-      it 'sets the :action' do
-        result.action.must_equal :create
-      end
-      it 'sets any other attributes' do
-        result.subject.must_equal sub
-      end
-    end
+    it { result.must_be_kind_of TestTracker }
+    it { result.actor.must_equal actor }
+    it { result.actor_cache.must_equal(to_s: actor.to_s) }
+    it { result.action.must_equal :create }
+    it { result.subject.must_equal sub }
+  end
 
-    # ---------------------------------------------------------------------
+  describe '.tracks' do
+    it { subject.must_respond_to :subject }
+    it { subject.must_respond_to :subject_cache }
+    it { subject.subject_cache.must_be_kind_of Hash }
+    it { subject.must_respond_to :subject_cache_methods }
+    it { subject.subject_cache_methods.must_equal %i[to_s] }
+    it { subject.subject_cache_object.must_respond_to :to_s }
 
-    describe '.tracks' do
-      it 'adds the belongs_to :subject relation' do
-        subject.must_respond_to :subject
-      end
-      it 'adds the :subject_cache field' do
-        subject.must_respond_to :subject_cache
-        subject.subject_cache.must_be_kind_of Hash
-      end
-      it 'defines the :subject_cache_methods accessor' do
-        subject.must_respond_to :subject_cache_methods
-      end
-      it 'sets :to_s as a default for the :subject_cache_methods' do
-        subject.subject_cache_methods.must_equal %i(to_s)
-      end
-      it 'adds the :subject_cache_object wrapper' do
-        subject.subject_cache_object.must_respond_to :to_s
-      end
-      it 'sets the cache before :save' do
-        test_subject = TestSubject.new
-        subject.subject = test_subject
-        subject.run_callbacks(:save)
-        subject.subject_cache.fetch(:to_s).must_equal test_subject.to_s
+    describe TestSubject do
+      let(:tsubject) { TestSubject.new }
+
+      before do
+        subject.subject = tsubject
+        subject.run_callbacks(:validation)
       end
+
+      it { subject.subject_cache.fetch(:to_s).must_equal tsubject.to_s }
     end
+  end
 
-    # ---------------------------------------------------------------------
+  describe ':created_at' do
+    it { subject.must_respond_to :created_at }
+    it { subject.created_at.must_be_kind_of Time }
+  end
 
-    describe ':created_at' do
-      it 'infers time from BSON id' do
-        subject.must_respond_to :created_at
-        subject.created_at.must_be_kind_of Time
-      end
+  describe ':actor_cache' do
+    before do
+      subject.actor = actor
+      subject.run_callbacks(:validation)
     end
 
-    describe ':actor_cache' do
+    it { subject.actor_cache.fetch(:to_s).must_equal actor.to_s }
+
+    describe ':to_s' do
       before do
-        subject.actor = actor
-      end
-      it 'sets :actor_cache on save' do
-        subject.run_callbacks(:save)
-        subject.actor_cache.fetch(:to_s).must_equal actor.to_s
-      end
-      it 'allows preset cache manually' do
         subject.actor_cache[:to_s] = 'foo-bar'
-        subject.run_callbacks(:save)
-        subject.actor_cache.fetch(:to_s).must_equal 'foo-bar'
-      end
-      it 'allows to override the default cache methods' do
-        subject.actor_cache_methods = %i(class)
-        subject.run_callbacks(:save)
-        subject.actor_cache.fetch(:class).must_equal TestActor
+        subject.run_callbacks(:validation)
       end
+
+      it { subject.actor_cache.fetch(:to_s).must_equal 'foo-bar' }
     end
 
-    describe ':actor_cache_object' do
-      it 'wraps the :actor_cache with a Struct' do
-        subject.actor_cache_object.must_be_kind_of OpenStruct
-      end
-      it 'converts keys to methods' do
-        subject.actor_cache_object.must_respond_to :to_s
+    describe '#actor_cache_methods' do
+      before do
+        subject.actor_cache_methods = %i[class]
+        subject.run_callbacks(:validation)
       end
+
+      it { subject.actor_cache.fetch(:class).must_equal TestActor }
     end
   end
+
+  describe ':actor_cache_object' do
+    it { subject.actor_cache_object.must_be_kind_of OpenStruct }
+    it { subject.actor_cache_object.must_respond_to :to_s }
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_activity_tracker
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Tomas Celizna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-03 00:00:00.000000000 Z
+date: 2019-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -168,8 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Minimal set of classes and modules to help with activity tracking.