mongoid_delorean 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6046b3012b6e28a626ce3601fa23e58298e9fe91
-  data.tar.gz: 4ec10da2a928268a7327040ad719b230a338f796
+  metadata.gz: d7df0efa1af0ba01ca6bbb2b5625d0d03e3637d5
+  data.tar.gz: d781202b5b614f3e911921a5cee6355f3be06c54
 SHA512:
-  metadata.gz: 8786110df221df1adcd8ca77c475c4a556f8e9245ebc5ff547f3db18083d040022fef15f38d338a1bf5110ef10691c5d45989c74060c3b017c91206b2af1d361
-  data.tar.gz: d8e501f26a7b05e8c6af845badc918b9b52fa6dbc9ccc64bb4ef142c64a2e859a2291732a2f0e65bc3a672492b72a47437711c4f3cbc5d0c10ee2fa670a6c36b
+  metadata.gz: 5f58c034a757c4f02f6ada2e5a6cf56b516352dbfb544c92eae6a7f31b7d4f93c21dcb853b94e56c54f3718992d71654bc5c976b17b264ab41520248447dd5ba
+  data.tar.gz: 96ac147ef9a1261f5aeacbbff1cc856f6fde19d28e0a2594a4aa23dc70ded5b72dc80bcfc3688b1b6bf44f3a9f2161a62bc3a8e3a6c1d292b67e9d80edaead9c

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.after_save :after_save_version
         klass.send(:include, Mongoid::Delorean::Trackable::CommonInstanceMethods)
       end
 
@@ -23,12 +24,22 @@ module Mongoid
           _changes = self.changes_with_relations.dup
           _changes.merge!("version" => [self.version_was, _version])
 
-          Mongoid::Delorean::History.create(original_class: self.class.name, original_class_id: self.id, version: _version, altered_attributes: _changes, full_attributes: _attributes).inspect
+          Mongoid::Delorean::History.create(original_class: self.class.name, original_class_id: self.id, version: _version, altered_attributes: _changes, full_attributes: _attributes)
           self.without_history_tracking do
             self.version = _version
-            self.save!
+            unless(self.new_record?)
+              self.set(:version, _version)
+            end
           end
+
+          @__track_changes = false
         end
+
+        true
+      end
+
+      def after_save_version
+        @__track_changes = Mongoid::Delorean.config.track_history
       end
 
       def track_history?
@@ -36,9 +47,10 @@ module Mongoid
       end
 
       def without_history_tracking
+        previous_track_change = @__track_changes
         @__track_changes = false
         yield
-        @__track_changes = Mongoid::Delorean.config.track_history
+        @__track_changes = previous_track_change
       end
 
       def revert!(version = (self.version - 1))
@@ -54,7 +66,17 @@ module Mongoid
       module CommonEmbeddedMethods
 
         def save_version
-          self._parent.save_version if self._parent.respond_to?(:save_version)
+          if self._parent.respond_to?(:save_version)
+            if self._parent.respond_to?(:track_history?)
+              if self._parent.track_history?
+                self._parent.save_version
+              end
+            else
+              self._parent.save_version
+            end
+          end
+
+          true
         end
 
       end

data/lib/mongoid/delorean/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Delorean
-    VERSION = "1.2.0"
+    VERSION = "1.2.1"
   end
 end

data/spec/config.yml

@@ -3,4 +3,9 @@ test:
     default:
       database: mongoid_delorean_test
       hosts:
-        - localhost:27017
+        - localhost:27017
+      options:
+        safe: true
+        consistency: :strong
+        max_retries: 1
+        retry_interval: 0

data/spec/mongoid/delorean/trackable_spec.rb

@@ -64,6 +64,14 @@ describe Mongoid::Delorean::Trackable do
       version.full_attributes.except("created_at", "updated_at").should eql({"_id"=>u.id, "version"=>2, "name"=>"Mark", "age"=>36})
     end
 
+    it "passes validate options to save" do
+      u = User.create!(email: "test@example.com")
+
+      u.email = "invalid"
+      expect { u.save! }.to raise_error
+      expect { u.save!(validate: false) }.to_not raise_error
+    end
+
     describe "#without_history_tracking" do
       
       it "it doesn't track the history of the save" do
@@ -163,12 +171,12 @@ describe Mongoid::Delorean::Trackable do
       a = Article.create!(name: "My Article")
 
       version = a.versions.first
-      version.full_attributes.should eql({"_id"=>a.id, "version"=>1, "name"=>"My Article", "pages"=>[]})
+      version.full_attributes.should eql({"_id"=>a.id, "version"=>1, "name"=>"My Article", "pages"=>[], "authors" => []})
 
       a.update_attributes(summary: "Summary about the article")
 
       version = a.versions.last
