mongoid 0.4.2 → 0.4.3

data/README.textile

@@ -52,36 +52,55 @@ Example of a simple domain model:
   end
 </pre>
 
-Create a new Document:
+Mongoid suuports all the basic ActiveRecord creation and persistence methods.
+
+Creation:
 
 <pre>
   Person.create(:title => "Esquire")
+  Person.create!(:title => "Sir", :name => { :first_name => "Elton", :last_name => "John" })
 </pre>
 
-Save a Document:
+Save:
 
 <pre>
   person.save
+  person.save!
 </pre>
 
-Delete a Document:
+Updating:
 
 <pre>
-  person.destroy
+  person.update_attributes(:title => "Sir")
+  person.update_attributes!(:name => { :first_name => "Emmanuel", :last_name => "Zorg" })
 </pre>
 
-Update a Document:
+Deleting:
 
 <pre>
-  person.update_attributes(:title => "Sir")
+  person.destroy
+  Person.destroy_all(:title => "Sir")
+  person.delete
+  Person.delete_all(:title => "Sir")
 </pre>
 
-Search for a Document in the database:
+Retrieval of Documents from the database can be done in the traditional ActiveRecord
+manner or done using the Mongoid criteria DSL.
+
+Old School:
 
 <pre>
-  Person.find(:all, :conditions => {:title => "Esquire"})
+  Person.find(:all, :conditions => { :title => "Esquire" })
+  Person.find(:first, :conditions => { :title => "Esquire" })
+  Person.first(:conditions => { :title => "Sir" })
+  Person.all(:conditions => { :title => "Sir" })
+</pre>
 
-  Person.find(:first, :conditions => {:title => "Esquire"})
+New School:
+
+<pre>
+  Criteria.new.select(:title => "Sir").only(:first_name, :last_name).skip(10).limit(10).execute
+  Criteria.translate(:conditions => { :title => "Sir" }).execute
 </pre>
 
 Paginate Document search results:

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/lib/mongoid/document.rb

@@ -40,13 +40,16 @@ module Mongoid #:nodoc:
       # Defines all the fields that are accessable on the Document
       # For each field that is defined, a getter and setter will be
       # added as an instance method to the Document.
-      def fields(*names)
-        @fields ||= []
-        names.flatten.each do |name|
-          @fields << name
-          define_method(name) { read_attribute(name) }
-          define_method("#{name}=") { |value| write_attribute(name, value) }
-        end
+      def field(name, options = {})
+        @fields ||= {}
+        @fields[name] = Field.new(name, options)
+        define_method(name) { read_attribute(name) }
+        define_method("#{name}=") { |value| write_attribute(name, value) }
+      end
+
+      # Returns all the fields for the Document as a +Hash+ with names as keys.
+      def fields
+        @fields
       end
 
       # Find all Documents in several ways.
@@ -90,7 +93,8 @@ module Mongoid #:nodoc:
       # Adds timestamps on the Document in the form of the fields 'created_on'
       # and 'last_modified'
       def has_timestamps
-        fields :created_at, :last_modified
+        field :created_at
+        field :last_modified
         class_eval do
           before_create \
             :update_created_at,
@@ -128,6 +132,11 @@ module Mongoid #:nodoc:
       self.class.collection
     end
 
+    # Get the fields for the Document class.
+    def fields
+      self.class.fields
+    end
+
     # Get the Mongo::ObjectID associated with this object.
     # This is in essence the primary key.
     def id
@@ -170,7 +179,8 @@ module Mongoid #:nodoc:
 
     # Read from the attributes hash.
     def read_attribute(name)
-      @attributes[name.to_sym]
+      symbol = name.to_sym
+      fields[symbol].value(@attributes[symbol])
     end
 
     # Update the created_at field on the Document to the current time. This is

data/lib/mongoid/field.rb

@@ -21,5 +21,11 @@ module Mongoid #:nodoc:
       @default = options[:default]
     end
 
+    # Gets the value for the supplied object. If the object is nil, then the
+    # default value will be returned.
+    def value(object)
+      object ? object : default
+    end
+
   end
 end

