mongodb_model 0.0.4 → 0.0.5

data/lib/mongo/model.rb

@@ -18,6 +18,7 @@ module Mongo::Model; end
   validation/uniqueness_validator
   crud
   query
+  query_mixin
   scope
   attribute_convertors
   file_model
@@ -33,7 +34,7 @@ module Mongo
       Callbacks,
       Validation,
       Crud,
-      Query,
+      QueryMixin,
       Scope,
       AttributeConvertors,
       Mongo::Model::FileModel,

data/lib/mongo/model/callbacks.rb

@@ -2,7 +2,7 @@ module Mongo::Model::Callbacks
   inherit RubyExt::Callbacks
 
   module ClassMethods
-    [:validate, :update, :save, :destroy].each do |method_name|
+    [:validate, :create, :update, :save, :destroy].each do |method_name|
       define_method "before_#{method_name}" do |*args, &block|
         opt = args.extract_options!
         if block

data/lib/mongo/model/crud.rb

@@ -1,7 +1,7 @@
 module Mongo::Model::Crud
-  def save opts = {}
-    with_collection opts do |collection, opts|
-      collection.save self, opts
+  def save options = {}
+    with_collection options do |collection, options|
+      collection.save self, options
     end
   end
 
@@ -9,9 +9,9 @@ module Mongo::Model::Crud
     save(*args) || raise(Mongo::Error, "can't save #{self.inspect}!")
   end
 
-  def destroy opts = {}
-    with_collection opts do |collection, opts|
-      collection.destroy self, opts
+  def destroy options = {}
+    with_collection options do |collection, options|
+      collection.destroy self, options
     end
   end
 
@@ -20,38 +20,38 @@ module Mongo::Model::Crud
   end
 
   module ClassMethods
-    def build attributes = {}, opts = {}
-      self.new.set attributes, opts
+    def build attributes = {}, options = {}
+      self.new.set attributes, options
     end
 
-    def create attributes = {}, opts = {}
-      o = build attributes, opts
+    def create attributes = {}, options = {}
+      o = build attributes, options
       o.save
       o
     end
 
-    def create! attributes = {}, opts = {}
+    def create! attributes = {}, options = {}
       o = create attributes
       raise(Mongo::Error, "can't create #{attributes.inspect}!") if o.new_record?
       o
     end
 
-    def destroy_all selector = {}, opts = {}
+    def destroy_all selector = {}, options = {}
       success = true
-      collection = opts[:collection] || self.collection
+      collection = options[:collection] || self.collection
       each(selector){|o| success = false unless o.destroy}
       success
     end
 
-    def destroy_all! selector = {}, opts = {}
-      destroy_all(selector, opts) || raise(Mongo::Error, "can't destroy #{selector.inspect}!")
+    def destroy_all! selector = {}, options = {}
+      destroy_all(selector, options) || raise(Mongo::Error, "can't destroy #{selector.inspect}!")
     end
   end
 
   protected
-    def with_collection opts, &block
-      opts = opts.clone
-      collection = opts.delete(:collection) || self.class.collection
-      block.call collection, opts
+    def with_collection options, &block
+      options = options.clone
+      collection = options.delete(:collection) || self.class.collection
+      block.call collection, options
     end
 end

data/lib/mongo/model/file_model.rb

@@ -15,7 +15,7 @@ module Mongo::Model::FileModel
 
       before_validate do |model|
         file_model = model.send(attr_name)
-        file_model.validate
+        file_model.run_validations
         model.errors[attr_name] = file_model.errors unless file_model.errors.empty?
       end
 

data/lib/mongo/model/misc.rb

@@ -9,10 +9,9 @@ module Mongo::Model::Misc
   def _cache
     @_cache ||= {}
   end
-  def _clear_cache
-    @_cache = {}
-  end
-
+  # def _clear_cache
+  #   @_cache = {}
+  # end
 
   def dom_id
     # new_record? ? "new_#{self.class.name.underscore}" : to_param
@@ -25,6 +24,18 @@ module Mongo::Model::Misc
 
   delegate :t, to: I18n
 
