bullet 5.8.1 → 5.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ae0cc579f8e882c40e1e244ba991acc79bac497
-  data.tar.gz: '0558ed3107fd121dbf1ced92c20ef49609b0cc8d'
+  metadata.gz: fefb038c3c46f100cc22cdd95c417c781aff2943
+  data.tar.gz: ad23b5755c4956788bad2b3ae98323d6e24c2bb8
 SHA512:
-  metadata.gz: '019773e310b70aac51bb012d173c4354a8224f4808dcedbd1d0d58180faec7dc2738b78e15e14fe8a632a60a89f8423aea0fb9875feac28ca36c756235612bee'
-  data.tar.gz: fe9a9caf06ff5daea8090187c551b35b983ba7d136d37f579ecdccdfab7e11b26fc989ac58e8df5b672ae20ab4931abcac014e03fefd024bab135d04a6412b1a
+  metadata.gz: 79f4e0bb1d4e62df6460fd668f0789936e3e0b1c36d078bb13ec2788f9d69f46e0dd3615e1983019bc4c83d6e7d2b2195377c5216a23038d270aee2ddfb6e77c
+  data.tar.gz: 504905ca503f0727e71c1c476ab058eab57618bc6a4a9084411c479ebd63913c75ac178cf27566d05e800887e1d6f1e709aa89733632743c7216db810d410fb8

data/CHANGELOG.md

@@ -1,8 +1,9 @@
 ## Next Release
 
-## 5.8.1
+## 5.9.0 (11/11/2018)
 
 * Require Ruby 2.3+
+* Support Mongo 7.x
 
 ## 5.8.0 (10/29/2018)
 

data/Gemfile.mongoid-7.0

@@ -0,0 +1,15 @@
+source "https://rubygems.org"
+
+gemspec
+
+gem 'rails', '~> 5.0'
+gem 'sqlite3', platforms: [:ruby]
+gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
+gem 'mongoid', '~> 7.0.0'
+
+gem "rspec"
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'rubinius-developer_tools'
+end

data/lib/bullet/dependency.rb

@@ -42,6 +42,8 @@ module Bullet
                                'mongoid5x'
                              elsif mongoid6x?
                                'mongoid6x'
+                             elsif mongoid7x?
+                               'mongoid7x'
                              else
                                raise "Bullet does not support mongoid #{::Mongoid::VERSION} yet"
                              end
@@ -91,5 +93,9 @@ module Bullet
     def mongoid6x?
       mongoid? && ::Mongoid::VERSION =~ /\A6/
     end
+
+    def mongoid7x?
+      mongoid? && ::Mongoid::VERSION =~ /\A7/
+    end
   end
 end

data/lib/bullet/mongoid7x.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+module Bullet
+  module Mongoid
+    def self.enable
+      require 'mongoid'
+      ::Mongoid::Contextual::Mongo.class_eval do
+        alias_method :origin_first, :first
+        alias_method :origin_last, :last
+        alias_method :origin_each, :each
+        alias_method :origin_eager_load, :eager_load
+
+        def first(opts = {})
+          result = origin_first(opts)
+          Bullet::Detector::NPlusOneQuery.add_impossible_object(result) if result
+          result
+        end
+
+        def last(opts = {})
+          result = origin_last(opts)
+          Bullet::Detector::NPlusOneQuery.add_impossible_object(result) if result
+          result
+        end
+
+        def each(&block)
+          return to_enum unless block_given?
+
+          records = []
+          origin_each { |record| records << record }
+          if records.length > 1
+            Bullet::Detector::NPlusOneQuery.add_possible_objects(records)
+          elsif records.size == 1
+            Bullet::Detector::NPlusOneQuery.add_impossible_object(records.first)
+          end
+          records.each(&block)
+        end
+
+        def eager_load(docs)
+          associations = criteria.inclusions.map(&:name)
+          docs.each do |doc|
+            Bullet::Detector::NPlusOneQuery.add_object_associations(doc, associations)
+          end
+          Bullet::Detector::UnusedEagerLoading.add_eager_loadings(docs, associations)
+          origin_eager_load(docs)
+        end
+      end
+
+      ::Mongoid::Association::Accessors.class_eval do
+        alias_method :origin_get_relation, :get_relation
+
+        def get_relation(name, association, object, reload = false)
+          result = origin_get_relation(name, association, object, reload)
+          unless association.embedded?
+            Bullet::Detector::NPlusOneQuery.call_association(self, name)
+          end
+          result
+        end
+      end
+    end
+  end
+end

data/lib/bullet/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bullet
-  VERSION = '5.8.1'
+  VERSION = '5.9.0'
 end

data/test.sh

@@ -6,6 +6,7 @@ BUNDLE_GEMFILE=Gemfile.rails-5.0 bundle && BUNDLE_GEMFILE=Gemfile.rails-5.0 bund
 BUNDLE_GEMFILE=Gemfile.rails-4.2 bundle && BUNDLE_GEMFILE=Gemfile.rails-4.2 bundle exec rspec spec
 BUNDLE_GEMFILE=Gemfile.rails-4.1 bundle && BUNDLE_GEMFILE=Gemfile.rails-4.1 bundle exec rspec spec
 BUNDLE_GEMFILE=Gemfile.rails-4.0 bundle && BUNDLE_GEMFILE=Gemfile.rails-4.0 bundle exec rspec spec
+BUNDLE_GEMFILE=Gemfile.mongoid-7.0 bundle && BUNDLE_GEMFILE=Gemfile.mongoid-7.0 bundle exec rspec spec
 BUNDLE_GEMFILE=Gemfile.mongoid-6.0 bundle && BUNDLE_GEMFILE=Gemfile.mongoid-6.0 bundle exec rspec spec
 BUNDLE_GEMFILE=Gemfile.mongoid-5.0 bundle && BUNDLE_GEMFILE=Gemfile.mongoid-5.0 bundle exec rspec spec
 BUNDLE_GEMFILE=Gemfile.mongoid-4.0 bundle && BUNDLE_GEMFILE=Gemfile.mongoid-4.0 bundle exec rspec spec

data/update.sh

@@ -4,6 +4,7 @@ BUNDLE_GEMFILE=Gemfile.rails-5.0 bundle update
 BUNDLE_GEMFILE=Gemfile.rails-4.2 bundle update
 BUNDLE_GEMFILE=Gemfile.rails-4.1 bundle update
 BUNDLE_GEMFILE=Gemfile.rails-4.0 bundle update
+BUNDLE_GEMFILE=Gemfile.mongoid-7.0 bundle update
 BUNDLE_GEMFILE=Gemfile.mongoid-6.0 bundle update
 BUNDLE_GEMFILE=Gemfile.mongoid-5.0 bundle update
 BUNDLE_GEMFILE=Gemfile.mongoid-4.0 bundle update

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet
 version: !ruby/object:Gem::Version
-  version: 5.8.1
+  version: 5.9.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-30 00:00:00.000000000 Z
+date: 2018-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -54,6 +54,7 @@ files:
 - Gemfile.mongoid-4.0
 - Gemfile.mongoid-5.0
 - Gemfile.mongoid-6.0
+- Gemfile.mongoid-7.0
 - Gemfile.rails-4.0
 - Gemfile.rails-4.1
 - Gemfile.rails-4.2
@@ -84,6 +85,7 @@ files:
 - lib/bullet/mongoid4x.rb
 - lib/bullet/mongoid5x.rb
 - lib/bullet/mongoid6x.rb
+- lib/bullet/mongoid7x.rb
 - lib/bullet/notification.rb
 - lib/bullet/notification/base.rb
 - lib/bullet/notification/counter_cache.rb