Add support for Mongoid 5

Author: ElMassimo

.travis.yml

@@ -9,6 +9,8 @@ rvm:
 
 gemfile:
   - Gemfile
+  - gemfiles/mongoid3.gemfile
+  - gemfiles/mongoid4.gemfile
 
 env:
   global:

CHANGELOG.md

@@ -1,3 +1,7 @@
+## Mongoid::Includes 1.0.3 (2015-10-10) ##
+
+*   Add support for Mongoid 5.
+
 ## Mongoid::Includes 1.0.2 (2015-10-08) ##
 
 *   Fix error when using `merge` or `merge!` with a criteria and `includes`.

Gemfile

@@ -1,9 +1,11 @@
 source 'https://rubygems.org'
 
 gemspec
+
 gem 'bundler'
 gem 'rake'
 gem 'pry'
+gem 'mongoid', '~> 5.0.0'
 
 group :test do
   gem 'rspec-given', '~> 3.5'

Gemfile.lock

@@ -1,45 +1,41 @@
 PATH
   remote: .
   specs:
-    mongoid_includes (1.0.2)
-      mongoid (>= 3.1.0, < 5.0.0)
+    mongoid_includes (1.0.3)
+      mongoid (>= 3.1.0, < 6.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.2.3)
-      activesupport (= 4.2.3)
+    activemodel (4.2.4)
+      activesupport (= 4.2.4)
       builder (~> 3.1)
-    activesupport (4.2.3)
+    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 (3.2.1)
+    bson (3.2.6)
     builder (3.2.2)
     codeclimate-test-reporter (0.4.7)
       simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.0)
-    connection_pool (2.2.0)
     diff-lcs (1.2.5)
     docile (1.1.5)
     given_core (3.7.1)
       sorcerer (>= 0.3.7)
     i18n (0.7.0)
     json (1.8.3)
     method_source (0.8.2)
-    minitest (5.8.0)
-    mongoid (4.0.2)
+    minitest (5.8.1)
+    mongo (2.1.1)
+      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.6)
-      bson (~> 3.0)
-      connection_pool (~> 2.0)
-      optionable (~> 0.2.0)
-    optionable (0.2.0)
     origin (2.1.1)
     pry (0.10.1)
       coderay (~> 1.1.0)
@@ -84,6 +80,7 @@ PLATFORMS
 DEPENDENCIES
   bundler
   codeclimate-test-reporter
+  mongoid (~> 5.0.0)
   mongoid_includes!
   pry
   rake

gemfiles/mongoid3.gemfile

@@ -0,0 +1,18 @@
+source 'https://rubygems.org'
+
+gemspec '..'
+
+gem 'bundler'
+gem 'rake'
+gem 'pry'
+gem 'mongoid', '~> 3.1.0'
+
+group :test do
+  gem 'rspec-given', '~> 3.5'
+  gem 'codeclimate-test-reporter', require: nil
+end
+
+group :doc do
+  gem 'yard'
+  gem 'yard-tomdoc'
+end

gemfiles/mongoid4.gemfile

@@ -0,0 +1,18 @@
+source 'https://rubygems.org'
+
+gemspec '..'
+
+gem 'bundler'
+gem 'rake'
+gem 'pry'
+gem 'mongoid', '~> 4.0.2'
+
+group :test do
+  gem 'rspec-given', '~> 3.5'
+  gem 'codeclimate-test-reporter', require: nil
+end
+
+group :doc do
+  gem 'yard'
+  gem 'yard-tomdoc'
+end

lib/mongoid/includes/version.rb

@@ -5,6 +5,6 @@ module Mongoid
   module Includes
 
     # Public: This library will attempt to follow semantic versioning (whatever that's supposed to be).
-    VERSION = '1.0.2'
+    VERSION = '1.0.3'
   end
 end

mongoid_includes.gemspec

@@ -22,5 +22,5 @@ Gem::Specification.new do |s|
   s.files        = Dir.glob('lib/**/*') + %w(CHANGELOG.md LICENSE.txt README.md Rakefile)
   s.test_files   = Dir.glob('spec/**/*')
 
-  s.add_runtime_dependency 'mongoid', ['>= 3.1.0', '< 5.0.0']
+  s.add_runtime_dependency 'mongoid', ['>= 3.1.0', '< 6.0.0']
 end

spec/mongoid/includes/criteria_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe Mongoid::Criteria do
+  Given(:criteria) { Band.includes(:songs, :owner, from: :albums) }
+  Given(:other_criteria) { Band.includes(:musicians, :albums) }
+
+  describe '#merge' do
+    context 'inclusions are combined properly' do
+      When(:new_criteria) { criteria.merge(other_criteria) }
+      Then { new_criteria.inclusions.size == 4 }
+      And  { new_criteria.inclusions.class == Mongoid::Includes::Inclusions }
+      And  { criteria.inclusions.size == 3 }
+      And  { other_criteria.inclusions.size == 2 }
+    end
+  end
+
+  describe '#merge!' do
+    context 'inclusions are merged properly' do
+      When { criteria.merge!(other_criteria) }
+      Then { criteria.inclusions.size == 4 }
+      And  { criteria.inclusions.class == Mongoid::Includes::Inclusions }
+      And  { other_criteria.inclusions.size == 2 }
+    end
+  end
+end

