mongoid 3.1.6 → 4.0.0

data/lib/rails/generators/mongoid/model/model_generator.rb

@@ -12,7 +12,6 @@ module Mongoid
 
       class_option :timestamps, type: :boolean
       class_option :parent,     type: :string, desc: "The parent class for the generated model"
-      class_option :versioning, type: :boolean, default: false, desc: "Enable mongoid versioning"
       class_option :collection, type: :string, desc: "The collection for storing model's documents"
 
       def create_model_file

data/lib/rails/generators/mongoid/model/templates/model.rb.tt

@@ -6,9 +6,6 @@ class <%= class_name %><%= " < #{options[:parent].classify}" if options[:parent]
 <% if options[:timestamps] -%>
   include Mongoid::Timestamps
 <% end -%>
-<% if options[:versioning] -%>
-  include Mongoid::Versioning
-<% end -%>
 <% if options[:collection] -%>
   store_in collection: "<%= options[:collection] %>"
 <% end -%>

data/lib/rails/generators/mongoid_generator.rb

@@ -11,44 +11,6 @@ module Mongoid
           File.expand_path("../#{base_name}/#{generator_name}/templates", __FILE__)
       end
     end
-
-    class ActiveModel < ::Rails::Generators::ActiveModel
-      def self.all(klass)
-        "#{klass}.all"
-      end
-
-      def self.find(klass, params=nil)
-        "#{klass}.find(#{params})"
-      end
-
-      def self.build(klass, params=nil)
-        if params
-          "#{klass}.new(#{params})"
-        else
-          "#{klass}.new"
-        end
-      end
-
-      def save
-        "#{name}.save"
-      end
-
-      def update_attributes(params=nil)
-        "#{name}.update_attributes(#{params})"
-      end
-
-      def errors
-        "#{name}.errors"
-      end
-
-      def delete
-        "#{name}.delete"
-      end
-
-      def destroy
-        "#{name}.destroy"
-      end
-    end
   end
 end
 
@@ -56,8 +18,9 @@ module Rails
   module Generators
     class GeneratedAttribute
       def type_class
-        return "Time" if type.to_s == "datetime"
-        return "String" if type.to_s == "text"
+        return "Time" if type == :datetime
+        return "String" if type == :text
+        return "Mongoid::Boolean" if type == :boolean
         type.to_s.camelcase
       end
     end

data/lib/rails/mongoid.rb

@@ -3,98 +3,6 @@ module Rails
   module Mongoid
     extend self
 
-    # Create indexes for each model given the provided globs and the class is
-    # not embedded.
-    #
-    # @example Create all the indexes.
-    #   Rails::Mongoid.create_indexes("app/models/**/*.rb")
-    #
-    # @param [ Array<String> ] globs The file matching globs.
-    #
-    # @return [ Array<Class> ] The indexed models.
-    #
-    # @since 2.1.0
-    def create_indexes(*globs)
-      models(*globs).each do |model|
-        next if model.index_options.empty?
-        unless model.embedded?
-          model.create_indexes
-          logger.info("MONGOID: Created indexes on #{model}:")
-          model.index_options.each_pair do |index, options|
-            logger.info("MONGOID: Index: #{index}, Options: #{options}")
-          end
-          model
-        else
-          logger.info("MONGOID: Index ignored on: #{model}, please define in the root model.")
-          nil
-        end
-      end.compact
-    end
-
-    # Remove indexes for each model given the provided globs and the class is
-    # not embedded.
-    #
-    # @example Remove all the indexes.
-    #   Rails::Mongoid.create_indexes("app/models/**/*.rb")
-    #
-    # @param [ Array<String> ] globs The file matching globs.
-    #
-    # @return [ Array<Class> ] The un-indexed models.
-    #
-    def remove_indexes(*globs)
-      models(*globs).each do |model|
-        next if model.embedded?
-        indexes = model.collection.indexes.map{ |doc| doc["name"] }
-        indexes.delete_one("_id_")
-        model.remove_indexes
-        logger.info("MONGOID: Removing indexes on: #{model} for: #{indexes.join(', ')}.")
-        model
-      end.compact
-    end
-
-    # Return all models matching the globs or, if no globs are specified, all
-    # possible models known from engines, the app, any gems, etc.
-    #
-    # @example Return *all* models.  Return all models under app/models/
-    #   Rails::Mongoid.models
-    #   Rails::Mongoid.models("app/models/**/*.rb")
-    #
-    # @param [ String ] glob The file matching glob.
-    #
-    # @return [ Array<Class> ] The models.
-    #
-    def models(*globs)
-      all_possible_models = globs.empty?
-
-      if globs.empty?
-        engines_models_paths = Rails.application.railties.engines.map{|engine| engine.paths["app/models"].expanded}
-        root_models_paths = Rails.application.paths["app/models"]
-        models_paths = engines_models_paths.push(root_models_paths).flatten
-        globs.replace(models_paths.map{|path| "#{path}/**/*.rb"})
-      end
-
-      models = []
-
-      globs.flatten.compact.each do |glob|
-        Dir.glob(glob).map do |file|
-          begin
-            model = determine_model(file, logger)
-            models.push(model)
-          rescue => e
-            logger.error(%Q{MONGOID: Failed to determine model from #{file}:
-              #{e.class}:#{e.message}
-              #{e.backtrace.join("\n")}
-            })
-            nil
-          end
-        end
-      end
-
-      models = (::Mongoid.models | models) if all_possible_models
-
-      models.compact.sort_by { |model| model.name || '' }
-    end
-
     # Use the application configuration to get every model and require it, so
     # that indexing and inheritance work in both development and production
     # with the same results.
@@ -144,35 +52,5 @@ module Rails
         Logger.new($stdout).warn(e.message)
       end
     end
-
-    # Given the provided file name, determine the model and return the class.
-    #
-    # @example Determine the model from the file.
-    #   Rails::Mongoid.determine_model("app/models/person.rb")
-    #
-    # @param [ String ] file The filename.
-    #
-    # @return [ Class ] The model.
-    #
-    # @since 2.1.0
-    def determine_model(file, logger)
-      return nil unless file =~ /app\/models\/(.*).rb$/
-      return nil unless logger
-
-      model_path = $1.split('/')
-      begin
-        parts = model_path.map { |path| path.camelize }
-        name = parts.join("::")
-        klass = name.constantize
-      rescue NameError, LoadError
-        logger.info("MONGOID: Attempted to constantize #{name}, trying without namespacing.")
-        klass = parts.last.constantize rescue nil
-      end
-      klass if klass && klass.ancestors.include?(::Mongoid::Document)
-    end
-
-    def logger
-      @logger ||= Logger.new($stdout)
-    end
   end
 end

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,12 +1,13 @@
 class Acolyte
   include Mongoid::Document
+  include Mongoid::Attributes::Dynamic
   field :status
   field :name
 
   embeds_many :versions, as: :memorable
   belongs_to :church
 
-  default_scope asc(:name)
+  default_scope ->{ asc(:name) }
   scope :active, ->{ where(status: "active") }
   scope :named, ->{ where(:name.exists => true) }
 

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
 
@@ -38,8 +43,8 @@ class Address
   belongs_to :account
   belongs_to :band
 
-  scope :without_postcode, where(postcode: nil)
-  scope :rodeo, where(street: "Rodeo Dr") do
+  scope :without_postcode, ->{ where(postcode: nil) }
+  scope :rodeo, ->{ where(street: "Rodeo Dr") } do
     def mansion?
       all? { |address| address.street == "Rodeo Dr" }
     end

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)
+  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/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/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