mongoid 1.0.2 → 1.0.3

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

data/lib/mongoid/criteria.rb

@@ -234,7 +234,8 @@ module Mongoid #:nodoc:
     # type: One of :all, :first:, or :last
     # klass: The class to execute on.
     def initialize(klass)
-      @selector, @options, @klass = { :_type => { "$in" => klass._types } }, {}, klass
+      @selector = klass.hereditary ? { :_type => { "$in" => klass._types } } : {}
+      @options, @klass = {}, klass
     end
 
     # Return the last result for the +Criteria+. Essentially does a find_one on

data/lib/mongoid/document.rb

@@ -7,9 +7,15 @@ module Mongoid #:nodoc:
         include InstanceMethods
         extend ClassMethods
 
-        cattr_accessor :_collection, :collection_name, :embedded, :primary_key
+        cattr_accessor \
+          :_collection,
+          :collection_name,
+          :embedded,
+          :primary_key,
+          :hereditary
 
         self.embedded = false
+        self.hereditary = false
         self.collection_name = self.name.collectionize
 
         attr_accessor :association_name, :_parent
@@ -31,6 +37,12 @@ module Mongoid #:nodoc:
         add_indexes; self._collection
       end
 
+      # Perform default behavior but mark the hierarchy as being hereditary.
+      def inherited(subclass)
+        super(subclass)
+        self.hereditary = true
+      end
+
       # Returns a human readable version of the class.
       #
       # Example:

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

@@ -4,7 +4,7 @@ module Mongoid #:nodoc:
     module Float #:nodoc:
       module Conversions #:nodoc:
         def set(value)
-          value.to_f
+          value =~ /\d/ ? value.to_f : value
         end
         def get(value)
           value

data/mongoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "1.0.2"
+  s.version = "1.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
-  s.date = %q{2010-01-11}
+  s.date = %q{2010-01-12}
   s.email = %q{durran@gmail.com}
   s.extra_rdoc_files = [
     "README.rdoc"

data/spec/unit/mongoid/criteria_spec.rb

@@ -405,9 +405,22 @@ describe Mongoid::Criteria do
 
   describe "#initialize" do
 
-    it "sets the _type value on the selector" do
-      criteria = Mongoid::Criteria.new(Person)
-      criteria.selector.should == { :_type => { "$in" => ["Doctor", "Person"] } }
+    context "when class is hereditary" do
+
+      it "sets the _type value on the selector" do
+        criteria = Mongoid::Criteria.new(Person)
+        criteria.selector.should == { :_type => { "$in" => ["Doctor", "Person"] } }
+      end
+
+    end
+
+    context "when class is not hereditary" do
+
+      it "sets no _type value on the selector" do
+        criteria = Mongoid::Criteria.new(Game)
+        criteria.selector.should == {}
+      end
+
     end
 
   end

data/spec/unit/mongoid/document_spec.rb

@@ -169,7 +169,8 @@ describe Mongoid::Document do
     context "when the document is embedded" do
 
       it "returns true" do
-        Address.embedded.should be_true
+        address = Address.new
+        address.embedded.should be_true
       end
 
     end
@@ -177,38 +178,37 @@ describe Mongoid::Document do
     context "when the document is not embedded" do
 
       it "returns false" do
-        Person.embedded.should be_false
+        person = Person.new
+        person.embedded.should be_false
       end
 
     end
 
-  end
-
-  describe "#embedded?" do
-
-    context "when the document is embedded" do
+    context "when a subclass is embedded" do
 
       it "returns true" do
-        address = Address.new
-        address.embedded.should be_true
+        circle = Circle.new
+        circle.embedded.should be_true
       end
 
     end
 
-    context "when the document is not embedded" do
+  end
 
-      it "returns false" do
-        person = Person.new
-        person.embedded.should be_false
+  describe ".hereditary" do
+
+    context "when the class is part of a hierarchy" do
+
+      it "returns true" do
+        Canvas.hereditary.should be_true
       end
 
     end
 
-    context "when a subclass is embedded" do
+    context "when the class is not part of a hierarchy" do
 
-      it "returns true" do
-        circle = Circle.new
-        circle.embedded.should be_true
+      it "returns false" do
+        Game.hereditary.should be_false
       end
 
     end

data/spec/unit/mongoid/extensions/float/conversions_spec.rb

@@ -4,8 +4,20 @@ describe Mongoid::Extensions::Float::Conversions do
 
   describe "#set" do
 
-    it "converts the string to a float" do
-      Float.set("3.45").should == 3.45
+    context "when the string is a number" do
+
+      it "converts the string to a float" do
+        Float.set("3.45").should == 3.45
+      end
+
+    end
+
+    context "when the string is not a number" do
+
+      it "returns the string" do
+        Float.set("foo").should == "foo"
+      end
+
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors: 
 - Durran Jordan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-11 00:00:00 -05:00
+date: 2010-01-12 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency