mongoid 0.5.9 → 0.5.10

data/VERSION

@@ -1 +1 @@
-0.5.9
+0.5.10

data/lib/mongoid.rb

@@ -21,8 +21,8 @@
 require "rubygems"
 
 gem "activesupport", "2.3.4"
-gem "mongo", "0.15.1"
-gem "durran-validatable", "1.7.5"
+gem "mongo", "0.16"
+gem "durran-validatable", "1.8.2"
 gem "will_paginate", "2.3.11"
 
 require "delegate"

data/lib/mongoid/criteria.rb

@@ -173,7 +173,7 @@ module Mongoid #:nodoc:
     #
     # Returns: <tt>self</tt>
     def id(object_id)
-      @selector[:_id] = Mongo::ObjectID.from_string(object_id); self
+      @selector[:_id] = object_id; self
     end
 
     # Create the new +Criteria+ object. This will initialize the selector
@@ -310,7 +310,7 @@ module Mongoid #:nodoc:
     # Returns a new +Criteria+ object.
     def self.translate(*args)
       type, params = args[0], args[1] || {}
-      return new(:first).id(type.to_s) if type.is_a?(Mongo::ObjectID)
+      return new(:first).id(type) unless type.is_a?(Symbol)
       return new(type).where(params.delete(:conditions)).extras(params)
     end
 

data/lib/mongoid/extensions.rb

@@ -4,6 +4,7 @@ require "mongoid/extensions/boolean/conversions"
 require "mongoid/extensions/date/conversions"
 require "mongoid/extensions/float/conversions"
 require "mongoid/extensions/hash/accessors"
+require "mongoid/extensions/hash/conversions"
 require "mongoid/extensions/integer/conversions"
 require "mongoid/extensions/object/conversions"
 require "mongoid/extensions/object/parentization"
@@ -31,6 +32,7 @@ end
 
 class Hash #:nodoc
   include Mongoid::Extensions::Hash::Accessors
+  extend Mongoid::Extensions::Hash::Conversions
 end
 
 class Integer #:nodoc

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

@@ -0,0 +1,14 @@
+module Mongoid #:nodoc:
+  module Extensions #:nodoc:
+    module Hash #:nodoc:
+      module Conversions #:nodoc:
+        def get(value)
+          value
+        end
+        def set(value)
+          value
+        end
+      end
+    end
+  end
+end

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

@@ -3,11 +3,30 @@ module Mongoid #:nodoc:
     module Object #:nodoc:
       # This module converts objects into mongoid related objects.
       module Conversions #:nodoc:
-        # Converts this object to a hash of attributes
-        def mongoidize
-          self.attributes
+        def self.included(base)
+          base.class_eval do
+            include InstanceMethods
+            extend ClassMethods
+          end
+        end
+
+        module InstanceMethods
+          # Converts this object to a hash of attributes
+          def mongoidize
+            self.attributes
+          end
+        end
+
+        module ClassMethods
+          def set(value)
+            value.attributes
+          end
+
+          def get(value)
+            self.new(value)
+          end
         end
       end
     end
   end
-end
+end

data/mongoid.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "0.5.9"
+  s.version = "0.5.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
@@ -45,6 +45,7 @@ Gem::Specification.new do |s|
      "lib/mongoid/extensions/date/conversions.rb",
      "lib/mongoid/extensions/float/conversions.rb",
      "lib/mongoid/extensions/hash/accessors.rb",
+     "lib/mongoid/extensions/hash/conversions.rb",
      "lib/mongoid/extensions/integer/conversions.rb",
      "lib/mongoid/extensions/object/casting.rb",
      "lib/mongoid/extensions/object/conversions.rb",
@@ -81,6 +82,7 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/extensions/date/conversions_spec.rb",
      "spec/unit/mongoid/extensions/float/conversions_spec.rb",
      "spec/unit/mongoid/extensions/hash/accessors_spec.rb",
+     "spec/unit/mongoid/extensions/hash/conversions_spec.rb",
      "spec/unit/mongoid/extensions/integer/conversions_spec.rb",
      "spec/unit/mongoid/extensions/object/conversions_spec.rb",
      "spec/unit/mongoid/extensions/object/parentization_spec.rb",
@@ -121,6 +123,7 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/extensions/date/conversions_spec.rb",
      "spec/unit/mongoid/extensions/float/conversions_spec.rb",
      "spec/unit/mongoid/extensions/hash/accessors_spec.rb",
+     "spec/unit/mongoid/extensions/hash/conversions_spec.rb",
      "spec/unit/mongoid/extensions/integer/conversions_spec.rb",
      "spec/unit/mongoid/extensions/object/conversions_spec.rb",
      "spec/unit/mongoid/extensions/object/parentization_spec.rb",

data/spec/spec_helper.rb

@@ -15,22 +15,23 @@ Spec::Runner.configure do |config|
   Mocha::Configuration.prevent(:stubbing_non_existent_method)
 end
 
+class MixedDrink < Mongoid::Document
+  field :name
+end
+
 class Person < Mongoid::Document
   include Mongoid::Timestamps
   field :title
   field :terms, :type => Boolean
   field :age, :type => Integer, :default => 100
   field :dob, :type => Date
+  field :mixed_drink, :type => MixedDrink
   has_many :addresses
   has_many :phone_numbers, :class_name => "Phone"
   has_one :name
   has_one :pet, :class_name => "Animal"
 end
 
-class MixedDrink < Mongoid::Document
-  field :name
-end
-
 class Address < Mongoid::Document
   field :street
   field :city

data/spec/unit/mongoid/criteria_spec.rb

@@ -170,7 +170,7 @@ describe Mongoid::Criteria do
 
     it "adds the _id query to the selector" do
       id = Mongo::ObjectID.new
