mongo_mapper 0.10.0 → 0.10.1

data/lib/mongo_mapper.rb

@@ -62,6 +62,7 @@ module MongoMapper
       autoload :Collection,                   'mongo_mapper/plugins/associations/collection'
       autoload :EmbeddedCollection,           'mongo_mapper/plugins/associations/embedded_collection'
       autoload :ManyAssociation,              'mongo_mapper/plugins/associations/many_association'
+      autoload :SingleAssociation,            'mongo_mapper/plugins/associations/single_association'
       autoload :BelongsToAssociation,         'mongo_mapper/plugins/associations/belongs_to_association'
       autoload :OneAssociation,               'mongo_mapper/plugins/associations/one_association'
       autoload :ManyDocumentsProxy,           'mongo_mapper/plugins/associations/many_documents_proxy'

data/lib/mongo_mapper/plugins/accessible.rb

@@ -15,7 +15,7 @@ module MongoMapper
       end
 
       module InstanceMethods
-        def assign(attrs={})
+        def attributes=(attrs={})
           super(filter_inaccessible_attrs(attrs))
         end
 
@@ -29,7 +29,7 @@ module MongoMapper
 
         protected
           def filter_inaccessible_attrs(attrs)
-            return attrs if accessible_attributes.blank? || attrs.blank?
+            return attrs if !accessible_attributes? || attrs.blank?
             attrs.dup.delete_if { |key, val| !accessible_attributes.include?(key.to_sym) }
           end
       end

data/lib/mongo_mapper/plugins/associations/belongs_to_association.rb

@@ -2,8 +2,7 @@
 module MongoMapper
   module Plugins
     module Associations
-      class BelongsToAssociation < Base
-
+      class BelongsToAssociation < SingleAssociation
         def embeddable?
           false
         end
@@ -14,41 +13,7 @@ module MongoMapper
 
         def setup(model)
           model.key foreign_key, ObjectId unless model.key?(foreign_key)
