mongoid-history 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 913a0832973eef07a72d4ea723d6e9fa12285e9b
-  data.tar.gz: f8014e49bc8abd5af67ad229bd6c6a995a24653d
+  metadata.gz: 2f7422b15f0027945a65e155ac5776cbbb7f3a38
+  data.tar.gz: e23db13692cbf5679ad32fecaa2a6bd000379547
 SHA512:
-  metadata.gz: 79e4e82a0b8aa9a25bdbba77060b90921b75d469db982a609404ec3a511f4992b4c9a7a731b38d1509191201fa882ebd03cb13539634dbe01205de3edb5f5c09
-  data.tar.gz: 2bc72da395f9602b5cf7e90e17566b2cc0ce5f51db1b14924c4aeac8d02f40c2fdc81eefda20b774e995364e102cbca10ec1af46b7cca1dba063a963ef1b442f
+  metadata.gz: 2d88df0753a104a5fa4577ad4c8117d2fb46e0e1bcd1d996669d79a9f64bc92e8bd32dfecbcbc549d7801d815817eeef805f451b01bd8ba9485fd6f2abbbc3b6
+  data.tar.gz: 718ff47501c3b4feac38f5113131fcffca37570954bce7be763a88ae12a3c7f36f0b6ad6dbe063b6a8018256c4f14f5b7e9d6d364423ec61a34631e02bc1ffaf

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+0.4.3 (7/10/2014)
+-----------------
+
+* [#110](https://github.com/aq1018/mongoid-history/pull/110) - Fix scope reference on history tracks criteria -  [@adbeelitamar](https://github.com/adbeelitamar).
+
 0.4.2 (7/1/2014)
 ----------------
 

data/lib/mongoid/history/trackable.rb

@@ -68,7 +68,7 @@ module Mongoid
 
       module MyInstanceMethods
         def history_tracks
-          @history_tracks ||= Mongoid::History.tracker_class.where(scope: history_trackable_options[:scope], association_chain: association_hash)
+          @history_tracks ||= Mongoid::History.tracker_class.where(scope: related_scope, association_chain: association_hash)
         end
 
         #  undo :from => 1, :to => 5
@@ -128,6 +128,18 @@ module Mongoid
           versions.desc(:version)
         end
 
+        def related_scope
+          scope = history_trackable_options[:scope]
+          scope = _parent.collection_name.to_s.singularize.to_sym if scope.is_a?(Array)
+
+          if Mongoid::History.mongoid3?
+            scope = metadata.inverse_class_name.tableize.singularize.to_sym if metadata.present? && scope == metadata.as
+          else
+            scope = relation_metadata.inverse_class_name.tableize.singularize.to_sym if relation_metadata.present? && scope == relation_metadata.as
+          end
+          scope
+        end
+
         def traverse_association_chain(node = self)
           list = node._parent ? traverse_association_chain(node._parent) : []
           list << association_hash(node)
@@ -191,18 +203,9 @@ module Mongoid
         def history_tracker_attributes(action)
           return @history_tracker_attributes if @history_tracker_attributes
 
-          scope = history_trackable_options[:scope]
-          scope = _parent.collection_name.to_s.singularize.to_sym if scope.is_a?(Array)
-
-          if Mongoid::History.mongoid3?
-            scope = metadata.inverse_class_name.tableize.singularize.to_sym if metadata.present? && scope == metadata.as
-          else
-            scope = relation_metadata.inverse_class_name.tableize.singularize.to_sym if relation_metadata.present? && scope == relation_metadata.as
-          end
-
           @history_tracker_attributes = {
             association_chain: traverse_association_chain,
-            scope: scope,
+            scope: related_scope,
             modifier: send(history_trackable_options[:modifier_field])
           }
 

data/lib/mongoid/history/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module History
-    VERSION = '0.4.2'
+    VERSION = '0.4.3'
   end
 end

data/spec/integration/embedded_in_polymorphic_spec.rb

@@ -86,14 +86,17 @@ describe Mongoid::History::Tracker do
     real_state.save!
     real_state.build_address(address: "Main Street #123", city: "Highland Park", state: 'IL').save!
     expect(real_state.history_tracks.count).to eq(2)
+    expect(real_state.address.history_tracks.count).to eq(1)
 
     real_state.reload
     real_state.address.update_attribute(:address, 'Second Street')
     expect(real_state.history_tracks.count).to eq(3)
+    expect(real_state.address.history_tracks.count).to eq(2)
     expect(real_state.history_tracks.last.action).to eq('update')
 
     real_state.build_embone(name: 'Lorem ipsum').save!
     expect(real_state.history_tracks.count).to eq(4)
+    expect(real_state.embone.history_tracks.count).to eq(1)
     expect(real_state.history_tracks.last.action).to eq('create')
     expect(real_state.history_tracks.last.association_chain.last['name']).to eq('embone')
 
@@ -101,19 +104,23 @@ describe Mongoid::History::Tracker do
     company.save!
     company.build_address(address: "Main Street #456", city: "Evanston", state: 'IL').save!
     expect(company.history_tracks.count).to eq(2)
+    expect(company.address.history_tracks.count).to eq(1)
 
     company.reload
     company.address.update_attribute(:address, 'Second Street')
     expect(company.history_tracks.count).to eq(3)
+    expect(company.address.history_tracks.count).to eq(2)
     expect(company.history_tracks.last.action).to eq('update')
 
     company.build_second_address(address: "Main Street #789", city: "Highland Park", state: 'IL').save!
     expect(company.history_tracks.count).to eq(4)
+    expect(company.second_address.history_tracks.count).to eq(1)
     expect(company.history_tracks.last.action).to eq('create')
     expect(company.history_tracks.last.association_chain.last['name']).to eq('second_address')
 
     company.build_embone(name: 'Lorem ipsum').save!
     expect(company.history_tracks.count).to eq(5)
+    expect(company.embone.history_tracks.count).to eq(1)
     expect(company.history_tracks.last.action).to eq('create')
     expect(company.history_tracks.last.association_chain.last['name']).to eq('embone')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-history
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Aaron Qian
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-01 00:00:00.000000000 Z
+date: 2014-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: easy_diff