mongoid 0.7.10 → 0.8.1

data/Rakefile

@@ -15,8 +15,8 @@ begin
     gem.add_dependency("durran-validatable", "1.8.2")
     gem.add_dependency("will_paginate", "2.3.11")
     gem.add_dependency("activesupport", "2.3.4")
-    gem.add_dependency("mongo", "0.16")
-    gem.add_dependency("mongo_ext", "0.16")
+    gem.add_dependency("mongo", "0.17")
+    gem.add_dependency("mongo_ext", "0.17")
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.7.10
+0.8.1

data/lib/mongoid.rb

@@ -36,12 +36,12 @@ require "active_support/time_with_zone"
 require "will_paginate/collection"
 require "mongo"
 require "mongoid/associations"
+require "mongoid/associations/options"
 require "mongoid/attributes"
 require "mongoid/commands"
 require "mongoid/criteria"
 require "mongoid/extensions"
 require "mongoid/field"
-require "mongoid/options"
 require "mongoid/timestamps"
 require "mongoid/versioning"
 require "mongoid/document"

data/lib/mongoid/associations.rb

@@ -43,7 +43,7 @@ module Mongoid # :nodoc:
       #   end
       def belongs_to(name, options = {})
         @embedded = true
-        add_association(Associations::BelongsTo, Options.new(options.merge(:association_name => name)))
+        add_association(Associations::BelongsTo, Associations::Options.new(options.merge(:name => name)))
       end
 
       # Adds the association from a parent document to its children. The name
@@ -64,7 +64,7 @@ module Mongoid # :nodoc:
       #     belongs_to :person
       #   end
       def has_many(name, options = {})
-        add_association(Associations::HasMany, Options.new(options.merge(:association_name => name)))
+        add_association(Associations::HasMany, Associations::Options.new(options.merge(:name => name)))
       end
 
       # Adds the association from a parent document to its child. The name
@@ -85,15 +85,15 @@ module Mongoid # :nodoc:
       #     belongs_to :person
       #   end
       def has_one(name, options = {})
-        add_association(Associations::HasOne, Options.new(options.merge(:association_name => name)))
+        add_association(Associations::HasOne, Associations::Options.new(options.merge(:name => name)))
       end
 
       private
       # Adds the association to the associations hash with the type as the key,
       # then adds the accessors for the association.
       def add_association(type, options)
-        associations[options.association_name] = type
-        name = options.association_name
+        name = options.name
+        associations[name] = type
         define_method(name) do
           return instance_variable_get("@#{name}") if instance_variable_defined?("@#{name}")
           proxy = Associations::Accessor.get(type, self, options)

data/lib/mongoid/associations/has_many.rb

@@ -61,7 +61,7 @@ module Mongoid #:nodoc:
       # essentially a proxy to an array itself.
       def initialize(document, options)
         @parent = document
-        @association_name = options.association_name
+        @association_name = options.name
         @klass = options.klass
         attributes = document.attributes[@association_name]
         @documents = attributes ? attributes.collect do |attribute|
@@ -77,13 +77,13 @@ module Mongoid #:nodoc:
         # is initialized by setting the has_many to the supplied +Enumerable+
         # and setting up the parentization.
         def update(children, parent, options)
-          parent.attributes.delete(options.association_name)
+          parent.attributes.delete(options.name)
           klass = options.klass
           children.each do |child|
             unless child.respond_to?(:parentize)
               child = klass.new(child)
             end
-            child.parentize(parent, options.association_name)
+            child.parentize(parent, options.name)
             child.notify
           end
           new(parent, options)

data/lib/mongoid/associations/has_one.rb

@@ -15,9 +15,9 @@ module Mongoid #:nodoc:
       # to the internal document itself.
       def initialize(document, options)
         @klass = options.klass
-        attributes = document.attributes[options.association_name]
+        attributes = document.attributes[options.name]
         @document = klass.instantiate(attributes || {})
-        @document.parentize(document, options.association_name)
+        @document.parentize(document, options.name)
         decorate!
       end
 
@@ -29,7 +29,7 @@ module Mongoid #:nodoc:
             klass = options.klass
             child = klass.new(child)
           end