-      @criteria.id(id.to_s)
+      @criteria.id(id)
       @criteria.selector.should == { :_id => id }
     end
 
@@ -384,14 +384,20 @@ describe Mongoid::Criteria do
 
   describe "#translate" do
 
-    context "single argument as a string" do
+    context "with a single argument" do
 
-      it "creates a new select criteria" do
+      it "creates a criteria for an object id" do
         id = Mongo::ObjectID.new
         criteria = Mongoid::Criteria.translate(id)
         criteria.selector.should == { :_id => id }
       end
 
+      it "creates a criteria for a string" do
+        id = Mongo::ObjectID.new.to_s
+        criteria = Mongoid::Criteria.translate(id)
+        criteria.selector.should == { :_id => id }
+      end
+
     end
 
     context "multiple arguments" do

data/spec/unit/mongoid/document_spec.rb

@@ -145,6 +145,21 @@ describe Mongoid::Document do
 
     end
 
+    context "when type is an object" do
+
+      before do
+        @person = Person.new
+        @drink = MixedDrink.new(:name => "Jack and Coke")
+        @person.mixed_drink = @drink
+      end
+
+      it "allows proper access to the object" do
+        @person.mixed_drink.should == @drink
+        @person.attributes[:mixed_drink].except(:_id).should == { "name" => "Jack and Coke" }
+      end
+
+    end
+
   end
 
   describe "#find" do
@@ -623,6 +638,39 @@ describe Mongoid::Document do
 
       end
 
+      describe "#validates_uniqueness_of" do
+
+        it "adds the uniqueness validation" do
+          Person.class_eval do
+            validates_uniqueness_of :title
+          end
+          Person.validations.first.should be_a_kind_of(Validatable::ValidatesUniquenessOf)
+        end
+
+      end
+
+      describe "#validates_inclusion_of" do
+
+        it "adds the inclusion validation" do
+          Person.class_eval do
+            validates_inclusion_of :title, :within => ["test"]
+          end
+          Person.validations.first.should be_a_kind_of(Validatable::ValidatesInclusionOf)
+        end
+
+      end
+
+      describe "#validates_exclusion_of" do
+
+        it "adds the exclusion validation" do
+          Person.class_eval do
+            validates_exclusion_of :title, :within => ["test"]
+          end
+          Person.validations.first.should be_a_kind_of(Validatable::ValidatesExclusionOf)
+        end
+
+      end
+
       describe "#validates_true_for" do
 
         it "adds the true validation" do

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

@@ -0,0 +1,21 @@
+require File.join(File.dirname(__FILE__), "/../../../../spec_helper.rb")
+
+describe Mongoid::Extensions::Hash::Conversions do
+
+  describe "#get" do
+
+    it "returns the hash" do
+      Hash.get({ :field => "test" }).should == { :field => "test" }
+    end
+
+  end
+
+  describe "#set" do
+
+    it "returns the hash" do
+      Hash.set({ :field => "test" }).should == { :field => "test" }
+    end
+
+  end
+
+end

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

@@ -6,7 +6,32 @@ describe Mongoid::Extensions::Object::Conversions do
 
     it "returns its attributes" do
       Person.new(:_id => 1, :title => "Sir").mongoidize.should ==
-        HashWithIndifferentAccess.new({ :_id => 1, :title => "Sir", :age => 100 })
+        { "_id" => 1, "title" => "Sir", "age" => 100 }
+    end
+
+  end
+
+  describe "#get" do
+
+    before do
+      @attributes = { :_id => "test", :title => "Sir", :age => 100 }
+    end
+
+    it "instantiates a new class from the attributes" do
+      Person.get(@attributes).should == Person.new(@attributes)
+    end
+
+  end
+
+  describe "#set" do
+
+    before do
+      @attributes = { "_id" => "test", "title" => "Sir", "age" => 100 }
+      @person = Person.new(@attributes)
+    end
+
+    it "converts the object to a hash" do
+      Person.set(@person).should == @attributes
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 0.5.9
+  version: 0.5.10
 platform: ruby
 authors: 
 - Durran Jordan
@@ -91,6 +91,7 @@ files:
 - lib/mongoid/extensions/date/conversions.rb
 - lib/mongoid/extensions/float/conversions.rb
 - lib/mongoid/extensions/hash/accessors.rb
+- lib/mongoid/extensions/hash/conversions.rb
 - lib/mongoid/extensions/integer/conversions.rb
 - lib/mongoid/extensions/object/casting.rb
 - lib/mongoid/extensions/object/conversions.rb
@@ -127,6 +128,7 @@ files:
 - spec/unit/mongoid/extensions/date/conversions_spec.rb
 - spec/unit/mongoid/extensions/float/conversions_spec.rb
 - spec/unit/mongoid/extensions/hash/accessors_spec.rb
+- spec/unit/mongoid/extensions/hash/conversions_spec.rb
 - spec/unit/mongoid/extensions/integer/conversions_spec.rb
 - spec/unit/mongoid/extensions/object/conversions_spec.rb
 - spec/unit/mongoid/extensions/object/parentization_spec.rb
@@ -189,6 +191,7 @@ test_files:
 - spec/unit/mongoid/extensions/date/conversions_spec.rb
 - spec/unit/mongoid/extensions/float/conversions_spec.rb
 - spec/unit/mongoid/extensions/hash/accessors_spec.rb
+- spec/unit/mongoid/extensions/hash/conversions_spec.rb
 - spec/unit/mongoid/extensions/integer/conversions_spec.rb
 - spec/unit/mongoid/extensions/object/conversions_spec.rb
 - spec/unit/mongoid/extensions/object/parentization_spec.rb