mongoid-collection-snapshot 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a83bba2b3b5308ff4015fb6b1160946e9ce76acc
-  data.tar.gz: 74c2c24fcee8b86d53cd090cddcb3dd9b59ce117
+  metadata.gz: 413b563ac9f33351ab543a7e72f56e7c5402802c
+  data.tar.gz: 803caae2c222ab14a8cbdcef6b1390a941cfed87
 SHA512:
-  metadata.gz: b4d4d635979850c86c773192dea47a00497a48a5d1220fce28e80cae6e002960ffa3a9f7db48ac5be62c6c22043120dbf4bb117971705561f831fb617b033ad3
-  data.tar.gz: ac843dacc50abd245f56487ddaa49542d2aed4cc70d4a82ab9e84d359b0bc2306217471db489db6a70ff7798babd7736c6fdd042ab230958204507be1e3853fa
+  metadata.gz: 8f27da72bb8c0308a12d0f79b7a06afd5c9317407036231bdda9995b9eec05f845641116d44fc28c042c758e2ce278c7cb31ed685d9ced8c5ea67e072f171ef9
+  data.tar.gz: f48f7d1e8414a9dbd7ba41f541d86b57382490ed7ea51a1aa2e93b4bb522f2d960ac9f22daea95ffb14c0965e1d577a94da20c1f258706cc88d04a3b5490ee7e

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-01-20 15:27:40 -0500 using RuboCop version 0.47.1.
+# on 2017-06-03 12:33:20 -0400 using RuboCop version 0.47.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -26,18 +26,18 @@ Lint/UselessAccessModifier:
 
 # Offense count: 3
 Metrics/AbcSize:
-  Max: 34
+  Max: 37
 
 # Offense count: 5
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/BlockLength:
-  Max: 145
+  Max: 151
 
 # Offense count: 1
 Metrics/CyclomaticComplexity:
   Max: 8
 
-# Offense count: 43
+# Offense count: 46
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:
@@ -51,7 +51,7 @@ Metrics/MethodLength:
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
-  Max: 147
+  Max: 153
 
 # Offense count: 1
 Metrics/PerceivedComplexity:

data/CHANGELOG.md

@@ -1,6 +1,7 @@
-### 1.3.2 (Next)
+### 1.3.2 (6/4/2017)
 
