mongoid 3.1.7 → 4.0.0.alpha1

data/lib/support/ruby_version.rb

@@ -19,7 +19,7 @@ end
 if invalid_version?
   message = %{
 Mongoid requires MRI version 1.9.3+ or JRuby 1.6.0+ running in 1.9 mode.
-You're current Ruby version is defined as #{RUBY_VERSION}. Please see:
+Your current Ruby version is defined as #{RUBY_VERSION}. Please see:
 http://mongoid.org/en/mongoid/docs/tips.html#ruby for details.
   }
   raise_version_error(message)

data/spec/app/models/account.rb

@@ -1,13 +1,13 @@
 class Account
   include Mongoid::Document
 
-  field :_id, type: String, default: ->{ name.try(:parameterize) }
+  field :_id, type: String, overwrite: true, default: ->{ name.try(:parameterize) }
 
   field :number, type: String
   field :balance, type: String
   field :nickname, type: String
   field :name, type: String
-  field :balanced, type: Boolean, default: ->{ balance? ? true : false }
+  field :balanced, type: Mongoid::Boolean, default: ->{ balance? ? true : false }
 
   field :overridden, type: String
 
@@ -18,10 +18,6 @@ class Account
   has_and_belongs_to_many :agents
   has_one :comment, validate: false
 
-  attr_accessible :nickname, as: [ :default, :admin ]
-  attr_accessible :name, as: [ :default, :admin ]
-  attr_accessible :balance, as: :default
-
   validates_presence_of :name
   validates_presence_of :nickname, on: :upsert
   validates_length_of :name, maximum: 10, on: :create

data/spec/app/models/acolyte.rb

@@ -1,5 +1,6 @@
 class Acolyte
   include Mongoid::Document
+  include Mongoid::Attributes::Dynamic
   field :status
   field :name
 

data/spec/app/models/actor.rb

@@ -7,7 +7,6 @@ class Actor
   accepts_nested_attributes_for :things, allow_destroy: true
 
   define_model_callbacks :custom
-  observable :custom
 
   def do_something
     run_callbacks(:custom) do

data/spec/app/models/address.rb

@@ -1,21 +1,26 @@
 class Address
   include Mongoid::Document
 
-  field :_id, type: String, default: ->{ street.try(:parameterize) }
+  field :_id, type: String, overwrite: true, default: ->{ street.try(:parameterize) }
 
   attr_accessor :mode
 
   field :address_type
   field :number, type: Integer
+  field :no, type: Integer
+  field :h, as: :house, type: Integer
   field :street
   field :city
   field :state
   field :post_code
   field :parent_title
   field :services, type: Array
+  field :aliases, as: :a, type: Array
+  field :test, type: Array
   field :latlng, type: Array
   field :map, type: Hash
   field :move_in, type: DateTime
+  field :end_date, type: Date
   field :s, type: String, as: :suite
   field :name, localize: true
 

data/spec/app/models/animal.rb

@@ -1,7 +1,7 @@
 class Animal
   include Mongoid::Document
 
-  field :_id, type: String, default: ->{ name.try(:parameterize) }
+  field :_id, type: String, overwrite: true, default: ->{ name.try(:parameterize) }
 
   field :name
   field :height, type: Integer

data/spec/app/models/appointment.rb

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

data/spec/app/models/article.rb

@@ -2,12 +2,9 @@ class Article
   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_accessible :title, as: [:default, :parser]
-  attr_accessible :is_rss, as: :parser
-  attr_accessible :user_login
   has_and_belongs_to_many :tags, validate: false
   has_and_belongs_to_many :preferences, inverse_of: nil, validate: false
 end

data/spec/app/models/audio.rb

@@ -0,0 +1,5 @@
+class Audio
+  include Mongoid::Document
+  field :likes, type: Integer
+  default_scope where(:likes.gt => 100)
+end

data/spec/app/models/author.rb

@@ -1,6 +1,4 @@
 class Author
   include Mongoid::Document
   field :name, type: String
-
-  belongs_to :paranoid_post
 end

data/spec/app/models/band.rb

@@ -1,7 +1,8 @@
 class Band
   include Mongoid::Document
+  include Mongoid::Attributes::Dynamic
   field :name, type: String
-  field :active, type: Boolean, default: true
+  field :active, type: Mongoid::Boolean, default: true
   field :origin, type: String
   field :genres, type: Array
   field :member_count, type: Integer
@@ -9,7 +10,7 @@ class Band
   field :likes, type: Integer
   field :views, type: Integer
   field :rating, type: Float
-  field :upserted, type: Boolean, default: false
+  field :upserted, type: Mongoid::Boolean, default: false
   field :created, type: DateTime
   field :sales, type: BigDecimal
   field :y, as: :years, type: Integer

data/spec/app/models/bar.rb

@@ -1,5 +1,6 @@
 class Bar
   include Mongoid::Document
+  include Mongoid::Attributes::Dynamic
   field :name, type: String
   field :location, type: Array
   field :lat_lng, type: LatLng

data/spec/app/models/book.rb

@@ -1,5 +1,6 @@
 class Book
   include Mongoid::Document
+  include Mongoid::Attributes::Dynamic
   field :title, type: String
   field :chapters, type: Integer
   belongs_to :series

data/spec/app/models/building.rb

@@ -1,7 +1,5 @@
 class Building
   include Mongoid::Document
-  attr_accessible
-  attr_accessible :building_address, :contractors, as: :admin
   embeds_one :building_address
   embeds_many :contractors
 end

data/spec/app/models/building_address.rb

@@ -1,7 +1,5 @@
 class BuildingAddress
   include Mongoid::Document
-  attr_accessible
-  attr_accessible :city, as: :admin
   embedded_in :building
   field :city, type: String
 end

data/spec/app/models/bus.rb

@@ -1,6 +1,6 @@
 class Bus
   include Mongoid::Document
-  field :saturday, type: Boolean, default: false
+  field :saturday, type: Mongoid::Boolean, default: false
   field :departure_time, type: Time
   field :number, type: Integer
   embedded_in :circuit

data/spec/app/models/canvas.rb

@@ -18,7 +18,7 @@ class Canvas
 
   class Test < Canvas
 
-    field :foo, type: String, default: ->{ "overridden" }
+    field :foo, type: String, overwrite: true, default: ->{ "overridden" }
   end
 end
 

data/spec/app/models/contractor.rb

@@ -1,7 +1,5 @@
 class Contractor
   include Mongoid::Document
-  attr_accessible
-  attr_accessible :name, as: :admin
   embedded_in :building
   field :name, type: String
 end

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

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,7 +61,6 @@ 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
@@ -90,7 +92,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 +115,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
@@ -153,6 +153,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)