mongoid_monkey 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3993c5f5fbdf5f1f30b9a824ffbd3447772bf68d
-  data.tar.gz: 77026f83baf29fd6ebbcc63c7487818d3b0e081c
+  metadata.gz: f08602871ad1f23178fbcdb229ec18d40f385e70
+  data.tar.gz: 65f0267dc96fdec8fb505754097e9fd0a447df63
 SHA512:
-  metadata.gz: a64eee10db5554f9f068522d8d571a7d42ffeabf1b14b84df8b8052eb1730311cc6f4964dd4bbfead35bbd24f078f68f8cd597a56d328993e26f11563a01bb6f
-  data.tar.gz: 935a41fc23448476f511e49fba9fea2fd7e546625758bb26e78c6f7f2c784fedaae1392158dd2417701e0afd7551fa535264ff7d84d425e478b8d0ac9cebd77a
+  metadata.gz: 69ae75a8d969b6a215b65f51b1a42cc32712d3a80a86b605d1c1040190702240f78be792488774864e02c389814d4daf7f347e66cc10d9965c269d88820cd3ab
+  data.tar.gz: 6999c691a45888d763881006dc1d2674521671fac1fee6fa0d95390f4bc7f5807f671a601b45e7033ecef1ac4aa3fdf5f05b45faa72e42dae68ee333c31be33e

data/README.md

@@ -31,7 +31,8 @@ If you would only like some of the patches, please copy and paste the code to yo
 
 | File | Description | 3 | 4 | 5 |
 | --- | --- | --- | --- | --- |
-| `atomic.rb` | Backport syntax change of atomic query methods. | ● | ○ | ○ |
+| `aggregate_cursor.rb` | Aggregate methods (`max`, `sum`, etc) must use cursor in MongoDB 3.6+ | ● | ○ | ○ |
+| `atomic.rb` | Backport syntax change of atomic query methods. Replace `$pushAll` with `$push + $each`. | ● | ○ | ○ |
 | `big_decimal.rb` | Fixes buggy BigDecimal behavior. | ● | ● | ● |
 | `db_commands.rb` | Use MongoDB 3.0+ command syntax; required for WiredTiger. | ● | ● | ○ |
 | `instrument.rb` | Backport instrumentation change to Moped 1. | ● | ○ | ○ |
