dm-mongo-adapter 0.2.0.pre3 → 0.6.0

data/spec/public/model_spec.rb

@@ -1,37 +1,23 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
 describe DataMapper::Mongo::Model do
-
   before(:all) do
     class ::PropertyTest
       include DataMapper::Mongo::Resource
-      property :array,     Array
-      property :hash,      Hash
-      property :date,      Date
-      property :date_time, DateTime
+      property :array_attr, Array
+      property :hash_attr,  Hash
     end
   end
 
   describe '#property' do
-    it 'should cast Array types to EmbeddedArray' do
-      prop = PropertyTest.properties[:array]
-      prop.type.should == DataMapper::Mongo::Types::EmbeddedArray
-    end
-
-    it 'should cast Hash types to EmbeddedHash' do
-      prop = PropertyTest.properties[:hash]
-      prop.type.should == DataMapper::Mongo::Types::EmbeddedHash
+    it 'should cast Array class to DataMapper::Mongo::Property::Array' do
+      prop = PropertyTest.properties[:array_attr]
+      prop.should be_kind_of(DataMapper::Mongo::Property::Array)
     end
 
-    it 'should cast Hash types to Types::Date' do
-      prop = PropertyTest.properties[:date]
-      prop.type.should == DataMapper::Mongo::Types::Date
-    end
-
-    it 'should cast Hash types to Types::DateTime' do
-      prop = PropertyTest.properties[:date_time]
-      prop.type.should == DataMapper::Mongo::Types::DateTime
+    it 'should cast Hash class to DataMapper::Mongo::Property::Hash' do
+      prop = PropertyTest.properties[:hash_attr]
+      prop.should be_kind_of(DataMapper::Mongo::Property::Hash)
     end
   end
-
 end

data/spec/public/modifier_spec.rb

@@ -0,0 +1,109 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+
+describe DataMapper::Mongo::Resource do
+  before :all do
+    class ::Post
+      include DataMapper::Mongo::Resource
+
+      property :id, ObjectId
+      property :comment_count, Integer
+      property :body, Text
+    end
+
+    Post.all.destroy!
+  end
+
+  describe "#increment" do
+    before :all do
+      @post = Post.create(:comment_count => 1)
+      #@post.increment(:comment_count, 1)
+    end
+
+    it "should update the given property with the incremented value" do
+      pending "not implemented yet" do
+        @post.comment_count.should == 2
+        Post.get(@post.id).comment_count.should == 2
+      end
+    end
+
+    it "should reload the updated resource" do
+      @post.dirty?.should be_false
+    end
+  end
+
+  describe "#decrement" do
+    before :all do
+      @post = Post.create(:comment_count => 10)
+      #@post.decrement(:comment_count, 5)
+    end
+
+    it "should update the given property with the decremented value" do
+      pending "not implemented yet" do
+        @post.comment_count.should == 5
+        Post.get(@post.id).comment_count.should == 5
+      end
+    end
+
+    it "should reload the updated resource" do
+      @post.dirty?.should be_false
+    end
+  end
+
+  describe "#set" do
+    it "should set the value of a property" do
+      post = Post.create(:body => "This needs to be edited", :comment_count => 2)
+
+      post.set(:body => "This was edited", :comment_count => 3)
+      post.body.should == "This was edited"
+      post.comment_count.should == 3
+      fresh_post = Post.get(post.id)
+      fresh_post.body.should == "This was edited"
+      fresh_post.comment_count.should == 3
+    end
+  end
+
+  describe "#unset" do
+    it "should unset the value of a property" do
+      post = Post.create(:body => "This needs to be removed", :comment_count => 2)
+
+      pending "not implemented yet" do
+        post.unset(:body, :comment_count)
+        post.body.should be_nil
+        post.comment_count.should be_nil
+        fresh_post = Post.get(post.id)
+        fresh_post.body.should be_nil
+        fresh_post.comment_count.should be_nil
+      end
+    end
+  end
+
+  describe "#push" do
+    it "should be implemented" do
+      pending
+    end
+  end
+
+  describe "#push_all" do
+    it "should be implemented" do
+      pending
+    end
+  end
+
+  describe "#pop" do
+    it "should be implemented" do
+      pending
+    end
+  end
+
+  describe "#pull" do
+    it "should be implemented" do
+      pending
+    end
+  end
+
+  describe "#pull_all" do
+    it "should be implemented" do
+      pending
+    end
+  end
+end

