mongoid 3.1.7 → 4.0.0

data/spec/app/models/name.rb

@@ -1,13 +1,15 @@
 class Name
   include Mongoid::Document
+  include Mongoid::Attributes::Dynamic
 
-  field :_id, type: String, default: ->{
+  field :_id, type: String, overwrite: true, default: ->{
     "#{first_name}-#{last_name}"
   }
 
   field :first_name, type: String
   field :last_name, type: String
   field :parent_title, type: String
+  field :middle, type: String
 
   embeds_many :translations, validate: false
   embeds_one :language, as: :translatable, validate: false
@@ -15,8 +17,6 @@ class Name
 
   accepts_nested_attributes_for :language
 
-  attr_protected :_id, :id
-
   def set_parent=(set = false)
     self.parent_title = namable.title if set
   end

data/spec/app/models/note.rb

@@ -1,11 +1,13 @@
 class Note
   include Mongoid::Document
   field :text, type: String
-  field :saved, type: Boolean, default: false
+  field :saved, type: Mongoid::Boolean, default: false
   embedded_in :noteable, polymorphic: true
 
   after_save :update_saved
 
+  scope :permanent, ->{ where(saved: true) }
+
   def update_saved
     self.saved = true
   end

data/spec/app/models/odd.rb

@@ -0,0 +1,7 @@
+class Odd
+  include Mongoid::Document
+  field :name
+
+  belongs_to :parent, class_name: 'Even', inverse_of: :odds
+  has_many :evens, inverse_of: :parent
+end

data/spec/app/models/oscar.rb

@@ -1,7 +1,7 @@
 class Oscar
   include Mongoid::Document
   field :title, type: String
-  field :destroy_after_save, type: Boolean, default: false
+  field :destroy_after_save, type: Mongoid::Boolean, default: false
   before_save :complain
 
   def complain

data/spec/app/models/parent_doc.rb

@@ -2,5 +2,5 @@ class ParentDoc
   include Mongoid::Document
   field :statistic
   field :children_order, type: Array, default: [] # hold all the children's id
-  embeds_many :child_docs
+  embeds_many :children, class_name: 'ChildDoc', inverse_of: :parent_doc
 end

data/spec/app/models/person.rb

@@ -1,5 +1,6 @@
 class Person
   include Mongoid::Document
+  include Mongoid::Attributes::Dynamic
   attr_accessor :mode
 
   class_attribute :somebody_elses_important_class_options
@@ -7,8 +8,8 @@ class Person
 
   field :username, default: -> { "arthurnn#{rand(0..10)}" }
   field :title
-  field :terms, type: Boolean
-  field :pets, type: Boolean, default: false
+  field :terms, type: Mongoid::Boolean
+  field :pets, type: Mongoid::Boolean, default: false
   field :age, type: Integer, default: "100"
   field :dob, type: Date
   field :employer_id
@@ -23,7 +24,7 @@ class Person
   field :owner_id, type: Integer
   field :security_code
   field :reading, type: Object
-  field :bson_id, type: Moped::BSON::ObjectId
+  field :bson_id, type: BSON::ObjectId
   field :pattern, type: Regexp
   field :override_me, type: Integer
   field :at, as: :aliased_timestamp, type: Time
@@ -31,6 +32,10 @@ class Person
   field :i, as: :inte, type: Integer
   field :a, as: :array, type: Array
   field :desc, localize: true
+  field :test_array, type: Array
+  field :overridden_setter, type: String
+  field :arrays, type: Array
+  field :range, type: Range
 
   index age: 1
   index addresses: 1
@@ -42,8 +47,6 @@ class Person
 
   attr_reader :rescored
 
-  attr_protected :security_code, :owner_id, :appointments
-
   embeds_many :favorites, order: :title.desc, inverse_of: :perp, validate: false
   embeds_many :videos, order: [[ :title, :asc ]], validate: false
   embeds_many :phone_numbers, class_name: "Phone", validate: false
@@ -58,10 +61,10 @@ class Person
   end
 
   embeds_many :address_components, validate: false
-  embeds_many :paranoid_phones, validate: false
   embeds_many :services, cascade_callbacks: true, validate: false
   embeds_many :symptoms, validate: false
   embeds_many :appointments, validate: false
+  embeds_many :messages, validate: false
 
   embeds_one :passport, autobuild: true, store_as: :pass, validate: false
   embeds_one :pet, class_name: "Animal", validate: false
@@ -90,7 +93,6 @@ class Person
     end
   end
   has_many :ordered_posts, order: :rating.desc, validate: false
-  has_many :paranoid_posts, validate: false
   has_and_belongs_to_many \
     :preferences,
     index: true,
@@ -114,7 +116,6 @@ class Person
     validate: false
 
   accepts_nested_attributes_for :addresses
-  accepts_nested_attributes_for :paranoid_phones
   accepts_nested_attributes_for :name, update_only: true
   accepts_nested_attributes_for :pet, allow_destroy: true
   accepts_nested_attributes_for :game, allow_destroy: true
@@ -124,8 +125,8 @@ class Person
   accepts_nested_attributes_for :quiz
   accepts_nested_attributes_for :services, allow_destroy: true
 
-  scope :minor, where(:age.lt => 18)
-  scope :without_ssn, without(:ssn)
+  scope :minor, ->{ where(:age.lt => 18) }
+  scope :without_ssn, ->{ without(:ssn) }
   scope :search, ->(query){ any_of({ title: query }) }
 
   def score_with_rescoring=(score)
@@ -153,6 +154,11 @@ class Person
     read_attribute(:override_me).to_s
   end
 
+  def overridden_setter=(value)
+    @override_called = true
+    super(value)
+  end
+
   class << self
     def accepted
       scoped.where(terms: true)

data/spec/app/models/phone.rb

@@ -1,9 +1,7 @@
 class Phone
   include Mongoid::Document
 
-  attr_accessor :number_in_observer
-
-  field :_id, type: String, default: ->{ number }
+  field :_id, type: String, overwrite: true, default: ->{ number }
 
   field :number
   embeds_one :country_code

data/spec/app/models/player.rb

@@ -1,18 +1,18 @@
 class Player
   include Mongoid::Document
-  field :active, type: Boolean
+  field :active, type: Mongoid::Boolean
   field :frags, type: Integer
   field :deaths, type: Integer
   field :impressions, type: Integer, default: 0
   field :status
 
-  scope :active, where(active: true) do
+  scope :active, ->{ where(active: true) } do
     def extension
       "extension"
     end
   end
 
-  scope :inactive, where(active: false)
+  scope :inactive, ->{ where(active: false) }
   scope :frags_over, ->(count) { where(:frags.gt => count) }
   scope :deaths_under, ->(count) { where(:deaths.lt => count) }
   scope :deaths_over, ->(count) { where(:deaths.gt => count) }

data/spec/app/models/post.rb

@@ -1,10 +1,11 @@
 class Post
   include Mongoid::Document
+  include Mongoid::Attributes::Dynamic
 
   field :title, type: String
   field :content, type: String
   field :rating, type: Integer
-  field :person_title, type: String, default: ->{ person.try(:title) }
+  field :person_title, type: String, default: ->{ person.title if ivar(:person) }
 
   attr_accessor :before_add_called, :after_add_called, :before_remove_called, :after_remove_called
 
@@ -14,8 +15,9 @@ class Post
   has_many :videos, validate: false
   has_many :roles, validate: false
 
-  scope :recent, where(created_at: { "$lt" => Time.now, "$gt" => 30.days.ago })
-  scope :posting, where(:content.in => [ "Posting" ])
+  scope :recent, ->{ where(created_at: { "$lt" => Time.now, "$gt" => 30.days.ago }) }
+  scope :posting, ->{ where(:content.in => [ "Posting" ]) }
+  scope :open, ->{ where(title: "open") }
 
   validates_format_of :title, without: /\$\$\$/
 

data/spec/app/models/preference.rb

@@ -5,5 +5,5 @@ class Preference
   field :ranking, type: Integer
   has_and_belongs_to_many :people, validate: false
   validates_length_of :name, minimum: 2, allow_nil: true
-  scope :posting, where(:value.in => [ "Posting" ])
+  scope :posting, ->{ where(:value.in => [ "Posting" ]) }
 end

data/spec/app/models/quiz.rb

@@ -4,7 +4,4 @@ class Quiz
   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/record.rb

@@ -2,11 +2,11 @@ class Record
   include Mongoid::Document
   field :name, type: String
 
-  field :before_create_called, type: Boolean, default: false
-  field :before_save_called, type: Boolean, default: false
-  field :before_update_called, type: Boolean, default: false
-  field :before_validation_called, type: Boolean, default: false
-  field :before_destroy_called, type: Boolean, default: false
+  field :before_create_called, type: Mongoid::Boolean, default: false
+  field :before_save_called, type: Mongoid::Boolean, default: false
+  field :before_update_called, type: Mongoid::Boolean, default: false
+  field :before_validation_called, type: Mongoid::Boolean, default: false
+  field :before_destroy_called, type: Mongoid::Boolean, default: false
 
   embedded_in :band
   embeds_many :tracks, cascade_callbacks: true
@@ -43,4 +43,9 @@ class Record
   def access_band
     band.name
   end
+
+  def dont_call_me_twice
+  end
+
+  validate { dont_call_me_twice }
 end

data/spec/app/models/registry.rb

@@ -1,4 +1,4 @@
 class Registry
   include Mongoid::Document
-  field :data, type: Moped::BSON::Binary
+  field :data, type: BSON::Binary
 end

data/spec/app/models/server.rb

@@ -1,7 +1,7 @@
 class Server
   include Mongoid::Document
   field :name, type: String
-  field :after, type: Boolean, default: false
+  field :after, type: Mongoid::Boolean, default: false
   belongs_to :node
   embeds_many :filesystems, validate: false
   accepts_nested_attributes_for :filesystems

data/spec/app/models/service.rb

@@ -1,9 +1,9 @@
 class Service
   include Mongoid::Document
   field :sid
-  field :before_destroy_called, type: Boolean, default: false
-  field :after_destroy_called, type: Boolean, default: false
-  field :after_initialize_called, type: Boolean, default: false
+  field :before_destroy_called, type: Mongoid::Boolean, default: false
+  field :after_destroy_called, type: Mongoid::Boolean, default: false
+  field :after_initialize_called, type: Mongoid::Boolean, default: false
   embedded_in :person
   belongs_to :target, class_name: "User"
   validates_numericality_of :sid

data/spec/app/models/sound.rb

@@ -0,0 +1,5 @@
+class Sound
+  include Mongoid::Document
+  field :active, type: Mongoid::Boolean
+  default_scope ->{ where(active: true) }
+end

data/spec/app/models/symptom.rb

@@ -2,5 +2,5 @@ class Symptom
   include Mongoid::Document
   field :name, type: String
   embedded_in :person
-  default_scope asc(:name)
+  default_scope ->{ asc(:name) }
 end

data/spec/app/models/template.rb

@@ -1,5 +1,5 @@
 class Template
   include Mongoid::Document
-  field :active, type: Boolean, default: false
+  field :active, type: Mongoid::Boolean, default: false
   validates :active, presence: true
 end

data/spec/app/models/title.rb

@@ -1,4 +1,3 @@
 class Title
   include Mongoid::Document
-  belongs_to :paranoid_post
 end

data/spec/app/models/track.rb

@@ -2,11 +2,11 @@ class Track
   include Mongoid::Document
   field :name, type: String
 
-  field :before_create_called, type: Boolean, default: false
-  field :before_save_called, type: Boolean, default: false
-  field :before_update_called, type: Boolean, default: false
-  field :before_validation_called, type: Boolean, default: false
-  field :before_destroy_called, type: Boolean, default: false
+  field :before_create_called, type: Mongoid::Boolean, default: false
+  field :before_save_called, type: Mongoid::Boolean, default: false
+  field :before_update_called, type: Mongoid::Boolean, default: false
+  field :before_validation_called, type: Mongoid::Boolean, default: false
+  field :before_destroy_called, type: Mongoid::Boolean, default: false
 
   embedded_in :record
 

data/spec/app/models/tree.rb

@@ -2,8 +2,8 @@ class Tree
   include Mongoid::Document
 
   field :name
-  field :evergreen, type: Boolean
+  field :evergreen, type: Mongoid::Boolean
 
-  scope :verdant, where(evergreen: true)
-  default_scope asc(:name)
+  scope :verdant, ->{ where(evergreen: true) }
+  default_scope ->{ asc(:name) }
 end

data/spec/app/models/video.rb

@@ -9,9 +9,5 @@ class Video
   belongs_to :post
   belongs_to :game
 
-  default_scope asc(:title)
-
-  attr_accessible :title, as: [ :default, :admin ]
-  attr_accessible :year, as: [ :default ]
-  attr_accessible :person_attributes, as: [ :default ]
+  default_scope ->{ asc(:title) }
 end

data/spec/app/models/wiki_page.rb

@@ -1,16 +1,13 @@
 class WikiPage
   include Mongoid::Document
   include Mongoid::Timestamps
-  include Mongoid::Versioning
 
   field :title, type: String
-  field :transient_property, type: String, versioned: false
+  field :transient_property, type: String
   field :author, type: String
   field :description, type: String, localize: true
-  max_versions 5
-
-  attr_protected :author
 
+  embeds_many :edits, validate: false
   has_many :comments, dependent: :destroy, validate: false
   has_many :child_pages, class_name: "WikiPage", dependent: :delete, inverse_of: :parent_pages
   belongs_to :parent_pages, class_name: "WikiPage", inverse_of: :child_pages

data/spec/app/models/word.rb

@@ -1,6 +1,7 @@
 class Word
   include Mongoid::Document
   field :name, type: String
+  field :origin, type: String
 
   belongs_to :dictionary
 
@@ -9,4 +10,6 @@ class Word
   embeds_one :pronunciation, validate: false
 
   accepts_nested_attributes_for :definitions, allow_destroy: true
+
+  index({ name: "text" }, default_language: "english")
 end

data/spec/app/models/word_origin.rb

@@ -1,7 +1,7 @@
 class WordOrigin
   include Mongoid::Document
 
-  field :_id, type: Integer, default: ->{ origin_id }
+  field :_id, type: Integer, overwrite: true, default: ->{ origin_id }
 
   field :origin_id, type: Integer
   field :country, type: String

data/spec/config/mongoid.yml

@@ -5,7 +5,7 @@ test:
       hosts:
         - <%=ENV["MONGOID_SPEC_HOST"]%>:<%=ENV["MONGOID_SPEC_PORT"]%>
       options:
-        consistency: :strong
+        read: primary
     mongohq_single:
       database: <%=ENV["MONGOHQ_SINGLE_NAME"]%>
       username: <%=ENV["MONGOHQ_SINGLE_USER"]%>
@@ -13,8 +13,9 @@ test:
       hosts:
         - <%=ENV["MONGOHQ_SINGLE_URL"]%>
       options:
-        safe: true
-        consistency: :strong
+        write:
+          w: 1
+        read: primary
     mongohq_repl:
       database: <%=ENV["MONGOHQ_REPL_NAME"]%>
       username: <%=ENV["MONGOHQ_REPL_USER"]%>
@@ -23,18 +24,16 @@ test:
         - <%=ENV["MONGOHQ_REPL_1_URL"]%>
         - <%=ENV["MONGOHQ_REPL_2_URL"]%>
       options:
-        consistency: :strong
-        safe: true
+        read: primary
+        write:
+          w: majority
     mongohq_repl_uri:
       uri: <%= ENV["MONGOHQ_REPL_URI"]%>
   options:
-    allow_dynamic_fields: true
-    identity_map_enabled: false
     include_root_in_json: false
     include_type_for_serialization: false
     preload_models: false
     scope_overwrite_exception: false
     raise_not_found_error: true
-    skip_version_check: true
     use_activesupport_time_zone: true
     use_utc: false

data/spec/helpers.rb

@@ -0,0 +1,18 @@
+require 'mongoid/support/query_counter'
+
+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}
+])
+    end
+
+    def expect_no_queries(&block)
+      expect_query(0, &block)
+    end
+  end
+end

