mongoid_collection_snapshot 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 041a83b26ca092439e83e0dd525c73d08ece188a
-  data.tar.gz: 4a5e32a1d3f3809279fbb0747988bde7f254db3b
+  metadata.gz: ee0eb2dd2be3c1d026371d32ebde78fccc17f5e2
+  data.tar.gz: 55f375b7f5e03c0c81bb42b063f4ef395f2c6865
 SHA512:
-  metadata.gz: b889d8da972a015996384bdf38f2bbe2b53b025efb716a95d55ab88a429e9268dd5cbbdd045edc84fbdbfd34ab694190bcb0554e57c0c3a48802d84393fed2b6
-  data.tar.gz: 2945f8661a3dd9eb70795d79cca5efae7a925a3454a6e94ffe607ce3dd81816055a90ecd4cf2a74b9b7d2f9079776aebaa03fa21d38ec529f944468f11354ada
+  metadata.gz: 69524590f00970250e79cfc7d7952298c82ab312a1e32ed1f2c57457b5787f80ab3a9c57a81fb111e3c41469704cd0057b45fddb4fdaede2390f4a7976f4458a
+  data.tar.gz: cceda5bc748e34e4f528880023d5f2067110ac21188a9df969c2dea25951e620b84455c382769ddd5363e79cb5ecbf17156383c889689eb451c3a24988ab92cf

data/.rspec

@@ -1,2 +1,2 @@
 --color
---format=progress
+--format=documentation

data/.travis.yml

@@ -9,6 +9,7 @@ rvm:
 env:
   - MONGOID_VERSION=3
   - MONGOID_VERSION=4
+  - MONGOID_VERSION=5
 
 language: ruby
 

data/CHANGELOG.md

@@ -1,6 +1,9 @@
 Next Release
 ------------
 
