From 906d9047d6fbd8d1e372ab7baa2426f01bedaff2 Mon Sep 17 00:00:00 2001 From: Maximo Mussini Date: Fri, 30 Oct 2020 22:37:02 -0300 Subject: [PATCH 1/4] Add support for Mongoid 7 --- .travis.yml | 2 +- CHANGELOG.md | 5 + Gemfile | 10 +- Gemfile.lock | 110 ++- bin/rspec | 29 + doc/Mongoid.html | 117 --- doc/Mongoid/Includes.html | 143 ---- doc/Mongoid/Includes/Criteria.html | 420 ---------- doc/Mongoid/Includes/EagerLoad.html | 449 ----------- doc/Mongoid/Includes/Errors.html | 117 --- .../Includes/Errors/InvalidIncludes.html | 366 --------- .../Errors/InvalidPolymorphicIncludes.html | 240 ------ doc/Mongoid/Includes/Inclusion.html | 752 ------------------ doc/Mongoid/Includes/Inclusions.html | 393 --------- doc/Mongoid/Includes/Relations.html | 115 --- doc/Mongoid/Includes/Relations/Eager.html | 213 ----- doc/_index.html | 212 ----- doc/class_list.html | 58 -- doc/css/common.css | 1 - doc/css/full_list.css | 57 -- doc/css/style.css | 339 -------- doc/file.README.html | 130 --- doc/file_list.html | 60 -- doc/frames.html | 26 - doc/index.html | 130 --- doc/js/app.js | 219 ----- doc/js/full_list.js | 181 ----- doc/js/jquery.js | 4 - doc/method_list.html | 189 ----- doc/top-level-namespace.html | 112 --- gemfiles/.bundle/config | 2 +- .../{mongoid4.gemfile => mongoid7.gemfile} | 2 +- gemfiles/mongoid7.gemfile.lock | 88 ++ lib/mongoid/includes.rb | 2 +- .../{relations => association}/eager.rb | 4 +- lib/mongoid/includes/inclusion.rb | 9 +- lib/mongoid/includes/inclusions.rb | 5 + lib/mongoid/includes/version.rb | 2 +- lib/mongoid_includes.rb | 2 +- mongoid_includes.gemspec | 2 +- spec/mongoid/includes/inclusions_spec.rb | 8 +- .../includes/polymorphic_includes_spec.rb | 4 +- spec/spec_helper.rb | 7 +- spec/support/helpers.rb | 28 +- spec/support/models/person.rb | 2 +- spec/support/models/post.rb | 2 + 46 files changed, 220 insertions(+), 5148 deletions(-) create mode 100755 bin/rspec delete mode 100644 doc/Mongoid.html delete mode 100644 doc/Mongoid/Includes.html delete mode 100644 doc/Mongoid/Includes/Criteria.html delete mode 100644 doc/Mongoid/Includes/EagerLoad.html delete mode 100644 doc/Mongoid/Includes/Errors.html delete mode 100644 doc/Mongoid/Includes/Errors/InvalidIncludes.html delete mode 100644 doc/Mongoid/Includes/Errors/InvalidPolymorphicIncludes.html delete mode 100644 doc/Mongoid/Includes/Inclusion.html delete mode 100644 doc/Mongoid/Includes/Inclusions.html delete mode 100644 doc/Mongoid/Includes/Relations.html delete mode 100644 doc/Mongoid/Includes/Relations/Eager.html delete mode 100644 doc/_index.html delete mode 100644 doc/class_list.html delete mode 100644 doc/css/common.css delete mode 100644 doc/css/full_list.css delete mode 100644 doc/css/style.css delete mode 100644 doc/file.README.html delete mode 100644 doc/file_list.html delete mode 100644 doc/frames.html delete mode 100644 doc/index.html delete mode 100644 doc/js/app.js delete mode 100644 doc/js/full_list.js delete mode 100644 doc/js/jquery.js delete mode 100644 doc/method_list.html delete mode 100644 doc/top-level-namespace.html rename gemfiles/{mongoid4.gemfile => mongoid7.gemfile} (90%) create mode 100644 gemfiles/mongoid7.gemfile.lock rename lib/mongoid/includes/{relations => association}/eager.rb (81%) diff --git a/.travis.yml b/.travis.yml index 90e2932..449693b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ rvm: gemfile: - Gemfile - - gemfiles/mongoid6.gemfile + - gemfiles/mongoid7.gemfile env: global: diff --git a/CHANGELOG.md b/CHANGELOG.md index 10055ab..b2f7bf4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## Mongoid::Includes 3.0.0 (2020-10-29) ## + +* Add support for Mongoid `7.1`. +* Avoid making a query when the foreign keys are empty. + ## Mongoid::Includes 2.1.0 (2017-07-03) ## * Fix bug where `includes` ignores the `:with` option if the association is polymorphic. Thanks @nickcherry for the bug report! diff --git a/Gemfile b/Gemfile index 6362c59..ad3a25b 100644 --- a/Gemfile +++ b/Gemfile @@ -4,15 +4,9 @@ gemspec gem 'bundler' gem 'rake' -gem 'pry' -gem 'mongoid', '6.0.1' +gem 'pry-byebug' +gem 'mongoid', '~> 7.1.0' group :test do gem 'rspec-given', '~> 3.5' - gem 'codeclimate-test-reporter', require: nil -end - -group :doc do - gem 'yard' - gem 'yard-tomdoc' end diff --git a/Gemfile.lock b/Gemfile.lock index f1210ac..83e25be 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,87 +1,75 @@ PATH remote: . specs: - mongoid_includes (2.0.0) - mongoid (>= 6.0.1, < 7.0.0) + mongoid_includes (3.0.0) + mongoid (>= 7.0.10, < 8.0.0) GEM remote: https://rubygems.org/ specs: - activemodel (5.0.1) - activesupport (= 5.0.1) - activesupport (5.0.1) + activemodel (6.0.3.4) + activesupport (= 6.0.3.4) + activesupport (6.0.3.4) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (~> 0.7) + i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - bson (4.2.1) - codeclimate-test-reporter (0.4.7) - simplecov (>= 0.7.1, < 1.0.0) - coderay (1.1.0) - concurrent-ruby (1.0.4) - diff-lcs (1.2.5) - docile (1.1.5) - given_core (3.7.1) + zeitwerk (~> 2.2, >= 2.2.2) + bson (4.11.0) + byebug (11.1.3) + coderay (1.1.3) + concurrent-ruby (1.1.7) + diff-lcs (1.4.4) + given_core (3.8.1) sorcerer (>= 0.3.7) - i18n (0.7.0) - json (1.8.3) - method_source (0.8.2) - minitest (5.10.1) - mongo (2.4.1) - bson (>= 4.2.1, < 5.0.0) - mongoid (6.0.1) - activemodel (~> 5.0) - mongo (~> 2.3) - pry (0.10.1) - coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - rake (10.4.2) - rspec (3.3.0) - rspec-core (~> 3.3.0) - rspec-expectations (~> 3.3.0) - rspec-mocks (~> 3.3.0) - rspec-core (3.3.2) - rspec-support (~> 3.3.0) - rspec-expectations (3.3.1) + i18n (1.8.5) + concurrent-ruby (~> 1.0) + method_source (1.0.0) + minitest (5.14.2) + mongo (2.13.1) + bson (>= 4.8.2, < 5.0.0) + mongoid (7.1.4) + activemodel (>= 5.1, < 6.1) + mongo (>= 2.7.0, < 3.0.0) + pry (0.13.1) + coderay (~> 1.1) + method_source (~> 1.0) + pry-byebug (3.9.0) + byebug (~> 11.0) + pry (~> 0.13.0) + rake (13.0.1) + rspec (3.9.0) + rspec-core (~> 3.9.0) + rspec-expectations (~> 3.9.0) + rspec-mocks (~> 3.9.0) + rspec-core (3.9.3) + rspec-support (~> 3.9.3) + rspec-expectations (3.9.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.3.0) - rspec-given (3.7.1) - given_core (= 3.7.1) + rspec-support (~> 3.9.0) + rspec-given (3.8.1) + given_core (= 3.8.1) rspec (>= 2.14.0) - rspec-mocks (3.3.2) + rspec-mocks (3.9.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.3.0) - rspec-support (3.3.0) - simplecov (0.10.0) - docile (~> 1.1.0) - json (~> 1.8) - simplecov-html (~> 0.10.0) - simplecov-html (0.10.0) - slop (3.6.0) - sorcerer (1.0.2) - thread_safe (0.3.5) - tomparse (0.4.2) - tzinfo (1.2.2) + rspec-support (~> 3.9.0) + rspec-support (3.9.4) + sorcerer (2.0.1) + thread_safe (0.3.6) + tzinfo (1.2.7) thread_safe (~> 0.1) - yard (0.8.7.6) - yard-tomdoc (0.7.1) - tomparse (>= 0.4.0) - yard + zeitwerk (2.4.1) PLATFORMS ruby DEPENDENCIES bundler - codeclimate-test-reporter - mongoid (= 6.0.1) + mongoid (~> 7.1.0) mongoid_includes! - pry + pry-byebug rake rspec-given (~> 3.5) - yard - yard-tomdoc BUNDLED WITH - 1.12.5 + 2.1.4 diff --git a/bin/rspec b/bin/rspec new file mode 100755 index 0000000..a6c7852 --- /dev/null +++ b/bin/rspec @@ -0,0 +1,29 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'rspec' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +require "pathname" +ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", + Pathname.new(__FILE__).realpath) + +bundle_binstub = File.expand_path("../bundle", __FILE__) + +if File.file?(bundle_binstub) + if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/ + load(bundle_binstub) + else + abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run. +Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.") + end +end + +require "rubygems" +require "bundler/setup" + +load Gem.bin_path("rspec-core", "rspec") diff --git a/doc/Mongoid.html b/doc/Mongoid.html deleted file mode 100644 index 6c6a490..0000000 --- a/doc/Mongoid.html +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - Module: Mongoid - - — Documentation by YARD 0.8.7.6 - - - - - - - - - - - - - - - - - - - - - -

Module: Mongoid - - - -

- -
- - - - - - - - -
Defined in:
-
lib/mongoid/includes/version.rb,
- lib/mongoid/includes/criteria.rb,
lib/mongoid/includes/inclusion.rb,
lib/mongoid/includes/inclusions.rb,
lib/mongoid/includes/eager_load.rb,
lib/mongoid/includes/relations/eager.rb,
lib/mongoid/includes/errors/invalid_includes.rb,
lib/mongoid/includes/errors/invalid_polymorphic_includes.rb -
- -
-
- -

Defined Under Namespace

-

- - - Modules: Includes - - - - -

- - - - - - - - - -
- - - - - \ No newline at end of file diff --git a/doc/Mongoid/Includes.html b/doc/Mongoid/Includes.html deleted file mode 100644 index bca367b..0000000 --- a/doc/Mongoid/Includes.html +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - Module: Mongoid::Includes - - — Documentation by YARD 0.8.7.6 - - - - - - - - - - - - - - - - - - - - - -

Module: Mongoid::Includes - - - -