data/spec/public/properties/db_ref_spec.rb

@@ -0,0 +1,17 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
+
+describe DataMapper::Mongo::Property::DBRef do
+  before(:all) do
+    class User
+      include DataMapper::Mongo::Resource
+
+      property :id,       ObjectId
+      property :group_id, DBRef
+    end
+
+    @property_class = DataMapper::Mongo::Property::DBRef
+    @property       = User.properties[:group_id]
+  end
+
+  it_should_behave_like 'An ObjectId Type'
+end

data/spec/public/properties/object_id_spec.rb

@@ -0,0 +1,15 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
+
+describe DataMapper::Mongo::Property::ObjectId do
+  before(:all) do
+    class User
+      include DataMapper::Mongo::Resource
+      property :id,       ObjectId
+    end
+
+    @property_class = DataMapper::Mongo::Property::ObjectId
+    @property       = User.properties[:id]
+  end
+
+  it_should_behave_like 'An ObjectId Type'
+end

data/spec/public/resource_spec.rb

@@ -3,26 +3,14 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 describe DataMapper::Mongo::Resource do
 
   before(:all) do
-    class ::Address
-      include DataMapper::Mongo::EmbeddedResource
-      property :city,  String
-      property :state, String
-    end
-
-    class ::Location < ::Address
-      property :country,   String
-      property :continent, String
-    end
-
     class ::User
       include DataMapper::Mongo::Resource
-      property  :id,        ObjectID
+
+      property  :id,        ObjectId
       property  :name,      String
       property  :tags,      Array
       property  :metadata,  Hash
       property  :created_at, DateTime
-      embeds 1, :address,   :model => Address
-      embeds n, :locations
     end
   end
 
@@ -69,55 +57,6 @@ describe DataMapper::Mongo::Resource do
         expected = User.create(:name => 'Two')
         User.all(:name => 'Two').should == [expected]
       end
-
-      describe 'including conditions for an embedded has 1 resource' do
-        before(:all) do
-          User.all.destroy!
-          User.create(:name => 'Boston guy', :address => { :city => 'Boston' })
-          @expected = User.create(:name => 'NY guy', :address => { :city => 'New York' })
-        end
-
-        it 'should return a collection' do
-          collection = User.all('address.city' => 'Washington')
-          collection.should be_kind_of(DataMapper::Collection)
-        end
-
-        it 'should return an empty collection when there are no matching resources' do
-          collection = User.all('address.city' => 'Washington')
-          collection.should be_empty
-        end
-
-        it 'should return specific resources' do
-          User.all('address.city' => 'New York').should == [@expected]
-        end
-      end # including conditions for an embedded has 1 resource
-
-      describe 'including conditions for an embedded has n resource' do
-        before(:all) do
-          User.all.destroy!
-          User.create(:name => 'Canada Guy', :locations => [{ :country => 'Canada' }])
-          
-          @expected = User.create(:name => 'John Kowalski', :locations => [
-            { :country => 'US',     :continent => 'North America' },
-            { :country => 'Poland', :continent => 'Europe' }])
-        end
-
-        it 'should return a collection' do
-          collection = User.all('locations.country' => 'Canada')
-          collection.should be_kind_of(DataMapper::Collection)
-        end
-
-        it 'should return an empty collection when there are no matching resources' do
-          collection = User.all('locations.country' => 'Brazil')
-          collection.should be_empty
-        end
-
-        it 'should return specific resources' do
-          User.all('locations.country' => 'US').should == [@expected]
-          User.all('locations.country' => 'Poland', 'locations.continent' => 'Europe').should == [@expected]
-        end
-      end # including conditions for an embedded has n resource
-
     end
   end
 
@@ -154,195 +93,6 @@ describe DataMapper::Mongo::Resource do
     end
   end
 