-* Your contribution here.
+* [#13](https://github.com/mongoid/mongoid-collection-snapshot/issues/13): Fix: use correct database on all threads - [@dblock](https://github.com/dblock).
+* [#7](https://github.com/mongoid/mongoid-collection-snapshot/issues/7): Fix: `max_collection_snapshot_instances` broken - [@dblock](https://github.com/dblock).
 
 ### 1.3.1 (5/22/2017)
 

data/lib/mongoid-collection-snapshot.rb

@@ -2,7 +2,7 @@ require 'mongoid-collection-snapshot/version'
 
 module Mongoid
   module CollectionSnapshot
-    extend ActiveSupport::Concern
+    extend ::ActiveSupport::Concern
 
     DEFAULT_COLLECTION_KEY_NAME = '*'.freeze
 
@@ -16,10 +16,10 @@ module Mongoid
       field :workspace_basename, default: 'snapshot'
       slug :workspace_basename
 
-      field :max_collection_snapshot_instances, default: 2
+      class_attribute :max_collection_snapshot_instances
 
       before_create :build
-      after_create :ensure_at_most_two_instances_exist
+      after_create :ensure_at_most_max_instances_exist
       before_destroy :drop_snapshot_collections
 
       class_attribute :document_blocks
@@ -41,14 +41,18 @@ module Mongoid
               cattr_accessor :mongo_session
             end
             instance_eval(&document_block) if document_block
-            store_in collection: collection_name
           end
           if Mongoid::Compatibility::Version.mongoid6?
-            ctx = PersistenceContext.set(klass, {})
-            ctx.instance_variable_set(:@client, snapshot_session)
+            # assign a name to the snapshot session
+            session_id = snapshot_session.object_id.to_s
+            Mongoid::Clients.set session_id, snapshot_session
+            # tell the class to use the client by name
+            klass.class_variable_set :@@storage_options, client: session_id, collection: collection_name
           elsif Mongoid::Compatibility::Version.mongoid5?
+            klass.store_in collection: collection_name
             klass.mongo_client = snapshot_session
           else
+            klass.store_in collection: collection_name
             klass.mongo_session = snapshot_session
           end
           Object.const_set(class_name, klass)
@@ -87,8 +91,9 @@ module Mongoid
     # called after each save - making sure only at most two instances exists should be
     # sufficient to ensure that this data can be rebuilt live without corrupting any
     # existing computations that might have a handle to the previous "latest" instance.
-    def ensure_at_most_two_instances_exist
+    def ensure_at_most_max_instances_exist
       all_instances = self.class.order_by([[:created_at, :desc]]).to_a
+      max_collection_snapshot_instances = self.class.max_collection_snapshot_instances || 2
       return unless all_instances.length > max_collection_snapshot_instances
       all_instances[max_collection_snapshot_instances..-1].each(&:destroy)
     end

data/lib/mongoid-collection-snapshot/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module CollectionSnapshot
-    VERSION = '1.3.1'.freeze
+    VERSION = '1.3.2'.freeze
   end
 end

data/spec/config/mongoid3.yml

@@ -0,0 +1,6 @@
+test:
+  sessions:
+    default:
+      uri: mongodb://localhost:27017/mongoid-collection-snapshot_test
+    imports:
+      uri: mongodb://localhost:27017/mongoid-collection-snapshot_test-imports

data/spec/config/mongoid4.yml

@@ -0,0 +1,6 @@
+test:
+  sessions:
+    default:
+      uri: mongodb://localhost:27017/mongoid-collection-snapshot_test
+    imports:
+      uri: mongodb://localhost:27017/mongoid-collection-snapshot_test-imports

data/spec/config/mongoid5.yml

@@ -0,0 +1,6 @@
+test:
+  clients:
+    default:
+      uri: mongodb://localhost:27017/mongoid-collection-snapshot_test
+    imports:
+      uri: mongodb://localhost:27017/mongoid-collection-snapshot_test-imports

data/spec/config/mongoid6.yml

@@ -0,0 +1,6 @@
+test:
+  clients:
+    default:
+      uri: mongodb://localhost:27017/mongoid-collection-snapshot_test
+    imports:
+      uri: mongodb://localhost:27017/mongoid-collection-snapshot_test-imports

data/spec/mongoid/collection_snapshot_spec.rb

@@ -55,6 +55,15 @@ module Mongoid
         end
       end
 
+      it 'maintains at most max_collection_snapshot_instances of the latest snapshots to support its calculations' do
+        AverageArtistPrice.max_collection_snapshot_instances = 5
+        AverageArtistPrice.create
+        10.times do
+          AverageArtistPrice.create
+        end
+        expect(AverageArtistPrice.count).to eq(5)
+      end
+
       context '#documents' do
         it 'provides access to a Mongoid collection' do
           snapshot = AverageArtistPrice.create

data/spec/mongoid/multiple_databases_spec.rb

@@ -0,0 +1,63 @@
+require 'spec_helper'
+
+class Widget
+  include Mongoid::Document
+end
+
+class Gadget
+  include Mongoid::Document
+end
+
+class WidgetsAndGadgets
+  include Mongoid::CollectionSnapshot
+
+  document do
+    belongs_to :widget, inverse_of: nil
+    belongs_to :gadget, inverse_of: nil
+  end
+
+  def build
+    collection_snapshot.drop
+    Widget.all.each do |widget|
+      Gadget.all.each do |gadget|
+        if Mongoid::Compatibility::Version.mongoid5? || Mongoid::Compatibility::Version.mongoid6?
+          collection_snapshot.insert_one(widget_id: widget.id, gadget_id: gadget.id)
+        else
+          collection_snapshot.insert(widget_id: widget.id, gadget_id: gadget.id)
+        end
+      end
+    end
+  end
+
+  def snapshot_session
+    if Mongoid::Compatibility::Version.mongoid5? || Mongoid::Compatibility::Version.mongoid6?
+      Mongoid.client('imports')
+    else
+      Mongoid.session('imports')
+    end
+  end
+end
+
+module Mongoid
+  describe CollectionSnapshot do
+    before do
+      Widget.delete_all
+      Gadget.delete_all
+      Widget.create!
+      Gadget.create!
+      WidgetsAndGadgets.each.map(&:collection_snapshot).each(&:drop)
+      WidgetsAndGadgets.create!
+    end
+    it 'uses the correct database on a separate thread' do
+      expect(WidgetsAndGadgets.latest.documents.count).to eq 1
+      require 'thread'
+      Thread.new do
+        expect(WidgetsAndGadgets.latest.documents.count).to eq 1
+        WidgetsAndGadgets.latest.documents.each do |pair|
+          expect(pair.widget).to_not be nil
+          expect(pair.gadget).to_not be nil
+        end
+      end.join
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -5,9 +5,7 @@ require 'rspec'
 require 'mongoid'
 require 'timecop'
 
-Mongoid.configure do |config|
-  config.connect_to('mongoid-collection-snapshot_test')
-end
+Mongoid.load!("#{File.dirname(__FILE__)}/config/mongoid#{ENV['MONGOID_VERSION'] || 6}.yml", :test)
 
 require File.expand_path('../../lib/mongoid-collection-snapshot', __FILE__)
 Dir["#{File.dirname(__FILE__)}/models/**/*.rb"].each { |f| require f }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-collection-snapshot
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Aaron Windsor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-22 00:00:00.000000000 Z
+date: 2017-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -80,6 +80,10 @@ files:
 - lib/mongoid-collection-snapshot.rb
 - lib/mongoid-collection-snapshot/version.rb
 - mongoid-collection-snapshot.gemspec
+- spec/config/mongoid3.yml
+- spec/config/mongoid4.yml
+- spec/config/mongoid5.yml
+- spec/config/mongoid6.yml
 - spec/models/artist.rb
 - spec/models/artwork.rb
 - spec/models/average_price.rb
@@ -87,6 +91,7 @@ files:
 - spec/models/multi_collection_snapshot.rb
 - spec/models/partner.rb
 - spec/mongoid/collection_snapshot_spec.rb
+- spec/mongoid/multiple_databases_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/mongoid/mongoid-collection-snapshot
 licenses:
@@ -108,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Easy maintenence of collections of processed data in MongoDB with the Mongoid