mongoid 3.1.7 → 4.0.0.alpha1

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,6 +1,6 @@
 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

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
 

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

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/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,7 +2,7 @@ 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)

data/spec/app/models/video.rb

@@ -10,8 +10,4 @@ class Video
   belongs_to :game
 
   default_scope asc(:title)
-
-  attr_accessible :title, as: [ :default, :admin ]
-  attr_accessible :year, as: [ :default ]
-  attr_accessible :person_attributes, as: [ :default ]
 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
-
   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

data/spec/mongoid/atomic/paths/embedded/many_spec.rb

@@ -25,21 +25,21 @@ describe Mongoid::Atomic::Paths::Embedded::Many do
   describe "#delete_modifier" do
 
     it "returns $pull" do
-      many.delete_modifier.should eq("$pull")
+      expect(many.delete_modifier).to eq("$pull")
     end
   end
 
   describe "#document" do
 
     it "returns the document" do
-      many.document.should eq(address)
+      expect(many.document).to eq(address)
     end
   end
 
   describe "#insert_modifier" do
 
     it "returns $push" do
-      many.insert_modifier.should eq("$push")
+      expect(many.insert_modifier).to eq("$push")
     end
   end
 
@@ -48,7 +48,7 @@ describe Mongoid::Atomic::Paths::Embedded::Many do
     context "when the document is embedded one level" do
 
       it "returns the name of the relation" do
-        many.path.should eq("addresses")
+        expect(many.path).to eq("addresses")
       end
     end
 
@@ -67,7 +67,7 @@ describe Mongoid::Atomic::Paths::Embedded::Many do
       end
 
       it "returns the nested path to the relation" do
-        many.path.should eq("addresses.locations")
+        expect(many.path).to eq("addresses.locations")
       end
     end
   end
@@ -85,12 +85,12 @@ describe Mongoid::Atomic::Paths::Embedded::Many do
           person.phones << phone
         end
         it "return the name of the store_as in relation" do
-          many.position.should eq("mobile_phones")
+          expect(many.position).to eq("mobile_phones")
         end
       end
 
       it "returns the name of the relation" do
-        many.position.should eq("addresses")
+        expect(many.position).to eq("addresses")
       end
     end
 
@@ -111,48 +111,7 @@ describe Mongoid::Atomic::Paths::Embedded::Many do
       end
 
       it "returns the nested position to the relation" do
-        many.position.should eq("addresses.0.locations.0")
-      end
-    end
-  end
-
-  describe "#selector" do
-
-    context "when the document is embedded one level" do
-
-      it "returns the the hash with parent selector" do
-        many.selector.should eq(
-          { "_id" => person._id, "addresses._id" => address._id }
-        )
-      end
-    end
-
-    context "when the document is embedded multiple levels" do
-
-      let(:location) do
-        Location.new(name: "home")
-      end
-
-      before do
-        address.locations << location
-        address.new_record = false
-        address.post_persist
-        location.new_record = false
-        location.post_persist
-      end
-
-      let(:many) do
-        described_class.new(location)
-      end
-
-      it "returns the hash with all parent selectors" do
-        many.selector.should eq(
-          {
-            "_id" => person._id,
-            "addresses._id" => address._id,
-            "addresses.0.locations._id" => location._id
-          }
-        )
+        expect(many.position).to eq("addresses.0.locations.0")
       end
     end
   end