mongoid 1.0.3 → 1.0.4

data/HISTORY

@@ -1,3 +1,18 @@
+=== 1.0.4
+- Modified criteria to use the querying class
+  when instantiating documents if there are no
+  subclasses.
+
+- Floats that are empty strings or nil get
+  defaulted to 0.0
+
+=== 1.0.3
+- Small performance improvements on finders
+
+- Float.set allows setting of non-numeric string
+  in order for validates_numericality_of to fail
+  properly.
+
 === 1.0.2
 - Named scopes get added functionality:
 

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.0.4

data/lib/mongoid/criteria.rb

@@ -185,7 +185,7 @@ module Mongoid #:nodoc:
         true
       ).collect do |docs|
         docs["group"] = docs["group"].collect do |attrs|
-          attrs["_type"].constantize.instantiate(attrs)
+          instantiate(attrs)
         end
         docs
       end
@@ -234,8 +234,11 @@ module Mongoid #:nodoc:
     # type: One of :all, :first:, or :last
     # klass: The class to execute on.
     def initialize(klass)
-      @selector = klass.hereditary ? { :_type => { "$in" => klass._types } } : {}
-      @options, @klass = {}, klass
+      @selector, @options, @klass = {}, {}, klass
+      if klass.hereditary
+        @selector = { :_type => { "$in" => klass._types } }
+        @hereditary = true
+      end
     end
 
     # Return the last result for the +Criteria+. Essentially does a find_one on
@@ -251,7 +254,7 @@ module Mongoid #:nodoc:
       sorting = [[:_id, :asc]] unless sorting
       opts[:sort] = sorting.collect { |option| [ option[0], option[1].invert ] }
       attributes = @klass.collection.find_one(@selector, opts)
-      attributes ? attributes["_type"].constantize.instantiate(attributes) : nil
+      attributes ? instantiate(attributes) : nil
     end
 
     # Adds a criterion to the +Criteria+ that specifies the maximum number of
@@ -392,7 +395,7 @@ module Mongoid #:nodoc:
     # <tt>Criteria.select(:name).where(:name = "Chrissy").one</tt>
     def one
       attributes = @klass.collection.find_one(@selector, process_options)
-      attributes ? attributes["_type"].constantize.instantiate(attributes) : nil
+      attributes ? instantiate(attributes) : nil
     end
 
     alias :first :one
@@ -565,23 +568,12 @@ module Mongoid #:nodoc:
       attributes = @klass.collection.find(@selector, process_options)
       if attributes
         @count = attributes.count
-        attributes.collect { |doc| doc["_type"].constantize.instantiate(doc) }
+        attributes.collect { |doc| instantiate(doc) }
       else
         []
       end
     end
 
-    # Filters the field list. If no fields have been supplied, then it will be
-    # empty. If fields have been defined then _type will be included as well.
-    def process_options
-      fields = @options[:fields]
-      if fields && fields.size > 0 && !fields.include?(:_type)
-        fields << :_type
-        @options[:fields] = fields
-      end
-      @options.dup
-    end
-
     # Filters the unused options out of the options +Hash+. Currently this
     # takes into account the "page" and "per_page" options that would be passed
     # in if using will_paginate.
@@ -607,6 +599,22 @@ module Mongoid #:nodoc:
       collection.first[start.to_s]
     end
 
+    # If hereditary instantiate by _type otherwise use the klass.
+    def instantiate(attrs)
+      @hereditary ? attrs["_type"].constantize.instantiate(attrs) : @klass.instantiate(attrs)
+    end
+
+    # Filters the field list. If no fields have been supplied, then it will be
+    # empty. If fields have been defined then _type will be included as well.
+    def process_options
+      fields = @options[:fields]
+      if fields && fields.size > 0 && !fields.include?(:_type)
+        fields << :_type
+        @options[:fields] = fields
+      end
+      @options.dup
+    end
+
     # Update the selector setting the operator on the value for each key in the
     # supplied attributes +Hash+.
     def update_selector(attributes, operator)

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

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

data/mongoid.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "1.0.3"
+  s.version = "1.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
@@ -85,6 +85,7 @@ Gem::Specification.new do |s|
      "spec/integration/mongoid/commands_spec.rb",
      "spec/integration/mongoid/criteria_spec.rb",
      "spec/integration/mongoid/document_spec.rb",
+     "spec/integration/mongoid/extensions_spec.rb",
      "spec/integration/mongoid/finders_spec.rb",
      "spec/integration/mongoid/inheritance_spec.rb",
      "spec/integration/mongoid/named_scope_spec.rb",