-          child.parentize(parent, options.association_name)
+          child.parentize(parent, options.name)
           child.notify
           child
         end

data/lib/mongoid/associations/options.rb

@@ -0,0 +1,31 @@
+module Mongoid #:nodoc:
+  module Associations #:nodoc:
+    class Options #:nodoc:
+
+      # Create the new +Options+ object, which provides convenience methods for
+      # accessing values out of an options +Hash+.
+      def initialize(attributes = {})
+        @attributes = attributes
+      end
+
+      # Returns the association name of the options.
+      def name
+        @attributes[:name]
+      end
+
+      # Return a +Class+ for the options. If a class_name was provided, then the
+      # constantized class_name will be returned. If not, a constant based on the
+      # association name will be returned.
+      def klass
+        class_name = @attributes[:class_name]
+        class_name ? class_name.constantize : name.to_s.classify.constantize
+      end
+
+      # Returns whether or not this association is polymorphic.
+      def polymorphic
+        @attributes[:polymorphic] == true
+      end
+
+    end
+  end
+end

data/lib/mongoid/extensions/date/conversions.rb

@@ -3,10 +3,10 @@ module Mongoid #:nodoc:
     module Date #:nodoc:
       module Conversions #:nodoc:
         def set(value)
-          value.to_time.utc unless value.blank?
+          value.to_time unless value.blank?
         end
         def get(value)
-          value ? value.to_date : value
+          value ? value.getlocal.to_date : value
         end
       end
     end

data/lib/mongoid/extensions/time/conversions.rb

@@ -6,7 +6,7 @@ module Mongoid #:nodoc:
           ::Time.parse(value.to_s).utc
         end
         def get(value)
-          ::Time.zone ? ::Time.zone.parse(value.to_s) : value
+          ::Time.zone ? ::Time.zone.parse(value.to_s).getlocal : value
         end
       end
     end

data/mongoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "0.7.10"
+  s.version = "0.8.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
-  s.date = %q{2009-11-16}
+  s.date = %q{2009-11-17}
   s.email = %q{durran@gmail.com}
   s.extra_rdoc_files = [
     "README.textile"
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
      "lib/mongoid/associations/decorator.rb",
      "lib/mongoid/associations/has_many.rb",
      "lib/mongoid/associations/has_one.rb",
+     "lib/mongoid/associations/options.rb",
      "lib/mongoid/attributes.rb",
      "lib/mongoid/commands.rb",
      "lib/mongoid/commands/create.rb",
@@ -55,7 +56,6 @@ Gem::Specification.new do |s|
      "lib/mongoid/extensions/symbol/inflections.rb",
      "lib/mongoid/extensions/time/conversions.rb",
      "lib/mongoid/field.rb",
-     "lib/mongoid/options.rb",
      "lib/mongoid/timestamps.rb",
      "lib/mongoid/versioning.rb",
      "mongoid.gemspec",
@@ -68,6 +68,7 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/associations/decorator_spec.rb",
      "spec/unit/mongoid/associations/has_many_spec.rb",
      "spec/unit/mongoid/associations/has_one_spec.rb",
+     "spec/unit/mongoid/associations/options_spec.rb",
      "spec/unit/mongoid/associations_spec.rb",
      "spec/unit/mongoid/attributes_spec.rb",
      "spec/unit/mongoid/commands/create_spec.rb",
@@ -94,7 +95,6 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/extensions/symbol/inflections_spec.rb",
      "spec/unit/mongoid/extensions/time/conversions_spec.rb",
      "spec/unit/mongoid/field_spec.rb",
-     "spec/unit/mongoid/options_spec.rb",
      "spec/unit/mongoid/timestamps_spec.rb",
      "spec/unit/mongoid/versioning_spec.rb"
   ]
@@ -111,6 +111,7 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/associations/decorator_spec.rb",
      "spec/unit/mongoid/associations/has_many_spec.rb",
      "spec/unit/mongoid/associations/has_one_spec.rb",