data/spec/mongoid/atomic/modifiers_spec.rb

@@ -15,7 +15,7 @@ describe Mongoid::Atomic::Modifiers do
       end
 
       it "does not contain any operations" do
-        modifiers.should eq({})
+        expect(modifiers).to eq({})
       end
     end
 
@@ -32,7 +32,7 @@ describe Mongoid::Atomic::Modifiers do
         end
 
         it "adds the add to set with each modifiers" do
-          modifiers.should eq({
+          expect(modifiers).to eq({
             "$addToSet" => { "preference_ids" => { "$each" => [ "one", "two" ] }}
           })
         end
@@ -50,7 +50,7 @@ describe Mongoid::Atomic::Modifiers do
         end
 
         it "adds the add to set with each modifiers" do
-          modifiers.should eq({
+          expect(modifiers).to eq({
             "$addToSet" =>
               { "preference_ids" =>
                 { "$each" => [ "one", "two", "three" ] }
@@ -70,7 +70,7 @@ describe Mongoid::Atomic::Modifiers do
       end
 
       it "does not contain any pull operations" do
-        modifiers.should eq({})
+        expect(modifiers).to eq({})
       end
     end
 
@@ -87,7 +87,7 @@ describe Mongoid::Atomic::Modifiers do
         end
 
         it "adds the push all modifiers" do
-          modifiers.should eq(
+          expect(modifiers).to eq(
             { "$pull" => { "addresses" => { "_id" => { "$in" => [ "one" ]}}}}
           )
         end
@@ -109,7 +109,7 @@ describe Mongoid::Atomic::Modifiers do
         end
 
         it "overwrites the previous pulls" do
-          modifiers.should eq(
+          expect(modifiers).to eq(
             { "$pull" => { "addresses" => { "_id" => { "$in" => [ "two" ]}}}}
           )
         end
@@ -126,7 +126,7 @@ describe Mongoid::Atomic::Modifiers do
       end
 
       it "does not contain any pull operations" do
-        modifiers.should eq({})
+        expect(modifiers).to eq({})
       end
     end
 
@@ -143,7 +143,7 @@ describe Mongoid::Atomic::Modifiers do
         end
 
         it "adds the push all modifiers" do
-          modifiers.should eq(
+          expect(modifiers).to eq(
             { "$pullAll" =>
               { "addresses" => [
                   { "_id" => "one" }
@@ -170,7 +170,7 @@ describe Mongoid::Atomic::Modifiers do
         end
 
         it "adds the pull all modifiers" do
-          modifiers.should eq(
+          expect(modifiers).to eq(
             { "$pullAll" =>
               { "addresses" => [
                   { "street" => "Hobrechtstr." },
@@ -193,7 +193,7 @@ describe Mongoid::Atomic::Modifiers do
       end
 
       it "does not contain any push operations" do
-        modifiers.should eq({})
+        expect(modifiers).to eq({})
       end
     end
 
@@ -210,7 +210,7 @@ describe Mongoid::Atomic::Modifiers do
         end
 
         it "adds the push all modifiers" do
-          modifiers.should eq(
+          expect(modifiers).to eq(
             { "$pushAll" =>
               { "addresses" => [
                   { "street" => "Oxford St" }
@@ -237,7 +237,7 @@ describe Mongoid::Atomic::Modifiers do
         end
 
         it "adds the push all modifiers" do
-          modifiers.should eq(
+          expect(modifiers).to eq(
             { "$pushAll" =>
               { "addresses" => [
                   { "street" => "Hobrechtstr." },
@@ -268,7 +268,7 @@ describe Mongoid::Atomic::Modifiers do
         end
 
         it "adds the push all modifiers to the conflicts hash" do
-          modifiers.should eq(
+          expect(modifiers).to eq(
             { "$set" => { "addresses.0.street" => "Bond" },
               conflicts: { "$pushAll" =>
                 { "addresses" => [
@@ -297,7 +297,7 @@ describe Mongoid::Atomic::Modifiers do
         end
 
         it "adds the push all modifiers to the conflicts hash" do
-          modifiers.should eq(
+          expect(modifiers).to eq(
             { "$pullAll" => {
               "addresses" => { "street" => "Bond St" }},
               conflicts: { "$pushAll" =>
@@ -327,7 +327,7 @@ describe Mongoid::Atomic::Modifiers do
         end
 
         it "adds the push all modifiers to the conflicts hash" do
-          modifiers.should eq(
+          expect(modifiers).to eq(
             { "$pushAll" => {
               "addresses.0.locations" => [{ "street" => "Bond St" }]},
               conflicts: { "$pushAll" =>
@@ -360,14 +360,14 @@ describe Mongoid::Atomic::Modifiers do
           end
 
           it "adds the sets to the modifiers" do
-            modifiers.should eq({ "$set" => { "title" => "Sir" } })
+            expect(modifiers).to eq({ "$set" => { "title" => "Sir" } })
           end
         end
 
         context "when the sets contain an id" do
 
           let(:sets) do
-            { "_id" => Moped::BSON::ObjectId.new }
+            { "_id" => BSON::ObjectId.new }
           end
 
           before do
@@ -375,7 +375,7 @@ describe Mongoid::Atomic::Modifiers do
           end
 
           it "does not include the id sets" do
-            modifiers.should eq({})
+            expect(modifiers).to eq({})
           end
         end
 
@@ -386,7 +386,7 @@ describe Mongoid::Atomic::Modifiers do
           end
 
           it "does not contain set operations" do
-            modifiers.should eq({})
+            expect(modifiers).to eq({})
           end
         end
       end
@@ -407,7 +407,7 @@ describe Mongoid::Atomic::Modifiers do
         end
 
         it "adds the set modifiers to the conflicts hash" do
-          modifiers.should eq(
+          expect(modifiers).to eq(
             { "$pullAll" =>
               { "addresses" => [
                   { "_id" => "one" }
@@ -437,7 +437,7 @@ describe Mongoid::Atomic::Modifiers do
         end
 
         it "adds the unsets to the modifiers" do
-          modifiers.should eq({ "$unset" => { "addresses" => true } })
+          expect(modifiers).to eq({ "$unset" => { "addresses" => true } })
         end
       end
 
@@ -448,7 +448,7 @@ describe Mongoid::Atomic::Modifiers do
         end
 
         it "does not contain unset operations" do
-          modifiers.should eq({})
+          expect(modifiers).to eq({})
         end
       end
     end