mongoid_versioning 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3da640238adffc66b1ef2b4aa7c1214e96f76e84
-  data.tar.gz: bbf75f611e013b11dd7819a46c58c7a739102de5
+  metadata.gz: 335f426351947efbcd8dde32386982a9afadfd5c
+  data.tar.gz: 39f3168fe68034772d2326c38027f0d8f3535116
 SHA512:
-  metadata.gz: fa55a2afa36a3aede3250003ed3225424c8a8215c0a0ead848f2d9a0ee6ba0bc2f16449f5872e0c8252f7b422b97291ecf78418191ad9bffe42ccd4ca5a48098
-  data.tar.gz: 41bd4e6e8f24f25c3f80e062b4993d7814bd7c18bb0dee72162a7cd6bd828156bd5af0e7d823793680bd086ca72b2fb9d65c1dcb185bb127c9761541bd9eb461
+  metadata.gz: 1402591cba459621cbd352dd35c4391edaccc490552f90bf49eeb5954641806123866a15425f56489443085b049f22754ebd9b69001dbe49f39f1bb1414caad9
+  data.tar.gz: 0418a28b9439bd5d9c42b1dcf185fc3679b06cfde94ef71c7c1ff6d4fe9c5c11a6a91d5314477b08c6a0509763997981c675444651167db013728bbe509611b2

data/Gemfile.lock

@@ -1,96 +1,105 @@
 PATH
   remote: .
   specs:
-    mongoid_versioning (0.0.3)
-      mongoid (~> 4.0)
+    mongoid_versioning (0.1.0)
+      mongoid (~> 5.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.2.0)
-      activesupport (= 4.2.0)
+    activemodel (4.2.4)
+      activesupport (= 4.2.4)
       builder (~> 3.1)
-    activesupport (4.2.0)
+    activesupport (4.2.4)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    bson (2.3.0)
+    bson (3.2.6)
     builder (3.2.2)
-    celluloid (0.16.0)
-      timers (~> 4.0.0)
     coderay (1.1.0)
-    connection_pool (2.1.0)
-    coveralls (0.7.1)
-      multi_json (~> 1.3)
-      rest-client
-      simplecov (>= 0.7)
-      term-ansicolor
-      thor
-    database_cleaner (1.3.0)
+    coveralls (0.8.3)
+      json (~> 1.8)
+      rest-client (>= 1.6.8, < 2)
+      simplecov (~> 0.10.0)
+      term-ansicolor (~> 1.3)
+      thor (~> 0.19.1)
+    database_cleaner (1.5.1)
     docile (1.1.5)
-    ffi (1.9.5)
+    domain_name (0.5.25)
+      unf (>= 0.0.5, < 1.0.0)
+    ffi (1.9.10)
     formatador (0.2.5)
-    guard (2.6.1)
+    guard (2.13.0)
       formatador (>= 0.2.4)