+  def reload
+    obj = self.class.by_id!(_id || raise("can't reload new document (#{self})!"))
+    instance_variables.each{|n| remove_instance_variable n}
+    obj.instance_variables.each do |n|
+      instance_variable_set n, obj.instance_variable_get(n)
+    end
+    nil
+  end
+  
+  def original
+    @_original ||= _id? ? self.class.by_id(self._id) : nil
+  end
 
   module ClassMethods
     delegate :t, to: I18n

data/lib/mongo/model/query.rb

@@ -1,36 +1,46 @@
-module Mongo::Model::Query
-  module ClassMethods
-    include Mongo::DynamicFinders
+class Mongo::Model::Query < Object
+  attr_reader :model, :selector, :options
 
-    def count selector = {}, opts = {}
-      collection.count selector, opts
-    end
+  def initialize model, selector = {}, options = {} *args
+    @model, @selector, @options = model, selector, options
+  end
 
-    def first selector = {}, opts = {}
-      collection.first selector, opts
-    end
+  def class
+    ::Mongo::Model::Query
+  end
 
-    def each selector = {}, opts = {}, &block
-      collection.each selector, opts, &block
-    end
+  def merge query
+    raise "can't merge queries with different models!" unless model == query.model
+    self.class.new model, selector.merge(query.selector), options.merge(query.options)
+  end
 
-    def all selector = {}, opts = {}, &block
-      if block
-        each selector, opts, &block
-      else
-        list = []
-        each(selector, opts){|doc| list << doc}
-        list
-      end
-    end
+  def inspect
+    "#<Mongo::Model::Query: #{model} #{@selector.inspect} #{@options.inspect}>"
+  end
+  alias_method :to_s, :inspect
 
-    def first! selector = {}, opts = {}
-      first(selector, opts) || raise(Mongo::NotFound, "document with selector #{selector} not found!")
-    end
+  def == o
+    self.class == o.class and ([model, selector, options] == [o.model, o.selector, o.options])
+  end
 
-    def exists? selector = {}, opts = {}
-      count(selector, opts) > 0
-    end
-    alias :exist? :exists?
+  def build attributes = {}, options = {}
+    model.build selector.merge(attributes), options
   end
+
+  def create attributes = {}, options = {}
+    model.create selector.merge(attributes), options
+  end
+
+  def create! attributes = {}, options = {}
+    model.create! selector.merge(attributes), options
+  end
+
+  protected
+    def method_missing method, *args, &block
+      model.with_scope selector, options do
+        result = model.send method, *args, &block
+        result = self.merge result if result.is_a? self.class
+        result
+      end
+    end
 end

data/lib/mongo/model/query_mixin.rb

@@ -0,0 +1,45 @@
+module Mongo::Model::QueryMixin
+  module ClassMethods
+    include Mongo::DynamicFinders
+
+    def count selector = {}, options = {}
+      collection.count selector, options
+    end
+
+    def first selector = {}, options = {}
+      collection.first selector, options
+    end
+
+    def each selector = {}, options = {}, &block
+      collection.each selector, options, &block
+    end
+
+    def all selector = {}, options = {}, &block
+      if block
+        each selector, options, &block
+      else
+        list = []
+        each(selector, options){|doc| list << doc}
+        list
+      end
+    end
+
+    def first! selector = {}, options = {}
+      first(selector, options) || raise(Mongo::NotFound, "document with selector #{selector} not found!")
+    end
+
+    def exists? selector = {}, options = {}
+      count(selector, options) > 0
+    end
+    alias :exist? :exists?
+
+    def query *args
+      if args.first.is_a? Mongo::Model::Query
+        args.first
+      else
+        selector, options = args.first.is_a?(::Array) ? args.first : args
+        Mongo::Model::Query.new self, (selector || {}), (options || {})
+      end
+    end
+  end
+end

data/lib/mongo/model/scope.rb

@@ -1,82 +1,55 @@
 module Mongo::Model::Scope
