Permalink
Commits on Jan 8, 2012
  1. Merge branch 'master' into rspec

    * master:
      Document change to update_attribute
      Fix accessible/protected tests after change to update_attribute
      ActiveSupport::Concern's automatic inclusion of the InstanceMethods module is deprecated
      Fix add_to_set/push_uniq test typos
      Fuzzy match development dependency requirements on the minor version
      rename `connection_options` to `options` and create a test
      use mongodb connection options from yaml config file
      rename test
      move reflect_on_association to Rails module
      Make update_attribute behave like in ActiveRecord
      ActiveRecord compatible association reflection
      added :context option to validates_associated
      Added namespacing to model generator
      Add OneEmbeddedPolymorphicProxy (the last missing polymorphic proxy)
      type_key_name should be "_type" for ManyAssociation and OneAssociation, only "#{as}_type" for BelongsToAssociation
      More tests for many embedded polymorphic proxy (wasn't clear that it worked with non-SCI models)
    
    Conflicts:
    	Gemfile
    	spec/mongo_mapper_spec.rb
    	test/unit/associations/test_one_association.rb
    bkeepers committed Jan 8, 2012
Commits on Jan 7, 2012
  1. Merge branch 'master' of github.com:jnunemaker/mongomapper

    * 'master' of github.com:jnunemaker/mongomapper:
      rename `connection_options` to `options` and create a test
      use mongodb connection options from yaml config file
    bkeepers committed Jan 7, 2012
  2. Merge branch 'master' of git://github.com/matthiassiegel/mongomapper

    * 'master' of git://github.com/matthiassiegel/mongomapper:
      Make update_attribute behave like in ActiveRecord
    
    Conflicts:
    	lib/mongo_mapper/plugins/keys.rb
    bkeepers committed Jan 7, 2012
  3. Merge pull request #368 from balexand/config_mongo_connection

    Use MongoDB connection options from yaml config file
    bkeepers committed Jan 7, 2012
Commits on Jan 4, 2012
  1. Merge pull request #374 from laserlemon/master

    Stop relying on ActiveSupport::Concern's deprecated inclusion of the InstanceMethods module
    bkeepers committed Jan 4, 2012
Commits on Dec 21, 2011
Commits on Dec 20, 2011
Commits on Dec 14, 2011
  1. Merge pull request #364 from balexand/association_reflection

    ActiveRecord compatible association reflection
    bkeepers committed Dec 14, 2011
  2. rename test

    balexand committed Dec 14, 2011
Commits on Dec 12, 2011
  1. Merge pull request #363 from statianzo/validate-association-context

    validates_associated context limitations
    bkeepers committed Dec 12, 2011
Commits on Dec 5, 2011
  1. Merge pull request #355 from bhbryant/master

    Adds Namespacing to Model Generator / Template
    bkeepers committed Dec 5, 2011
Commits on Dec 4, 2011
  1. Added namespacing to model generator

    bhbryant committed Dec 4, 2011
Commits on Nov 28, 2011
  1. Merge pull request #354 from brianhempel/one_embedded_polymorphic_proxy

    Added one embedded polymorphic proxy
    bkeepers committed Nov 28, 2011
Commits on Nov 26, 2011
  1. Merge branch 'master' into rspec

    * master:
      There was what looked like a copy/paste bug --whenever page2 was used, it was reloaded, but the assertion was made to page, which had already been done
      fixed rake db:index description
      Release 0.10.1
      Extract common logic between one and belongs_to into SingleAssociation
      Use #load_from_database in #reload to ignore accessible/protected attributes
      Fix rake task
      Delegate index methods to the collection
      Deprecate :index option to #key
      who uses "not", honestly?
      Added db:indexes rake task that reads in db/indexes.rb
      Deprecated #assign
      Enforce attr_protected on #attributes=
      Enforce attr_accessible on #attributes=
      Allow calling attr_accessible with no args to force whitelisting
      Use plucky 0.4.x, which supports $and queries.  (No longer compatible with < 0.4, plucky changed Query#update to Query#amend)
      Prepare for 0.10 release
    bkeepers committed Nov 26, 2011
Commits on Nov 25, 2011
  1. type_key_name should be "_type" for ManyAssociation and OneAssociatio…

    …n, only "#{as}_type" for BelongsToAssociation
    brianhempel committed Nov 25, 2011
  2. More tests for many embedded polymorphic proxy (wasn't clear that it …

    …worked with non-SCI models)
    brianhempel committed Nov 25, 2011
Commits on Nov 15, 2011
  1. Merge pull request #348 from scohen/master

    Fixed copy/paste errors in test
    bkeepers committed Nov 15, 2011
  2. There was what looked like a copy/paste bug --whenever page2 was used…

    …, it was reloaded, but the assertion was made to page, which had already been done
    Steve Cohen committed Nov 15, 2011
Commits on Nov 10, 2011
  1. Merge pull request #347 from bearded/patch-2

    fixed rake db:index description
    bkeepers committed Nov 10, 2011
  2. fixed rake db:index description

    bearded committed Nov 10, 2011
Commits on Nov 7, 2011
  1. Release 0.10.1

    bkeepers committed Nov 7, 2011
  2. Fix rake task

    bkeepers committed Nov 7, 2011