+     "spec/unit/mongoid/associations/options_spec.rb",
      "spec/unit/mongoid/associations_spec.rb",
      "spec/unit/mongoid/attributes_spec.rb",
      "spec/unit/mongoid/commands/create_spec.rb",
@@ -137,7 +138,6 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/extensions/symbol/inflections_spec.rb",
      "spec/unit/mongoid/extensions/time/conversions_spec.rb",
      "spec/unit/mongoid/field_spec.rb",
-     "spec/unit/mongoid/options_spec.rb",
      "spec/unit/mongoid/timestamps_spec.rb",
      "spec/unit/mongoid/versioning_spec.rb"
   ]
@@ -150,21 +150,21 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<durran-validatable>, ["= 1.8.2"])
       s.add_runtime_dependency(%q<will_paginate>, ["= 2.3.11"])
       s.add_runtime_dependency(%q<activesupport>, ["= 2.3.4"])
-      s.add_runtime_dependency(%q<mongo>, ["= 0.16"])
-      s.add_runtime_dependency(%q<mongo_ext>, ["= 0.16"])
+      s.add_runtime_dependency(%q<mongo>, ["= 0.17"])
+      s.add_runtime_dependency(%q<mongo_ext>, ["= 0.17"])
     else
       s.add_dependency(%q<durran-validatable>, ["= 1.8.2"])
       s.add_dependency(%q<will_paginate>, ["= 2.3.11"])
       s.add_dependency(%q<activesupport>, ["= 2.3.4"])
-      s.add_dependency(%q<mongo>, ["= 0.16"])
-      s.add_dependency(%q<mongo_ext>, ["= 0.16"])
+      s.add_dependency(%q<mongo>, ["= 0.17"])
+      s.add_dependency(%q<mongo_ext>, ["= 0.17"])
     end
   else
     s.add_dependency(%q<durran-validatable>, ["= 1.8.2"])
     s.add_dependency(%q<will_paginate>, ["= 2.3.11"])
     s.add_dependency(%q<activesupport>, ["= 2.3.4"])
-    s.add_dependency(%q<mongo>, ["= 0.16"])
-    s.add_dependency(%q<mongo_ext>, ["= 0.16"])
+    s.add_dependency(%q<mongo>, ["= 0.17"])
+    s.add_dependency(%q<mongo_ext>, ["= 0.17"])
   end
 end
 

data/spec/spec_helper.rb

@@ -123,3 +123,17 @@ class Game < Mongoid::Document
   field :high_score, :default => 500
   field :score, :default => 0
 end
+
+if RUBY_VERSION == '1.8.6'
+  class Array
+    alias :count :size
+  end
+end
+
+class Object
+  def tapp
+    tap do
+      puts "#{File.basename caller[2]}: #{self.inspect}"
+    end
+  end
+end

data/spec/unit/mongoid/associations/accessor_spec.rb

@@ -12,8 +12,12 @@ describe Mongoid::Associations::Accessor do
     context "when type is has_many" do
 
       it "returns a HasMany" do
-        @options = Mongoid::Options.new(:association_name => :addresses)
-        association = Mongoid::Associations::Accessor.get(Mongoid::Associations::HasMany, @document, @options)
+        @options = Mongoid::Associations::Options.new(:name => :addresses)
+        association = Mongoid::Associations::Accessor.get(
+          Mongoid::Associations::HasMany,
+          @document,
+          @options
+        )
         association.should be_a_kind_of(Mongoid::Associations::HasMany)
       end
 
@@ -24,8 +28,12 @@ describe Mongoid::Associations::Accessor do
       context "when document is not nil" do
 
         it "returns a HasOne" do
-          @options = Mongoid::Options.new(:association_name => :name)
-          association = Mongoid::Associations::Accessor.get(Mongoid::Associations::HasOne, @document, @options)
+          @options = Mongoid::Associations::Options.new(:name => :name)
+          association = Mongoid::Associations::Accessor.get(
+            Mongoid::Associations::HasOne,
+            @document,
+            @options
+          )
           association.should be_a_kind_of(Name)
         end
 
@@ -34,8 +42,12 @@ describe Mongoid::Associations::Accessor do
       context "when document is nil" do
 
         it "returns nil" do