-  class ScopeProxy < BasicObject
-    def initialize model, scope
-      @model, @scope = model, scope
-    end
-
-    def class
-      ::Mongo::Model::Scope::ScopeProxy
-    end
-
-    def reverse_merge! scope
-      @scope = scope.merge @scope
-    end
-
-    def inspect
-      "#<ScopeProxy:{#{scope.inspect}}>"
-    end
-    alias_method :to_s, :inspect
-
-    protected
-      attr_reader :model, :scope
-
-      def method_missing method, *args, &block
-        model.with_scope scope do
-          result = model.send method, *args, &block
-          result.reverse_merge! scope if result.class == ::Mongo::Model::Scope::ScopeProxy
-          result
-        end
-      end
-  end
-
   module ClassMethods
     def current_scope
       scope, exclusive = Thread.current[:mongo_model_scope]
-      if exclusive
+      current = if exclusive
         scope
       elsif scope
-        default_scope.merge scope
+        default_scope ? default_scope.merge(scope) : scope
       else
         default_scope
       end
     end
 
-    def with_exclusive_scope options = {}, &block
-      with_scope options, true, &block
+    def with_exclusive_scope *args, &block
+      with_scope *(args << true), &block
     end
 
-    def with_scope options = {}, exclusive = false, &block
-      previous_options, previous_exclusive = Thread.current[:mongo_model_scope]
+    def with_scope *args, &block
+      if args.last.is_a?(TrueClass) or args.last.is_a?(FalseClass)
+        exclusive = args.pop
+      else
+        exclusive = false
+      end
+
+      scope = query *args
+      previous_scope, previous_exclusive = Thread.current[:mongo_model_scope]
       raise "exclusive scope already applied!" if previous_exclusive
 
       begin
-        options = previous_options.merge options if previous_options and !exclusive
-        Thread.current[:mongo_model_scope] = [options, exclusive]
+        scope = previous_scope.merge scope if !exclusive and previous_scope
+        Thread.current[:mongo_model_scope] = [scope, exclusive]
         return block.call
       ensure
-        Thread.current[:mongo_model_scope] = [previous_options, false]
+        Thread.current[:mongo_model_scope] = [previous_scope, false]
       end
     end
 
-    inheritable_accessor :_default_scope, -> {{}}
+    inheritable_accessor :_default_scope, nil
     def default_scope *args, &block
       if block
-        self._default_scope = block
+        self._default_scope = -> {query block.call}
       elsif !args.empty?
-        args.size.must == 1
-        args.first.must_be.a Hash
-        scope = args.first
-        self._default_scope = -> {args.first}
+        self._default_scope = -> {query *args}
       else
-        _default_scope.call
+        _default_scope && _default_scope.call
       end
     end
 
-    def scope name, options = nil, &block
+    def scope name, *args, &block
       model = self
       metaclass.define_method name do
-        scope = (block && block.call) || options
-        ScopeProxy.new model, scope
+        query (block && instance_eval(&block)) || args
       end
     end
 
@@ -84,16 +57,28 @@ module Mongo::Model::Scope
     #
     # finders
     #
-    def count selector = {}, opts = {}
-      super current_scope.merge(selector), opts
+    def count selector = {}, options = {}
+      if current = current_scope
+        super current.selector.merge(selector), current.options.merge(options)
+      else
+        super selector, options
+      end
     end
 
-    def first selector = {}, opts = {}
-      super current_scope.merge(selector), opts
+    def first  selector = {}, options = {}
+      if current = current_scope
+        super current.selector.merge(selector), current.options.merge(options)
+      else
+        super selector, options
+      end
     end
 
-    def each selector = {}, opts = {}, &block
-      super current_scope.merge(selector), opts, &block
+    def each  selector = {}, options = {}, &block
+      if current = current_scope
+        super current.selector.merge(selector), current.options.merge(options), &block
+      else
+        super selector, options, &block
+      end
     end
   end
 end

data/lib/mongo/model/spec.rb

@@ -1,4 +1,5 @@
 require 'mongo/object/spec'
+require 'file_model/spec'
 
 rspec do
   class << self

data/lib/mongo/model/validation.rb

@@ -4,7 +4,15 @@ module Mongo::Model::Validation
   end
 
   def run_validations
-    self.class.validations.each{|v| v.validate self}
+    self.class.validations.each do |v|
+      if v.respond_to?(:validate)
+        v.validate self
+      elsif v.is_a? Proc
+        v.call self
+      else
+        send v
+      end
+    end
     true
   end
 