+* Compatibility with Mongoid 5 - [@dblock](https://github.com/dblock).
+* Your contribution here.
+
 1.1.0
 -----
 

data/Gemfile

@@ -1,6 +1,11 @@
 source 'http://rubygems.org'
 
-case version = ENV['MONGOID_VERSION'] || '~> 4.0'
+gemspec
+
+case version = ENV['MONGOID_VERSION'] || '~> 5.0'
+when /5/
+  gem 'mongoid', '~> 5.0'
+  gem 'mongoid-slug', github: 'dblock/mongoid-slug', branch: 'mongoid-5'
 when /4/
   gem 'mongoid', '~> 4.0'
 when /3/
@@ -9,8 +14,6 @@ else
   gem 'mongoid', version
 end
 
-gem 'mongoid_slug'
-
 group :development, :test do
   gem 'rspec', '~> 3.1'
   gem 'rake'

data/README.md

@@ -1,7 +1,7 @@
 Mongoid Collection Snapshot
 ===========================
 
-Easy maintenance of collections of processed data in MongoDB with the Mongoid 3.x ODM.
+Easy maintenance of collections of processed data in MongoDB with Mongoid 3, 4 and 5.
 
 [![Build Status](https://travis-ci.org/aaw/mongoid_collection_snapshot.svg)](https://travis-ci.org/aaw/mongoid_collection_snapshot)
 
@@ -48,7 +48,7 @@ class AverageArtistPrice
     EOS
 
     Artwork.map_reduce(map, reduce).out(inline: 1).each do |doc|
-      collection_snapshot.insert(
+      collection_snapshot.insert_one(
         artist_id: doc['_id']['artist_id'],
         count: doc['value']['count'],
         sum: doc['value']['sum']
@@ -190,8 +190,8 @@ class ArtistStats
   end
 
   def self.snapshot_session
-    @@snapshot_session ||= Moped::Session.new(['127.0.0.1:27017']).tap do |s|
-      s.use :alternate_db
+    @@snapshot_session ||= Mongo::Client.new('mongodb://localhost:27017').tap do |c|
+      c.use :alternate_db
     end
   end
 end

data/Rakefile

@@ -19,7 +19,6 @@ require 'rspec/core'
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = FileList['spec/**/*_spec.rb']
-  spec.rspec_opts = '--color --format progress'
 end
 
 task default: :spec

data/lib/mongoid_collection_snapshot.rb

@@ -35,11 +35,19 @@ module Mongoid
           collection_name = collection_snapshot(name).name
           klass = Class.new do
             include Mongoid::Document
-            cattr_accessor :mongo_session
+            if Mongoid::Compatibility::Version::mongoid5?
+              cattr_accessor :mongo_client
+            else
+              cattr_accessor :mongo_session
+            end
             instance_eval(&document_block) if document_block
             store_in collection: collection_name
           end
-          klass.mongo_session = snapshot_session
+          if Mongoid::Compatibility::Version.mongoid5?
+            klass.mongo_client = snapshot_session
+          else
+            klass.mongo_session = snapshot_session
+          end
           Object.const_set(class_name, klass)
           klass
         end
@@ -66,7 +74,8 @@ module Mongoid
     end
 
     def drop_snapshot_collections
-      snapshot_session.collections.each do |collection|
+      collections = Mongoid::Compatibility::Version.mongoid5? ? snapshot_session.database.collections : snapshot_session.collections
+      collections.each do |collection|
         collection.drop if collection.name =~ /^#{self.collection.name}\.([^\.]+\.)?#{slug}$/
       end
     end
@@ -83,7 +92,7 @@ module Mongoid
 
     # Override to supply custom database connection for snapshots
     def snapshot_session
-      Mongoid.default_session
+      Mongoid::Compatibility::Version.mongoid5? ? Mongoid.default_client : Mongoid.default_session
     end
   end
 end

data/lib/mongoid_collection_snapshot/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module CollectionSnapshot
-    VERSION = '1.1.0'
+    VERSION = '1.2.0'
   end
 end

data/mongoid_collection_snapshot.gemspec

@@ -14,5 +14,6 @@ Gem::Specification.new do |s|
   s.licenses = ['MIT']
   s.summary = 'Easy maintenence of collections of processed data in MongoDB with the Mongoid ODM.'
   s.add_dependency 'mongoid', '>= 3.0'
-  s.add_dependency 'mongoid_slug'
+  s.add_dependency 'mongoid-compatibility'
+  s.add_dependency 'mongoid-slug'
 end

data/spec/models/average_artist_price.rb

@@ -27,11 +27,19 @@ class AverageArtistPrice
     EOS
 
     Artwork.map_reduce(map, reduce).out(inline: 1).each do |doc|
-      collection_snapshot.insert(
-        artist_id: doc['_id']['artist_id'],
-        count: doc['value']['count'],
-        sum: doc['value']['sum']
-      )
+      if Mongoid::Compatibility::Version.mongoid5?
+        collection_snapshot.insert_one(
+          artist_id: doc['_id']['artist_id'],
+          count: doc['value']['count'],
+          sum: doc['value']['sum']
+        )
+      else
+        collection_snapshot.insert(
+          artist_id: doc['_id']['artist_id'],
+          count: doc['value']['count'],
+          sum: doc['value']['sum']
+        )
+      end
     end
   end
 

data/spec/models/custom_connection_snapshot.rb

@@ -2,9 +2,7 @@ class CustomConnectionSnapshot
   include Mongoid::CollectionSnapshot
 
   def self.snapshot_session
-    @snapshot_session ||= Moped::Session.new(['127.0.0.1:27017']).tap do |session|
-      session.use :snapshot_test
-    end
+    @snapshot_session ||= new_snapshot_session
   end
 
   def snapshot_session
@@ -12,7 +10,26 @@ class CustomConnectionSnapshot
   end
 
   def build
-    collection_snapshot.insert('name' => 'foo')
-    collection_snapshot('foo').insert('name' => 'bar')
+    if Mongoid::Compatibility::Version.mongoid5?
+      collection_snapshot.insert_one('name' => 'foo')
+      collection_snapshot('foo').insert_one('name' => 'bar')
+    else
+      collection_snapshot.insert('name' => 'foo')
+      collection_snapshot('foo').insert('name' => 'bar')
+    end
+  end
+
+  private
+
+  def self.new_snapshot_session
+    if Mongoid::Compatibility::Version.mongoid5?
+      Mongo::Client.new('mongodb://localhost:27017').tap do |client|
+        client.use :snapshot_test
+      end
+    else
+      Moped::Session.new(['127.0.0.1:27017']).tap do |session|
+        session.use :snapshot_test
+      end
+    end
   end
 end

data/spec/models/multi_collection_snapshot.rb

@@ -17,9 +17,15 @@ class MultiCollectionSnapshot
   end
 
   def build
-    collection_snapshot('foo').insert('name' => 'foo!', count: 1)
-    collection_snapshot('bar').insert('name' => 'bar!', number: 2)
-    collection_snapshot('baz').insert('name' => 'baz!', digit: 3)
+    if Mongoid::Compatibility::Version.mongoid5?
+      collection_snapshot('foo').insert_one('name' => 'foo!', count: 1)
+      collection_snapshot('bar').insert_one('name' => 'bar!', number: 2)
+      collection_snapshot('baz').insert_one('name' => 'baz!', digit: 3)
+    else
+      collection_snapshot('foo').insert('name' => 'foo!', count: 1)
+      collection_snapshot('bar').insert('name' => 'bar!', number: 2)
+      collection_snapshot('baz').insert('name' => 'baz!', digit: 3)
+    end
   end
 
   def names

data/spec/mongoid/collection_snapshot_spec.rb

@@ -75,22 +75,31 @@ module Mongoid
 
       it 'safely cleans up all collections used by the snapshot' do
         # Create some collections with names close to the snapshots we'll create
-        Mongoid.default_session["#{MultiCollectionSnapshot.collection.name}.do.not_delete"].insert('a' => 1)
-        Mongoid.default_session["#{MultiCollectionSnapshot.collection.name}.snapshorty"].insert('a' => 1)
-        Mongoid.default_session["#{MultiCollectionSnapshot.collection.name}.hello.1"].insert('a' => 1)
+        if Mongoid::Compatibility::Version.mongoid5?
+          Mongoid.default_client["#{MultiCollectionSnapshot.collection.name}.do.not_delete"].insert_one('a' => 1)
+          Mongoid.default_client["#{MultiCollectionSnapshot.collection.name}.snapshorty"].insert_one('a' => 1)
+          Mongoid.default_client["#{MultiCollectionSnapshot.collection.name}.hello.1"].insert_one('a' => 1)
+        else
+          Mongoid.default_session["#{MultiCollectionSnapshot.collection.name}.do.not_delete"].insert('a' => 1)
+          Mongoid.default_session["#{MultiCollectionSnapshot.collection.name}.snapshorty"].insert('a' => 1)
+          Mongoid.default_session["#{MultiCollectionSnapshot.collection.name}.hello.1"].insert('a' => 1)
+        end
 
         MultiCollectionSnapshot.create
-        before_create = Mongoid.default_session.collections.map(&:name)
+        collections = Mongoid::Compatibility::Version.mongoid5? ? Mongoid.default_client.database.collections : Mongoid.default_session.collections
+        before_create = collections.map(&:name)
         expect(before_create.length).to be > 0
 
         Timecop.travel(1.second.from_now)
         MultiCollectionSnapshot.create
-        after_create = Mongoid.default_session.collections.map(&:name)
+        collections = Mongoid::Compatibility::Version.mongoid5? ? Mongoid.default_client.database.collections : Mongoid.default_session.collections
+        after_create = collections.map(&:name)
         collections_created = (after_create - before_create).sort
         expect(collections_created.length).to eq(3)
 
         MultiCollectionSnapshot.latest.destroy
-        after_destroy = Mongoid.default_session.collections.map(&:name)
+        collections = Mongoid::Compatibility::Version.mongoid5? ? Mongoid.default_client.database.collections : Mongoid.default_session.collections
+        after_destroy = collections.map(&:name)
         collections_destroyed = (after_create - after_destroy).sort
         expect(collections_created).to eq(collections_destroyed)
       end
@@ -98,9 +107,17 @@ module Mongoid
 
     context 'with a custom snapshot connection' do
       around(:each) do |example|
-        CustomConnectionSnapshot.snapshot_session.drop
+        if Mongoid::Compatibility::Version.mongoid5?
+          CustomConnectionSnapshot.snapshot_session.database.drop
+        else
+          CustomConnectionSnapshot.snapshot_session.drop
+        end
         example.run
-        CustomConnectionSnapshot.snapshot_session.drop
+        if Mongoid::Compatibility::Version.mongoid5?
+          CustomConnectionSnapshot.snapshot_session.database.drop
+        else
+          CustomConnectionSnapshot.snapshot_session.drop
+        end
       end
 
       it 'builds snapshot in custom database' do
@@ -109,14 +126,19 @@ module Mongoid
           "#{CustomConnectionSnapshot.collection.name}.foo.#{snapshot.slug}",
           "#{CustomConnectionSnapshot.collection.name}.#{snapshot.slug}"
         ].each do |collection_name|
-          expect(Mongoid.default_session[collection_name].find.count).to eq(0)
+          session = Mongoid::Compatibility::Version.mongoid5? ? Mongoid.default_client : Mongoid.default_session
+          expect(session[collection_name].find.count).to eq(0)
           expect(CustomConnectionSnapshot.snapshot_session[collection_name].find.count).to eq(1)
         end
       end
 
       context '#documents' do
         it 'uses the custom session' do
-          expect(CustomConnectionSnapshot.new.documents.mongo_session).to eq CustomConnectionSnapshot.snapshot_session
+          if Mongoid::Compatibility::Version.mongoid5?
+            expect(CustomConnectionSnapshot.new.documents.mongo_client).to eq CustomConnectionSnapshot.snapshot_session
+          else
+            expect(CustomConnectionSnapshot.new.documents.mongo_session).to eq CustomConnectionSnapshot.snapshot_session
+          end
         end
         it 'provides access to a Mongoid collection' do
           snapshot = CustomConnectionSnapshot.create

data/spec/spec_helper.rb

@@ -12,12 +12,22 @@ end
 require File.expand_path('../../lib/mongoid_collection_snapshot', __FILE__)
 Dir["#{File.dirname(__FILE__)}/models/**/*.rb"].each { |f| require f }
 
+require 'mongoid-compatibility'
+
 RSpec.configure do |c|
+  c.before(:all) do
+    Mongoid.logger.level = Logger::INFO
+    Mongo::Logger.logger.level = Logger::INFO if Mongoid::Compatibility::Version.mongoid5?
+  end
   c.before(:each) do
     Mongoid.purge!
   end
   c.after(:all) do
-    Mongoid.default_session.drop
+    if Mongoid::Compatibility::Version.mongoid5?
+      Mongoid.default_client.database.drop
+    else
+      Mongoid.default_session.drop
+    end
   end
 end
 

metadata

@@ -1,41 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_collection_snapshot
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Aaron Windsor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-27 00:00:00.000000000 Z
+date: 2015-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: mongoid_slug
+  name: mongoid-compatibility
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mongoid-slug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -44,9 +58,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -72,17 +86,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Easy maintenence of collections of processed data in MongoDB with the Mongoid