-          @options = Mongoid::Options.new(:association_name => :name)
-          association = Mongoid::Associations::Accessor.get(Mongoid::Associations::HasOne, nil, @options)
+          @options = Mongoid::Associations::Options.new(:name => :name)
+          association = Mongoid::Associations::Accessor.get(
+            Mongoid::Associations::HasOne,
+            nil,
+            @options
+          )
           association.should be_nil
         end
 
@@ -46,8 +58,12 @@ describe Mongoid::Associations::Accessor do
     context "when type is belongs_to" do
 
       it "returns a BelongsTo" do
-        @options = Mongoid::Options.new(:association_name => :person)
-        association = Mongoid::Associations::Accessor.get(Mongoid::Associations::BelongsTo, stub(:parent => @document), @options)
+        @options = Mongoid::Associations::Options.new(:name => :person)
+        association = Mongoid::Associations::Accessor.get(
+          Mongoid::Associations::BelongsTo,
+          stub(:parent => @document),
+          @options
+        )
         association.should be_a_kind_of(Person)
       end
 
@@ -60,9 +76,14 @@ describe Mongoid::Associations::Accessor do
     context "when type is has_many" do
 
       it "returns a HasMany" do
-        @options = Mongoid::Options.new(:association_name => :addresses)
+        @options = Mongoid::Associations::Options.new(:name => :addresses)
         Mongoid::Associations::HasMany.expects(:update).with(@document, @object, @options)
-        Mongoid::Associations::Accessor.set(Mongoid::Associations::HasMany, @document, @object, @options)
+        Mongoid::Associations::Accessor.set(
+          Mongoid::Associations::HasMany,
+          @document,
+          @object,
+          @options
+        )
       end
 
     end
@@ -70,9 +91,14 @@ describe Mongoid::Associations::Accessor do
     context "when type is has_one" do
 
       it "returns a HasOne" do
-        @options = Mongoid::Options.new(:association_name => :name)
+        @options = Mongoid::Associations::Options.new(:name => :name)
         Mongoid::Associations::HasOne.expects(:update).with(@document, @object, @options)
-        Mongoid::Associations::Accessor.set(Mongoid::Associations::HasOne, @document, @object, @options)
+        Mongoid::Associations::Accessor.set(
+          Mongoid::Associations::HasOne,
+          @document,
+          @object,
+          @options
+        )
       end
 
     end
@@ -80,9 +106,14 @@ describe Mongoid::Associations::Accessor do
     context "when type is belongs_to" do
 
       it "returns a BelongsTo" do
-        @options = Mongoid::Options.new(:association_name => :person)
+        @options = Mongoid::Associations::Options.new(:name => :person)
         Mongoid::Associations::BelongsTo.expects(:update).with(@object, @document, @options)
-        Mongoid::Associations::Accessor.set(Mongoid::Associations::BelongsTo, @document, @object, @options)
+        Mongoid::Associations::Accessor.set(
+          Mongoid::Associations::BelongsTo,
+          @document,
+          @object,
+          @options
+        )
       end
 
     end

data/spec/unit/mongoid/associations/belongs_to_spec.rb

@@ -7,7 +7,7 @@ describe Mongoid::Associations::BelongsTo do
     before do
       @parent = Name.new(:first_name => "Drexel")
       @document = stub(:parent => @parent)
-      @options = Mongoid::Options.new(:association_name => :person)
+      @options = Mongoid::Associations::Options.new(:name => :person)
       @association = Mongoid::Associations::BelongsTo.new(@document, @options)
     end
 
@@ -27,7 +27,7 @@ describe Mongoid::Associations::BelongsTo do
     before do
       @parent = Name.new(:first_name => "Drexel")
       @document = stub(:parent => @parent)
-      @options = Mongoid::Options.new(:association_name => :person)
+      @options = Mongoid::Associations::Options.new(:name => :person)
       @association = Mongoid::Associations::BelongsTo.new(@document, @options)
     end
 
@@ -57,7 +57,7 @@ describe Mongoid::Associations::BelongsTo do
       before do
         @name = Name.new(:first_name => "Test", :last_name => "User")
         @person = Person.new(:title => "Mrs")