@@ -17,12 +25,16 @@ module Mongo::Model::Validation
       add_validations(args, Mongo::Model::UniquenessValidator)
     end
 
+    def validate validation
+      validations << validation
+    end
+
     protected
       def add_validations(args, klass)
         options = args.last.is_a?(Hash) ? args.pop : {}
         args.each do |attribute|
           new_validation = klass.new self, attribute, options
-          validations << new_validation
+          validate new_validation
         end
       end
   end

data/spec/assignment_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'Model callbacks' do
-  with_mongo
+  with_mongo_model
 
   after{remove_constants :User, :Writer}
 
@@ -26,6 +26,9 @@ describe 'Model callbacks' do
       assign do
         name     String,  true
         has_mail Boolean, true
+      end
+      
+      assign do
         age      Integer, true
         position true
         banned   Boolean
@@ -40,7 +43,7 @@ describe 'Model callbacks' do
     u.set! banned: '0'
     u.banned.should == false
   end
-
+  
   it "should inherit assignment rules" do
     class User
       inherit Mongo::Model

data/spec/associations_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+describe 'Associations' do
+  with_mongo_model
+
+  after{remove_constants :Post, :Comment}
+
+  it "basic" do
+    class Post
+      inherit Mongo::Model
+      collection :posts
+
+      attr_accessor :text
+
+      def comments
+        Comment.query({post_id: _id}, {sort: [[:created_at, -1]]})
+      end
+    end
+
+    class Comment
+      inherit Mongo::Model
+      collection :comments
+
+      attr_accessor :text, :post_id
+
+      def == o
+        [self.class, text, post_id] == [o.class, o.text, o.post_id]
+      end
+
+      timestamps!
+    end
+
+    post1 = Post.create! text: 'Post 1'
+    comment1 = post1.comments.create! text: 'Comment 1'
+    comment2 = post1.comments.create! text: 'Comment 2'
+
+    post2 = Post.create! text: 'Post 2'
+    comment3 = post2.comments.create! text: 'Comment 3'
+
+    post1.comments.count.should == 2
+    post1.comments.all.should == [comment2, comment1]
+  end
+end

data/spec/attribute_convertors_spec.rb

@@ -51,7 +51,7 @@ describe "Attribute Convertors" do
     # get
     o.tags_as_string.should == ''
     o.tags = %w(Java Ruby)
-    o._clear_cache
+    o._cache.clear
     o.tags_as_string.should == 'Java, Ruby'
 
     # set

data/spec/callbacks_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'Model callbacks' do
-  with_mongo
+  with_mongo_model
 
   after(:all){remove_constants :TheModel, :Player}
 

data/spec/db_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'Collection & Database' do
-  with_mongo
+  with_mongo_model
 
   before :all do
     class TheModel

data/spec/file_model_spec.rb

@@ -12,6 +12,8 @@ describe 'File Model' do
       inherit Mongo::Model
       collection :units
 
+      attr_accessor :name
+
       mount_file :image, ImageFile
     end
   end

data/spec/misc_spec.rb

@@ -7,6 +7,8 @@ describe 'Model Miscellaneous' do
     class User
       inherit Mongo::Model
       collection :users
+
+      attr_accessor :name
     end
   end
   after{remove_constants :Unit3, :User}
@@ -55,4 +57,11 @@ describe 'Model Miscellaneous' do
     u.save!
     u.dom_id.should_not be_empty
   end
+
+  it 'reload' do
+    u = User.create! name: 'Zeratul'
+    u.name = 'Jim'
+    u.reload
+    u.name.should == 'Zeratul'
+  end
 end

data/spec/query_spec.rb

@@ -11,7 +11,7 @@ describe "Model Query" do
       attr_accessor :name
     end
   end
-  after(:all){remove_constants :Unit}
+  after(:all){remove_constants :Unit, :SpecialUnit}
 
   before{@zeratul = Unit.build name: 'Zeratul'}
 
@@ -40,7 +40,28 @@ describe "Model Query" do
 
   it 'dynamic finders integration' do
     Unit.first_by_name('Zeratul').should be_nil
