mongoid 0.4.1 → 0.4.2

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/lib/mongoid.rb

@@ -32,9 +32,10 @@ require "delegate"
 require "will_paginate/collection"
 require "mongo"
 require "mongoid/associations"
+require "mongoid/commands"
 require "mongoid/criteria"
 require "mongoid/extensions"
-require "mongoid/commands"
+require "mongoid/field"
 require "mongoid/document"
 
 module Mongoid

data/lib/mongoid/commands/create.rb

@@ -1,6 +1,6 @@
 module Mongoid #:nodoc:
   module Commands
-    class Create #:nodoc:
+    class Create
       # Performs a create of the supplied Document, with the necessary
       # callbacks. It then delegates to the Save command.
       #

data/lib/mongoid/commands/delete.rb

@@ -1,6 +1,6 @@
 module Mongoid #:nodoc:
   module Commands
-    class Delete #:nodoc:
+    class Delete
       # Performs a delete of the supplied +Document+ without any callbacks.
       #
       # Options:

data/lib/mongoid/commands/delete_all.rb

@@ -1,6 +1,6 @@
 module Mongoid #:nodoc:
   module Commands
-    class DeleteAll #:nodoc:
+    class DeleteAll
       # Performs a delete of the all the +Documents+ that match the criteria
       # supplied.
       #

data/lib/mongoid/commands/destroy.rb

@@ -1,6 +1,6 @@
 module Mongoid #:nodoc:
   module Commands
-    class Destroy #:nodoc:
+    class Destroy
       # Performs a destroy of the supplied +Document+, with the necessary
       # callbacks. It then deletes the record from the collection.
       #

data/lib/mongoid/commands/destroy_all.rb

@@ -1,6 +1,6 @@
 module Mongoid #:nodoc:
   module Commands
-    class DestroyAll #:nodoc:
+    class DestroyAll
       # Performs a destroy of the all the +Documents+ that match the criteria
       # supplied. Will execute all the destroy callbacks for each +Document+.
       #

data/lib/mongoid/commands/save.rb

@@ -1,6 +1,6 @@
 module Mongoid #:nodoc:
   module Commands
-    class Save #:nodoc:
+    class Save
       # Performs a save of the supplied +Document+, handling all associated
       # callbacks and validation.
       #

data/lib/mongoid/criteria.rb

@@ -72,6 +72,22 @@ module Mongoid #:nodoc:
       return klass.collection.find(@selector, @options).collect { |doc| klass.new(doc) }
     end
 
+    # Adds a criterion to the +Criteria+ that specifies additional options
+    # to be passed to the Ruby driver, in the exact format for the driver.
+    #
+    # Options:
+    #
+    # extras: A +Hash+ that gets set to the driver options.
+    #
+    # Example:
+    #
+    # <tt>criteria.extras(:limit => 20, :skip => 40)</tt>
+    #
+    # Returns: <tt>self</tt>
+    def extras(extras)
+      @options = extras; self
+    end
+
     # Adds a criterion to the +Criteria+ that specifies values where any can
     # be matched in order to return results. This is similar to an SQL "IN"
     # clause. The MongoDB conditional operator that will be used is "$in".
@@ -173,36 +189,19 @@ module Mongoid #:nodoc:
       exclusions.each { |key, value| @selector[key] = { "$nin" => value } }; self
     end
 
-    # Adds a criterion to the +Criteria+ that specifies additional options
-    # to be passed to the Ruby driver, in the exact format for the driver.
-    #
-    # Options:
-    #
-    # extras: A +Hash+ that gets set to the driver options.
-    #
-    # Example:
-    #
-    # <tt>criteria.extras(:limit => 20, :skip => 40)</tt>
-    #
-    # Returns: <tt>self</tt>
-    def extras(extras)
-      @options = extras; self
-    end
-
     # Adds a criterion to the +Criteria+ that specifies the sort order of
     # the returned documents in the database. Similar to a SQL "ORDER BY".
     #
     # Options:
     #
-    # params: A +Hash+ where the key is the field name and the value is an
-    # integer specifying the direction: 1 for ascending, -1 for descending.
+    # params: An +Array+ of [field, direction] sorting pairs.
     #
     # Example:
     #
-    # <tt>criteria.order_by(:field1 => 1, :field2 => -1)</tt>
+    # <tt>criteria.order_by([[:field1, :asc], [:field2, :desc]])</tt>
     #
     # Returns: <tt>self</tt>
-    def order_by(params = {})
+    def order_by(params = [])
       @options[:sort] = params; self
     end
 

data/lib/mongoid/document.rb

@@ -1,5 +1,5 @@
 module Mongoid #:nodoc:
-  class Document #:nodoc:
+  class Document
     include ActiveSupport::Callbacks
     include Validatable
     include Commands