-        @options = Mongoid::Options.new(:association_name => :person)
+        @options = Mongoid::Associations::Options.new(:name => :person)
         Mongoid::Associations::BelongsTo.update(@person, @name, @options)
       end
 

data/spec/unit/mongoid/associations/has_many_spec.rb

@@ -14,7 +14,7 @@ describe Mongoid::Associations::HasMany do
     before do
       @address = Address.new(:street => "Madison Ave")
       @person = Person.new(:title => "Sir")
-      Mongoid::Associations::HasMany.update([@address], @person, Mongoid::Options.new(:association_name => :addresses))
+      Mongoid::Associations::HasMany.update([@address], @person, Mongoid::Associations::Options.new(:name => :addresses))
     end
 
     it "parentizes the child document" do
@@ -31,7 +31,7 @@ describe Mongoid::Associations::HasMany do
   describe "#[]" do
 
     before do
-      @association = Mongoid::Associations::HasMany.new(@document, Mongoid::Options.new(:association_name => :addresses))
+      @association = Mongoid::Associations::HasMany.new(@document, Mongoid::Associations::Options.new(:name => :addresses))
     end
 
     context "when the index is present in the association" do
@@ -56,7 +56,7 @@ describe Mongoid::Associations::HasMany do
   describe "#<<" do
 
     before do
-      @association = Mongoid::Associations::HasMany.new(@document, Mongoid::Options.new(:association_name => :addresses))
+      @association = Mongoid::Associations::HasMany.new(@document, Mongoid::Associations::Options.new(:name => :addresses))
       @address = Address.new
     end
 
@@ -77,7 +77,7 @@ describe Mongoid::Associations::HasMany do
   describe "#concat" do
 
     before do
-      @association = Mongoid::Associations::HasMany.new(@document, Mongoid::Options.new(:association_name => :addresses))
+      @association = Mongoid::Associations::HasMany.new(@document, Mongoid::Associations::Options.new(:name => :addresses))
       @address = Address.new
     end
 
@@ -92,7 +92,7 @@ describe Mongoid::Associations::HasMany do
   describe "#push" do
 
     before do
-      @association = Mongoid::Associations::HasMany.new(@document, Mongoid::Options.new(:association_name => :addresses))
+      @association = Mongoid::Associations::HasMany.new(@document, Mongoid::Associations::Options.new(:name => :addresses))
       @address = Address.new
     end
 
@@ -107,7 +107,7 @@ describe Mongoid::Associations::HasMany do
   describe "#build" do
 
     before do
-      @association = Mongoid::Associations::HasMany.new(@document, Mongoid::Options.new(:association_name => :addresses))
+      @association = Mongoid::Associations::HasMany.new(@document, Mongoid::Associations::Options.new(:name => :addresses))
     end
 
     it "adds a new document to the array with the suppied parameters" do
@@ -128,7 +128,7 @@ describe Mongoid::Associations::HasMany do
   describe "#find" do
 
     before do
-      @association = Mongoid::Associations::HasMany.new(@document, Mongoid::Options.new(:association_name => :addresses))
+      @association = Mongoid::Associations::HasMany.new(@document, Mongoid::Associations::Options.new(:name => :addresses))
     end
 
     context "when finding all" do
@@ -155,7 +155,10 @@ describe Mongoid::Associations::HasMany do
     context "when there are elements in the array" do
 
       before do
-        @association = Mongoid::Associations::HasMany.new(@document, Mongoid::Options.new(:association_name => :addresses))
+        @association = Mongoid::Associations::HasMany.new(
+          @document,
+          Mongoid::Associations::Options.new(:name => :addresses)
+        )
       end
 
       it "returns the first element" do
@@ -168,7 +171,10 @@ describe Mongoid::Associations::HasMany do
     context "when the array is empty" do
 
       before do
-        @association = Mongoid::Associations::HasMany.new(Person.new, Mongoid::Options.new(:association_name => :addresses))
+        @association = Mongoid::Associations::HasMany.new(
+          Person.new,
+          Mongoid::Associations::Options.new(:name => :addresses)
+        )
       end
 
       it "returns nil" do