-    Unit.build(name: 'Zeratul').save!
+    u = Unit.build(name: 'Zeratul')
+    u.save!
     Unit.first_by_name('Zeratul').name.should == 'Zeratul'
+    Unit.by_id!(u._id).name.should == 'Zeratul'
+  end
+
+  it 'build, create, create!' do
+    class SpecialUnit < Unit
+      attr_accessor :age
+    end
+
+    u = SpecialUnit.query(name: 'Zeratul').build age: 500
+    [u.name, u.age].should == ['Zeratul', 500]
+
+    SpecialUnit.destroy_all
+    SpecialUnit.query(name: 'Zeratul').create age: 500
+    u = SpecialUnit.first
+    [u.name, u.age].should == ['Zeratul', 500]
+
+    SpecialUnit.destroy_all
+    SpecialUnit.query(name: 'Zeratul').create! age: 500
+    u = SpecialUnit.first
+    [u.name, u.age].should == ['Zeratul', 500]
   end
 end

data/spec/scope_spec.rb

@@ -25,7 +25,7 @@ describe "Scope" do
       Unit.first(name: 'Tassadar').should_not be_nil
       Unit.first!(name: 'Tassadar').should_not be_nil
 
-      Unit.stub!(:current_scope).and_return(status: 'alive')
+      Unit.stub!(:current_scope).and_return(Unit.query(status: 'alive'))
 
       Unit.count.should == 2
       Unit.all.size.should == 2
@@ -42,61 +42,62 @@ describe "Scope" do
 
   describe 'default scope' do
     it "should not affect objects without default_scope" do
-      Unit.current_scope.should == {}
+      Unit.current_scope.should be_nil
     end
 
     it "definition" do
       Unit.default_scope status: 'alive'
-      Unit.current_scope.should == {status: 'alive'}
+
+      Unit.current_scope.should == Unit.query(status: 'alive')
 
       Unit.default_scope do
         {status: 'alive'}
       end
-      Unit.current_scope.should == {status: 'alive'}
+      Unit.current_scope.should == Unit.query(status: 'alive')
     end
 
     it "should be inherited" do
       Unit.default_scope status: 'alive'
 
       class Protoss < Unit; end
-      Protoss.current_scope.should == {status: 'alive'}
+      Protoss.current_scope.should == Unit.query(status: 'alive')
 
       Protoss.default_scope status: 'dead'
-      Unit.current_scope.should == {status: 'alive'}
-      Protoss.current_scope.should == {status: 'dead'}
+      Unit.current_scope.should == Unit.query(status: 'alive')
+      Protoss.current_scope.should == Protoss.query(status: 'dead')
     end
   end
 
   describe 'scope' do
     it "definition" do
       Unit.scope :alive, status: 'alive'
-      Unit.alive.current_scope.should == {status: 'alive'}
+      Unit.alive.current_scope.should == Unit.query(status: 'alive')
 
       Unit.scope :alive do
         {status: 'alive'}
       end
-      Unit.alive.current_scope.should == {status: 'alive'}
+      Unit.alive.current_scope.should == Unit.query(status: 'alive')
     end
 
     it 'scope should affect current scope' do
       Unit.scope :alive, status: 'alive'
 
-      Unit.current_scope.should == {}
+      Unit.current_scope.should be_nil
 
-      Unit.alive.current_scope.should == {status: 'alive'}
-      Unit.alive.should == Unit
+      Unit.alive.current_scope.should == Unit.query(status: 'alive')
+      Unit.alive.class.should == Mongo::Model::Query
     end
 
     it 'should be merged with default scope' do
       Unit.default_scope race: 'Protoss'
       Unit.scope :alive, status: 'alive'
-      Unit.alive.current_scope.should == {race: 'Protoss', status: 'alive'}
+      Unit.alive.current_scope.should == Unit.query(race: 'Protoss', status: 'alive')
     end
 
     it 'should allow to chain scopes' do
       Unit.scope :alive, status: 'alive'
       Unit.scope :protosses, race: 'Protoss'