-
-          model.associations_module.module_eval <<-end_eval
-            def #{name}
-              proxy = get_proxy(associations[#{name.inspect}])
-              proxy.nil? ? nil : proxy
-            end
-
-            def #{name}=(value)
-              association = associations[#{name.inspect}]
-              proxy = get_proxy(association)
-
-              if proxy.nil? || proxy.target != value
-                proxy = build_proxy(association)
-              end
-
-              proxy.replace(value)
-              value
-            end
-
-            def #{name}?
-              get_proxy(associations[#{name.inspect}]).present?
-            end
-
-            def build_#{name}(attrs={})
-              get_proxy(associations[#{name.inspect}]).build(attrs)
-            end
-
-            def create_#{name}(attrs={})
-              get_proxy(associations[#{name.inspect}]).create(attrs)
-            end
-
-            def create_#{name}!(attrs={})
-              get_proxy(associations[#{name.inspect}]).create!(attrs)
-            end
-          end_eval
+          super
         end
 
         def autosave?

data/lib/mongo_mapper/plugins/associations/in_array_proxy.rb

@@ -103,8 +103,8 @@ module MongoMapper
           def query(options={})
             klass.
               query(association.query_options).
-              update(options).
-              update(criteria)
+              amend(options).
+              amend(criteria)
           end
 
           def criteria

data/lib/mongo_mapper/plugins/associations/many_documents_proxy.rb

@@ -74,7 +74,7 @@ module MongoMapper
           def query(options={})
             klass.
               query(association.query_options).
-              update(options).update(criteria)
+              amend(options).amend(criteria)
           end
 
           def method_missing(method, *args, &block)

data/lib/mongo_mapper/plugins/associations/one_association.rb

@@ -2,7 +2,7 @@
 module MongoMapper
   module Plugins
     module Associations
-      class OneAssociation < BelongsToAssociation
+      class OneAssociation < SingleAssociation
         def embeddable?
           klass.embeddable?
         end
@@ -17,17 +17,17 @@ module MongoMapper
               OneProxy
             end
         end
-        
+
         def setup(model)
           super
-                    
+
           association = self
           options = self.options
 
           model.before_destroy do
             if !association.embeddable?
               proxy = self.get_proxy(association)
-              
+
               unless proxy.nil?
                 case options[:dependent]
                   when :destroy then proxy.destroy

data/lib/mongo_mapper/plugins/associations/single_association.rb

@@ -0,0 +1,45 @@
+# encoding: UTF-8
+module MongoMapper
+  module Plugins
+    module Associations
+      class SingleAssociation < Base
+        def setup(model)
+          model.associations_module.module_eval <<-end_eval
+            def #{name}
+              proxy = get_proxy(associations[#{name.inspect}])
+              proxy.nil? ? nil : proxy
+            end
+
+            def #{name}=(value)
+              association = associations[#{name.inspect}]
+              proxy = get_proxy(association)
+
+              if proxy.nil? || proxy.target != value
+                proxy = build_proxy(association)
+              end
+
+              proxy.replace(value)
+              value
+            end
+
+            def #{name}?
+              get_proxy(associations[#{name.inspect}]).present?
+            end
+
+            def build_#{name}(attrs={})
+              get_proxy(associations[#{name.inspect}]).build(attrs)
+            end
+
+            def create_#{name}(attrs={})
+              get_proxy(associations[#{name.inspect}]).create(attrs)
+            end
+
+            def create_#{name}!(attrs={})
+              get_proxy(associations[#{name.inspect}]).create!(attrs)
+            end
+          end_eval
+        end
+      end
+    end
+  end
+end

data/lib/mongo_mapper/plugins/document.rb

@@ -25,7 +25,7 @@ module MongoMapper
               get_proxy(association).reset
             end
             instance_variables.each { |ivar| instance_variable_set(ivar, nil) }
-            self.attributes = doc
+            load_from_database(doc)
             self
           else
             raise DocumentNotFound, "Document match #{_id.inspect} does not exist in #{collection.name} collection"

data/lib/mongo_mapper/plugins/identity_map.rb

@@ -34,14 +34,14 @@ module MongoMapper
 
         module IdentityMapQueryMethods
           def all(opts={})
-            query = clone.update(opts)
+            query = clone.amend(opts)
             super.tap do |docs|
               model.remove_documents_from_map(docs) if query.fields?
             end
           end
 
           def find_one(opts={})
-            query = clone.update(opts)
+            query = clone.amend(opts)
 
             if model.identity_map_on? && query.simple? && model.identity_map[query[:_id]]
               model.identity_map[query[:_id]]

data/lib/mongo_mapper/plugins/indexes.rb

@@ -5,9 +5,8 @@ module MongoMapper
       extend ActiveSupport::Concern
 
       module ClassMethods
-        def ensure_index(spec, options={})
-          collection.create_index(spec, options)
-        end
+        extend Forwardable
+        def_delegators :collection, :ensure_index, :create_index, :drop_index, :drop_indexes
       end
     end
   end

data/lib/mongo_mapper/plugins/keys.rb

@@ -111,7 +111,10 @@ module MongoMapper
           end
 
           def create_indexes_for(key)
-            ensure_index key.name if key.options[:index] && !key.embeddable?
+            if key.options[:index] && !key.embeddable?
+              warn "[DEPRECATION] :index option when defining key #{key.name.inspect} is deprecated. Put indexes in `db/indexes.rb`"
+              ensure_index key.name
+            end
           end
 
           def create_validations_for(key)
@@ -159,7 +162,7 @@ module MongoMapper
       module InstanceMethods
         def initialize(attrs={})
           @_new = true
-          assign(attrs)
+          self.attributes = attrs
         end
 
         def initialize_from_database(attrs={})
@@ -205,16 +208,17 @@ module MongoMapper
         alias :to_mongo :attributes
 
         def assign(attrs={})
+          warn "[DEPRECATION] #assign is deprecated, use #attributes="
           self.attributes = attrs
         end
 
         def update_attributes(attrs={})
-          assign(attrs)
+          self.attributes = attrs
           save
         end
 
         def update_attributes!(attrs={})
-          assign(attrs)
+          self.attributes = attrs
           save!
         end
 

data/lib/mongo_mapper/plugins/protected.rb

@@ -24,7 +24,7 @@ module MongoMapper
       end
 
       module InstanceMethods
-        def assign(attrs={})
+        def attributes=(attrs={})
           super(filter_protected_attrs(attrs))
         end
 

data/lib/mongo_mapper/plugins/querying.rb

@@ -64,7 +64,7 @@ module MongoMapper
           query = Plucky::Query.new(collection, :transformer => transformer)
           query.extend(Decorator)
           query.object_ids(object_id_keys)
-          query.update(options)
+          query.amend(options)
           query.model(self)
           query
         end
@@ -80,7 +80,7 @@ module MongoMapper
           end
 
           def find_some(ids, options={})
-            query = query(options).update(:_id => ids.flatten.compact.uniq)
+            query = query(options).amend(:_id => ids.flatten.compact.uniq)
             find_many(query.to_hash).compact
           end
 

data/lib/mongo_mapper/railtie/database.rake

@@ -1,13 +1,12 @@
 namespace :db do
-
-  if not Rake::Task.task_defined?("db:drop")
+  unless Rake::Task.task_defined?("db:drop")
     desc 'Drops all the collections for the database for the current Rails.env'
     task :drop => :environment do
       MongoMapper.database.collections.select {|c| c.name !~ /system/ }.each(&:drop)
     end
   end
 
-  if not Rake::Task.task_defined?("db:seed")
+  unless Rake::Task.task_defined?("db:seed")
     # if another ORM has defined db:seed, don't run it twice.
     desc 'Load the seed data from db/seeds.rb'
     task :seed => :environment do
@@ -16,29 +15,29 @@ namespace :db do
     end
   end
 
-  if not Rake::Task.task_defined?("db:setup")
+  unless Rake::Task.task_defined?("db:setup")
     desc 'Create the database, and initialize with the seed data'
     task :setup => [ 'db:create', 'db:seed' ]
   end
 
-  if not Rake::Task.task_defined?("db:reseed")
+  unless Rake::Task.task_defined?("db:reseed")
     desc 'Delete data and seed'
     task :reseed => [ 'db:drop', 'db:seed' ]
   end
 
-  if not Rake::Task.task_defined?("db:create")
+  unless Rake::Task.task_defined?("db:create")
     task :create => :environment do
       # noop
     end
   end
 
-  if not Rake::Task.task_defined?("db:migrate")
+  unless Rake::Task.task_defined?("db:migrate")
     task :migrate => :environment do
       # noop
     end
   end
 
-  if not Rake::Task.task_defined?("db:schema:load")
+  unless Rake::Task.task_defined?("db:schema:load")
     namespace :schema do
       task :load do
         # noop
@@ -46,7 +45,7 @@ namespace :db do
     end
   end
 
-  if not Rake::Task.task_defined?("db:test:prepare")
+  unless Rake::Task.task_defined?("db:test:prepare")
     namespace :test do
       task :prepare => :environment do
         MongoMapper.connect('test')
@@ -55,6 +54,12 @@ namespace :db do
       end
     end
   end
+
+  desc 'Load the seed data from db/seeds.rb'
+  task :index => :environment do
+    indexes = File.join(Rails.root, 'db', 'indexes.rb')
+    load(indexes) if File.exist?(indexes)
+  end
 end
 
 task 'test:prepare' => 'db:test:prepare'

data/lib/mongo_mapper/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module MongoMapper
-  Version = '0.10.0'
+  Version = '0.10.1'
 end

data/test/functional/associations/test_one_as_proxy.rb

@@ -17,6 +17,12 @@ class OneAsProxyTest < Test::Unit::TestCase
     nil.should === @post_class.new.author
   end
 
+  should "not define any keys" do
+    count = @post_class.keys.length
+    @post_class.one :author, :class => @author_class
+    @post_class.keys.length.should == count
+  end
+
   should "allow assignment of associated document using a hash" do
     @post_class.one :author, :as => :authorable, :class => @author_class
 

data/test/functional/test_accessible.rb

@@ -58,6 +58,16 @@ class AccessibleTest < Test::Unit::TestCase
       doc.name.should == 'John'
     end
 
+    should "not ignore inaccessible attributes on #reload" do
+      doc = @doc_class.new(:name => 'John')
+      doc.admin = true
+      doc.save!
+
+      doc.reload
+      doc.admin.should be_true
+      doc.name.should == 'John'
+    end
+
     should "ignore inaccessible attribute on #update_attributes" do
       @doc.update_attributes(:name => 'Ren Hoek', :admin => true)
       @doc.name.should == 'Ren Hoek'
@@ -70,6 +80,12 @@ class AccessibleTest < Test::Unit::TestCase
       @doc.admin.should be_false
     end
 
+    should "ignore inaccessible attribute on #attributes=" do
+      @doc.attributes = {:name => 'Ren Hoek', :admin => true}
+      @doc.name.should == 'Ren Hoek'
+      @doc.admin.should be_false
+    end
+
     should "be indifferent to whether the accessible keys are strings or symbols" do
       @doc.update_attributes!("name" => 'Stimpson J. Cat', "admin" => true)
       @doc.name.should == 'Stimpson J. Cat'
@@ -79,6 +95,15 @@ class AccessibleTest < Test::Unit::TestCase
     should "accept nil as constructor's argument without raising exception" do
       lambda { @doc_class.new(nil) }.should_not raise_error
     end
+
+    should "ignore all attributes if called with no args" do
+      @doc_class = Doc do
+        key :name
+        attr_accessible
+      end
+
+      @doc_class.new(:name => 'Steve Sloan').name.should be_nil
+    end
   end
 
   context "Single collection inherited accessible attributes" do

data/test/functional/test_indexes.rb

@@ -12,6 +12,14 @@ class IndexingTest < Test::Unit::TestCase
     end
     teardown { drop_indexes(@document) }
 
+    [:create_index, :ensure_index, :drop_index, :drop_indexes].each do |method|
+      should "delegate #{method} to collection" do
+        @document.stubs(:collection).returns(mock(:name => :foo))
+        @document.collection.expects(method).with(:arg)
+        @document.send(method, :arg)
+      end
+    end
+
     should "allow creating index for a key" do
       @document.ensure_index :first_name
       @document.should have_index('first_name_1')
@@ -35,7 +43,7 @@ class IndexingTest < Test::Unit::TestCase
     end
 
     should "work with :index shortcut when defining key" do
-      @document.key :father, String, :index => true
+      silence_stderr { @document.key :father, String, :index => true }
       @document.should have_index('father_1')
     end
   end

data/test/functional/test_protected.rb

@@ -64,6 +64,16 @@ class ProtectedTest < Test::Unit::TestCase
       doc.name.should == 'John'
     end
 
+    should "not ignore protected attributes on #reload" do
+      doc = @doc_class.new(:name => 'John')
+      doc.admin = true
+      doc.save!
+
+      doc.reload
+      doc.admin.should be_true
+      doc.name.should == 'John'
+    end
+
     should "ignore protected attribute on #update_attributes" do
       @doc.update_attributes(:name => 'Ren Hoek', :admin => true)
       @doc.name.should == 'Ren Hoek'
@@ -76,6 +86,12 @@ class ProtectedTest < Test::Unit::TestCase
       @doc.admin.should be_false
     end
 
+    should "ignore protecteds attribute on #attributes=" do
+      @doc.attributes = {:name => 'Stimpson J. Cat', :admin => true}
+      @doc.name.should == 'Stimpson J. Cat'
+      @doc.admin.should be_false
+    end
+
     should "be indifferent to whether the protected keys are strings or symbols" do
       @doc.update_attributes!("name" => 'Stimpson J. Cat', "admin" => true)
       @doc.name.should == 'Stimpson J. Cat'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_mapper
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: 
   segments: 
   - 0
   - 10
-  - 0
-  version: 0.10.0
+  - 1
+  version: 0.10.1
 platform: ruby
 authors: 
 - John Nunemaker
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-02 00:00:00 -04:00
+date: 2011-11-07 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,12 +55,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15
         segments: 
         - 0
-        - 3
-        - 8
-        version: 0.3.8
+        - 4
+        - 0
+        version: 0.4.0
   prerelease: false
   type: :runtime
   requirement: *id003
@@ -128,6 +128,7 @@ files:
 - lib/mongo_mapper/plugins/associations/one_embedded_proxy.rb
 - lib/mongo_mapper/plugins/associations/one_proxy.rb
 - lib/mongo_mapper/plugins/associations/proxy.rb
+- lib/mongo_mapper/plugins/associations/single_association.rb
 - lib/mongo_mapper/plugins/associations.rb
 - lib/mongo_mapper/plugins/caching.rb
 - lib/mongo_mapper/plugins/callbacks.rb