@@ -184,7 +190,10 @@ describe Mongoid::Associations::HasMany do
     context "#length" do
 
       it "returns the length of the delegated array" do
-        @association = Mongoid::Associations::HasMany.new(@document, Mongoid::Options.new(:association_name => :addresses))
+        @association = Mongoid::Associations::HasMany.new(
+          @document,
+          Mongoid::Associations::Options.new(:name => :addresses)
+        )
         @association.length.should == 2
       end
 
@@ -195,7 +204,10 @@ describe Mongoid::Associations::HasMany do
   describe "#push" do
 
     before do
-      @association = Mongoid::Associations::HasMany.new(@document, Mongoid::Options.new(:association_name => :addresses))
+      @association = Mongoid::Associations::HasMany.new(
+        @document,
+        Mongoid::Associations::Options.new(:name => :addresses)
+      )
     end
 
     it "appends the document to the end of the array" do

data/spec/unit/mongoid/associations/has_one_spec.rb

@@ -12,7 +12,11 @@ describe Mongoid::Associations::HasOne do
     before do
       @name = Name.new(:first_name => "Donald")
       @person = Person.new(:title => "Sir")
-      Mongoid::Associations::HasOne.update(@name, @person, Mongoid::Options.new(:association_name => :name))
+      Mongoid::Associations::HasOne.update(
+        @name,
+        @person,
+        Mongoid::Associations::Options.new(:name => :name)
+      )
     end
 
     it "parentizes the child document" do
@@ -29,7 +33,10 @@ describe Mongoid::Associations::HasOne do
   describe "#decorate!" do
 
     before do
-      @association = Mongoid::Associations::HasOne.new(@document, Mongoid::Options.new(:association_name => :mixed_drink))
+      @association = Mongoid::Associations::HasOne.new(
+        @document,
+        Mongoid::Associations::Options.new(:name => :mixed_drink)
+      )
     end
 
     context "when getting values" do

data/spec/unit/mongoid/{options_spec.rb → associations/options_spec.rb}

@@ -1,16 +1,16 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "/../../spec_helper.rb"))
+require File.expand_path(File.join(File.dirname(__FILE__), "/../../../spec_helper.rb"))
 
-describe Mongoid::Options do
+describe Mongoid::Associations::Options do
 
-  describe "#association_name" do
+  describe "#name" do
 
     before do
-      @attributes = { :association_name => :addresses }
-      @options = Mongoid::Options.new(@attributes)
+      @attributes = { :name => :addresses }
+      @options = Mongoid::Associations::Options.new(@attributes)
     end
 
     it "returns the association name" do
-      @options.association_name.should == :addresses
+      @options.name.should == :addresses
     end
 
   end
@@ -21,7 +21,7 @@ describe Mongoid::Options do
 
       before do
         @attributes = { :class_name => "Person" }
-        @options = Mongoid::Options.new(@attributes)
+        @options = Mongoid::Associations::Options.new(@attributes)
       end
 
       it "constantizes the class name" do
@@ -35,8 +35,8 @@ describe Mongoid::Options do
       context "when association name is singular" do
 
         before do
-          @attributes = { :association_name => :person }
-          @options = Mongoid::Options.new(@attributes)
+          @attributes = { :name => :person }
+          @options = Mongoid::Associations::Options.new(@attributes)
         end
 
         it "classifies and constantizes the association name" do
@@ -48,8 +48,8 @@ describe Mongoid::Options do
       context "when association name is plural" do
 
         before do
-          @attributes = { :association_name => :people }
-          @options = Mongoid::Options.new(@attributes)
+          @attributes = { :name => :people }
+          @options = Mongoid::Associations::Options.new(@attributes)
         end
 
         it "classifies and constantizes the association name" do
@@ -69,7 +69,7 @@ describe Mongoid::Options do
 
       before do
         @attributes = { :polymorphic => true }
-        @options = Mongoid::Options.new(@attributes)
+        @options = Mongoid::Associations::Options.new(@attributes)
 
       end
 
@@ -82,7 +82,7 @@ describe Mongoid::Options do
     context "when attribute not provided" do
 
       before do