@@ -40,6 +41,7 @@ If you would only like some of the patches, please copy and paste the code to yo
 | `embedded_touch.rb` (1) | Backport [Issue #3310](https://github.com/mongodb/mongoid/commit/a94c2f43573e58f973913c881ad9d11d62bf857c) from Mongoid 4 to add `:touch` option to `embedded_in`. | ● | ○ | ○ |
 | `embedded_touch.rb` (2) | Backport [PR #4392](https://github.com/mongodb/mongoid/pull/4392) from Mongoid 6 to fix an infinite loop issue related to `:touch` callbacks. | ● | ● | ● |
 | `index_options.rb` | Backport latest index valid index options from Mongoid 6. | ● | ● | ○ |
+| `write_concern.rb` | Config `safe: true` should send WriteConcern: Acknowledged `w: 1` to database (and not `safe: true`). | ● | ○ | ○ |
 
 ### License
 

data/lib/mongoid_monkey.rb

@@ -1,5 +1,6 @@
 require 'version'
 
+require 'patches/aggregate_cursor'
 require 'patches/atomic'
 require 'patches/big_decimal'
 require 'patches/db_commands'
@@ -8,3 +9,4 @@ require 'patches/instrument'
 require 'patches/reorder'
 require 'patches/only_pluck_localized'
 require 'patches/embedded_touch'
+require 'patches/write_concern'

data/lib/patches/aggregate_cursor.rb

@@ -0,0 +1,16 @@
+# Use cursor for aggregation methods in Mongoid 3 in order to support MongoDB 3.6+
+
+if Mongoid::VERSION =~ /\A3\./
+
+  module Moped
+    class Collection
+      def aggregate(*pipeline)
+        pipeline.flatten!
+        command = { aggregate: name.to_s, pipeline: pipeline, cursor: {} }
+        result = database.session.command(command)['cursor']
+        result = result['firstBatch'] if result
+        result
+      end
+    end
+  end
+end

data/lib/patches/atomic.rb

@@ -69,14 +69,14 @@ module Atomic
   end
   alias_method_chain :push, :mongoid4
 
-  def push_all_with_mongoid4(*args)
+  # Uses $push + $each rather than $pushAll
+  def push_all(*args)
     if args.length == 1 && args.first.is_a?(Hash)
-      query.update_all("$pushAll" => collect_operations(args.first))
+      query.update_all("$push" => collect_operations(args.first, true))
     else
-      push_all_without_mongoid4(*args)
+      query.update_all("$push" => { database_field_name(args[0]) => { "$each" => args[1] } })
     end
   end
-  alias_method_chain :push_all, :mongoid4
 
   def rename_with_mongoid4(*args)
     if args.length == 1 && args.first.is_a?(Hash)
@@ -102,9 +102,9 @@ module Atomic
 
   private
 
-  def collect_operations(ops)
+  def collect_operations(ops, use_each = false)
     ops.inject({}) do |operations, (field, value)|
-      operations[database_field_name(field)] = value.mongoize
+      operations[database_field_name(field)] = use_each ? { '$each' => value.mongoize } : value.mongoize
       operations
     end
   end
@@ -116,7 +116,16 @@ module Mongoid
 module Persistence
 module Atomic
 
-  # push_all is deprecated so not supported
+  # Replace usage of $pushAll with $push + $each
+  class PushAll
+    def persist
+      append_with("$push")
+    end
+
+    def operation(modifier)
+      { modifier => { path => value.is_a?(Array) ? { "$each" => value } : value}}
+    end
+  end
 
   def add_to_set_with_mongoid4(*args)
     if args.length == 1 && args.first.is_a?(Hash)
@@ -335,4 +344,30 @@ end
 end
 end
 
+# Replace usage of $pushAll with $push + $each
+module Mongoid
+module Relations
+module Embedded
+module Batchable
+
+  def batch_insert(docs)
+    execute_batch_insert(docs, "$push", true)
+  end
+
+  def execute_batch_insert(docs, operation, use_each = false)
+    self.inserts_valid = true
+    inserts = pre_process_batch_insert(docs)
+    if insertable?
+      collection.find(selector).update(
+          positionally(selector, operation => { path => use_each ? { '$each' => inserts } : inserts })
+      )
+      post_process_batch_insert(docs)
+    end
+    inserts
+  end
+end
+end
+end
+end
+
 end

data/lib/patches/write_concern.rb

@@ -0,0 +1,10 @@
+# Safe mode should set WriteConcern: Acknowledged in order to support MongoDB 3.4+
+
+if Mongoid::VERSION =~ /\A3\./
+
+  class TrueClass
+    def __safe_options__
+      { w: 1 }
+    end
+  end
+end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module MongoidMonkey
-  VERSION = '0.2.5'
+  VERSION = '0.3.0'
 end

data/spec/app/models/address.rb

@@ -21,4 +21,5 @@ class Address
   field :name, localize: true
 
   embedded_in :addressable, polymorphic: true
+  embeds_many :locations, validate: false
 end

data/spec/app/models/album.rb

@@ -0,0 +1,14 @@
+class Album
+  include Mongoid::Document
+
+  belongs_to :artist
+  before_destroy :set_parent_name
+
+  attr_accessor :before_add_called
+
+  private
+
+  def set_parent_name
+    artist.name = "destroyed"
+  end
+end

data/spec/app/models/animal.rb

@@ -0,0 +1,25 @@
+class Animal
+  include Mongoid::Document
+
+  field :_id, type: String, default: ->{ name.try(:parameterize) }
+
+  field :name
+  field :height, type: Integer
+  field :weight, type: Integer
+  field :tags, type: Array
+
+  embedded_in :person
+  embedded_in :circus
+
+  validates_format_of :name, without: /\$\$\$/
+
+  accepts_nested_attributes_for :person
+
+  def tag_list
+    tags.join(", ")
+  end
+
+  def tag_list=(_tag_list)
+    self.tags = _tag_list.split(",").map(&:strip)
+  end
+end

data/spec/app/models/appointment.rb

@@ -0,0 +1,7 @@
+class Appointment
+  include Mongoid::Document
+  field :active, type: Boolean, default: true
+  field :timed, type: Boolean, default: true
+  embedded_in :person
+  default_scope where(active: true)
+end

data/spec/app/models/artist.rb

@@ -0,0 +1,66 @@
+class Artist
+  include Mongoid::Document
+
+  attr_accessor :before_add_called, :after_add_called, :before_add_referenced_called, :after_add_referenced_called, :before_remove_embedded_called, :after_remove_embedded_called, :before_remove_referenced_called, :after_remove_referenced_called
+
+  field :name, type: String
+
+  embeds_many :songs, before_add: [ :before_add_song, Proc.new { |artist, song| song.before_add_called = true } ], before_remove: :before_remove_song
+  embeds_many :labels, after_add: :after_add_label, after_remove: :after_remove_label
+  has_many :albums, dependent: :destroy, before_add: [:before_add_album, Proc.new { |artist, album| album.before_add_called = true} ], after_add: :after_add_album, before_remove: :before_remove_album, after_remove: :after_remove_album
+
+  before_create :before_create_stub
+  after_create :create_songs
+  before_save :before_save_stub
+  before_destroy :before_destroy_stub
+
+  protected
+  def before_create_stub
+    true
+  end
+
+  def before_save_stub
+    true
+  end
+
+  def before_destroy_stub
+    true
+  end
+
+  def create_songs
+    2.times { |n| songs.create!(title: "#{n}") }
+  end
+
+  def before_add_song(song)
+    @before_add_called = true
+  end
+
+  def after_add_label(label)
+    @after_add_called = true
+  end
+
+  def before_add_album(album)
+    @before_add_referenced_called = true
+  end
+
+  def after_add_album(album)
+    @after_add_referenced_called = true
+  end
+
+  def before_remove_song(song)
+    @before_remove_embedded_called = true
+  end
+
+  def after_remove_label(label)
+    @after_remove_embedded_called = true
+  end
+
+  def before_remove_album(album)
+    @before_remove_referenced_called = true
+  end
+
+  def after_remove_album(album)
+    @after_remove_referenced_called = true
+  end
+
+end

data/spec/app/models/circus.rb

@@ -0,0 +1,7 @@
+class Circus
+  include Mongoid::Document
+
+  field :name
+
+  embeds_many :animals
+end

data/spec/app/models/country_code.rb

@@ -0,0 +1,8 @@
+class CountryCode
+  include Mongoid::Document
+
+  field :_id, type: Integer, default: ->{ code }
+
+  field :code, type: Integer
+  embedded_in :phone_number, class_name: "Phone"
+end

data/spec/app/models/label.rb

@@ -0,0 +1,39 @@
+class Label
+  include Mongoid::Document
+  include Mongoid::Timestamps::Updated::Short
+
+  field :name, type: String
+  field :after_create_called, type: Boolean, default: false
+  field :after_save_called, type: Boolean, default: false
+  field :after_update_called, type: Boolean, default: false
+  field :after_validation_called, type: Boolean, default: false
+
+  embedded_in :artist
+
+  after_create :after_create_stub
+  after_save :after_save_stub
+  after_update :after_update_stub
+  after_validation :after_validation_stub
+  before_validation :cleanup
+
+  def after_create_stub
+    self.after_create_called = true
+  end
+
+  def after_save_stub
+    self.after_save_called = true
+  end
+
+  def after_update_stub
+    self.after_update_called = true
+  end
+
+  def after_validation_stub
+    self.after_validation_called = true
+  end
+
+  private
+  def cleanup
+    self.name = self.name.downcase.capitalize
+  end
+end

data/spec/app/models/location.rb

@@ -0,0 +1,8 @@
+class Location
+  include Mongoid::Document
+  field :name
+  field :info, type: Hash
+  field :occupants, type: Array
+  field :number, type: Integer
+  embedded_in :address
+end

data/spec/app/models/page.rb

@@ -1,6 +1,7 @@
 class Page
   include Mongoid::Document
-
+  embedded_in :quiz
+  embeds_many :page_questions
   embedded_in :book, touch: true
   field :content, :type => String
 end

data/spec/app/models/page_question.rb

@@ -0,0 +1,4 @@
+class PageQuestion
+  include Mongoid::Document
+  embedded_in :page
+end

data/spec/app/models/person.rb

@@ -39,6 +39,11 @@ class Person
   field :range, type: Range
 
   embeds_many :addresses, as: :addressable, validate: false
+  embeds_many :videos, order: [[ :title, :asc ]], validate: false
+  embeds_many :appointments, validate: false
+  embeds_many :symptoms, validate: false
+  embeds_many :phone_numbers, class_name: "Phone", validate: false
+  embeds_many :phones, store_as: :mobile_phones, validate: false
   embeds_one :name, as: :namable, validate: false do
     def extension
       "Testing"

data/spec/app/models/phone.rb

@@ -0,0 +1,11 @@
+class Phone
+  include Mongoid::Document
+
+  attr_accessor :number_in_observer
+
+  field :_id, type: String, default: ->{ number }
+
+  field :number
+  embeds_one :country_code
+  embedded_in :person
+end

data/spec/app/models/quiz.rb

@@ -0,0 +1,10 @@
+class Quiz
+  include Mongoid::Document
+  include Mongoid::Timestamps::Created
+  field :name, type: String
+  field :topic, type: String
+  embeds_many :pages
+
+  attr_accessible :topic, as: [ :default, :admin ]
+  attr_accessible :name, as: :default
+end

data/spec/app/models/role.rb

@@ -0,0 +1,7 @@
+class Role
+  include Mongoid::Document
+  field :name, type: String
+  belongs_to :user
+  belongs_to :post
+  recursively_embeds_many
+end

data/spec/app/models/song.rb

@@ -0,0 +1,8 @@
+class Song
+  include Mongoid::Document
+  field :title
+  embedded_in :artist
+
+  attr_accessor :before_add_called
+
+end

data/spec/app/models/symptom.rb

@@ -0,0 +1,6 @@
+class Symptom
+  include Mongoid::Document
+  field :name, type: String
+  embedded_in :person
+  default_scope asc(:name)
+end

data/spec/app/models/user.rb

@@ -3,4 +3,5 @@ class User
   include Mongoid::Document
   field :name
   index name: 1
+  has_one :role, validate: false
 end