- -
- - - - - - - - -
Defined in:
-
lib/mongoid/includes/version.rb,
- lib/mongoid/includes/criteria.rb,
lib/mongoid/includes/inclusion.rb,
lib/mongoid/includes/inclusions.rb,
lib/mongoid/includes/eager_load.rb,
lib/mongoid/includes/relations/eager.rb,
lib/mongoid/includes/errors/invalid_includes.rb,
lib/mongoid/includes/errors/invalid_polymorphic_includes.rb -
- -
-
- -

Defined Under Namespace

-

- - - Modules: Criteria, EagerLoad, Errors, Relations - - - - Classes: Inclusion, Inclusions - - -

- -

Constant Summary

- -
- -
VERSION = -
-
- -

This library will attempt to follow semantic versioning (whatever -that's supposed to be).

- - -
-
-
- - -
-
- 
'1.0.1'
- -
- - - - - - - - - - -
- - - - - \ No newline at end of file diff --git a/doc/Mongoid/Includes/Criteria.html b/doc/Mongoid/Includes/Criteria.html deleted file mode 100644 index 93692c7..0000000 --- a/doc/Mongoid/Includes/Criteria.html +++ /dev/null @@ -1,420 +0,0 @@ - - - - - - Module: Mongoid::Includes::Criteria - - — Documentation by YARD 0.8.7.6 - - - - - - - - - - - - - - - - - - - - - -

Module: Mongoid::Includes::Criteria - - - Private -

- -
- - - - - - - - -
Defined in:
-
lib/mongoid/includes/criteria.rb
- -
-
- -

Overview

-
-

- This module is part of a private API. - You should avoid using this module if possible, as it may be removed or be changed in the future. -

- -

Adds and overrides methods in Mongoid::Criteria to enhance eager loading.

- - -
-
-
- - -
- - - - - - - -

- Instance Method Summary - (collapse) -

- - - - - - -
-

Instance Method Details

- - -
-

- - - (Object) includes(*relations, **options) - - - - - -

-
- -

Eager loads the specified associations.

- - -
-
-
-

Parameters:

-
    - -
  • - - relations - - - - - - - — -
    -

    The relations of the two-level relations to eager load.

    -
    - -
    • - -
  • - - from: - - - - - - - — -
    -

    The relation through which two-level relations are loaded from.

    -
    - -
    • - -
  • - - from_class: - - - - - - - — -
    -

    Necessary to solve ambiguity when doing two-level eager load through a -polymorphic relation.

    -
    - -
    • - -
  • - - loader: - - - - - - - — -
    -

    An optional block that specifies how to load all the related documents.

    -
    - -
    • - -
  • - - Notes: - - - - - - - — -
    -

    Eager loading brings all the documents into memory, so there is a sweet -spot on the performance gains. Internal benchmarks show that eager loading -becomes slower around 100k documents, but this will naturally depend on the -specific application. Polymorphic belongs_to relations are supported, but -will trigger a query for each collection of the matched documents types.

    -
    - -
    • - -
  • - - Example: - - - - - - - — -
    -

    Album.includes(:musicians, from: :band)

    -
    - -
    • - -
- -

Returns:

-
    - -
  • - - - - - - - -
    -

    the cloned Mongoid::Criteria.

    -
    - -
    • - -
- -
- - - - -
- 
-
-
-38
-39
-40
-41
-42
-43
-44
-45
-46
-47
-48
-49
-50
-51
-52
- 		- 
# File 'lib/mongoid/includes/criteria.rb', line 38
-
-def includes(*relations, **options)
-  if options[:from]
-    from_metadata = add_inclusion(klass, options[:from])
-    if from_metadata.polymorphic_belongs_to? && !options[:from_class]
-      raise Mongoid::Includes::Errors::InvalidPolymorphicIncludes.new(klass, relations, options)
-    end
-  end
-
-  owner_class = options[:from_class] || from_metadata.try!(:klass) || self.klass
-
-  relations.flatten.each do |relation|
-    add_inclusion(owner_class, relation, options)
-  end
-  clone
-end
-
-
- -
-

- - - (Object) inclusions - - - - - -

-
-

- This method is part of a private API. - You should avoid using this method if possible, as it may be removed or be changed in the future. -

- -

Overrides: Get a list of criteria that are to be executed for eager -loading.

- - -
-
-
- - -
- - - - -
- 
-
-
-11
-12
-13
- 		- 
# File 'lib/mongoid/includes/criteria.rb', line 11
-
-def inclusions
-  @inclusions ||= Mongoid::Includes::Inclusions.new
-end
-
-
- -
- -
- - - - - \ No newline at end of file diff --git a/doc/Mongoid/Includes/EagerLoad.html b/doc/Mongoid/Includes/EagerLoad.html deleted file mode 100644 index f04d582..0000000 --- a/doc/Mongoid/Includes/EagerLoad.html +++ /dev/null @@ -1,449 +0,0 @@ - - - - - - Module: Mongoid::Includes::EagerLoad - - — Documentation by YARD 0.8.7.6 - - - - - - - - - - - - - - - - - - - - - -

Module: Mongoid::Includes::EagerLoad - - - -

- -
- - - - - - - - -
Defined in:
-
lib/mongoid/includes/eager_load.rb
- -
-
- -

Overview

-
- -

Adds support for polymorphic and nested eager loading.

- - -
-
-
- - -
- - - - - - - -

- Instance Method Summary - (collapse) -

- - - - - - -
-

Instance Method Details

- - -
-

- - - (Object) eager_load(docs) - - - - - -

-
- -

Override: Partitions the inclusions into the different types.

- - -
-
-
- - -
- - - - -
- 
-
-
-8
-9
-10
-11
-12
-13
-14
-15
-16
- 		- 
# File 'lib/mongoid/includes/eager_load.rb', line 8
-
-def eager_load(docs)
-  return false unless eager_loadable?
-
-  nested_inclusions, inclusions = criteria.inclusions.partition(&:nested?)
-  polymorphic_inclusions, inclusions = inclusions.partition(&:polymorphic_belongs_to?)
-  full_preload(docs, inclusions, polymorphic_inclusions, nested_inclusions)
-
-  self.eager_loaded = true
-end
-
-
- -
-

- - - (Object) full_preload(docs, inclusions, polymorphic_inclusions, nested_inclusions) - - - - - -

-
-

- This method is part of a private API. - You should avoid using this method if possible, as it may be removed or be changed in the future. -

- -

Performs the normal inclusions first, which allows to perform the -polymorphic eager loading. Nested inclusions are performed at the end.

- - -
-
-
- - -
- - - - -
- 
-
-
-20
-21
-22
-23
-24
-25
-26
-27
-28
- 		- 
# File 'lib/mongoid/includes/eager_load.rb', line 20
-
-def full_preload(docs, inclusions, polymorphic_inclusions, nested_inclusions)
-  preload(inclusions, docs)
-
-  polymorphic_inclusions.each do |metadata|
-    preload_polymorphic(metadata, docs)
-  end
-
-  preload_nested(nested_inclusions, docs)
-end
-
-
- -
-

- - - (Object) preload_nested(nested_inclusions, docs) - - - - - -

-
-

- This method is part of a private API. - You should avoid using this method if possible, as it may be removed or be changed in the future. -

- -

The documents are grouped by the nested property, and all the includes by -that property are processed as usual.

- - -
-
-
- - -
- - - - -
- 
-
-
-43
-44
-45
-46
-47
- 		- 
# File 'lib/mongoid/includes/eager_load.rb', line 43
-
-def preload_nested(nested_inclusions, docs)
-  nested_inclusions.group_by(&:from).each do |from, inclusions|
-    preload(inclusions, docs.map(&from).flatten)
-  end
-end
-
-
- -
-

- - - (Object) preload_polymorphic(inclusion, docs) - - - - - -

-
-

- This method is part of a private API. - You should avoid using this method if possible, as it may be removed or be changed in the future. -

- -

Preloads each polymorphic includes, by grouping the documents by concrete -type of the polymorphic relation, and making a query for each type.

- - -
-
-
- - -
- - - - -
- 
-
-
-32
-33
-34
-35
-36
-37
-38
-39
- 		- 
# File 'lib/mongoid/includes/eager_load.rb', line 32
-
-def preload_polymorphic(inclusion, docs)
-  docs.group_by do |doc|
-    doc.send(inclusion.inverse_type) # The {name}_type attribute in polymorphic relations.
-  end.each do |type, docs|
-    concrete_inclusion = inclusion.for_class_name(type)
-    preload([concrete_inclusion], docs)
-  end
-end
-
-
- -
- -
- - - - - \ No newline at end of file diff --git a/doc/Mongoid/Includes/Errors.html b/doc/Mongoid/Includes/Errors.html deleted file mode 100644 index 59085f9..0000000 --- a/doc/Mongoid/Includes/Errors.html +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - Module: Mongoid::Includes::Errors - - — Documentation by YARD 0.8.7.6 - - - - - - - - - - - - - - - - - - - - - -

Module: Mongoid::Includes::Errors - - - -

- -
- - - - - - - - -
Defined in:
-
lib/mongoid/includes/errors/invalid_includes.rb,
- lib/mongoid/includes/errors/invalid_polymorphic_includes.rb -
- -
-
- -

Defined Under Namespace

-

- - - - - Classes: InvalidIncludes, InvalidPolymorphicIncludes - - -

- - - - - - - - - -
- - - - - \ No newline at end of file diff --git a/doc/Mongoid/Includes/Errors/InvalidIncludes.html b/doc/Mongoid/Includes/Errors/InvalidIncludes.html deleted file mode 100644 index 29e0d5a..0000000 --- a/doc/Mongoid/Includes/Errors/InvalidIncludes.html +++ /dev/null @@ -1,366 +0,0 @@ - - - - - - Class: Mongoid::Includes::Errors::InvalidIncludes - - — Documentation by YARD 0.8.7.6 - - - - - - - - - - - - - - - - - - - - - -

Class: Mongoid::Includes::Errors::InvalidIncludes - - - -

- -
- -
Inherits:
-
- Errors::MongoidError - -
    -
  • Object
    • - - - - - -
- show all - -
- - - - - - - - - -
Defined in:
-
lib/mongoid/includes/errors/invalid_includes.rb
- -
-
- -

Overview

-
- -

This error is raised when an invalid include is performed.

- - -
-
-
- - -
-

Direct Known Subclasses

-

InvalidPolymorphicIncludes

-
- - - - - - - - -

- Instance Method Summary - (collapse) -

- - - - - -
-

Constructor Details

- -
-

- - - (InvalidIncludes) initialize(klass, args, options) - - - - - -

-
- -

Composes a message from the class the includes would be performed on, the -relations to be included, and the options.

- - -
-
-
- - -
- - - - -
- 
-
-
-10
-11
-12
-13
-14
- 		- 
# File 'lib/mongoid/includes/errors/invalid_includes.rb', line 10
-
-def initialize(klass, args, options)
-  super compose_message(type, options.merge(
-    klass: klass, relations: klass.relations.keys, args: Array.wrap(args)
-  ))
-end
-
-
- -
- - -
-

Instance Method Details

- - -
-

- - - (Object) compose_message(type, options) - - - - - -

-
- - -
-
-
- - -
- - - - -
- 
-
-
-21
-22
-23
-24
-25
- 		- 
# File 'lib/mongoid/includes/errors/invalid_includes.rb', line 21
-
-def compose_message(type, options)
-  super type, options.transform_values { |value|
-    value.is_a?(Array) ? value.map(&:inspect).join(', ') : value.inspect
-  }
-end
-
-
- -
-

- - - (Object) type - - - - - -

-
-

- This method is part of a private API. - You should avoid using this method if possible, as it may be removed or be changed in the future. -

- -

Key of the translation message

- - -
-
-
- - -
- - - - -
- 
-
-
-17
-18
-19
- 		- 
# File 'lib/mongoid/includes/errors/invalid_includes.rb', line 17
-
-def type
-  :invalid_includes
-end
-
-
- -
- -
- - - - - \ No newline at end of file diff --git a/doc/Mongoid/Includes/Errors/InvalidPolymorphicIncludes.html b/doc/Mongoid/Includes/Errors/InvalidPolymorphicIncludes.html deleted file mode 100644 index 50601b2..0000000 --- a/doc/Mongoid/Includes/Errors/InvalidPolymorphicIncludes.html +++ /dev/null @@ -1,240 +0,0 @@ - - - - - - Class: Mongoid::Includes::Errors::InvalidPolymorphicIncludes - - — Documentation by YARD 0.8.7.6 - - - - - - - - - - - - - - - - - - - - - -

Class: Mongoid::Includes::Errors::InvalidPolymorphicIncludes - - - -

- -
- -
Inherits:
-
- InvalidIncludes - -
    -
  • Object
    • - - - - - - - -
- show all - -
- - - - - - - - - -
Defined in:
-
lib/mongoid/includes/errors/invalid_polymorphic_includes.rb
- -
-
- -

Overview

-
- -

This error is raised when an invalid nested inclusion is attempted through -a polymorphic relation.

- - -
-
-
- - -
- - - - - - - -

- Instance Method Summary - (collapse) -

- - - - - - - - - - - - - -

Methods inherited from InvalidIncludes

-

#compose_message, #initialize

- -
-

Constructor Details

- -

This class inherits a constructor from Mongoid::Includes::Errors::InvalidIncludes

- -
- - -
-

Instance Method Details

- - -
-

- - - (Object) type - - - - - -

-
-

- This method is part of a private API. - You should avoid using this method if possible, as it may be removed or be changed in the future. -

- -

Key of the translation message

- - -
-
-
- - -
- - - - -
- 
-
-
-10
-11
-12
- 		- 
# File 'lib/mongoid/includes/errors/invalid_polymorphic_includes.rb', line 10
-
-def type
-  :invalid_polymorphic_nested_includes
-end
-
-
- -
- -
- - - - - \ No newline at end of file diff --git a/doc/Mongoid/Includes/Inclusion.html b/doc/Mongoid/Includes/Inclusion.html deleted file mode 100644 index eebf69d..0000000 --- a/doc/Mongoid/Includes/Inclusion.html +++ /dev/null @@ -1,752 +0,0 @@ - - - - - - Class: Mongoid::Includes::Inclusion - - — Documentation by YARD 0.8.7.6 - - - - - - - - - - - - - - - - - - - - - -

Class: Mongoid::Includes::Inclusion - - - -

- -
- -
Inherits:
-
- SimpleDelegator - -
    -
  • Object
    • - - - - - -
- show all - -
- - - - - - - - - -
Defined in:
-
lib/mongoid/includes/inclusion.rb
- -
-
- -

Overview

-
- -

Represents a relation that needs to be eager loaded.

- - -
-
-
- - -
- - - - - - - -

- Instance Method Summary - (collapse) -

- - - - - -
-

Constructor Details

- -
-

- - - (Inclusion) initialize(metadata, options = {}) - - - - - -

-
- -

Returns a new instance of Inclusion

- - -
-
-
- - -
- - - - -
- 
-
-
-10
-11
-12
-13
- 		- 
# File 'lib/mongoid/includes/inclusion.rb', line 10
-
-def initialize(metadata, options = {})
-  super(metadata)
-  @options = options
-end
-
-
- -
- - -
-

Instance Method Details

- - -
-

- - - (Object) for_class_name(class_name) - - - - - -

-
- -

Clones the inclusion and changes the Mongoid::Metadata::Relation that it -wraps to make it non polymorphic and target a particular class.

- - -
-
-
- -

Returns:

-
    - -
  • - - - - - - - -
    -

    an Inclusion that can be eager loaded as usual.

    -
    - -
    • - -
- -
- - - - -
- 
-
-
-55
-56
-57
-58
-59
-60
-61
- 		- 
# File 'lib/mongoid/includes/inclusion.rb', line 55
-
-def for_class_name(class_name)
-  Inclusion.new metadata.clone.instance_eval { |relation_metadata|
-    self[:class_name] = @class_name = class_name
-    self[:polymorphic], self[:as], @polymorphic, @klass = nil
-    self
-  }
-end
-
-
- -
-

- - - (Object) from - - - - - -

-
- -

Name of the relation from which a nested inclusion is performed.

- - -
-
-
- - -
- - - - -
- 
-
-
-26
-27
-28
- 		- 
# File 'lib/mongoid/includes/inclusion.rb', line 26
-
-def from
-  @from ||= @options[:from]
-end
-
-
- -
-

- - - (Object) load_documents_for(foreign_key, foreign_key_values) - - - - - -

-
- -

Preloads the documents for the relation. Users a custom block if one was -provided, or fetches them using the class and the foreign key.

- - -
-
-
- - -
- - - - -
- 
-
-
-42
-43
-44
-45
-46
-47
-48
-49
- 		- 
# File 'lib/mongoid/includes/inclusion.rb', line 42
-
-def load_documents_for(foreign_key, foreign_key_values)
-  if loader
-    loader.call(foreign_key, foreign_key_values)
-  else
-    docs = klass.any_in(foreign_key => foreign_key_values)
-    modifier ? modifier.call(docs) : docs
-  end
-end
-
-
- -
-

- - - (Object) loader - - - - - -

-
-

- This method is part of a private API. - You should avoid using this method if possible, as it may be removed or be changed in the future. -

- -

Proc that will return the included documents from a set of foreign keys.

- - -
-
-
- - -
- - - - -
- 
-
-
-31
-32
-33
- 		- 
# File 'lib/mongoid/includes/inclusion.rb', line 31
-
-def loader
-  @loader ||= @options[:loader]
-end
-
-
- -
-

- - - (Object) modifier - - - - - -

-
-

- This method is part of a private API. - You should avoid using this method if possible, as it may be removed or be changed in the future. -

- -

Proc that will modify the documents to include in the relation.

- - -
-
-
- - -
- - - - -
- 
-
-
-36
-37
-38
- 		- 
# File 'lib/mongoid/includes/inclusion.rb', line 36
-
-def modifier
-  @modifier ||= @options[:with]
-end
-
-
- -
-

- - - (Boolean) nested? - - - - - -

-
- -

Returns true if the relation is not direct.

- - -
-
-
- -

Returns:

-
    - -
  • - - - (Boolean) - - - -
    • - -
- -
- - - - -
- 
-
-
-16
-17
-18
- 		- 
# File 'lib/mongoid/includes/inclusion.rb', line 16
-
-def nested?
-  !!from
-end
-
-
- -
-

- - - (Boolean) polymorphic_belongs_to? - - - - - -

-
- -

Returns true if the relation is a polymorphic belongs_to.

- - -
-
-
- -

Returns:

-
    - -
  • - - - (Boolean) - - - -
    • - -
- -
- - - - -
- 
-
-
-21
-22
-23
- 		- 
# File 'lib/mongoid/includes/inclusion.rb', line 21
-
-def polymorphic_belongs_to?
-  metadata.polymorphic? && metadata.relation == Mongoid::Relations::Referenced::In
-end
-
-
- -
- -
- - - - - \ No newline at end of file diff --git a/doc/Mongoid/Includes/Inclusions.html b/doc/Mongoid/Includes/Inclusions.html deleted file mode 100644 index 3425f39..0000000 --- a/doc/Mongoid/Includes/Inclusions.html +++ /dev/null @@ -1,393 +0,0 @@ - - - - - - Class: Mongoid::Includes::Inclusions - - — Documentation by YARD 0.8.7.6 - - - - - - - - - - - - - - - - - - - - - -

Class: Mongoid::Includes::Inclusions - - - -

- -
- -
Inherits:
-
- SimpleDelegator - -
    -
  • Object
    • - - - - - -
- show all - -
- - - - - - - - - -
Defined in:
-
lib/mongoid/includes/inclusions.rb
- -
-
- -

Overview

-
- -

Collection of relations that need to be eager loaded.

- - -
-
-
- - -
- - - - - - - -

- Instance Method Summary - (collapse) -

- - - - - -
-

Constructor Details

- -
-

- - - (Inclusions) initialize(object = []) - - - - - -

-
-

- This method is part of a private API. - You should avoid using this method if possible, as it may be removed or be changed in the future. -

- -

By default, it wraps an empty array.

- - -
-
-
- - -
- - - - -
- 
-
-
-10
-11
-12
- 		- 
# File 'lib/mongoid/includes/inclusions.rb', line 10
-
-def initialize(object = [])
-  super
-end
-
-
- -
- - -
-

Instance Method Details

- - -
-

- - - (Boolean) include?(metadata) - - - - - -

-
- -

Checks if the collection already has an inclusion with the specified -metadata.

- - -
-
-
- -

Returns:

-
    - -
  • - - - (Boolean) - - - -
    • - -
- -
- - - - -
- 
-
-
-25
-26
-27
- 		- 
# File 'lib/mongoid/includes/inclusions.rb', line 25
-
-def include?(metadata)
-  find { |inclusion| inclusion.metadata == metadata }
-end
-
-
- -
-

- - - (Object) push(metadata, options = {}) - - - - - -

-
- -

Adds a new relation as an inclusion.

- - -
-
-
- -

Returns:

-
    - -
  • - - - - - - - -
    -

    the added inclusion.

    -
    - -
    • - -
- -
- - - - -
- 
-
-
-17
-18
-19
-20
-21
- 		- 
# File 'lib/mongoid/includes/inclusions.rb', line 17
-
-def push(metadata, options = {})
-  metadata = Inclusion.new(metadata, options) unless metadata.is_a?(Inclusion)
-  super(metadata)
-  metadata
-end
-
-
- -
- -
- - - - - \ No newline at end of file diff --git a/doc/Mongoid/Includes/Relations.html b/doc/Mongoid/Includes/Relations.html deleted file mode 100644 index 44ac35e..0000000 --- a/doc/Mongoid/Includes/Relations.html +++ /dev/null @@ -1,115 +0,0 @@ - - - - - - Module: Mongoid::Includes::Relations - - — Documentation by YARD 0.8.7.6 - - - - - - - - - - - - - - - - - - - - - -

Module: Mongoid::Includes::Relations - - - -

- -
- - - - - - - - -
Defined in:
-
lib/mongoid/includes/relations/eager.rb
- -
-
- -

Defined Under Namespace

-

- - - Modules: Eager - - - - -

- - - - - - - - - -
- - - - - \ No newline at end of file diff --git a/doc/Mongoid/Includes/Relations/Eager.html b/doc/Mongoid/Includes/Relations/Eager.html deleted file mode 100644 index 1958e62..0000000 --- a/doc/Mongoid/Includes/Relations/Eager.html +++ /dev/null @@ -1,213 +0,0 @@ - - - - - - Module: Mongoid::Includes::Relations::Eager - - — Documentation by YARD 0.8.7.6 - - - - - - - - - - - - - - - - - - - - - -

Module: Mongoid::Includes::Relations::Eager - - - Private -

- -
- - - - - - - - -
Defined in:
-
lib/mongoid/includes/relations/eager.rb
- -
-
- -

Overview

-
-

- This module is part of a private API. - You should avoid using this module if possible, as it may be removed or be changed in the future. -

- -

Patch to the base class for eager load preload functions, that interacts -with the Mongoid::Includes::Inclusion as @medatada.

- - -
-
-
- - -
- - - - - - - -

- Instance Method Summary - (collapse) -

- - - - - - -
-

Instance Method Details

- - -
-

- - - (Object) each_loaded_document - - - - - -

-
-

- This method is part of a private API. - You should avoid using this method if possible, as it may be removed or be changed in the future. -

- -

Performs eager load and iterates over the preloaded documents for the -current relation.

- - -
-
-
- - -
- - - - -
- 
-
-
-11
-12
-13
-14
-15
- 		- 
# File 'lib/mongoid/includes/relations/eager.rb', line 11
-
-def each_loaded_document
-  @metadata.load_documents_for(key, keys_from_docs).each do |doc|
-    yield doc
-  end
-end
-
-
- -
- -
- - - - - \ No newline at end of file diff --git a/doc/_index.html b/doc/_index.html deleted file mode 100644 index 36d368c..0000000 --- a/doc/_index.html +++ /dev/null @@ -1,212 +0,0 @@ - - - - - - Documentation by YARD 0.8.7.6 - - - - - - - - - - - - - - - - - - - - - -

Documentation by YARD 0.8.7.6

-
-

Alphabetic Index

- -

File Listing

- - -
-

Namespace Listing A-Z

- - - - - - - - -
- - -
    -
  • C
    • -
      - -
    • - Criteria - - (Mongoid::Includes) - -
      • - -
    -
- - -
    -
  • E
    • -
      - -
    • - Eager - - (Mongoid::Includes::Relations) - -
      • - -
    • - EagerLoad - - (Mongoid::Includes) - -
      • - -
    • - Errors - - (Mongoid::Includes) - -
      • - -
    -
- - - - - - - - -
    -
  • R
    • -
      - -
    • - Relations - - (Mongoid::Includes) - -
      • - -
    -
- -
- -
- -
- - - - - \ No newline at end of file diff --git a/doc/class_list.html b/doc/class_list.html deleted file mode 100644 index 125f980..0000000 --- a/doc/class_list.html +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - Class List - - - - -
-

Class List

- - - - -
- - diff --git a/doc/css/common.css b/doc/css/common.css deleted file mode 100644 index cf25c45..0000000 --- a/doc/css/common.css +++ /dev/null @@ -1 +0,0 @@ -/* Override this file with custom rules */ \ No newline at end of file diff --git a/doc/css/full_list.css b/doc/css/full_list.css deleted file mode 100644 index c918cf1..0000000 --- a/doc/css/full_list.css +++ /dev/null @@ -1,57 +0,0 @@ -body { - margin: 0; - font-family: "Lucida Sans", "Lucida Grande", Verdana, Arial, sans-serif; - font-size: 13px; - height: 101%; - overflow-x: hidden; -} - -h1 { padding: 12px 10px; padding-bottom: 0; margin: 0; font-size: 1.4em; } -.clear { clear: both; } -#search { position: absolute; right: 5px; top: 9px; padding-left: 24px; } -#content.insearch #search, #content.insearch #noresults { background: url(data:image/gif;base64,R0lGODlhEAAQAPYAAP///wAAAPr6+pKSkoiIiO7u7sjIyNjY2J6engAAAI6OjsbGxjIyMlJSUuzs7KamppSUlPLy8oKCghwcHLKysqSkpJqamvT09Pj4+KioqM7OzkRERAwMDGBgYN7e3ujo6Ly8vCoqKjY2NkZGRtTU1MTExDw8PE5OTj4+PkhISNDQ0MrKylpaWrS0tOrq6nBwcKysrLi4uLq6ul5eXlxcXGJiYoaGhuDg4H5+fvz8/KKiohgYGCwsLFZWVgQEBFBQUMzMzDg4OFhYWBoaGvDw8NbW1pycnOLi4ubm5kBAQKqqqiQkJCAgIK6urnJyckpKSjQ0NGpqatLS0sDAwCYmJnx8fEJCQlRUVAoKCggICLCwsOTk5ExMTPb29ra2tmZmZmhoaNzc3KCgoBISEiIiIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh/hpDcmVhdGVkIHdpdGggYWpheGxvYWQuaW5mbwAh+QQJCAAAACwAAAAAEAAQAAAHaIAAgoMgIiYlg4kACxIaACEJCSiKggYMCRselwkpghGJBJEcFgsjJyoAGBmfggcNEx0flBiKDhQFlIoCCA+5lAORFb4AJIihCRbDxQAFChAXw9HSqb60iREZ1omqrIPdJCTe0SWI09GBACH5BAkIAAAALAAAAAAQABAAAAdrgACCgwc0NTeDiYozCQkvOTo9GTmDKy8aFy+NOBA7CTswgywJDTIuEjYFIY0JNYMtKTEFiRU8Pjwygy4ws4owPyCKwsMAJSTEgiQlgsbIAMrO0dKDGMTViREZ14kYGRGK38nHguHEJcvTyIEAIfkECQgAAAAsAAAAABAAEAAAB2iAAIKDAggPg4iJAAMJCRUAJRIqiRGCBI0WQEEJJkWDERkYAAUKEBc4Po1GiKKJHkJDNEeKig4URLS0ICImJZAkuQAhjSi/wQyNKcGDCyMnk8u5rYrTgqDVghgZlYjcACTA1sslvtHRgQAh+QQJCAAAACwAAAAAEAAQAAAHZ4AAgoOEhYaCJSWHgxGDJCQARAtOUoQRGRiFD0kJUYWZhUhKT1OLhR8wBaaFBzQ1NwAlkIszCQkvsbOHL7Y4q4IuEjaqq0ZQD5+GEEsJTDCMmIUhtgk1lo6QFUwJVDKLiYJNUd6/hoEAIfkECQgAAAAsAAAAABAAEAAAB2iAAIKDhIWGgiUlh4MRgyQkjIURGRiGGBmNhJWHm4uen4ICCA+IkIsDCQkVACWmhwSpFqAABQoQF6ALTkWFnYMrVlhWvIKTlSAiJiVVPqlGhJkhqShHV1lCW4cMqSkAR1ofiwsjJyqGgQAh+QQJCAAAACwAAAAAEAAQAAAHZ4AAgoOEhYaCJSWHgxGDJCSMhREZGIYYGY2ElYebi56fhyWQniSKAKKfpaCLFlAPhl0gXYNGEwkhGYREUywag1wJwSkHNDU3D0kJYIMZQwk8MjPBLx9eXwuETVEyAC/BOKsuEjYFhoEAIfkECQgAAAAsAAAAABAAEAAAB2eAAIKDhIWGgiUlh4MRgyQkjIURGRiGGBmNhJWHm4ueICImip6CIQkJKJ4kigynKaqKCyMnKqSEK05StgAGQRxPYZaENqccFgIID4KXmQBhXFkzDgOnFYLNgltaSAAEpxa7BQoQF4aBACH5BAkIAAAALAAAAAAQABAAAAdogACCg4SFggJiPUqCJSWGgkZjCUwZACQkgxGEXAmdT4UYGZqCGWQ+IjKGGIUwPzGPhAc0NTewhDOdL7Ykji+dOLuOLhI2BbaFETICx4MlQitdqoUsCQ2vhKGjglNfU0SWmILaj43M5oEAOwAAAAAAAAAAAA==) no-repeat center left; } -#full_list { padding: 0; list-style: none; margin-left: 0; } -#full_list ul { padding: 0; } -#full_list li { padding: 5px; padding-left: 12px; margin: 0; font-size: 1.1em; list-style: none; } -#noresults { padding: 7px 12px; } -#content.insearch #noresults { margin-left: 7px; } -ul.collapsed ul, ul.collapsed li { display: none; } -ul.collapsed.search_uncollapsed { display: block; } -ul.collapsed.search_uncollapsed li { display: list-item; } -li a.toggle { cursor: default; position: relative; left: -5px; top: 4px; text-indent: -999px; width: 10px; height: 9px; margin-left: -10px; display: block; float: left; background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAASCAYAAABb0P4QAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAK8AAACvABQqw0mAAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTM5jWRgMAAAAVdEVYdENyZWF0aW9uIFRpbWUAMy8xNC8wOeNZPpQAAAE2SURBVDiNrZTBccIwEEXfelIAHUA6CZ24BGaWO+FuzZAK4k6gg5QAdGAq+Bxs2Yqx7BzyL7Llp/VfzZeQhCTc/ezuGzKKnKSzpCxXJM8fwNXda3df5RZETlIt6YUzSQDs93sl8w3wBZxCCE10GM1OcWbWjB2mWgEH4Mfdyxm3PSepBHibgQE2wLe7r4HjEidpnXMYdQPKEMJcsZ4zs2POYQOcaPfwMVOo58zsAdMt18BuoVDPxUJRacELbXv3hUIX2vYmOUvi8C8ydz/ThjXrqKqqLbDIAdsCKBd+Wo7GWa7o9qzOQHVVVXeAbs+yHHCH4aTsaCOQqunmUy1yBUAXkdMIfMlgF5EXLo2OpV/c/Up7jG4hhHcYLgWzAZXUc2b2ixsfvc/RmNNfOXD3Q/oeL9axJE1yT9IOoUu6MGUkAAAAAElFTkSuQmCC) no-repeat bottom left; } -li.collapsed a.toggle { opacity: 0.5; cursor: default; background-position: top left; } -li { color: #888; cursor: pointer; } -li.deprecated { text-decoration: line-through; font-style: italic; } -li.r1 { background: #f0f0f0; } -li.r2 { background: #fafafa; } -li:hover { background: #ddd; } -li small:before { content: "("; } -li small:after { content: ")"; } -li small.search_info { display: none; } -a:link, a:visited { text-decoration: none; color: #05a; } -li.clicked { background: #05a; color: #ccc; } -li.clicked a:link, li.clicked a:visited { color: #eee; } -li.clicked a.toggle { opacity: 0.5; background-position: bottom right; } -li.collapsed.clicked a.toggle { background-position: top right; } -#search input { border: 1px solid #bbb; -moz-border-radius: 3px; -webkit-border-radius: 3px; } -#nav { margin-left: 10px; font-size: 0.9em; display: none; color: #aaa; } -#nav a:link, #nav a:visited { color: #358; } -#nav a:hover { background: transparent; color: #5af; } -.frames #nav span:after { content: ' | '; } -.frames #nav span:last-child:after { content: ''; } - -.frames #content h1 { margin-top: 0; } -.frames li { white-space: nowrap; cursor: normal; } -.frames li small { display: block; font-size: 0.8em; } -.frames li small:before { content: ""; } -.frames li small:after { content: ""; } -.frames li small.search_info { display: none; } -.frames #search { width: 170px; position: static; margin: 3px; margin-left: 10px; font-size: 0.9em; color: #888; padding-left: 0; padding-right: 24px; } -.frames #content.insearch #search { background-position: center right; } -.frames #search input { width: 110px; } -.frames #nav { display: block; } - -#full_list.insearch li { display: none; } -#full_list.insearch li.found { display: list-item; padding-left: 10px; } -#full_list.insearch li a.toggle { display: none; } -#full_list.insearch li small.search_info { display: block; } diff --git a/doc/css/style.css b/doc/css/style.css deleted file mode 100644 index 96307c5..0000000 --- a/doc/css/style.css +++ /dev/null @@ -1,339 +0,0 @@ -body { - padding: 0 20px; - font-family: "Lucida Sans", "Lucida Grande", Verdana, Arial, sans-serif; - font-size: 13px; -} -body.frames { padding: 0 5px; } -h1 { font-size: 25px; margin: 1em 0 0.5em; padding-top: 4px; border-top: 1px dotted #d5d5d5; } -h1.noborder { border-top: 0px; margin-top: 0; padding-top: 4px; } -h1.title { margin-bottom: 10px; } -h1.alphaindex { margin-top: 0; font-size: 22px; } -h2 { - padding: 0; - padding-bottom: 3px; - border-bottom: 1px #aaa solid; - font-size: 1.4em; - margin: 1.8em 0 0.5em; -} -h2 small { font-weight: normal; font-size: 0.7em; display: block; float: right; } -.clear { clear: both; } -.inline { display: inline; } -.inline p:first-child { display: inline; } -.docstring h1, .docstring h2, .docstring h3, .docstring h4 { padding: 0; border: 0; border-bottom: 1px dotted #bbb; } -.docstring h1 { font-size: 1.2em; } -.docstring h2 { font-size: 1.1em; } -.docstring h3, .docstring h4 { font-size: 1em; border-bottom: 0; padding-top: 10px; } -.summary_desc .object_link, .docstring .object_link { font-family: monospace; } -.rdoc-term { padding-right: 25px; font-weight: bold; } -.rdoc-list p { margin: 0; padding: 0; margin-bottom: 4px; } - -/* style for */ -#filecontents table, .docstring table { border-collapse: collapse; } -#filecontents table th, #filecontents table td, -.docstring table th, .docstring table td { border: 1px solid #ccc; padding: 8px; padding-right: 17px; } -#filecontents table tr:nth-child(odd), -.docstring table tr:nth-child(odd) { background: #eee; } -#filecontents table tr:nth-child(even), -.docstring table tr:nth-child(even) { background: #fff; } -#filecontents table th, .docstring table th { background: #fff; } - -/* style for
a",d=q.getElementsByTagName("*"),e=q.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=q.getElementsByTagName("input")[0],b={leadingWhitespace:q.firstChild.nodeType===3,tbody:!q.getElementsByTagName("tbody").length,htmlSerialize:!!q.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:q.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete q.test}catch(s){b.deleteExpando=!1}!q.addEventListener&&q.attachEvent&&q.fireEvent&&(q.attachEvent("onclick",function(){b.noCloneEvent=!1}),q.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),q.appendChild(i),k=c.createDocumentFragment(),k.appendChild(q.lastChild),b.checkClone=k.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,k.removeChild(i),k.appendChild(q),q.innerHTML="",a.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",q.style.width="2px",q.appendChild(j),b.reliableMarginRight=(parseInt((a.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0);if(q.attachEvent)for(o in{submit:1,change:1,focusin:1})n="on"+o,p=n in q,p||(q.setAttribute(n,"return;"),p=typeof q[n]=="function"),b[o+"Bubbles"]=p;k.removeChild(q),k=g=h=j=q=i=null,f(function(){var a,d,e,g,h,i,j,k,m,n,o,r=c.getElementsByTagName("body")[0];!r||(j=1,k="position:absolute;top:0;left:0;width:1px;height:1px;margin:0;",m="visibility:hidden;border:0;",n="style='"+k+"border:5px solid #000;padding:0;'",o="
"+""+"
",a=c.createElement("div"),a.style.cssText=m+"width:0;height:0;position:static;top:0;margin-top:"+j+"px",r.insertBefore(a,r.firstChild),q=c.createElement("div"),a.appendChild(q),q.innerHTML="
t
",l=q.getElementsByTagName("td"),p=l[0].offsetHeight===0,l[0].style.display="",l[1].style.display="none",b.reliableHiddenOffsets=p&&l[0].offsetHeight===0,q.innerHTML="",q.style.width=q.style.paddingLeft="1px",f.boxModel=b.boxModel=q.offsetWidth===2,typeof q.style.zoom!="undefined"&&(q.style.display="inline",q.style.zoom=1,b.inlineBlockNeedsLayout=q.offsetWidth===2,q.style.display="",q.innerHTML="
",b.shrinkWrapBlocks=q.offsetWidth!==2),q.style.cssText=k+m,q.innerHTML=o,d=q.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,i={doesNotAddBorder:e.offsetTop!==5,doesAddBorderForTableAndCells:h.offsetTop===5},e.style.position="fixed",e.style.top="20px",i.fixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",i.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,i.doesNotIncludeMarginInBodyOffset=r.offsetTop!==j,r.removeChild(a),q=a=null,f.extend(b,i))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.valHooks[g.nodeName.toLowerCase()]||f.valHooks[g.type];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;h=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/\bhover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function(a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")}; -f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;le&&i.push({elem:this,matches:d.slice(e)});for(j=0;j0?this.on(b,null,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return bc[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="

";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="
";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h0)for(h=g;h=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(S(c[0])||S(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c);L.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!R[a]?f.unique(e):e,(this.length>1||N.test(d))&&M.test(a)&&(e=e.reverse());return this.pushStack(e,a,P.call(arguments).join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var V="abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/",""],legend:[1,"
","
"],thead:[1,"","
"],tr:[2,"","
"],td:[3,"","
"],col:[2,"","
"],area:[1,"",""],_default:[0,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div
","
"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function() -{for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1>");try{for(var c=0,d=this.length;c1&&l0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||!bc.test("<"+a.nodeName)?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!_.test(k))k=b.createTextNode(k);else{k=k.replace(Y,"<$1>");var l=(Z.exec(k)||["",""])[1].toLowerCase(),m=bg[l]||bg._default,n=m[0],o=b.createElement("div");b===c?bh.appendChild(o):U(b).appendChild(o),o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=$.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]===""&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&X.test(k)&&o.insertBefore(b.createTextNode(X.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return br.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bq,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bq.test(g)?g.replace(bq,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bz(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bA=function(a,b){var c,d,e;b=b.replace(bs,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b)));return c}),c.documentElement.currentStyle&&(bB=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f===null&&g&&(e=g[b])&&(f=e),!bt.test(f)&&bu.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f||0,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),bz=bA||bB,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bD=/%20/g,bE=/\[\]$/,bF=/\r?\n/g,bG=/#.*$/,bH=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bI=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bJ=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bK=/^(?:GET|HEAD)$/,bL=/^\/\//,bM=/\?/,bN=/)<[^<]*)*<\/script>/gi,bO=/^(?:select|textarea)/i,bP=/\s+/,bQ=/([?&])_=[^&]*/,bR=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bS=f.fn.load,bT={},bU={},bV,bW,bX=["*/"]+["*"];try{bV=e.href}catch(bY){bV=c.createElement("a"),bV.href="",bV=bV.href}bW=bR.exec(bV.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bS)return bS.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("
").append(c.replace(bN,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bO.test(this.nodeName)||bI.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bF,"\r\n")}}):{name:b.name,value:c.replace(bF,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b_(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b_(a,b);return a},ajaxSettings:{url:bV,isLocal:bJ.test(bW[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bX},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bZ(bT),ajaxTransport:bZ(bU),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?cb(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cc(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bH.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bG,"").replace(bL,bW[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bP),d.crossDomain==null&&(r=bR.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bW[1]&&r[2]==bW[2]&&(r[3]||(r[1]==="http:"?80:443))==(bW[3]||(bW[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),b$(bT,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bK.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bM.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bQ,"$1_="+x);d.url=y+(y===d.url?(bM.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bX+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=b$(bU,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)ca(g,a[g],c,e);return d.join("&").replace(bD,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cd=f.now(),ce=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cd++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ce.test(b.url)||e&&ce.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ce,l),b.url===j&&(e&&(k=k.replace(ce,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cf=a.ActiveXObject?function(){for(var a in ch)ch[a](0,1)}:!1,cg=0,ch;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ci()||cj()}:ci,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cf&&delete ch[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cg,cf&&(ch||(ch={},f(a).unload(cf)),ch[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var ck={},cl,cm,cn=/^(?:toggle|show|hide)$/,co=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cp,cq=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cr;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cu("show",3),a,b,c);for(var g=0,h=this.length;g=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cy(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cy(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,d,"padding")):this[d]():null},f.fn["outer"+c]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,d,a?"margin":"border")):this[d]():null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c],h=e.document.body;return e.document.compatMode==="CSS1Compat"&&g||h&&h["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var i=f.css(e,d),j=parseFloat(i);return f.isNumeric(j)?j:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window); \ No newline at end of file diff --git a/doc/method_list.html b/doc/method_list.html deleted file mode 100644 index 19ad95c..0000000 --- a/doc/method_list.html +++ /dev/null @@ -1,189 +0,0 @@ - - - - - - - - - - - - - - - - - Method List - - - - -
-

Method List

- - - - -
- - diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html deleted file mode 100644 index eb3397c..0000000 --- a/doc/top-level-namespace.html +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - Top Level Namespace - - — Documentation by YARD 0.8.7.6 - - - - - - - - - - - - - - - - - - - - - -

Top Level Namespace - - - -

- -
- - - - - - - - -
-
- -

Defined Under Namespace

-

- - - Modules: Mongoid - - - - -

- - - - - - - - - -
- - - - - \ No newline at end of file diff --git a/gemfiles/.bundle/config b/gemfiles/.bundle/config index 0981b95..10c69f1 100644 --- a/gemfiles/.bundle/config +++ b/gemfiles/.bundle/config @@ -1,2 +1,2 @@ --- -BUNDLE_WITHOUT: development +BUNDLE_WITHOUT: "development" diff --git a/gemfiles/mongoid4.gemfile b/gemfiles/mongoid7.gemfile similarity index 90% rename from gemfiles/mongoid4.gemfile rename to gemfiles/mongoid7.gemfile index 1056541..02dd22c 100644 --- a/gemfiles/mongoid4.gemfile +++ b/gemfiles/mongoid7.gemfile @@ -5,7 +5,7 @@ gemspec path: '..' gem 'bundler' gem 'rake' gem 'pry' -gem 'mongoid', '~> 4.0.2' +gem 'mongoid', '~> 7.0.0' group :test do gem 'rspec-given', '~> 3.5' diff --git a/gemfiles/mongoid7.gemfile.lock b/gemfiles/mongoid7.gemfile.lock new file mode 100644 index 0000000..6ec95a9 --- /dev/null +++ b/gemfiles/mongoid7.gemfile.lock @@ -0,0 +1,88 @@ +PATH + remote: .. + specs: + mongoid_includes (2.1.0) + mongoid (>= 7.0.0, < 8.0.0) + +GEM + remote: https://rubygems.org/ + specs: + activemodel (6.0.3.4) + activesupport (= 6.0.3.4) + activesupport (6.0.3.4) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + zeitwerk (~> 2.2, >= 2.2.2) + bson (4.11.0) + codeclimate-test-reporter (1.0.9) + simplecov (<= 0.13) + coderay (1.1.3) + concurrent-ruby (1.1.7) + diff-lcs (1.4.4) + docile (1.1.5) + given_core (3.8.1) + sorcerer (>= 0.3.7) + i18n (1.8.5) + concurrent-ruby (~> 1.0) + json (2.3.1) + method_source (1.0.0) + minitest (5.14.2) + mongo (2.13.1) + bson (>= 4.8.2, < 5.0.0) + mongoid (7.0.10) + activemodel (>= 5.1, < 6.1) + mongo (>= 2.7.0, < 3.0.0) + pry (0.13.1) + coderay (~> 1.1) + method_source (~> 1.0) + rake (13.0.1) + rspec (3.9.0) + rspec-core (~> 3.9.0) + rspec-expectations (~> 3.9.0) + rspec-mocks (~> 3.9.0) + rspec-core (3.9.3) + rspec-support (~> 3.9.3) + rspec-expectations (3.9.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.9.0) + rspec-given (3.8.1) + given_core (= 3.8.1) + rspec (>= 2.14.0) + rspec-mocks (3.9.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.9.0) + rspec-support (3.9.4) + simplecov (0.13.0) + docile (~> 1.1.0) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.2) + sorcerer (2.0.1) + thread_safe (0.3.6) + tomparse (0.4.2) + tzinfo (1.2.7) + thread_safe (~> 0.1) + yard (0.9.25) + yard-tomdoc (0.7.1) + tomparse (>= 0.4.0) + yard + zeitwerk (2.4.1) + +PLATFORMS + ruby + +DEPENDENCIES + bundler + codeclimate-test-reporter + mongoid (~> 7.0.0) + mongoid_includes! + pry + rake + rspec-given (~> 3.5) + yard + yard-tomdoc + +BUNDLED WITH + 2.1.4 diff --git a/lib/mongoid/includes.rb b/lib/mongoid/includes.rb index 2bd6db0..bb67799 100644 --- a/lib/mongoid/includes.rb +++ b/lib/mongoid/includes.rb @@ -1,4 +1,4 @@ require 'mongoid/includes/version' require 'mongoid/includes/criteria' require 'mongoid/includes/eager_load' -require 'mongoid/includes/relations/eager' +require 'mongoid/includes/association/eager' diff --git a/lib/mongoid/includes/relations/eager.rb b/lib/mongoid/includes/association/eager.rb similarity index 81% rename from lib/mongoid/includes/relations/eager.rb rename to lib/mongoid/includes/association/eager.rb index 9f48aac..2a08010 100644 --- a/lib/mongoid/includes/relations/eager.rb +++ b/lib/mongoid/includes/association/eager.rb @@ -1,6 +1,6 @@ module Mongoid module Includes - module Relations + module Association # Internal: Patch to the base class for eager load preload functions, # that interacts with the Mongoid::Includes::Inclusion as @medatada. @@ -9,7 +9,7 @@ module Eager # Internal: Performs eager load and iterates over the preloaded documents # for the current relation. def each_loaded_document - @metadata.load_documents_for(key, keys_from_docs).each do |doc| + @association.load_documents_for(key, keys_from_docs).each do |doc| yield doc end end diff --git a/lib/mongoid/includes/inclusion.rb b/lib/mongoid/includes/inclusion.rb index bd5cc52..ee2ec2b 100644 --- a/lib/mongoid/includes/inclusion.rb +++ b/lib/mongoid/includes/inclusion.rb @@ -25,7 +25,7 @@ def eql?(other) # Public: Returns true if the relation is a polymorphic belongs_to. def polymorphic_belongs_to? - metadata.polymorphic? && metadata.relation == Mongoid::Relations::Referenced::In + metadata.polymorphic? && metadata.relation == Mongoid::Association::Referenced::BelongsTo::Proxy end # Public: Name of the relation from which a nested inclusion is performed. @@ -46,6 +46,9 @@ def modifier # Public: Preloads the documents for the relation. Uses a custom block # if one was provided, or fetches them using the class and the foreign key. def load_documents_for(foreign_key, foreign_key_values) + # NOTE: We assume the upstream code in Mongoid is removing nil keys. + return klass.none if foreign_key_values.empty? + if loader loader.call(foreign_key, foreign_key_values) else @@ -60,8 +63,8 @@ def load_documents_for(foreign_key, foreign_key_values) # Returns an Inclusion that can be eager loaded as usual. def for_class_name(class_name) Inclusion.new metadata.clone.instance_eval { |relation_metadata| - self[:class_name] = @class_name = class_name - self[:polymorphic], self[:as], @polymorphic, @klass = nil + @options[:class_name] = @class_name = class_name + @options[:polymorphic], @options[:as], @polymorphic, @klass = nil self }, with: @modifier, loader: @loader end diff --git a/lib/mongoid/includes/inclusions.rb b/lib/mongoid/includes/inclusions.rb index 89160d1..d69a370 100644 --- a/lib/mongoid/includes/inclusions.rb +++ b/lib/mongoid/includes/inclusions.rb @@ -11,6 +11,11 @@ def initialize(object = []) super Set.new(object) end + # Override: Avoid replacing existing inclusions. + def add(metadata) + include?(metadata) ? metadata : super + end + # Public: Adds a new relation as an inclusion. # # Returns the added inclusion. diff --git a/lib/mongoid/includes/version.rb b/lib/mongoid/includes/version.rb index 8cb0a44..18008de 100644 --- a/lib/mongoid/includes/version.rb +++ b/lib/mongoid/includes/version.rb @@ -5,6 +5,6 @@ module Mongoid module Includes # Public: This library will attempt to follow semantic versioning (whatever that's supposed to be). - VERSION = '2.1.0' + VERSION = '3.0.0' end end diff --git a/lib/mongoid_includes.rb b/lib/mongoid_includes.rb index 63952f9..bcf12ce 100644 --- a/lib/mongoid_includes.rb +++ b/lib/mongoid_includes.rb @@ -9,4 +9,4 @@ Mongoid::Contextual::Memory.send :prepend, Mongoid::Includes::EagerLoad Mongoid::Criteria.send :prepend, Mongoid::Includes::Criteria -Mongoid::Relations::Eager::Base.send :prepend, Mongoid::Includes::Relations::Eager +Mongoid::Association::Referenced::Eager::Base.send :prepend, Mongoid::Includes::Association::Eager diff --git a/mongoid_includes.gemspec b/mongoid_includes.gemspec index e999631..7444107 100644 --- a/mongoid_includes.gemspec +++ b/mongoid_includes.gemspec @@ -22,5 +22,5 @@ Gem::Specification.new do |s| s.files = Dir.glob('lib/**/*') + %w(CHANGELOG.md LICENSE.txt README.md Rakefile) s.test_files = Dir.glob('spec/**/*') - s.add_runtime_dependency 'mongoid', ['>= 6.0.1', '< 7.0.0'] + s.add_runtime_dependency 'mongoid', ['>= 7.0.10', '< 8.0.0'] end diff --git a/spec/mongoid/includes/inclusions_spec.rb b/spec/mongoid/includes/inclusions_spec.rb index 62d8ec0..3848cc5 100644 --- a/spec/mongoid/includes/inclusions_spec.rb +++ b/spec/mongoid/includes/inclusions_spec.rb @@ -20,11 +20,9 @@ And { result.class == Mongoid::Includes::Inclusions } end - context 'prevents duplicates' do - Given { - inclusions.add(Band.relations['albums']) - } - Then { inclusions.size == 3 } + it 'prevents duplicates' do + new_criteria = criteria.includes(:albums) + expect(new_criteria.inclusions.size).to eq 3 end end end diff --git a/spec/mongoid/includes/polymorphic_includes_spec.rb b/spec/mongoid/includes/polymorphic_includes_spec.rb index 32082f2..fb07c34 100644 --- a/spec/mongoid/includes/polymorphic_includes_spec.rb +++ b/spec/mongoid/includes/polymorphic_includes_spec.rb @@ -6,7 +6,7 @@ Given(:inclusions) { criteria.inclusions } context 'multiple inclusions through polymorphic associations' do - Given(:pink_floyd) { Band.create!(name: 'Pink Floyd') } + Given(:pink_floyd) { Band.create!(name: 'Pink Floyd', musician_ids: [nil, '']) } Given(:jethro) { Band.create!(name: 'Jethro Tull') } Given { Artist.create!(name: 'David Gilmour', associated_act: pink_floyd) @@ -31,7 +31,7 @@ } describe ':with inclusions should not be overriden' do - When(:artists) { expect_query(5) { criteria.entries } } + When(:artists) { expect_query(4) { criteria.entries } } # There are no musicians, so no query should be made. Given(:albums) { artists.map(&:associated_act).flat_map(&:albums) } Then { artists.size == 2 } And { diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index cf2b4a6..fce7e1e 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -45,8 +45,11 @@ def mongodb_version ) end -if defined?(Mongo) - Mongo::Logger.logger = Logger.new("./spec/mongo.log") +# Logging to the console is useful for debugging queries. +Mongo::Logger.logger = Logger.new('./spec/mongo.log') + +def log_mongo_to_console + Mongo::Logger.logger = Logger.new($stdout) end RSpec.configure do |config| diff --git a/spec/support/helpers.rb b/spec/support/helpers.rb index 0c4a338..6beb635 100644 --- a/spec/support/helpers.rb +++ b/spec/support/helpers.rb @@ -23,21 +23,21 @@ def inspect module Mongoid module SpecHelpers - if defined?(Mongo::Logger.logger) - def expect_query(number) - # There are both start and complete events for each query. - expect(Mongo::Logger.logger).to receive(:debug?).exactly(number * 4).times.and_call_original - yield - end - else - 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} - ]) + def connection_class + Mongo::Server::ConnectionBase + end + + def expect_query(number) + rv = nil + RSpec::Mocks.with_temporary_scope do + if number > 0 + expect_any_instance_of(connection_class).to receive(:command_started).exactly(number).times.and_call_original + else + expect_any_instance_of(connection_class).not_to receive(:command_started) + end + rv = yield end + rv end def expect_no_queries(&block) diff --git a/spec/support/models/person.rb b/spec/support/models/person.rb index beedc34..fe64366 100644 --- a/spec/support/models/person.rb +++ b/spec/support/models/person.rb @@ -62,7 +62,7 @@ def extension end end - has_many :posts, dependent: :delete, validate: false do + has_many :posts, dependent: :delete_all, validate: false do def extension "Testing" end diff --git a/spec/support/models/post.rb b/spec/support/models/post.rb index e30d398..f5d1750 100644 --- a/spec/support/models/post.rb +++ b/spec/support/models/post.rb @@ -1,3 +1,5 @@ +require_relative './person' + class Post include Mongoid::Document include Mongoid::Attributes::Dynamic From 880e1184100cd7f4b62179cbc5196289efadd683 Mon Sep 17 00:00:00 2001 From: Maximo Mussini Date: Fri, 30 Oct 2020 22:46:47 -0300 Subject: [PATCH 2/4] Update Travis configuration --- .bundle/config | 2 ++ .travis.yml | 4 ++-- gemfiles/mongoid7.gemfile.lock | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 .bundle/config diff --git a/.bundle/config b/.bundle/config new file mode 100644 index 0000000..10c69f1 --- /dev/null +++ b/.bundle/config @@ -0,0 +1,2 @@ +--- +BUNDLE_WITHOUT: "development" diff --git a/.travis.yml b/.travis.yml index 449693b..c9f5e7f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ language: ruby bundler_args: --without development rvm: - - 2.3.3 + - 2.7.1 gemfile: - Gemfile @@ -14,7 +14,7 @@ env: - CI="travis" - JRUBY_OPTS="--server -J-Xms512m -J-Xmx1024m" matrix: - - MONGODB=2.6.10 + - MONGODB=4.0.3 before_script: - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz -O /tmp/mongodb.tgz diff --git a/gemfiles/mongoid7.gemfile.lock b/gemfiles/mongoid7.gemfile.lock index 6ec95a9..ddc871d 100644 --- a/gemfiles/mongoid7.gemfile.lock +++ b/gemfiles/mongoid7.gemfile.lock @@ -1,8 +1,8 @@ PATH remote: .. specs: - mongoid_includes (2.1.0) - mongoid (>= 7.0.0, < 8.0.0) + mongoid_includes (3.0.0) + mongoid (>= 7.0.10, < 8.0.0) GEM remote: https://rubygems.org/ From 02e595287aedd99bcba2973e1203daef72e4c742 Mon Sep 17 00:00:00 2001 From: Maximo Mussini Date: Fri, 30 Oct 2020 22:53:43 -0300 Subject: [PATCH 3/4] Automate test coverage reports and update Travis configuration --- .travis.yml | 8 +++ Gemfile | 1 + Gemfile.lock | 8 +++ gemfiles/mongoid4.gemfile.lock | 96 ---------------------------------- gemfiles/mongoid6.gemfile | 18 ------- gemfiles/mongoid6.gemfile.lock | 87 ------------------------------ gemfiles/mongoid7.gemfile | 9 +--- gemfiles/mongoid7.gemfile.lock | 23 ++++---- spec/spec_helper.rb | 6 +-- 9 files changed, 30 insertions(+), 226 deletions(-) delete mode 100644 gemfiles/mongoid4.gemfile.lock delete mode 100644 gemfiles/mongoid6.gemfile delete mode 100644 gemfiles/mongoid6.gemfile.lock diff --git a/.travis.yml b/.travis.yml index c9f5e7f..4dba73c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,7 @@ env: global: - CI="travis" - JRUBY_OPTS="--server -J-Xms512m -J-Xmx1024m" + - CC_TEST_REPORTER_ID=fd17c835d3e49ec85fddd67f8834b7652021efd7653d8d00f8be67d6229bdc2e matrix: - MONGODB=4.0.3 @@ -22,5 +23,12 @@ before_script: - mkdir /tmp/data - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath /tmp/data --bind_ip 127.0.0.1 --auth &> /dev/null & + - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter + - chmod +x ./cc-test-reporter + - ./cc-test-reporter before-build + +after_script: + - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT + notifications: email: false diff --git a/Gemfile b/Gemfile index ad3a25b..6622c5c 100644 --- a/Gemfile +++ b/Gemfile @@ -9,4 +9,5 @@ gem 'mongoid', '~> 7.1.0' group :test do gem 'rspec-given', '~> 3.5' + gem 'simplecov', '~> 0.17.0', require: false end diff --git a/Gemfile.lock b/Gemfile.lock index 83e25be..7a58fb4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -20,10 +20,12 @@ GEM coderay (1.1.3) concurrent-ruby (1.1.7) diff-lcs (1.4.4) + docile (1.3.2) given_core (3.8.1) sorcerer (>= 0.3.7) i18n (1.8.5) concurrent-ruby (~> 1.0) + json (2.3.1) method_source (1.0.0) minitest (5.14.2) mongo (2.13.1) @@ -54,6 +56,11 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) rspec-support (3.9.4) + simplecov (0.17.1) + docile (~> 1.1) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.2) sorcerer (2.0.1) thread_safe (0.3.6) tzinfo (1.2.7) @@ -70,6 +77,7 @@ DEPENDENCIES pry-byebug rake rspec-given (~> 3.5) + simplecov (~> 0.17.0) BUNDLED WITH 2.1.4 diff --git a/gemfiles/mongoid4.gemfile.lock b/gemfiles/mongoid4.gemfile.lock deleted file mode 100644 index 3a77204..0000000 --- a/gemfiles/mongoid4.gemfile.lock +++ /dev/null @@ -1,96 +0,0 @@ -PATH - remote: .. - specs: - mongoid_includes (1.1.3) - mongoid (>= 4.0.0, < 7.0.0) - -GEM - remote: https://rubygems.org/ - specs: - activemodel (4.2.7.1) - activesupport (= 4.2.7.1) - builder (~> 3.1) - activesupport (4.2.7.1) - i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) - minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) - tzinfo (~> 1.1) - bson (3.2.6) - builder (3.2.2) - codeclimate-test-reporter (1.0.4) - simplecov - coderay (1.1.1) - connection_pool (2.2.1) - diff-lcs (1.2.5) - docile (1.1.5) - given_core (3.8.0) - sorcerer (>= 0.3.7) - i18n (0.7.0) - json (1.8.3) - method_source (0.8.2) - minitest (5.10.1) - mongoid (4.0.2) - activemodel (~> 4.0) - moped (~> 2.0.0) - origin (~> 2.1) - tzinfo (>= 0.3.37) - moped (2.0.7) - bson (~> 3.0) - connection_pool (~> 2.0) - optionable (~> 0.2.0) - optionable (0.2.0) - origin (2.3.0) - pry (0.10.4) - coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - rake (12.0.0) - rspec (3.5.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-core (3.5.4) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-given (3.8.0) - given_core (= 3.8.0) - rspec (>= 2.14.0) - rspec-mocks (3.5.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-support (3.5.0) - simplecov (0.12.0) - docile (~> 1.1.0) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) - simplecov-html (0.10.0) - slop (3.6.0) - sorcerer (1.0.2) - thread_safe (0.3.5) - tomparse (0.4.2) - tzinfo (1.2.2) - thread_safe (~> 0.1) - yard (0.9.7) - yard-tomdoc (0.7.1) - tomparse (>= 0.4.0) - yard - -PLATFORMS - ruby - -DEPENDENCIES - bundler - codeclimate-test-reporter - mongoid (~> 4.0.2) - mongoid_includes! - pry - rake - rspec-given (~> 3.5) - yard - yard-tomdoc - -BUNDLED WITH - 1.12.5 diff --git a/gemfiles/mongoid6.gemfile b/gemfiles/mongoid6.gemfile deleted file mode 100644 index a4b0335..0000000 --- a/gemfiles/mongoid6.gemfile +++ /dev/null @@ -1,18 +0,0 @@ -source 'https://rubygems.org' - -gemspec path: '..' - -gem 'bundler' -gem 'rake' -gem 'pry' -gem 'mongoid', '~> 6.0.3' - -group :test do - gem 'rspec-given', '~> 3.5' - gem 'codeclimate-test-reporter', require: nil -end - -group :doc do - gem 'yard' - gem 'yard-tomdoc' -end diff --git a/gemfiles/mongoid6.gemfile.lock b/gemfiles/mongoid6.gemfile.lock deleted file mode 100644 index 615e27f..0000000 --- a/gemfiles/mongoid6.gemfile.lock +++ /dev/null @@ -1,87 +0,0 @@ -PATH - remote: .. - specs: - mongoid_includes (1.1.3) - mongoid (>= 4.0.0, < 7.0.0) - -GEM - remote: https://rubygems.org/ - specs: - activemodel (5.0.0.1) - activesupport (= 5.0.0.1) - activesupport (5.0.0.1) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (~> 0.7) - minitest (~> 5.1) - tzinfo (~> 1.1) - bson (4.2.0) - codeclimate-test-reporter (1.0.3) - simplecov - coderay (1.1.1) - concurrent-ruby (1.0.2) - diff-lcs (1.2.5) - docile (1.1.5) - given_core (3.8.0) - sorcerer (>= 0.3.7) - i18n (0.7.0) - json (2.0.2) - method_source (0.8.2) - minitest (5.10.1) - mongo (2.4.0) - bson (~> 4.2.0) - mongoid (6.0.3) - activemodel (~> 5.0) - mongo (~> 2.3) - pry (0.10.4) - coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - rake (12.0.0) - rspec (3.5.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-core (3.5.4) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-given (3.8.0) - given_core (= 3.8.0) - rspec (>= 2.14.0) - rspec-mocks (3.5.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-support (3.5.0) - simplecov (0.12.0) - docile (~> 1.1.0) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) - simplecov-html (0.10.0) - slop (3.6.0) - sorcerer (1.0.2) - thread_safe (0.3.5) - tomparse (0.4.2) - tzinfo (1.2.2) - thread_safe (~> 0.1) - yard (0.9.5) - yard-tomdoc (0.7.1) - tomparse (>= 0.4.0) - yard - -PLATFORMS - ruby - -DEPENDENCIES - bundler - codeclimate-test-reporter - mongoid (~> 6.0.3) - mongoid_includes! - pry - rake - rspec-given (~> 3.5) - yard - yard-tomdoc - -BUNDLED WITH - 1.12.5 diff --git a/gemfiles/mongoid7.gemfile b/gemfiles/mongoid7.gemfile index 02dd22c..9937a39 100644 --- a/gemfiles/mongoid7.gemfile +++ b/gemfiles/mongoid7.gemfile @@ -4,15 +4,10 @@ gemspec path: '..' gem 'bundler' gem 'rake' -gem 'pry' +gem 'pry-byebug' gem 'mongoid', '~> 7.0.0' group :test do gem 'rspec-given', '~> 3.5' - gem 'codeclimate-test-reporter', require: nil -end - -group :doc do - gem 'yard' - gem 'yard-tomdoc' + gem 'simplecov', '~> 0.17.0', require: false end diff --git a/gemfiles/mongoid7.gemfile.lock b/gemfiles/mongoid7.gemfile.lock index ddc871d..4f38be3 100644 --- a/gemfiles/mongoid7.gemfile.lock +++ b/gemfiles/mongoid7.gemfile.lock @@ -16,12 +16,11 @@ GEM tzinfo (~> 1.1) zeitwerk (~> 2.2, >= 2.2.2) bson (4.11.0) - codeclimate-test-reporter (1.0.9) - simplecov (<= 0.13) + byebug (11.1.3) coderay (1.1.3) concurrent-ruby (1.1.7) diff-lcs (1.4.4) - docile (1.1.5) + docile (1.3.2) given_core (3.8.1) sorcerer (>= 0.3.7) i18n (1.8.5) @@ -37,6 +36,9 @@ GEM pry (0.13.1) coderay (~> 1.1) method_source (~> 1.0) + pry-byebug (3.9.0) + byebug (~> 11.0) + pry (~> 0.13.0) rake (13.0.1) rspec (3.9.0) rspec-core (~> 3.9.0) @@ -54,20 +56,15 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) rspec-support (3.9.4) - simplecov (0.13.0) - docile (~> 1.1.0) + simplecov (0.17.1) + docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) sorcerer (2.0.1) thread_safe (0.3.6) - tomparse (0.4.2) tzinfo (1.2.7) thread_safe (~> 0.1) - yard (0.9.25) - yard-tomdoc (0.7.1) - tomparse (>= 0.4.0) - yard zeitwerk (2.4.1) PLATFORMS @@ -75,14 +72,12 @@ PLATFORMS DEPENDENCIES bundler - codeclimate-test-reporter mongoid (~> 7.0.0) mongoid_includes! - pry + pry-byebug rake rspec-given (~> 3.5) - yard - yard-tomdoc + simplecov (~> 0.17.0) BUNDLED WITH 2.1.4 diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index fce7e1e..ee4a410 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,7 +1,5 @@ -if ENV['CODECLIMATE_REPO_TOKEN'] - require 'codeclimate-test-reporter' - CodeClimate::TestReporter.start -end +require 'simplecov' +SimpleCov.start require 'rspec/given' require 'pry' From 80fd4921a7fd56bf22fde0797057adb89ea9752d Mon Sep 17 00:00:00 2001 From: Maximo Mussini Date: Fri, 30 Oct 2020 23:12:21 -0300 Subject: [PATCH 4/4] Remove undocumented loader feature --- lib/mongoid/includes/criteria.rb | 2 +- lib/mongoid/includes/inclusion.rb | 15 ++----- lib/mongoid/includes/inclusions.rb | 6 +-- .../includes/polymorphic_includes_spec.rb | 6 +++ .../includes/simple_inclusions_spec.rb | 14 +----- spec/support/helpers.rb | 23 ---------- spec/support/models/address.rb | 38 +--------------- spec/support/models/game.rb | 6 +-- spec/support/models/musician.rb | 4 -- spec/support/models/person.rb | 21 ++------- spec/support/models/record.rb | 43 ------------------- 11 files changed, 19 insertions(+), 159 deletions(-) diff --git a/lib/mongoid/includes/criteria.rb b/lib/mongoid/includes/criteria.rb index 2e277b2..6dd4b62 100644 --- a/lib/mongoid/includes/criteria.rb +++ b/lib/mongoid/includes/criteria.rb @@ -19,7 +19,7 @@ def inclusions # loaded from. # from_class: - Necessary to solve ambiguity when doing two-level eager # load through a polymorphic relation. - # loader: - An optional block that specifies how to load all the + # with: - An optional block that specifies how to load all the # related documents. # # Notes: diff --git a/lib/mongoid/includes/inclusion.rb b/lib/mongoid/includes/inclusion.rb index ee2ec2b..871b2ac 100644 --- a/lib/mongoid/includes/inclusion.rb +++ b/lib/mongoid/includes/inclusion.rb @@ -33,11 +33,6 @@ def from @from ||= @options[:from] end - # Internal: Proc that will return the included documents from a set of foreign keys. - def loader - @loader ||= @options[:loader] - end - # Internal: Proc that will modify the documents to include in the relation. def modifier @modifier ||= @options[:with] @@ -49,12 +44,8 @@ def load_documents_for(foreign_key, foreign_key_values) # NOTE: We assume the upstream code in Mongoid is removing nil keys. return klass.none if foreign_key_values.empty? - if loader - loader.call(foreign_key, foreign_key_values) - else - docs = klass.any_in(foreign_key => foreign_key_values) - modifier ? modifier.call(docs) : docs - end + docs = klass.any_in(foreign_key => foreign_key_values) + modifier ? modifier.call(docs) : docs end # Public: Clones the inclusion and changes the Mongoid::Metadata::Relation @@ -66,7 +57,7 @@ def for_class_name(class_name) @options[:class_name] = @class_name = class_name @options[:polymorphic], @options[:as], @polymorphic, @klass = nil self - }, with: @modifier, loader: @loader + }, with: @modifier end end end diff --git a/lib/mongoid/includes/inclusions.rb b/lib/mongoid/includes/inclusions.rb index d69a370..eb9d56a 100644 --- a/lib/mongoid/includes/inclusions.rb +++ b/lib/mongoid/includes/inclusions.rb @@ -22,9 +22,9 @@ def add(metadata) def push(metadata, options = {}) metadata = Inclusion.new(metadata, options) unless metadata.is_a?(Inclusion) - # Ensure that an inclusion with a specified loader or modifier replaces - # a previously specified loader. - delete(metadata) if metadata.loader || metadata.modifier + # Ensure that an inclusion with a specified modifier replaces a + # previously specified one. + delete(metadata) if metadata.modifier # Internally it's a set so it won't add it twice. add(metadata) diff --git a/spec/mongoid/includes/polymorphic_includes_spec.rb b/spec/mongoid/includes/polymorphic_includes_spec.rb index fb07c34..da22007 100644 --- a/spec/mongoid/includes/polymorphic_includes_spec.rb +++ b/spec/mongoid/includes/polymorphic_includes_spec.rb @@ -49,6 +49,12 @@ And { inclusions.first.nested? } And { inclusions.last.polymorphic? && inclusions.last.modifier } end + + it 'should fail if a polymorphic association is not disambiguated' do + expect { + criteria.includes(:musicians, from: :associated_act) + }.to raise_error(Mongoid::Includes::Errors::InvalidPolymorphicIncludes) + end end end end diff --git a/spec/mongoid/includes/simple_inclusions_spec.rb b/spec/mongoid/includes/simple_inclusions_spec.rb index e593274..f7f9cf6 100644 --- a/spec/mongoid/includes/simple_inclusions_spec.rb +++ b/spec/mongoid/includes/simple_inclusions_spec.rb @@ -327,7 +327,7 @@ class D end let!(:depeche) do - Band.create!(name: 'Depeche Mode') + Band.create!(name: 'Depeche Mode', records: [Record.new(name: 'Music for the Masses')]) end let!(:tool) do @@ -347,10 +347,6 @@ class D peep.reload.addresses.includes(:band) end - let(:context) do - criteria.context - end - let!(:document) do criteria.first end @@ -372,10 +368,6 @@ class D peep.reload.addresses.includes(:band) end - let(:context) do - criteria.context - end - let!(:document) do criteria.last end @@ -397,10 +389,6 @@ class D peep.reload.addresses.includes(:band) end - let(:context) do - criteria.context - end - let!(:documents) do criteria.to_a end diff --git a/spec/support/helpers.rb b/spec/support/helpers.rb index 6beb635..baea16c 100644 --- a/spec/support/helpers.rb +++ b/spec/support/helpers.rb @@ -1,26 +1,3 @@ -module Mongoid - class QueryCounter - attr_reader :events - - def initialize - @events = [] - end - - def instrument - subscriber = ActiveSupport::Notifications.subscribe('query.moped') do |*args| - @events << ActiveSupport::Notifications::Event.new(*args) - end - yield - ensure - ActiveSupport::Notifications.unsubscribe(subscriber) - end - - def inspect - @events.map { |e| e.payload[:ops].map(&:log_inspect) }.join("\n") - end - end -end - module Mongoid module SpecHelpers def connection_class diff --git a/spec/support/models/address.rb b/spec/support/models/address.rb index dc49d26..7b6e330 100644 --- a/spec/support/models/address.rb +++ b/spec/support/models/address.rb @@ -26,44 +26,8 @@ class Address belongs_to :band - embedded_in :addressable, polymorphic: true do - def extension - "Testing" - end - def doctor? - title == "Dr" - end - end - - scope :without_postcode, ->{ where(postcode: nil) } - scope :rodeo, ->{ where(street: "Rodeo Dr") } do - def mansion? - all? { |address| address.street == "Rodeo Dr" } - end - end + embedded_in :addressable, polymorphic: true validates_presence_of :street, on: :update validates_format_of :street, with: /\D/, allow_nil: true - - def set_parent=(set = false) - self.parent_title = addressable.title if set - end - - def <=>(other) - street <=> other.street - end - - class << self - def california - where(state: "CA") - end - - def homes - where(address_type: "Home") - end - - def streets - all.map(&:street) - end - end end diff --git a/spec/support/models/game.rb b/spec/support/models/game.rb index b26bc55..af1f42e 100644 --- a/spec/support/models/game.rb +++ b/spec/support/models/game.rb @@ -7,11 +7,7 @@ class Game belongs_to :person, index: true, validate: true - if Mongoid::VERSION >= "6.0.0" - belongs_to :parent, class_name: "Game", foreign_key: "parent-id", optional: true - else - belongs_to :parent, class_name: "Game", foreign_key: "parent-id" - end + belongs_to :parent, class_name: "Game", foreign_key: "parent-id", optional: true accepts_nested_attributes_for :person diff --git a/spec/support/models/musician.rb b/spec/support/models/musician.rb index 49239a4..2c41c29 100644 --- a/spec/support/models/musician.rb +++ b/spec/support/models/musician.rb @@ -3,8 +3,4 @@ class Musician < Person has_and_belongs_to_many :bands - - def musician? - true - end end diff --git a/spec/support/models/person.rb b/spec/support/models/person.rb index fe64366..1642341 100644 --- a/spec/support/models/person.rb +++ b/spec/support/models/person.rb @@ -47,26 +47,11 @@ class Person attr_reader :rescored - embeds_many :addresses, as: :addressable, validate: false do - def extension - "Testing" - end - def find_by_street(street) - where(street: street).first - end - end + embeds_many :addresses, as: :addressable, validate: false - has_one :game, dependent: :destroy, validate: false do - def extension - "Testing" - end - end + has_one :game, dependent: :destroy, validate: false - has_many :posts, dependent: :delete_all, validate: false do - def extension - "Testing" - end - end + has_many :posts, dependent: :delete_all, validate: false has_and_belongs_to_many :preferences, index: true, dependent: :nullify, validate: false end diff --git a/spec/support/models/record.rb b/spec/support/models/record.rb index 6d0015d..a8e3e5e 100644 --- a/spec/support/models/record.rb +++ b/spec/support/models/record.rb @@ -3,48 +3,5 @@ class Record field :name, type: String - 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 - - before_create :before_create_stub - before_save :before_save_stub - before_update :before_update_stub - before_validation :before_validation_stub - before_destroy :before_destroy_stub - - after_destroy :access_band - - def before_create_stub - self.before_create_called = true - end - - def before_save_stub - self.before_save_called = true - end - - def before_update_stub - self.before_update_called = true - end - - def before_validation_stub - self.before_validation_called = true - end - - def before_destroy_stub - self.before_destroy_called = true - end - - def access_band - band.name - end - - def dont_call_me_twice - end - - validate { dont_call_me_twice } end