-      listen (~> 2.7)
+      listen (>= 2.7, <= 4.0)
       lumberjack (~> 1.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
       pry (>= 0.9.12)
+      shellany (~> 0.0)
       thor (>= 0.18.1)
-    guard-minitest (2.3.2)
-      guard (~> 2.0)
+    guard-compat (1.2.1)
+    guard-minitest (2.4.4)
+      guard-compat (~> 1.2)
       minitest (>= 3.0)
-    hitimes (1.2.2)
+    http-cookie (1.0.2)
+      domain_name (~> 0.5)
     i18n (0.7.0)
-    json (1.8.1)
-    listen (2.7.11)
-      celluloid (>= 0.15.2)
+    json (1.8.3)
+    listen (3.0.3)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     lumberjack (1.0.9)
     method_source (0.8.2)
-    mime-types (2.4.1)
-    minitest (5.4.2)
-    mongoid (4.0.0)
+    mime-types (2.6.2)
+    minitest (5.8.1)
+    mongo (2.1.2)
+      bson (~> 3.0)
+    mongoid (5.0.0)
       activemodel (~> 4.0)
-      moped (~> 2.0.0)
+      mongo (~> 2.1)
       origin (~> 2.1)
       tzinfo (>= 0.3.37)
-    moped (2.0.2)
-      bson (~> 2.2)
-      connection_pool (~> 2.0)
-      optionable (~> 0.2.0)
-    multi_json (1.10.1)
-    netrc (0.7.7)
-    optionable (0.2.0)
+    nenv (0.2.0)
+    netrc (0.10.3)
+    notiffany (0.0.8)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
     origin (2.1.1)
-    pry (0.10.1)
+    pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rake (10.3.2)
-    rb-fsevent (0.9.4)
+    rake (10.4.2)
+    rb-fsevent (0.9.6)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rest-client (1.7.2)
+    rest-client (1.8.0)
+      http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
-    simplecov (0.9.1)
+    rspec-core (3.3.2)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
+    shellany (0.0.1)
+    simplecov (0.10.0)
       docile (~> 1.1.0)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
     slop (3.6.0)
-    term-ansicolor (1.3.0)
+    term-ansicolor (1.3.2)
       tins (~> 1.0)
     thor (0.19.1)
-    thread_safe (0.3.4)
-    timers (4.0.1)
-      hitimes
-    tins (1.3.3)
+    thread_safe (0.3.5)
+    tins (1.6.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.1)
 
 PLATFORMS
   ruby
@@ -104,3 +113,4 @@ DEPENDENCIES
   minitest
   mongoid_versioning!
   rake
+  rspec-core

data/README.md

@@ -87,6 +87,16 @@ To retrieve specific version:
 doc.version(2) # => MyVersionedDocument
 ```
 
+### Removing versions
+
+By default, past versions are never removed. This way it is possible to implement some sort of recovery mechanism of deleted documents.
+
+It should be however trivial to implement removal of versions on destroy. For example:
+
+```ruby
+after_destroy -> doc { doc.previous_versions.destroy_all }
+```
+
 ## Further Reading
 
 See [Further Thoughts on How to Track Versions with MongoDB](http://askasya.com/post/revisitversions).

data/lib/mongoid_versioning/version.rb

@@ -1,3 +1,3 @@
 module MongoidVersioning
-  VERSION = "0.0.3"
-end
+  VERSION = "0.1.0"
+end

data/lib/mongoid_versioning/versioned.rb

@@ -9,7 +9,7 @@ module MongoidVersioning
         field :_version, type: Integer
         field :_based_on_version, type: Integer
 
-        versions_collection.indexes.create(
+        versions_collection.indexes.create_one(
           { _orig_id: 1, _version: 1 }, { unique: true }
         )
 
@@ -81,7 +81,7 @@ module MongoidVersioning
     private # =============================================================
 
     def set_initial_version
-      self._version ||= 1
+      self[:_version] ||= 1
     end
 
     def revert_id
@@ -98,15 +98,17 @@ module MongoidVersioning
 
         current_version = previous_doc._version
 
-        res1 = self.class.versions_collection.where(_orig_id: previous_doc['_orig_id'], _version: previous_doc._version).upsert(previous_doc.as_document)
+        res1 = self.class.versions_collection.find(_orig_id: previous_doc['_orig_id'], _version: previous_doc._version)
+        previous_doc[:_version] = current_version if previous_doc[:_version].nil?
+        self.class.versions_collection.insert_one(previous_doc.as_document) if res1.count == 0
 
         self._based_on_version = _version || current_version
         self._version = current_version+1
 
-        res2 = self.class.collection.where(_id: id, _version: current_version).update(self.as_document)
+        res2 = self.class.collection.find(_id: id, _version: current_version).update_one(self.as_document)
 
         # replay flow if someone else updated the document before us
-        break unless res2['n'] != 1
+        break unless res2.n != 1
       end
     end
 

data/mongoid_versioning.gemspec

@@ -18,9 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "mongoid", "~> 4.0"
+  spec.add_dependency "mongoid", "~> 5.0.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "rspec-core"
   spec.add_development_dependency "coveralls"
   spec.add_development_dependency "database_cleaner"
   spec.add_development_dependency "guard"

data/test/mongoid_versioning/versioned_test.rb

@@ -70,8 +70,8 @@ module MongoidVersioning
             new_document.name = 'Foo'
             new_document.revise
 
-            @versions = TestDocument.versions_collection.where(_orig_id: new_document.id).sort(_version: -1)
-            @current = TestDocument.collection.where(_id: new_document.id).first
+            @versions = TestDocument.versions_collection.find(_orig_id: new_document.id).sort(_version: -1)
+            @current = TestDocument.collection.find(_id: new_document.id).first
           end
 
           it 'sets _version' do
@@ -121,8 +121,8 @@ module MongoidVersioning
             existing_document.name = 'Foo'
             existing_document.revise
 
-            @versions = TestDocument.versions_collection.where(_orig_id: existing_document.id).sort(_version: -1)
-            @current = TestDocument.collection.where(_id: existing_document.id).first
+            @versions = TestDocument.versions_collection.find(_orig_id: existing_document.id).sort(_version: -1)
+            @current = TestDocument.collection.find(_id: existing_document.id).first
           end
 
           it 'sets _version' do
@@ -169,8 +169,8 @@ module MongoidVersioning
               existing_document.name = 'Bar'
               existing_document.revise
 
-              @versions = TestDocument.versions_collection.where(_orig_id: existing_document.id).sort(_version: -1)
-              @current = TestDocument.collection.where(_id: existing_document.id).first
+              @versions = TestDocument.versions_collection.find(_orig_id: existing_document.id).sort(_version: -1)
+              @current = TestDocument.collection.find(_id: existing_document.id).first
             end
 
             it 'sets _version' do
@@ -217,8 +217,8 @@ module MongoidVersioning
             @user1.revise
 
             @result = TestDocument.where(_id: @doc.id).first
-            @versions = TestDocument.versions_collection.where(_orig_id: @doc.id).sort(_version: -1)
-            @current = TestDocument.collection.where(_id: @doc.id).first
+            @versions = TestDocument.versions_collection.find(_orig_id: @doc.id).sort(_version: -1)
+            @current = TestDocument.collection.find(_id: @doc.id).first
           end
 
           it 'will correctly set values' do

data/test/test_helper.rb

@@ -25,7 +25,7 @@ def database_id
 end
 
 CONFIG = {
-  sessions: {
+  clients: {
     default: {
       database: database_id,
       hosts: [ "#{HOST}:#{PORT}" ]
@@ -40,6 +40,6 @@ end
 DatabaseCleaner.orm = :mongoid
 DatabaseCleaner.strategy = :truncation
 
-class MiniTest::Spec
-  before(:each) { DatabaseCleaner.clean }
-end
+# class MiniTest::Spec
+#   before(:each) { DatabaseCleaner.clean }
+# end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_versioning
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Tomas Celizna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-01 00:00:00.000000000 Z
+date: 2015-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rspec-core
+  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: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -164,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Versioning Mongoid documents by means of separate collection.