-      version.full_attributes.except("created_at", "updated_at").should eql({"_id"=>a.id, "version"=>2, "name"=>"My Article", "summary"=>"Summary about the article", "pages"=>[]})
+      version.full_attributes.except("created_at", "updated_at").should eql({"_id"=>a.id, "version"=>2, "name"=>"My Article", "summary"=>"Summary about the article", "pages"=>[], "authors" => []})
     end
 
     it "tracks the full set of attributes including embeds at the time of saving" do
@@ -177,12 +185,12 @@ describe Mongoid::Delorean::Trackable do
       a.save!
 
       version = a.versions.first
-      version.full_attributes.should eql({"_id"=>a.id, "version"=>1, "name"=>"My Article", "pages"=>[{"_id"=>page.id, "name"=>"Page 1", "sections"=>[]}]})
+      version.full_attributes.should eql({"_id"=>a.id, "version"=>1, "name"=>"My Article", "pages"=>[{"_id"=>page.id, "name"=>"Page 1", "sections"=>[]}], "authors" => []})
 
       a.update_attributes(summary: "Summary about the article")
 
       version = a.versions.last
-      version.full_attributes.except("created_at", "updated_at").should eql({"_id"=>a.id, "version"=>2, "name"=>"My Article", "pages"=>[{"_id"=>page.id, "name"=>"Page 1", "sections"=>[]}], "summary"=>"Summary about the article"})
+      version.full_attributes.except("created_at", "updated_at").should eql({"_id"=>a.id, "version"=>2, "name"=>"My Article", "pages"=>[{"_id"=>page.id, "name"=>"Page 1", "sections"=>[]}], "summary"=>"Summary about the article", "authors" => []})
     end
 
     it "tracks changes when an embedded document is saved" do
@@ -198,6 +206,70 @@ describe Mongoid::Delorean::Trackable do
       page.name.should eql("The 1st Page")
     end
 
+    it "handles embeds with cascade callbacks" do
+      a = Article.new(name: "Article 1")
+      a.authors.build(name: "John Doe")
+      a.authors.build(name: "Jane Doe")
+      a.authors.last.influences.build(name: "Poe")
+      a.authors.last.influences.build(name: "Twain")
+
+      a.save!
+      a.version.should eql(1)
+
+      a.authors.first.name = "Joe Blow"
+      a.save!
+      a.reload
+      a.version.should eql(2)
+    end
+
+    it "saves parent versions when saving embedded documents multiple levels deep" do
+      a = Article.new(name: "Article 1")
+      page = a.pages.build(name: "Page 1")
+      section = page.sections.build(body: "some body text")
+
+      a.save!
+      a.version.should eql(1)
+
+      a.reload
+      section = a.pages.first.sections.first
+      section.body = "updated body text"
+      section.save!
+
+      a.reload
+      a.version.should eql(2)
+    end
+
+    it "doesn't force validations on the parent document when an embedded document is saved" do
+      a = Article.new(name: "Article 1", publish_year: -20)
+      page = a.pages.build(name: "Page 1")
+
+      expect { a.save! }.to raise_error
+      a.save!(validate: false)
+
+      a.version.should eql(1)
+      page.name = "Number One Page"
+      page.save!
+
+      a.reload
+      a.version.should eql(2)
+      page = a.pages.first
+      page.name.should eql("Number One Page")
+    end
+
+    it "doesn't save the parent document when the embedded document fails validation" do
+      a = Article.new(name: "Article 1")
+      page = a.pages.build(name: "Page 1", number: 1)
+      a.save!
+
+      page.number = -10
+      expect { page.save! }.to raise_error
+
+      a.reload
+      a.version.should eql(1)
+      page = a.pages.first
+      page.number.should eql(1)
+    end
+
     describe '#revert!' do
       
       it "reverts to the last version" do

data/spec/support/models.rb

@@ -15,8 +15,12 @@ class Article
 
   field :name, type: String
   field :summary, type: String
+  field :publish_year, type: String
 
   embeds_many :pages
+  embeds_many :authors, cascade_callbacks: true
+
+  validates :publish_year, numericality: { greater_than_or_equal_to: 0, allow_nil: true }
 end
 
 class Page
@@ -24,6 +28,9 @@ class Page
   include Mongoid::Timestamps
 
   field :name, type: String
+  field :number, type: Integer
+
+  validates :number, numericality: { greater_than_or_equal_to: 0, allow_nil: true }
 
   embedded_in :article, inverse_of: :pages
   embeds_many :sections
@@ -37,6 +44,26 @@ class Footer
   field :content, type: String
 
   embedded_in :page
+
+end
+
+class Author
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  field :name, type: String
+
+  embeds_many :influences, cascade_callbacks: true
+  embedded_in :article, inverse_of: :authors
+end
+
+class Influence
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  field :name, type: String
+
+  embedded_in :author
 end
 
 class User
@@ -46,4 +73,7 @@ class User
 
   field :name, type: String
   field :age, type: Integer
+  field :email, type: String
+
+  validates :email, format: { with: /.+@.+\..+/, allow_nil: true }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_delorean
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Mark Bates