mongoid 3.1.6 → 4.0.2

data/spec/app/models/country_code.rb

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

data/spec/app/models/definition.rb

@@ -2,8 +2,8 @@ class Definition
   include Mongoid::Document
   field :description, type: String
   field :p, as: :part, type: String
-  field :regular, type: Boolean
+  field :regular, type: Mongoid::Boolean
   field :syn, as: :synonyms, localize: true, type: String
-  field :active, type: Boolean, localize: true, default: true
+  field :active, type: Mongoid::Boolean, localize: true, default: true
   embedded_in :word
 end

data/spec/app/models/dog.rb

@@ -3,5 +3,5 @@ class Dog
   field :name, type: String
   has_and_belongs_to_many :breeds
   has_and_belongs_to_many :fire_hydrants, primary_key: :location
-  default_scope asc(:name)
+  default_scope ->{ asc(:name) }
 end

data/spec/app/models/draft.rb

@@ -0,0 +1,9 @@
+class Draft
+  include Mongoid::Document
+
+  field :text
+
+  recursively_embeds_one
+
+  index text: 1
+end

data/spec/app/models/dragon.rb

@@ -0,0 +1,4 @@
+class Dragon
+  include Mongoid::Document
+  has_and_belongs_to_many :dungeons
+end

data/spec/app/models/drug.rb

@@ -1,8 +1,6 @@
 class Drug
   include Mongoid::Document
   field :name, type: String
-  field :generic, type: Boolean
+  field :generic, type: Mongoid::Boolean
   belongs_to :person, counter_cache: true
-  attr_accessible :name, as: [ :default, :admin ]
-  attr_accessible :person_id
 end

data/spec/app/models/dungeon.rb

@@ -0,0 +1,4 @@
+class Dungeon
+  include Mongoid::Document
+  has_and_belongs_to_many :dragons
+end

data/spec/app/models/edit.rb

@@ -0,0 +1,5 @@
+class Edit
+  include Mongoid::Document
+  include Mongoid::Timestamps::Updated
+  embedded_in :wiki_page, touch: true
+end

data/spec/app/models/even.rb

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

data/spec/app/models/event.rb

@@ -17,6 +17,6 @@ class Event
     end
   end
 
-  scope :best, where(:kind.in => [ "party", "concert" ])
+  scope :best, ->{ where(:kind.in => [ "party", "concert" ]) }
   scope :by_kind, ->(kind){ where(:kind.in => [kind]) }
 end

data/spec/app/models/filesystem.rb

@@ -1,4 +1,5 @@
 class Filesystem
   include Mongoid::Document
+  include Mongoid::Attributes::Dynamic
   embedded_in :server
 end

data/spec/app/models/fish.rb

@@ -1,6 +1,5 @@
 class Fish
   include Mongoid::Document
-  include Mongoid::Paranoia
 
   def self.fresh
     where(fresh: true)

data/spec/app/models/fruits.rb

@@ -2,6 +2,7 @@ module Fruits
   class Apple
     include Mongoid::Document
     has_many :bananas, class_name: "Fruits::Banana"
+    has_many :fruits_melons, class_name: "Fruits::Melon"
     recursively_embeds_many
   end
 
@@ -10,6 +11,11 @@ module Fruits
     belongs_to :apple, class_name: "Fruits::Apple"
   end
 
+  class Melon
+    include Mongoid::Document
+    belongs_to :fruit_apple, class_name: "Fruits::Apple"
+  end
+
   class Pineapple
     include Mongoid::Document
     recursively_embeds_many cascade_callbacks: true

data/spec/app/models/game.rb

@@ -13,8 +13,6 @@ class Game
 
   validates_format_of :name, without: /\$\$\$/
 
-  attr_protected :_id
-
   set_callback(:initialize, :after) do |document|
     write_attribute("name", "Testing") unless name
   end

data/spec/app/models/house.rb

@@ -2,7 +2,5 @@ class House
   include Mongoid::Document
   field :name, type: String
   field :model, type: String
-  attr_accessible :name, as: [ :default, :admin ]
-
-  default_scope asc(:name)
+  default_scope ->{ asc(:name) }
 end

data/spec/app/models/id_key.rb

@@ -0,0 +1,6 @@
+class IdKey
+  include Mongoid::Document
+  field :key
+  alias_method :id,  :key
+  alias_method :id=, :key=
+end

data/spec/app/models/item.rb

@@ -1,12 +1,8 @@
 class Item
   include Mongoid::Document
   field :title, type: String
-  field :is_rss, type: Boolean, default: false
+  field :is_rss, type: Mongoid::Boolean, default: false
   field :user_login, type: String
-
-  attr_protected :title, as: [:default, :parser]
-  attr_protected :is_rss, as: :parser
-  attr_protected :user_login
 end
 
 require "app/models/sub_item"

data/spec/app/models/jar.rb

@@ -2,6 +2,6 @@ class Jar
   include Mongoid::Document
   include Mongoid::Timestamps::Updated
 
-  field :_id, type: Integer
+  field :_id, type: Integer, overwrite: true
   has_many :cookies, class_name: "Cookie"
 end

data/spec/app/models/label.rb

@@ -3,10 +3,10 @@ class Label
   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
+  field :after_create_called, type: Mongoid::Boolean, default: false
+  field :after_save_called, type: Mongoid::Boolean, default: false
+  field :after_update_called, type: Mongoid::Boolean, default: false
+  field :after_validation_called, type: Mongoid::Boolean, default: false
 
   embedded_in :artist
   embedded_in :band

data/spec/app/models/line_item.rb

@@ -2,5 +2,5 @@ class LineItem
   include Mongoid::Document
   embedded_in :purchase
   belongs_to :product, polymorphic: true
-  validates :product, presence: true
+  validates :product, presence: true, uniqueness: { scope: :product }
 end

data/spec/app/models/login.rb

@@ -1,7 +1,7 @@
 class Login
   include Mongoid::Document
 
-  field :_id, type: String, default: ->{ username }
+  field :_id, type: String, overwrite: true, default: ->{ username }
 
   field :username, type: String
   field :application_id, type: Integer

data/spec/app/models/message.rb

@@ -0,0 +1,8 @@
+class Message
+  include Mongoid::Document
+
+  field :body, type: String
+
+  embedded_in :person
+  has_and_belongs_to_many :receviers, class_name: "Person", inverse_of: nil
+end

data/spec/app/models/movie.rb

@@ -1,5 +1,6 @@
 class Movie
   include Mongoid::Document
+  include Mongoid::Attributes::Dynamic
   field :title, type: String
   field :poster, type: Image
   field :poster_thumb, type: Thumbnail

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: /\$\$\$/