-  #
-  # aggregations
-  #
-  describe 'aggregations' do
-    before(:all) do
-      class ::Student
-        include DataMapper::Mongo::Resource
-
-        property  :id,     ObjectID
-        property  :name,   String
-        property  :school, String
-        property  :score,  Float
-      end
-
-      Student.all.destroy!
-
-      @student_one   = Student.create(:school => 'School 1', :name => 'One',   :score => 3.0)
-      @student_two   = Student.create(:school => 'School 2', :name => 'Two',   :score => 3.5)
-      @student_three = Student.create(:school => 'School 2', :name => 'Three', :score => 4.5)
-    end
-
-    #
-    # count
-    #
-    describe "#count" do
-      describe 'with no query' do
-        it 'should return number of all resources' do
-          Student.count.should == 3
-        end
-      end
-
-      describe 'with a query' do
-        it 'should return number of resources matching conditions' do
-          Student.count(:name => /one|two/i).should == 2
-        end
-      end
-    end
-
-    #
-    # aggregate
-    #
-
-    describe "#aggregate" do
-
-      #
-      # simple aggregation without any operators
-      #
-
-      describe "without operators" do
-        describe "without conditions" do
-          it "should return array of hashes based on all records" do
-            result = Student.aggregate(:school, :score)
-
-            result.should == [
-              {:school => "School 1", :score => 3.0},
-              {:school => "School 2", :score => 3.5},
-              {:school => "School 2", :score => 4.5}]
-          end
-        end
-
-        describe "with conditions" do
-          it "should return array of hashes based on records that match conditions" do
-            result = Student.aggregate(:school, :score, :score.gt => 3.0)
-
-            result.should == [
-              {:school => "School 2", :score => 3.5},
-              {:school => "School 2", :score => 4.5}]
-          end
-        end
-      end
-
-      #
-      # count
-      #
-
-      describe "count operator" do
-        describe "without conditions" do
-          it "should get correct results based on all records" do
-            result = Student.aggregate(:school, :score.count)
-
-            result.size.should == 2
-
-            school_1, school_2 = result
-
-            school_1[:school].should == 'School 1'
-            school_2[:school].should == 'School 2'
-
-            school_1[:score].should == 1
-            school_2[:score].should   == 2
-          end
-        end
-
-        describe "with conditions" do
-          it "should get correct results based on records that match conditions" do
-            result = Student.aggregate(:school, :score.count, :name => /two|three/i)
-
-            result.size.should == 1
-            result.first[:score].should == 2
-            result.first[:school].should == 'School 2'
-          end
-        end
-      end
-
-      #
-      # avg
-      #
-      # TODO: add spec for #avg with conditions
-
-      describe "avg operator" do
-        describe 'without conditions' do
-          it 'should return an avarage value of the given field' do
-            result = Student.aggregate(:school, :score.avg)
-
-            school_1, school_2 = result
-
-            school_1[:school].should == 'School 1'
-            school_2[:school].should == 'School 2'
-
-            school_1[:score].should == 3.0
-            school_2[:score].should == 4.0
-          end
-        end
-      end
-
-      #
-      # min
-      #
-      # TODO: add spec for #min with conditions
-
-      describe "min operator" do
-        describe 'without conditions' do
-          it 'should return the minimum value of the given field' do
-            result = Student.aggregate(:school, :score.min)
-
-            school_1, school_2 = result
-
-            school_1[:school].should == 'School 1'
-            school_2[:school].should == 'School 2'
-
-            school_1[:score].should == 3.0
-            school_2[:score].should == 3.5
-          end
-        end
-      end
-
-      #
-      # max
-      #
-      # TODO: add spec for #max with conditions
-
-      describe "max operator" do
-        describe 'without conditions' do
-          it 'should return the maximum value of the given field' do
-            result = Student.aggregate(:school, :score.max)
-
-            school_1, school_2 = result
-
-            school_1[:school].should == 'School 1'
-            school_2[:school].should == 'School 2'
-
-            school_1[:score].should == 3.0
-            school_2[:score].should == 4.5
-          end
-        end
-      end
-
-       #
-      # max
-      #
-      # TODO: add spec for #sum with conditions
-
-      describe "sum operator" do
-        describe 'without conditions' do
-          it 'should return the maximum value of the given field' do
-            result = Student.aggregate(:school, :score.sum)
-
-            school_1, school_2 = result
-
-            school_1[:school].should == 'School 1'
-            school_2[:school].should == 'School 2'
-
-            school_1[:score].should == 3.0
-            school_2[:score].should == 8.0
-          end
-        end
-      end
-    end
-  end
-
   #
   # dirty?
   #