-        @options = Mongoid::Options.new
+        @options = Mongoid::Associations::Options.new
       end
 
       it "returns false" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 0.7.10
+  version: 0.8.1
 platform: ruby
 authors: 
 - Durran Jordan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-16 00:00:00 -05:00
+date: 2009-11-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: "0.16"
+        version: "0.17"
     version: 
 - !ruby/object:Gem::Dependency 
   name: mongo_ext
@@ -60,7 +60,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: "0.16"
+        version: "0.17"
     version: 
 description: 
 email: durran@gmail.com
@@ -84,6 +84,7 @@ files:
 - lib/mongoid/associations/decorator.rb
 - lib/mongoid/associations/has_many.rb
 - lib/mongoid/associations/has_one.rb
+- lib/mongoid/associations/options.rb
 - lib/mongoid/attributes.rb
 - lib/mongoid/commands.rb
 - lib/mongoid/commands/create.rb
@@ -111,7 +112,6 @@ files:
 - lib/mongoid/extensions/symbol/inflections.rb
 - lib/mongoid/extensions/time/conversions.rb
 - lib/mongoid/field.rb
-- lib/mongoid/options.rb
 - lib/mongoid/timestamps.rb
 - lib/mongoid/versioning.rb
 - mongoid.gemspec
@@ -124,6 +124,7 @@ files:
 - spec/unit/mongoid/associations/decorator_spec.rb
 - spec/unit/mongoid/associations/has_many_spec.rb
 - spec/unit/mongoid/associations/has_one_spec.rb
+- spec/unit/mongoid/associations/options_spec.rb
 - spec/unit/mongoid/associations_spec.rb
 - spec/unit/mongoid/attributes_spec.rb
 - spec/unit/mongoid/commands/create_spec.rb
@@ -150,7 +151,6 @@ files:
 - spec/unit/mongoid/extensions/symbol/inflections_spec.rb
 - spec/unit/mongoid/extensions/time/conversions_spec.rb
 - spec/unit/mongoid/field_spec.rb
-- spec/unit/mongoid/options_spec.rb
 - spec/unit/mongoid/timestamps_spec.rb
 - spec/unit/mongoid/versioning_spec.rb
 has_rdoc: true
@@ -189,6 +189,7 @@ test_files:
 - spec/unit/mongoid/associations/decorator_spec.rb
 - spec/unit/mongoid/associations/has_many_spec.rb
 - spec/unit/mongoid/associations/has_one_spec.rb
+- spec/unit/mongoid/associations/options_spec.rb
 - spec/unit/mongoid/associations_spec.rb
 - spec/unit/mongoid/attributes_spec.rb
 - spec/unit/mongoid/commands/create_spec.rb
@@ -215,6 +216,5 @@ test_files:
 - spec/unit/mongoid/extensions/symbol/inflections_spec.rb
 - spec/unit/mongoid/extensions/time/conversions_spec.rb
 - spec/unit/mongoid/field_spec.rb
-- spec/unit/mongoid/options_spec.rb
 - spec/unit/mongoid/timestamps_spec.rb
 - spec/unit/mongoid/versioning_spec.rb

data/lib/mongoid/options.rb

@@ -1,30 +0,0 @@
-module Mongoid #:nodoc:
-  class Options #:nodoc:
-
-    # Create the new +Options+ object, which provides convenience methods for
-    # accessing values out of an options +Hash+.
-    def initialize(attributes = {})
-      @attributes = attributes
-    end
-
-    # Returns the association name of the options.
-    def association_name
-      @attributes[:association_name]
-    end
-
-    # Return a +Class+ for the options. If a class_name was provided, then the
-    # constantized class_name will be returned. If not, a constant based on the
-    # association name will be returned.
-    def klass
-      class_name = @attributes[:class_name]
-      association_name = @attributes[:association_name]
-      class_name ? class_name.constantize : association_name.to_s.classify.constantize
-    end
-
-    # Returns whether or not this association is polymorphic.
-    def polymorphic
-      @attributes[:polymorphic] == true
-    end
-
-  end
-end