data/mongoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "0.4.2"
+  s.version = "0.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
-  s.date = %q{2009-10-11}
+  s.date = %q{2009-10-17}
   s.email = %q{durran@gmail.com}
   s.extra_rdoc_files = [
     "README.textile"

data/spec/spec_helper.rb

@@ -16,27 +16,24 @@ Spec::Runner.configure do |config|
 end
 
 class Person < Mongoid::Document
-  fields \
-    :title,
-    :terms,
-    :age
+  field :title
+  field :terms
+  field :age
   has_many :addresses
   has_one :name
 end
 
 class Address < Mongoid::Document
-  fields \
-    :street,
-    :city,
-    :state,
-    :post_code
+  field :street
+  field :city
+  field :state
+  field :post_code
   belongs_to :person
 end
 
 class Name < Mongoid::Document
-  fields \
-    :first_name,
-    :last_name
+  field :first_name
+  field :last_name
   belongs_to :person
 end
 

data/spec/unit/mongoid/document_spec.rb

@@ -29,6 +29,35 @@ describe Mongoid::Document do
 
   end
 
+  describe "#all" do
+
+    before do
+      @cursor = mock
+      @people = []
+    end
+
+    context "when a selector is provided" do
+
+      it "finds from the collection and instantiate objects for each returned" do
+        @collection.expects(:find).with({ :test => "Test" }, {}).returns(@cursor)
+        @cursor.expects(:collect).returns(@people)
+        Person.all(:conditions => {:test => "Test"})
+      end
+
+    end
+
+    context "when a selector is not provided" do
+
+      it "finds from the collection and instantiate objects for each returned" do
+        @collection.expects(:find).with(nil, {}).returns(@cursor)
+        @cursor.expects(:collect).returns(@people)
+        Person.all
+      end
+
+    end
+
+  end
+
   describe "#belongs_to" do
 
     it "creates a reader for the association" do
@@ -55,21 +84,25 @@ describe Mongoid::Document do
 
   end
 
-  describe "#fields" do
+  describe "#field" do
 
-    before do
-      Person.fields([:testing])
-    end
+    context "with no options" do
 
-    it "adds a reader for the fields defined" do
-      @person = Person.new(:testing => "Test")
-      @person.testing.should == "Test"
-    end
+      before do
+        Person.field(:testing)
+      end
+
+      it "adds a reader for the fields defined" do
+        @person = Person.new(:testing => "Test")
+        @person.testing.should == "Test"
+      end
+
+      it "adds a writer for the fields defined" do
+        @person = Person.new(:testing => "Test")
+        @person.testing = "Testy"
+        @person.testing.should == "Testy"
+      end
 
-    it "adds a writer for the fields defined" do
-      @person = Person.new(:testing => "Test")
-      @person.testing = "Testy"
-      @person.testing.should == "Testy"
     end
 
   end
@@ -162,35 +195,6 @@ describe Mongoid::Document do
 
   end
 
-  describe "#all" do
-
-    before do
-      @cursor = mock
-      @people = []
-    end
-
-    context "when a selector is provided" do
-
-      it "finds from the collection and instantiate objects for each returned" do
-        @collection.expects(:find).with({ :test => "Test" }, {}).returns(@cursor)
-        @cursor.expects(:collect).returns(@people)
-        Person.all(:conditions => {:test => "Test"})
-      end
-
-    end
-
-    context "when a selector is not provided" do
-
-      it "finds from the collection and instantiate objects for each returned" do
-        @collection.expects(:find).with(nil, {}).returns(@cursor)
-        @cursor.expects(:collect).returns(@people)
-        Person.all
-      end
-
-    end
-
-  end
-
   describe "#group_by" do
 
     before do
@@ -286,7 +290,9 @@ describe Mongoid::Document do
     end
 
     it "adds created_on and last_modified to the document" do
-      Tester.instance_variable_get(:@fields).should include(:created_at, :last_modified)
+      fields = Tester.instance_variable_get(:@fields)
+      fields[:created_at].should_not be_nil
+      fields[:last_modified].should_not be_nil
     end
 
   end
@@ -430,6 +436,23 @@ describe Mongoid::Document do
 
   end
 
+  describe "#read_attribute" do
+
+    context "when attribute does not exist" do
+
+      before do
+        Person.field :weight, :default => 100
+        @person = Person.new
+      end
+
+      it "returns the default value" do
+        @person.weight.should == 100
+      end
+
+    end
+
+  end
+
   describe "#to_param" do
 
     it "returns the id" do

data/spec/unit/mongoid/field_spec.rb

@@ -26,4 +26,28 @@ describe Mongoid::Field do
 
   end
 
+  describe "#value" do
+
+    before do
+      @field = Mongoid::Field.new(:score, :default => 10)
+    end
+
+    context "nil is provided" do
+
+      it "returns the default value" do
+        @field.value(nil).should == 10
+      end
+
+    end
+
+    context "value is provided" do
+
+      it "returns the value" do
+        @field.value(30).should == 30
+      end
+
+    end
+
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors: 
 - Durran Jordan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-11 00:00:00 -04:00
+date: 2009-10-17 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency