mongoid 0.10.5 → 0.10.6

data/HISTORY

@@ -1,3 +1,10 @@
+=== 0.10.6
+- Fixed bug when trying to set empty strings on number
+  fields. (TypeError: can't convert Fixnum into String)
+
+- Document.delete_all now drops the collection if
+  conditions are empty or nil.
+
 === 0.10.5
 
 - Documents that are embedded not properly respond to

data/VERSION

@@ -1 +1 @@
-0.10.5
+0.10.6

data/lib/mongoid/associations/proxy.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid #:nodoc
   module Associations #:nodoc
     module Proxy #:nodoc

data/lib/mongoid/attributes.rb

@@ -14,7 +14,7 @@ module Mongoid #:nodoc:
       # put into the document's attributes.
       def process(attrs = {})
         attrs.each_pair do |key, value|
-          send("#{key}=", value)
+          send("#{key}=", value) unless value.blank?
         end
       end
 

data/lib/mongoid/commands/delete_all.rb

@@ -13,8 +13,8 @@ module Mongoid #:nodoc:
       # Example:
       #
       # <tt>DeleteAll.execute(Person, :conditions => { :field => "value" })</tt>
-      def self.execute(klass, params = nil)
-        params ? klass.find(:all, params).each do
+      def self.execute(klass, params = {})
+        params.any? ? klass.find(:all, params).each do
           |doc| Delete.execute(doc)
         end : klass.collection.drop
       end

data/lib/mongoid/commands/deletion.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid #:nodoc
   module Commands #:nodoc
     module Deletion #:nodoc

data/lib/mongoid/complex_criterion.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid #:nodoc:
   class ComplexCriterion
     attr_accessor :key, :operator
@@ -6,4 +7,4 @@ module Mongoid #:nodoc:
       @key, @operator = opts[:key], opts[:operator]
     end
   end
-end
+end

data/lib/mongoid/config.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid #:nodoc
   class Config #:nodoc
     include Singleton

data/lib/mongoid/errors.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid #:nodoc
   module Errors #:nodoc
 

data/lib/mongoid/extensions/hash/criteria_helpers.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid #:nodoc:
   module Extensions #:nodoc:
     module Hash #:nodoc:

data/mongoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "0.10.5"
+  s.version = "0.10.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
-  s.date = %q{2009-12-28}
+  s.date = %q{2009-12-29}
   s.email = %q{durran@gmail.com}
   s.extra_rdoc_files = [
     "README.textile"
@@ -61,7 +61,6 @@ Gem::Specification.new do |s|
      "lib/mongoid/extensions/hash/conversions.rb",
      "lib/mongoid/extensions/hash/criteria_helpers.rb",
      "lib/mongoid/extensions/integer/conversions.rb",
-     "lib/mongoid/extensions/object/casting.rb",
      "lib/mongoid/extensions/object/conversions.rb",
      "lib/mongoid/extensions/string/conversions.rb",
      "lib/mongoid/extensions/string/inflections.rb",

data/spec/integration/mongoid/document_spec.rb

@@ -70,6 +70,41 @@ describe Mongoid::Document do
 
   end
 
+  context "#destroy" do
+
+    context "on a root document" do
+
+      before do
+        @person = Person.create(:title => "Sir")
+      end
+
+      it "deletes the document" do
+        @person.destroy
+        lambda { Person.find(@person.id) }.should raise_error
+      end
+
+    end
+
+    context "on an embedded document" do
+
+      before do
+        @person = Person.create(:title => "Lead")
+        @person.addresses.create(:street => "1st Street")
+        @person.name.create(:first_name => "Emmanuel")
+        @person.save
+      end
+
+      it "deletes the document" do
+        @person.addresses.first.destroy
+        @person.name.destroy
+        @person.addresses.first.should be_nil
+        @person.name.document.should be_nil
+      end
+
+    end
+
+  end
+
   context "using dynamic finders" do
 
     before do
@@ -265,6 +300,8 @@ describe Mongoid::Document do
 
       it "always persists" do
         @comment.save(false).should be_true
+        @from_db = Comment.find(@comment.id)
+        @from_db.should == @comment
       end
 
     end

data/spec/spec_helper.rb

@@ -32,6 +32,9 @@ class Person
   field :employer_id
   field :lunch_time, :type => Time
   field :aliases, :type => Array
+  field :score, :type => Integer
+
+  attr_reader :rescored
 
   has_many :addresses
   has_many :phone_numbers, :class_name => "Phone"
@@ -50,6 +53,13 @@ class Person
   has_one_related :game
   has_many_related :posts
 
+  def score_with_rescoring=(score)
+    @rescored = score + 20
+    self.score_without_rescoring = score
+  end
+
+  alias_method_chain :score=, :rescoring
+
   def update_addresses
     addresses.each do |address|
       address.street = "Updated Address"
@@ -74,8 +84,8 @@ class Person
 
 end
 
-class Admin < Person
-  field :code
+class Doctor < Person
+  field :specialty
 end
 
 class Employer
@@ -187,3 +197,39 @@ class Object
     end
   end
 end
+
+# Inhertiance test models:
+class Canvas
+  include Mongoid::Document
+  field :size, :type => Integer, :default => 0
+  has_many :shapes
+
+  def render
+    shapes.each { |shape| render }
+  end
+end
+
+class Browser < Canvas
+  def render; end
+end
+
+class Firefox < Browser
+  def render; end
+end
+
+class Shape
+  include Mongoid::Document
+  field :x, :type => Integer, :default => 0
+  field :y, :type => Integer, :default => 0
+
+  def render; end
+end
+
+class Square < Shape
+  field :width, :type => Integer, :default => 0
+  field :height, :type => Integer, :default => 0
+end
+
+class Circle < Shape
+  field :radius, :type => Integer, :default => 0
+end

data/spec/unit/mongoid/attributes_spec.rb

@@ -99,6 +99,7 @@ describe Mongoid::Attributes do
           :title => "value",
           :age => "30",
           :terms => "true",
+          :score => "",
           :name => {
             :_id => "2", :first_name => "Test", :last_name => "User"
           },
@@ -109,11 +110,12 @@ describe Mongoid::Attributes do
         }
       end
 
-      it "returns a properly cast the attributes" do
+      it "returns properly cast attributes" do
         attrs = Person.new(@attributes).attributes
         attrs[:age].should == 30
         attrs[:terms].should == true
         attrs[:_id].should == "1"
+        attrs[:score].should be_nil
       end
 
     end

data/spec/unit/mongoid/commands/delete_all_spec.rb

@@ -38,6 +38,20 @@ describe Mongoid::Commands::DeleteAll do
 
     end
 
+    context "when empty conditions supplied" do
+
+      before do
+        @collection = mock
+      end
+
+      it "drops the collection" do
+        @klass.expects(:collection).returns(@collection)
+        @collection.expects(:drop)
+        Mongoid::Commands::DeleteAll.execute(@klass, {})
+      end
+
+    end
+
   end
 
 end

data/spec/unit/mongoid/document_spec.rb

@@ -56,6 +56,23 @@ describe Mongoid::Document do
 
   end
 
+  describe "#alias_method_chain" do
+
+    context "on a field setter" do
+
+      before do
+        @person = Person.new
+      end
+
+      it "chains the method properly" do
+        @person.score = 10
+        @person.rescored.should == 30
+      end
+
+    end
+
+  end
+
   describe "#assimilate" do
 
     before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 0.10.5
+  version: 0.10.6
 platform: ruby
 authors: 
 - Durran Jordan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-28 00:00:00 -05:00
+date: 2009-12-29 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -137,7 +137,6 @@ files:
 - lib/mongoid/extensions/hash/conversions.rb
 - lib/mongoid/extensions/hash/criteria_helpers.rb
 - lib/mongoid/extensions/integer/conversions.rb
-- lib/mongoid/extensions/object/casting.rb
 - lib/mongoid/extensions/object/conversions.rb
 - lib/mongoid/extensions/string/conversions.rb
 - lib/mongoid/extensions/string/inflections.rb