@@ -153,6 +154,7 @@ Gem::Specification.new do |s|
      "spec/integration/mongoid/commands_spec.rb",
      "spec/integration/mongoid/criteria_spec.rb",
      "spec/integration/mongoid/document_spec.rb",
+     "spec/integration/mongoid/extensions_spec.rb",
      "spec/integration/mongoid/finders_spec.rb",
      "spec/integration/mongoid/inheritance_spec.rb",
      "spec/integration/mongoid/named_scope_spec.rb",

data/spec/integration/mongoid/associations_spec.rb

@@ -84,15 +84,36 @@ describe Mongoid::Associations do
 
     context "multiple levels nested" do
 
-      before do
-        @person.phone_numbers.create(:number => "4155551212")
+      context "when a has-many to has_one" do
+
+        before do
+          @person.phone_numbers.create(:number => "4155551212")
+        end
+
+        it "persists all the associations properly" do
+          from_db = Person.find(@person.id)
+          phone = from_db.phone_numbers.first
+          phone.create_country_code(:code => 1)
+          from_db.phone_numbers.first.country_code.code.should == 1
+        end
+
       end
 
-      it "persists all the associations properly" do
-        from_db = Person.find(@person.id)
-        phone = from_db.phone_numbers.first
-        phone.create_country_code(:code => 1)
-        from_db.phone_numbers.first.country_code.code.should == 1
+      context "when a has-many to has-many" do
+
+        before do
+          @address = Address.new(:street => "Upper Street")
+          @person.addresses << @address
+        end
+
+        it "bubbles the child association up to root" do
+          location = Location.new(:name => "Home")
+          @address.locations << location
+          location.stubs(:valid?).returns(false)
+          @person.save
+          @person.addresses.first.locations.first.should == location
+        end
+
       end
 
     end

data/spec/integration/mongoid/extensions_spec.rb

@@ -0,0 +1,26 @@
+require "spec_helper"
+
+describe Mongoid::Extensions do
+
+  context "setting floating point numbers" do
+
+    context "when value is an empty string" do
+
+      let(:person) { Person.new }
+
+      before do
+        Person.validates_numericality_of :blood_alcohol_content, :allow_blank => true
+      end
+
+      after do
+        Person.validations.clear
+      end
+
+      it "does not set the value" do
+        person.save.should be_true
+      end
+
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -37,6 +37,7 @@ class Person
   field :aliases, :type => Array
   field :map, :type => Hash
   field :score, :type => Integer
+  field :blood_alcohol_content, :type => Float
 
   attr_reader :rescored
 
@@ -149,9 +150,16 @@ class Address
   field :state
   field :post_code
   key :street
+  has_many :locations
   belongs_to :addressable, :inverse_of => :addresses
 end
 
+class Location
+  include Mongoid::Document
+  field :name
+  belongs_to :address, :inverse_of => :locations
+end
+
 class Name
   include Mongoid::Document
   field :first_name

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

@@ -4,18 +4,46 @@ describe Mongoid::Extensions::Float::Conversions do
 
   describe "#set" do
 
-    context "when the string is a number" do
+    context "when the value is a number" do
 
-      it "converts the string to a float" do
-        Float.set("3.45").should == 3.45
+      it "converts the number 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"
+      context "when the string is non numerical" do
+
+        it "returns the string" do
+          Float.set("foo").should == "foo"
+        end
+
+      end
+
+      context "when the string is numerical" do
+
+        it "returns the float value for the string" do
+          Float.set("3.45").should == 3.45
+        end
+
+      end
+
+      context "when the string is empty" do
+
+        it "returns 0.0" do
+          Float.set("").should == 0.0
+        end
+
+      end
+
+      context "when the string is nil" do
+
+        it "returns 0.0" do
+          Float.set(nil).should == 0.0
+        end
+
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors: 
 - Durran Jordan
@@ -151,6 +151,7 @@ files:
 - spec/integration/mongoid/commands_spec.rb
 - spec/integration/mongoid/criteria_spec.rb
 - spec/integration/mongoid/document_spec.rb
+- spec/integration/mongoid/extensions_spec.rb
 - spec/integration/mongoid/finders_spec.rb
 - spec/integration/mongoid/inheritance_spec.rb
 - spec/integration/mongoid/named_scope_spec.rb
@@ -241,6 +242,7 @@ test_files:
 - spec/integration/mongoid/commands_spec.rb
 - spec/integration/mongoid/criteria_spec.rb
 - spec/integration/mongoid/document_spec.rb
+- spec/integration/mongoid/extensions_spec.rb
 - spec/integration/mongoid/finders_spec.rb
 - spec/integration/mongoid/inheritance_spec.rb
 - spec/integration/mongoid/named_scope_spec.rb