mongoid_delorean 1.1.1 → 1.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6046b3012b6e28a626ce3601fa23e58298e9fe91
+  data.tar.gz: 4ec10da2a928268a7327040ad719b230a338f796
+SHA512:
+  metadata.gz: 8786110df221df1adcd8ca77c475c4a556f8e9245ebc5ff547f3db18083d040022fef15f38d338a1bf5110ef10691c5d45989c74060c3b017c91206b2af1d361
+  data.tar.gz: d8e501f26a7b05e8c6af845badc918b9b52fa6dbc9ccc64bb4ef142c64a2e859a2291732a2f0e65bc3a672492b72a47437711c4f3cbc5d0c10ee2fa670a6c36b

data/.gitignore

@@ -1,19 +1,3 @@
-*.log
-.DS_Store
-doc
-tmp
-pkg
 *.gem
-*.pid
-coverage
-coverage.data
-build/*
-*.pbxuser
-*.mode1v3
-.svn
-profile
-.console_history
-.sass-cache/*
-.rake_tasks~
-*.log.lck
-solr/
+.bundle
+Gemfile.lock

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - jruby-19mode
+  - rbx-19mode
+services: mongodb

data/Gemfile

@@ -2,6 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in mongoid_delorean.gemspec
 gemspec
-
-gem "rspec"
-gem 'database_cleaner'

data/README.md

@@ -4,7 +4,7 @@ A simple Mongoid 3 versioning system that works with embedded documents.
 
 Tracking document changes can be really important to a lot of systems, unfortunately all of the Mongoid versioning plugins either only work with Mongoid 2.x, don't handle embedded document changes, or worse, just don't work. <code>Mongoid::Delorean</code> solves those problems.
 
-<code>Mongoid::Delorean</code> is a simple plugin that does just what it sets out to do. It stores each version of your document as you make changes and then allows you to revert to earlier versions of the document. 
+<code>Mongoid::Delorean</code> is a simple plugin that does just what it sets out to do. It stores each version of your document as you make changes and then allows you to revert to earlier versions of the document.
 
 If this wasn't great already, <code>Mongoid::Delorean</code> will even track changes made to any embedded documents, or documents that those embedded documents may have, and so on.
 
@@ -100,3 +100,9 @@ a.version # => 1
 4. Commit your changes (`git commit -am 'Add some feature'`)
 5. Push to the branch (`git push origin my-new-feature`)
 6. Create new Pull Request
+
+## Contributors
+
+* Mark Bates
+* Nick Muerdter
+* Felipe Rodrigues

data/Rakefile

@@ -1,9 +1,8 @@
-require 'bundler'  
+require 'bundler'
 Bundler::GemHelper.install_tasks
 
-desc "Run tests"
-task :default => [:ruby]
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new('spec')
 
-task :ruby do
-  system "bundle exec rspec"
-end
+desc "Run tests"
+task :default => :spec

data/lib/mongoid/delorean/trackable.rb

@@ -52,7 +52,7 @@ module Mongoid
       end
 
       module CommonEmbeddedMethods
-        
+
         def save_version
           self._parent.save_version if self._parent.respond_to?(:save_version)
         end
@@ -73,9 +73,13 @@ module Mongoid
           self.embedded_relations.each do |name, details|
             relation = self.send(name)
             relation_changes[name] = []
-            r_changes = relation.map {|o| o.changes_with_relations}
-            relation_changes[name] << r_changes unless r_changes.empty?
-            relation_changes[name].flatten!
+            if details.relation == Mongoid::Relations::Embedded::One
+              relation_changes[name] = relation.changes_with_relations if relation
+            else
+              r_changes = relation.map {|o| o.changes_with_relations}
+              relation_changes[name] << r_changes unless r_changes.empty?
+              relation_changes[name].flatten!
+            end
             relation_changes.delete(name) if relation_changes[name].empty?
           end
 
@@ -85,15 +89,19 @@ module Mongoid
 
         def attributes_with_relations
           _attributes = self.attributes.dup
-          
+
           relation_attrs = {}
           self.embedded_relations.each do |name, details|
             relation = self.send(name)
-            relation_attrs[name] = []
-            r_attrs = relation.map {|o| o.attributes_with_relations}
-            relation_attrs[name] << r_attrs unless r_attrs.empty?
-            r_changes = relation.map {|o| o.changes}
-            relation_attrs[name].flatten!
+            if details.relation == Mongoid::Relations::Embedded::One
+              relation_attrs[name] = relation.attributes_with_relations if relation
+            else
+              relation_attrs[name] = []
+              r_attrs = relation.map {|o| o.attributes_with_relations}
+              relation_attrs[name] << r_attrs unless r_attrs.empty?
+              r_changes = relation.map {|o| o.changes}
+              relation_attrs[name].flatten!
+            end
           end
           _attributes.merge!(relation_attrs)
           return _attributes
@@ -103,4 +111,4 @@ module Mongoid
 
     end
   end
-end
+end

data/lib/mongoid/delorean/version.rb

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

data/mongoid_delorean.gemspec

@@ -19,4 +19,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency("mongoid", ">=3.0.0")
 
+  gem.add_development_dependency("rake")
+  gem.add_development_dependency("rspec")
+  gem.add_development_dependency("database_cleaner")
 end

data/spec/mongoid/delorean/trackable_spec.rb

@@ -151,6 +151,12 @@ describe Mongoid::Delorean::Trackable do
 
       version = a.versions.last
       version.altered_attributes.should eql({"pages"=>[{"sections"=>[{"_id"=>[nil, section.id], "body"=>[nil, "some body text"]}]}], "version"=>[2, 3]})
+
+      footer = page.build_footer(:content => "some footer text")
+      a.save!
+
+      version = a.versions.last
+      version.altered_attributes.should eql({"pages"=>[{"sections"=>[{}], "footer"=>{"_id"=>[nil, footer.id], "content"=>[nil, "some footer text"]}}], "version"=>[3, 4]})
     end
 
     it "tracks the full set of attributes at the time of saving" do
@@ -234,4 +240,4 @@ describe Mongoid::Delorean::Trackable do
     
   end
 
-end
+end

data/spec/support/models.rb

@@ -27,9 +27,17 @@ class Page
 
   embedded_in :article, inverse_of: :pages
   embeds_many :sections
+  embeds_one :footer
 end
 
+class Footer
+  include Mongoid::Document
+  include Mongoid::Timestamps
 
+  field :content, type: String
+
+  embedded_in :page
+end
 
 class User
   include Mongoid::Document
@@ -38,4 +46,4 @@ class User
 
   field :name, type: String
   field :age, type: Integer
-end
+end

metadata

@@ -1,32 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_delorean
 version: !ruby/object:Gem::Version
-  version: 1.1.1
-  prerelease: 
+  version: 1.2.0
 platform: ruby
 authors:
 - Mark Bates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-10 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A simple Mongoid 3 versioning system that works with embedded documents.
 email:
 - mark@markbates.com
@@ -35,8 +74,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -53,27 +92,26 @@ files:
 - spec/support/models.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A simple Mongoid 3 versioning system that works with embedded documents.
 test_files:
 - spec/config.yml

data/Gemfile.lock

@@ -1,44 +0,0 @@
-PATH
-  remote: .
-  specs:
-    mongoid_delorean (1.1.1)
-      mongoid (>= 3.0.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (3.2.8)
-      activesupport (= 3.2.8)
-      builder (~> 3.0.0)
-    activesupport (3.2.8)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    builder (3.0.3)
-    database_cleaner (0.8.0)
-    diff-lcs (1.1.3)
-    i18n (0.6.1)
-    mongoid (3.0.5)
-      activemodel (~> 3.1)
-      moped (~> 1.1)
-      origin (~> 1.0)
-      tzinfo (~> 0.3.22)
-    moped (1.2.1)
-    multi_json (1.3.6)
-    origin (1.0.8)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.2)
-    tzinfo (0.3.33)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  database_cleaner
-  mongoid_delorean!
-  rspec