mongoid_delorean 1.0.1 → 1.1.0

data/lib/mongoid/delorean/embedded_in.rb

@@ -0,0 +1,18 @@
+require "mongoid/relations/embedded/in"
+
+module Mongoid
+  module Relations
+    module Macros
+      module ClassMethods
+        alias :embedded_in_without_history :embedded_in
+        def embedded_in(*args)
+          relation = embedded_in_without_history(*args)
+          self.send(:include, Mongoid::Delorean::Trackable::CommonInstanceMethods)
+          self.send(:include, Mongoid::Delorean::Trackable::CommonEmbeddedMethods)
+          self.before_save :save_version
+          return relation
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/delorean/trackable.rb

@@ -6,6 +6,7 @@ module Mongoid
         super
         klass.field :version, type: Integer, default: 0
         klass.before_save :save_version
+        klass.send(:include, Mongoid::Delorean::Trackable::CommonInstanceMethods)
       end
 
       def versions
@@ -14,9 +15,6 @@ module Mongoid
 
       def save_version
         if self.track_history?
-          unless self.kind_of?(Mongoid::Delorean::Trackable::CommonInstanceMethods)
-            extend Mongoid::Delorean::Trackable::CommonInstanceMethods
-          end
           last_version = self.versions.last
           _version = last_version ? last_version.version + 1 : 1
 
@@ -46,36 +44,22 @@ module Mongoid
         old_version = self.versions.where(version: version).first
         if old_version
           old_version.full_attributes.each do |key, value|
-            self.send("#{key}=", value)
+            self.write_attribute(key, value)
           end
           self.save!
         end
       end
 
-      module CommonInstanceMethods
-
-        def self.extended(klass)
-          super
-          included(klass)
+      module CommonEmbeddedMethods
+        
+        def save_version
+          self._parent.save_version if self._parent.respond_to?(:save_version)
         end
 
-        def self.included(klass)
-          super
-          klass.embedded_relations.each do |name, details|
-            _klass = Kernel.const_get(details.class_name)
-            _klass.send(:include, Mongoid::Delorean::Trackable::CommonInstanceMethods)
-            _klass.after_save :save_parent_version
-          end
-        end
+      end
+
+      module CommonInstanceMethods
 
-        def save_parent_version
-          if self.embedded?
-            self._parent.save_parent_version
-          else
-            self.save_version
-          end
-        end
-        
         def changes_with_relations
           _changes = self.changes.dup
 

data/lib/mongoid/delorean/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Delorean
-    VERSION = "1.0.1"
+    VERSION = "1.1.0"
   end
 end

data/lib/mongoid_delorean.rb

@@ -1,6 +1,7 @@
 require 'mongoid'
 
 require "mongoid/delorean/version"
+require "mongoid/delorean/embedded_in"
 require "mongoid/delorean/configuration"
 require "mongoid/delorean/history"
 require "mongoid/delorean/trackable"

data/spec/mongoid/delorean/trackable_spec.rb

@@ -2,46 +2,6 @@ require 'spec_helper'
 
 describe Mongoid::Delorean::Trackable do
   
-  class Article
-    include Mongoid::Document
-    include Mongoid::Timestamps
-    include Mongoid::Delorean::Trackable
-
-    field :name, type: String
-    field :summary, type: String
-
-    embeds_many :pages
-  end
-
-  class Page
-    include Mongoid::Document
-    include Mongoid::Timestamps
-
-    field :name, type: String
-
-    embedded_in :article, inverse_of: :pages
-    embeds_many :sections
-  end
-
-  class Section
-    include Mongoid::Document
-    include Mongoid::Timestamps
-
-    field :name, type: String
-    field :body, type: String
-
-    embedded_in :page, inverse_of: :sections
-  end
-
-  class User
-    include Mongoid::Document
-    include Mongoid::Timestamps
-    include Mongoid::Delorean::Trackable
-
-    field :name, type: String
-    field :age, type: Integer
-  end
-
   context "simple document" do
   
     it "creates a history object" do
@@ -140,6 +100,7 @@ describe Mongoid::Delorean::Trackable do
         u.versions.size.should eql(3)
         u.version.should eql(3)
         u.revert!(2)
+        u.reload
         u.version.should eql(4)
         u.name.should eql("Mark")
         u.age.should eql(36)
@@ -152,6 +113,7 @@ describe Mongoid::Delorean::Trackable do
         u.versions.size.should eql(3)
         u.version.should eql(3)
         u.revert!(20)
+        u.reload
         u.version.should eql(3)
         u.name.should eql("Mark Bates")
         u.age.should eql(36)
@@ -238,6 +200,7 @@ describe Mongoid::Delorean::Trackable do
         a.pages.should_not be_empty
         a.revert!
         a.name.should eql("My Article")
+        a.reload
         a.pages.should be_empty
       end
 
@@ -263,6 +226,7 @@ describe Mongoid::Delorean::Trackable do
         a.pages.build(name: "Page 1")
         a.save!
         a.revert!(20)
+        a.reload
         a.version.should eql(2)
       end
 

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ require 'mongoid_delorean' # and any other gems you need
 require 'database_cleaner'
 
 Mongoid.load!(File.join(File.dirname(__FILE__), "config.yml"), :test)
+require File.join(File.dirname(__FILE__), "support", "models")
 
 DatabaseCleaner[:mongoid].strategy = :truncation
 

data/spec/support/models.rb

@@ -0,0 +1,41 @@
+class Section
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  field :name, type: String
+  field :body, type: String
+
+  embedded_in :page, inverse_of: :sections
+end
+
+class Article
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  include Mongoid::Delorean::Trackable
+
+  field :name, type: String
+  field :summary, type: String
+
+  embeds_many :pages
+end
+
+class Page
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  field :name, type: String
+
+  embedded_in :article, inverse_of: :pages
+  embeds_many :sections
+end
+
+
+
+class User
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  include Mongoid::Delorean::Trackable
+
+  field :name, type: String
+  field :age, type: Integer
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_delorean
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-09 00:00:00.000000000 Z
+date: 2012-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -41,6 +41,7 @@ files:
 - README.md
 - Rakefile
 - lib/mongoid/delorean/configuration.rb
+- lib/mongoid/delorean/embedded_in.rb
 - lib/mongoid/delorean/history.rb
 - lib/mongoid/delorean/trackable.rb
 - lib/mongoid/delorean/version.rb
@@ -49,6 +50,7 @@ files:
 - spec/config.yml
 - spec/mongoid/delorean/trackable_spec.rb
 - spec/spec_helper.rb
+- spec/support/models.rb
 homepage: ''
 licenses: []
 post_install_message: 
@@ -77,3 +79,4 @@ test_files:
 - spec/config.yml
 - spec/mongoid/delorean/trackable_spec.rb
 - spec/spec_helper.rb
+- spec/support/models.rb