@@ -26,6 +26,7 @@ module Mongoid #:nodoc:
         collection.group(fields, selector, { :count => 0 }, AGGREGATE_REDUCE)
       end
 
+      # Adds the association back to the parent document.
       def belongs_to(association_name)
         add_association(:belongs_to, association_name.to_s.classify, association_name)
       end
@@ -112,7 +113,7 @@ module Mongoid #:nodoc:
           params[:page] || 1,
           params[:per_page] || 20,
           0) do |pager|
-            results = collection.find(selector, { :sort => (params[:sort] || {}),
+            results = collection.find(selector, { :sort => params[:sort],
                                                   :limit => pager.per_page,
                                                   :offset => pager.offset })
             pager.total_entries = results.count

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

@@ -1,11 +1,11 @@
 module Mongoid #:nodoc:
   module Extensions #:nodoc:
-    module Object #:nodoc:
-      # This module converts objects into mongoid related objects.
+    module Array #:nodoc:
+      # This module converts arrays into mongoid related objects.
       module Conversions #:nodoc:
-        # Converts this object to a hash of attributes
+        # Converts this array into an array of hashes.
         def mongoidize
-          self.attributes
+          collect { |obj| obj.attributes }
         end
       end
     end

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

@@ -1,11 +1,11 @@
 module Mongoid #:nodoc:
   module Extensions #:nodoc:
-    module Array #:nodoc:
-      # This module converts arrays into mongoid related objects.
+    module Object #:nodoc:
+      # This module converts objects into mongoid related objects.
       module Conversions #:nodoc:
-        # Converts this array into an array of hashes.
+        # Converts this object to a hash of attributes
         def mongoidize
-          collect { |obj| obj.attributes }
+          self.attributes
         end
       end
     end

data/lib/mongoid/field.rb

@@ -0,0 +1,25 @@
+module Mongoid #:nodoc:
+  class Field
+
+    attr_reader \
+      :default,
+      :name
+
+    # Create the new field with a name and optional additional options. Valid
+    # options are :default
+    #
+    # Options:
+    #
+    # name: The name of the field as a +Symbol+.
+    # options: A +Hash+ of options for the field.
+    #
+    # Example:
+    #
+    # <tt>Field.new(:score, :default => 0)</tt>
+    def initialize(name, options = {})
+      @name = name
+      @default = options[:default]
+    end
+
+  end
+end

data/mongoid.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
@@ -40,6 +40,7 @@ Gem::Specification.new do |s|
      "lib/mongoid/extensions.rb",
      "lib/mongoid/extensions/array/conversions.rb",
      "lib/mongoid/extensions/object/conversions.rb",
+     "lib/mongoid/field.rb",
      "mongoid.gemspec",
      "spec/integration/mongoid/document_spec.rb",
      "spec/spec.opts",
@@ -55,10 +56,12 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/commands/destroy_all_spec.rb",
      "spec/unit/mongoid/commands/destroy_spec.rb",
      "spec/unit/mongoid/commands/save_spec.rb",
+     "spec/unit/mongoid/commands_spec.rb",
      "spec/unit/mongoid/criteria_spec.rb",
      "spec/unit/mongoid/document_spec.rb",
      "spec/unit/mongoid/extensions/array/conversions_spec.rb",
-     "spec/unit/mongoid/extensions/object/conversions_spec.rb"
+     "spec/unit/mongoid/extensions/object/conversions_spec.rb",
+     "spec/unit/mongoid/field_spec.rb"
   ]
   s.homepage = %q{http://github.com/durran/mongoid}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -79,10 +82,12 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/commands/destroy_all_spec.rb",
      "spec/unit/mongoid/commands/destroy_spec.rb",
      "spec/unit/mongoid/commands/save_spec.rb",
+     "spec/unit/mongoid/commands_spec.rb",
      "spec/unit/mongoid/criteria_spec.rb",
      "spec/unit/mongoid/document_spec.rb",
      "spec/unit/mongoid/extensions/array/conversions_spec.rb",
-     "spec/unit/mongoid/extensions/object/conversions_spec.rb"
+     "spec/unit/mongoid/extensions/object/conversions_spec.rb",
+     "spec/unit/mongoid/field_spec.rb"
   ]
 
   if s.respond_to? :specification_version then

data/spec/unit/mongoid/commands_spec.rb

@@ -0,0 +1,153 @@
+require File.join(File.dirname(__FILE__), "/../../spec_helper.rb")
+
+describe Mongoid::Commands do
+
+  context "instance methods" do
+
+    before do
+      @person = Person.new(:_id => Mongo::ObjectID.new)
+    end
+
+    describe "#delete" do
+
+      it "delegates to the Delete command" do
+        Mongoid::Commands::Delete.expects(:execute).with(@person)
+        @person.delete
+      end
+
+    end
+
+    describe "#destroy" do
+
+      it "delegates to the Destroy command" do
+        Mongoid::Commands::Destroy.expects(:execute).with(@person)
+        @person.destroy
+      end
+
+    end
+
+    describe "#save" do
+
+      it "delegates to the Save command" do
+        Mongoid::Commands::Save.expects(:execute).with(@person).returns(true)
+        @person.save
+      end
+
+    end
+
+    describe "#save!" do
+
+      context "when validation passes" do
+
+        it "it returns the person" do
+          Mongoid::Commands::Save.expects(:execute).with(@person).returns(@person)
+          @person.save!.should == @person
+        end
+
+      end
+
+      context "when validation fails" do
+
+        it "it raises a ValidationsError" do
+          Mongoid::Commands::Save.expects(:execute).with(@person).returns(false)
+          lambda { @person.save! }.should raise_error
+        end
+
+      end
+
+    end
+
+    describe "#update_attributes" do
+
+      it "delegates to the Save command" do
+        Mongoid::Commands::Save.expects(:execute).with(@person).returns(@person)
+        @person.update_attributes({})
+      end
+
+    end
+
+    describe "#update_attributes!" do
+
+      context "when validation passes" do
+
+        it "it returns the person" do
+          Mongoid::Commands::Save.expects(:execute).with(@person).returns(@person)
+          @person.update_attributes({}).should == @person
+        end
+
+      end
+
+      context "when validation fails" do
+
+        it "it raises a ValidationsError" do
+          Mongoid::Commands::Save.expects(:execute).with(@person).returns(false)
+          lambda { @person.update_attributes!({}) }.should raise_error
+        end
+
+      end
+
+    end
+
+  end
+
+  context "class methods" do
+
+    describe "#create" do
+
+      it "delegates to the Create command" do
+        Mongoid::Commands::Create.expects(:execute)
+        Person.create
+      end
+
+      it "returns the document" do
+        Mongoid::Commands::Create.expects(:execute).returns(Person.new)
+        Person.create.should_not be_nil
+      end
+
+    end
+
+    describe "#create!" do
+
+      it "delegates to the Create command" do
+        Mongoid::Commands::Create.expects(:execute).returns(Person.new)
+        Person.create!
+      end
+
+      it "returns the document" do
+        Mongoid::Commands::Create.expects(:execute).returns(Person.new)
+        Person.create!.should_not be_nil
+      end
+
+      context "when validation fails" do
+
+        it "raises an exception" do
+          person = stub(:errors => stub(:empty? => false))
+          Mongoid::Commands::Create.expects(:execute).returns(person)
+          lambda { Person.create! }.should raise_error          
+        end
+
+      end
+
+    end
+
+    describe "#delete_all" do
+
+      it "delegates to the DeleteAll command" do
+        Mongoid::Commands::DeleteAll.expects(:execute).with(Person, {})
+        Person.delete_all
+      end
+
+    end
+
+    describe "#destroy_all" do
+
+      it "delegates to the DestroyAll command" do
+        Mongoid::Commands::DestroyAll.expects(:execute).with(Person, {})
+        Person.destroy_all
+      end
+
+    end
+
+  end
+
+end

data/spec/unit/mongoid/criteria_spec.rb

@@ -158,8 +158,8 @@ describe Mongoid::Criteria do
     context "when field names and direction specified" do
 
       it "adds the sort to the options" do
-        @criteria.order_by(:title => 1, :text => -1)
-        @criteria.options.should == { :sort => { :title => 1, :text => -1 }}
+        @criteria.order_by([[:title, :asc], [:text, :desc]])
+        @criteria.options.should == { :sort => [[:title, :asc], [:text, :desc]] }
       end
 
     end

data/spec/unit/mongoid/document_spec.rb

@@ -55,54 +55,6 @@ describe Mongoid::Document do
 
   end
 
-  describe "#create" do
-
-    context "with no attributes" do
-
-      it "creates a new saved document" do
-        @collection.expects(:save).with({})
-        person = Person.create
-        person.should_not be_nil
-      end
-
-    end
-
-    context "with attributes" do
-
-      it "creates a new saved document" do
-        @collection.expects(:save).with({:test => "test"})
-        person = Person.create(:test => "test")
-        person.should_not be_nil
-      end
-
-    end
-
-  end
-
-  describe "#destroy" do
-
-    context "when the Document is remove from the database" do
-
-      it "returns nil" do
-        id = Mongo::ObjectID.new
-        person = Person.new(:_id => id)
-        Mongoid::Commands::Destroy.expects(:execute).with(person)
-        person.destroy.should be_nil
-      end
-
-    end
-
-  end
-
-  describe "#destroy_all" do
-
-    it "deletes all documents from the collection" do
-      Mongoid::Commands::DestroyAll.expects(:execute).with(Person, {})
-      Person.destroy_all
-    end
-
-  end
-
   describe "#fields" do
 
     before do
@@ -424,7 +376,7 @@ describe Mongoid::Document do
     context "when pagination parameters are passed" do
 
       it "delegates to will paginate with the results" do
-        @collection.expects(:find).with({ :test => "Test" }, { :sort => {}, :limit => 20, :offset => 20}).returns(@cursor)
+        @collection.expects(:find).with({ :test => "Test" }, { :sort => nil, :limit => 20, :offset => 20}).returns(@cursor)
         Person.paginate(:conditions => { :test => "Test" }, :page => 2, :per_page => 20)
       end
 
@@ -433,7 +385,7 @@ describe Mongoid::Document do
     context "when pagination parameters are not passed" do
 
       it "delegates to will paginate with default values" do
-        @collection.expects(:find).with({ :test => "Test" }, { :sort => {}, :limit => 20, :offset => 0}).returns(@cursor)
+        @collection.expects(:find).with({ :test => "Test" }, { :sort => nil, :limit => 20, :offset => 0}).returns(@cursor)
         Person.paginate(:conditions => { :test => "Test" })
       end
 
@@ -478,41 +430,6 @@ describe Mongoid::Document do
 
   end
 
-  describe "#save" do
-
-    context "when the document is the root" do
-
-      before do
-        @attributes = { :test => "test" }
-        @person = Person.new(@attributes)
-      end
-
-      it "persists the object to the MongoDB collection" do
-        @collection.expects(:save).with(@person.attributes)
-        @person.save.should be_true
-      end
-
-    end
-
-    context "when the document is embedded" do
-
-      before do
-        @attributes = { :title => "Sir",
-          :addresses => [
-            { :street => "Street 1", :document_class => "Address" },
-            { :street => "Street 2", :document_class => "Address" } ] }
-        @person = Person.new(@attributes)
-      end
-
-      it "saves the root document" do
-        @collection.expects(:save).with(@person.attributes)
-        @person.addresses.first.save
-      end
-
-    end
-
-  end
-
   describe "#to_param" do
 
     it "returns the id" do
@@ -522,20 +439,6 @@ describe Mongoid::Document do
 
   end
 
-  describe "#update_attributes" do
-
-    context "when attributes are provided" do
-
-      it "saves and returns true" do
-        person = Person.new
-        person.expects(:save).returns(true)
-        person.update_attributes(:test => "Test").should be_true
-      end
-
-    end
-
-  end
-
   context "validations" do
 
     context "when defining using macros" do

data/spec/unit/mongoid/field_spec.rb

@@ -0,0 +1,29 @@
+require File.join(File.dirname(__FILE__), "/../../spec_helper.rb")
+
+describe Mongoid::Field do
+
+  describe "#default" do
+
+    before do
+      @field = Mongoid::Field.new(:score, :default => 0)
+    end
+
+    it "returns the default option" do
+      @field.default.should == 0
+    end
+
+  end
+
+  describe "#name" do
+
+    before do
+      @field = Mongoid::Field.new(:score, :default => 0)
+    end
+
+    it "returns the name" do
+      @field.name.should == :score
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Durran Jordan
@@ -86,6 +86,7 @@ files:
 - lib/mongoid/extensions.rb
 - lib/mongoid/extensions/array/conversions.rb
 - lib/mongoid/extensions/object/conversions.rb
+- lib/mongoid/field.rb
 - mongoid.gemspec
 - spec/integration/mongoid/document_spec.rb
 - spec/spec.opts
@@ -101,10 +102,12 @@ files:
 - spec/unit/mongoid/commands/destroy_all_spec.rb
 - spec/unit/mongoid/commands/destroy_spec.rb
 - spec/unit/mongoid/commands/save_spec.rb
+- spec/unit/mongoid/commands_spec.rb
 - spec/unit/mongoid/criteria_spec.rb
 - spec/unit/mongoid/document_spec.rb
 - spec/unit/mongoid/extensions/array/conversions_spec.rb
 - spec/unit/mongoid/extensions/object/conversions_spec.rb
+- spec/unit/mongoid/field_spec.rb
 has_rdoc: true
 homepage: http://github.com/durran/mongoid
 licenses: []
@@ -147,7 +150,9 @@ test_files:
 - spec/unit/mongoid/commands/destroy_all_spec.rb
 - spec/unit/mongoid/commands/destroy_spec.rb
 - spec/unit/mongoid/commands/save_spec.rb
+- spec/unit/mongoid/commands_spec.rb
 - spec/unit/mongoid/criteria_spec.rb
 - spec/unit/mongoid/document_spec.rb
 - spec/unit/mongoid/extensions/array/conversions_spec.rb
 - spec/unit/mongoid/extensions/object/conversions_spec.rb
+- spec/unit/mongoid/field_spec.rb