-      Unit.alive.protosses.current_scope.should == {race: 'Protoss', status: 'alive'}
+      Unit.alive.protosses.current_scope.should == Unit.query(race: 'Protoss', status: 'alive')
     end
   end
 
@@ -119,21 +120,21 @@ describe "Scope" do
       Unit.default_scope status: 'alive'
 
       Unit.with_scope race: 'Protoss' do
-        Unit.current_scope.should == {status: 'alive', race: 'Protoss'}
+        Unit.current_scope.should == Unit.query(status: 'alive', race: 'Protoss')
 
         Unit.with_exclusive_scope do
-          Unit.current_scope.should == {}
+          Unit.current_scope.should == Unit.query({})
         end
 
         Unit.with_exclusive_scope race: 'Terran' do
-          Unit.current_scope.should == {race: 'Terran'}
+          Unit.current_scope.should == Unit.query(race: 'Terran')
         end
       end
     end
 
     it "usage" do
       Unit.with_scope status: 'alive' do
-        Unit.current_scope.should == {status: 'alive'}
+        Unit.current_scope.should == Unit.query(status: 'alive')
       end
     end
 
@@ -141,7 +142,7 @@ describe "Scope" do
       Unit.default_scope status: 'alive'
       Unit.with_scope race: 'Protoss' do
         Unit.with_scope name: 'Zeratul' do
-          Unit.current_scope.should == {name: 'Zeratul', race: 'Protoss', status: 'alive'}
+          Unit.current_scope.should == Unit.query(name: 'Zeratul', race: 'Protoss', status: 'alive')
         end
       end
     end

data/spec/validation_spec.rb

@@ -19,7 +19,7 @@ describe "Validations" do
       class Unit < BaseUnit
         before_validate :check_name
         def check_name
-          errors[:name] = 'invalid name'
+          errors.add :name, 'invalid name'
         end
       end
 
@@ -41,6 +41,19 @@ describe "Validations" do
       unit.save.should be_true
     end
 
+    it "should add custom validations" do
+      class Unit < BaseUnit
+        validate :check_name
+        def check_name
+          errors.add :name, 'invalid name'
+        end
+      end
+
+      unit = Unit.new
+      unit.save.should be_false
+      unit.errors[:name].should == ['invalid name']
+    end
+
     # it "should check :errors only and ignore valid? method" do
     #   unit = BaseUnit.build name: 'Zeratul'
     #   unit.should_not_receive(:valid?)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongodb_model
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-30 00:00:00.000000000Z
+date: 2011-09-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2781840 !ruby/object:Gem::Requirement
+  requirement: &2780720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *2781840
+  version_requirements: *2780720
 - !ruby/object:Gem::Dependency
   name: mongodb
-  requirement: &2781540 !ruby/object:Gem::Requirement
+  requirement: &2780430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2781540
+  version_requirements: *2780430
 - !ruby/object:Gem::Dependency
   name: file_model
-  requirement: &2781240 !ruby/object:Gem::Requirement
+  requirement: &2780140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2781240
+  version_requirements: *2780140
 - !ruby/object:Gem::Dependency
   name: validatable2
-  requirement: &2780950 !ruby/object:Gem::Requirement
+  requirement: &2779840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2780950
+  version_requirements: *2779840
 - !ruby/object:Gem::Dependency
   name: ruby_ext
-  requirement: &2780660 !ruby/object:Gem::Requirement
+  requirement: &2779540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2780660
+  version_requirements: *2779540
 description: 
 email: 
 executables: []
@@ -83,6 +83,7 @@ files:
 - lib/mongo/model/misc.rb
 - lib/mongo/model/model.rb
 - lib/mongo/model/query.rb
+- lib/mongo/model/query_mixin.rb
 - lib/mongo/model/scope.rb
 - lib/mongo/model/spec.rb
 - lib/mongo/model/support/types.rb
@@ -91,6 +92,7 @@ files:
 - lib/mongo/model.rb
 - lib/mongodb_model/gems.rb
 - spec/assignment_spec.rb
+- spec/associations_spec.rb
 - spec/attribute_convertors_spec.rb
 - spec/callbacks_spec.rb
 - spec/crud_spec.rb