spec/mongoid/includes/simple_inclusions_spec.rb

@@ -285,13 +285,6 @@ class D
             end
           end
 
-          it 'does not eager load the last document' do
-            doc = criteria.last
-            expect_query(1) do
-              expect(doc.person).to eq(person_two)
-            end
-          end
-
           it 'returns the first document' do
             expect(document).to eq(post_one)
           end
@@ -300,7 +293,7 @@ class D
         context 'when calling last' do
 
           let!(:criteria) do
-            Post.includes(:person)
+            Post.asc(:_id).includes(:person)
           end
 
           let!(:document) do

spec/spec_helper.rb

@@ -27,6 +27,15 @@ def mongodb_version
 # Set the database that the spec suite connects to.
 Mongoid.configure do |config|
   config.load_configuration(
+    clients: {
+      default: {
+        database: DATABASE,
+        hosts: [ "#{HOST}:#{PORT.to_i}" ],
+        options: {
+          max_pool_size: 1,
+        }
+      }
+    },
     sessions: {
       default: {
         database: DATABASE,

spec/support/config/mongoid.yml

@@ -1,34 +1,22 @@
 test:
-  sessions:
+  clients:
     default:
       database: mongoid_test
       hosts:
         - <%=ENV["MONGOID_SPEC_HOST"]%>:<%=ENV["MONGOID_SPEC_PORT"]%>
       options:
-        read: primary
-    mongohq_single:
-      database: <%=ENV["MONGOHQ_SINGLE_NAME"]%>
-      username: <%=ENV["MONGOHQ_SINGLE_USER"]%>
-      password: <%=ENV["MONGOHQ_SINGLE_PASS"]%>
-      hosts:
-        - <%=ENV["MONGOHQ_SINGLE_URL"]%>
-      options:
-        write:
-          w: 1
-        read: primary
-    mongohq_repl:
-      database: <%=ENV["MONGOHQ_REPL_NAME"]%>
-      username: <%=ENV["MONGOHQ_REPL_USER"]%>
-      password: <%=ENV["MONGOHQ_REPL_PASS"]%>
+        read:
+          mode: :primary
+        max_pool_size: 1
+
+  sessions:
+    default:
+      database: mongoid_test
       hosts:
-        - <%=ENV["MONGOHQ_REPL_1_URL"]%>
-        - <%=ENV["MONGOHQ_REPL_2_URL"]%>
+        - <%=ENV["MONGOID_SPEC_HOST"]%>:<%=ENV["MONGOID_SPEC_PORT"]%>
       options:
         read: primary
-        write:
-          w: majority
-    mongohq_repl_uri:
-      uri: <%= ENV["MONGOHQ_REPL_URI"]%>
+
   options:
     include_root_in_json: false
     include_type_for_serialization: false

spec/support/helpers.rb

@@ -1,14 +1,43 @@
-require 'mongoid/support/query_counter'
+module Mongoid
+  class QueryCounter
+    attr_reader :events
+
+    def initialize
+      @events = []
+    end
+
+    def instrument
+      subscriber = ActiveSupport::Notifications.subscribe('query.moped') do |*args|
+        @events << ActiveSupport::Notifications::Event.new(*args)
+      end
+      yield
+    ensure
+      ActiveSupport::Notifications.unsubscribe(subscriber)
+    end
+
+    def inspect
+      @events.map { |e| e.payload[:ops].map(&:log_inspect) }.join("\n")
+    end
+  end
+end
 
 module Mongoid
   module SpecHelpers
-    def expect_query(number, &block)
-      query_counter = Mongoid::QueryCounter.new
-      query_counter.instrument(&block)
-      expect(query_counter.events.size).to(eq(number), %[
-Expected to receive #{number} queries, it received #{query_counter.events.size}
-#{query_counter.inspect}
-])
+    if defined?(Mongo::Logger.logger)
+      def expect_query(number)
+        # There are both start and complete events for each query.
+        expect(Mongo::Logger.logger).to receive(:debug?).exactly(number * 4).times.and_call_original
+        yield
+      end
+    else
+      def expect_query(number, &block)
+        query_counter = Mongoid::QueryCounter.new
+        query_counter.instrument(&block)
+        expect(query_counter.events.size).to(eq(number), %[
+  Expected to receive #{number} queries, it received #{query_counter.events.size}
+  #{query_counter.inspect}
+  ])
+      end
     end
 
     def expect_no_queries(&block)