@@ -353,32 +103,6 @@ describe DataMapper::Mongo::Resource do
         User.new(:name => 'Mongo').should be_dirty
       end
     end
-
-    describe 'when the resource has no changes' do
-      it 'should return true if a one-to-one embedment has a change' do
-        user = User.new(:address => Address.new(:city => 'Rock Ridge'))
-        user.should be_dirty
-      end
-
-      it 'should return false having just been saved' do
-        user = User.new(:address => Address.new(:city => 'Rock Ridge'))
-        user.save
-        user.should_not be_dirty
-      end
-
-      it 'should return true if a one-to-many embedment has a change' do
-        user = User.new
-        user.locations << Address.new(:city => 'Rock Ridge')
-        user.should be_dirty
-      end
-
-      it 'should return false if no embedments have changes' do
-        user = User.new(:address => Address.new(:city => 'Rock Ridge'))
-        user.locations << Address.new(:city => 'Rock Ridge')
-        user.save
-        user.should_not be_dirty
-      end
-    end
   end
 
   #
@@ -455,109 +179,4 @@ describe DataMapper::Mongo::Resource do
     end
   end
 
-  describe "Modifier" do
-    before :all do
-      class ::Post
-        include DataMapper::Mongo::Resource
-
-        property :id, ObjectID
-        property :comment_count, Integer
-        property :body, Text
-      end
-
-      Post.all.destroy!
-    end
-
-    describe "#increment" do
-      before :all do
-        @post = Post.create(:comment_count => 1)
-        @post.increment(:comment_count, 1)
-      end
-
-      it "should update the given property with the incremented value" do
-        @post.comment_count.should == 2
-        Post.get(@post.id).comment_count.should == 2
-      end
-
-      it "should reload the updated resource" do
-        @post.dirty?.should be_false
-      end
-    end
-
-    describe "#decrement" do
-      before :all do
-        @post = Post.create(:comment_count => 10)
-        @post.decrement(:comment_count, 5)
-      end
-
-      it "should update the given property with the decremented value" do
-        @post.comment_count.should == 5
-        Post.get(@post.id).comment_count.should == 5
-      end
-
-      it "should reload the updated resource" do
-        @post.dirty?.should be_false
-      end
-    end
-
-    describe "#set" do
-      it "should set the value of a property" do
-        post = Post.create(:body => "This needs to be edited", :comment_count => 2)
-
-        pending "not implemented yet" do
-          post.set(:body => "This was edited", :comment_count => 3)
-          post.body.should == "This was edited"
-          post.comment_count.should == 3
-          fresh_post = Post.get(post.id)
-          fresh_post.body.should == "This was edited"
-          fresh_post.comment_count.should == 3
-        end
-      end
-    end
-
-    describe "#unset" do
-      it "should unset the value of a property" do
-        post = Post.create(:body => "This needs to be removed", :comment_count => 2)
-
-        pending "not implemented yet" do
-          post.unset(:body, :comment_count)
-          post.body.should be_nil
-          post.comment_count.should be_nil
-          fresh_post = Post.get(post.id)
-          fresh_post.body.should be_nil
-          fresh_post.comment_count.should be_nil
-        end
-      end
-    end
-
-    describe "#push" do
-      it "should be implemented" do
-        pending
-      end
-    end
-
-    describe "#push_all" do
-      it "should be implemented" do
-        pending
-      end
-    end
-
-    describe "#pop" do
-      it "should be implemented" do
-        pending
-      end
-    end
-
-    describe "#pull" do
-      it "should be implemented" do
-        pending
-      end
-    end
-
-    describe "#pull_all" do
-      it "should be implemented" do
-        pending
-      end
-    end
-  end
 end