mongodoc 0.2.2 → 0.2.4

data/lib/mongoid/matchers/in.rb

@@ -0,0 +1,11 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Matchers #:nodoc:
+    class In < Default
+      # Return true if the attribute is in the values.
+      def matches?(value)
+        value.values.first.include?(@attribute)
+      end
+    end
+  end
+end

data/lib/mongoid/matchers/lt.rb

@@ -0,0 +1,11 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Matchers #:nodoc:
+    class Lt < Default
+      # Return true if the attribute is less than the value.
+      def matches?(value)
+        determine(value, :<)
+      end
+    end
+  end
+end

data/lib/mongoid/matchers/lte.rb

@@ -0,0 +1,11 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Matchers #:nodoc:
+    class Lte < Default
+      # Return true if the attribute is less than or equal to the value.
+      def matches?(value)
+        determine(value, :<=)
+      end
+    end
+  end
+end

data/lib/mongoid/matchers/ne.rb

@@ -0,0 +1,11 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Matchers #:nodoc:
+    class Ne < Default
+      # Return true if the attribute and first value are not equal.
+      def matches?(value)
+        @attribute != value.values.first
+      end
+    end
+  end
+end

data/lib/mongoid/matchers/nin.rb

@@ -0,0 +1,11 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Matchers #:nodoc:
+    class Nin < Default
+      # Return true if the attribute is not in the value list.
+      def matches?(value)
+        !value.values.first.include?(@attribute)
+      end
+    end
+  end
+end

data/lib/mongoid/matchers/size.rb

@@ -0,0 +1,11 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Matchers #:nodoc:
+    class Size < Default
+      # Return true if the attribute size is equal to the first value.
+      def matches?(value)
+        @attribute.size == value.values.first
+      end
+    end
+  end
+end

data/mongodoc.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongodoc}
-  s.version = "0.2.2"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Les Hill"]
-  s.date = %q{2010-02-16}
+  s.date = %q{2010-02-23}
   s.description = %q{ODM for MongoDB}
   s.email = %q{leshill@gmail.com}
   s.extra_rdoc_files = [
@@ -31,23 +31,22 @@ Gem::Specification.new do |s|
      "features/finders.feature",
      "features/mongodb.yml",
      "features/mongodoc_base.feature",
-     "features/named_scopes.feature",
      "features/new_record.feature",
      "features/partial_updates.feature",
      "features/removing_documents.feature",
      "features/saving_an_object.feature",
+     "features/scopes.feature",
      "features/step_definitions/collection_steps.rb",
-     "features/step_definitions/criteria_steps.rb",
      "features/step_definitions/document_steps.rb",
      "features/step_definitions/documents.rb",
      "features/step_definitions/finder_steps.rb",
      "features/step_definitions/json_steps.rb",
-     "features/step_definitions/named_scope_steps.rb",
      "features/step_definitions/object_steps.rb",
      "features/step_definitions/objects.rb",
      "features/step_definitions/partial_update_steps.rb",
      "features/step_definitions/query_steps.rb",
      "features/step_definitions/removing_documents_steps.rb",
+     "features/step_definitions/scope_steps.rb",
      "features/step_definitions/util_steps.rb",
      "features/support/support.rb",
      "features/using_criteria.feature",
@@ -60,6 +59,9 @@ Gem::Specification.new do |s|
      "lib/mongodoc/bson.rb",
      "lib/mongodoc/collection.rb",
      "lib/mongodoc/connection.rb",
+     "lib/mongodoc/contexts.rb",
+     "lib/mongodoc/contexts/enumerable.rb",
+     "lib/mongodoc/contexts/mongo.rb",
      "lib/mongodoc/criteria.rb",
      "lib/mongodoc/cursor.rb",
      "lib/mongodoc/document.rb",
@@ -79,10 +81,30 @@ Gem::Specification.new do |s|
      "lib/mongodoc/ext/symbol.rb",
      "lib/mongodoc/ext/time.rb",
      "lib/mongodoc/finders.rb",
-     "lib/mongodoc/named_scope.rb",
+     "lib/mongodoc/matchers.rb",
      "lib/mongodoc/query.rb",
+     "lib/mongodoc/scope.rb",
      "lib/mongodoc/validations/macros.rb",
      "lib/mongodoc/validations/validates_embedded.rb",
+     "lib/mongoid/contexts/paging.rb",
+     "lib/mongoid/criteria.rb",
+     "lib/mongoid/criterion/complex.rb",
+     "lib/mongoid/criterion/exclusion.rb",
+     "lib/mongoid/criterion/inclusion.rb",
+     "lib/mongoid/criterion/optional.rb",
+     "lib/mongoid/extensions/hash/criteria_helpers.rb",
+     "lib/mongoid/extensions/symbol/inflections.rb",
+     "lib/mongoid/matchers/all.rb",
+     "lib/mongoid/matchers/default.rb",
+     "lib/mongoid/matchers/exists.rb",
+     "lib/mongoid/matchers/gt.rb",
+     "lib/mongoid/matchers/gte.rb",
+     "lib/mongoid/matchers/in.rb",
+     "lib/mongoid/matchers/lt.rb",
+     "lib/mongoid/matchers/lte.rb",
+     "lib/mongoid/matchers/ne.rb",
+     "lib/mongoid/matchers/nin.rb",
+     "lib/mongoid/matchers/size.rb",
      "mongod.example.yml",
      "mongodb.example.yml",
      "mongodoc.gemspec",
@@ -97,6 +119,9 @@ Gem::Specification.new do |s|
      "spec/bson_spec.rb",
      "spec/collection_spec.rb",
      "spec/connection_spec.rb",
+     "spec/contexts/enumerable_spec.rb",
+     "spec/contexts/mongo_spec.rb",
+     "spec/contexts_spec.rb",
      "spec/criteria_spec.rb",
      "spec/cursor_spec.rb",
      "spec/document_ext.rb",
@@ -104,18 +129,19 @@ Gem::Specification.new do |s|
      "spec/embedded_save_spec.rb",
      "spec/finders_spec.rb",
      "spec/hash_matchers.rb",
+     "spec/matchers_spec.rb",
      "spec/mongodb.yml",
      "spec/mongodb_pairs.yml",
-     "spec/named_scope_spec.rb",
      "spec/new_record_spec.rb",
      "spec/query_spec.rb",
+     "spec/scope_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/leshill/mongodoc}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6.pre.3}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{ODM for MongoDB}
   s.test_files = [
     "spec/associations/collection_proxy_spec.rb",
@@ -126,6 +152,9 @@ Gem::Specification.new do |s|
      "spec/bson_spec.rb",
      "spec/collection_spec.rb",
      "spec/connection_spec.rb",
+     "spec/contexts/enumerable_spec.rb",
+     "spec/contexts/mongo_spec.rb",
+     "spec/contexts_spec.rb",
      "spec/criteria_spec.rb",
      "spec/cursor_spec.rb",
      "spec/document_ext.rb",
@@ -133,9 +162,10 @@ Gem::Specification.new do |s|
      "spec/embedded_save_spec.rb",
      "spec/finders_spec.rb",
      "spec/hash_matchers.rb",
-     "spec/named_scope_spec.rb",
+     "spec/matchers_spec.rb",
      "spec/new_record_spec.rb",
      "spec/query_spec.rb",
+     "spec/scope_spec.rb",
      "spec/spec_helper.rb",
      "examples/simple_document.rb",
      "examples/simple_object.rb"

data/spec/attributes_spec.rb

@@ -132,6 +132,12 @@ describe "MongoDoc::Attributes" do
       has_many :sub_docs, :class_name => 'SubHasManyDoc'
     end
 
+    class TestHasManyDoc2
+      include MongoDoc::Document
+
+      has_many :sub_docs, :class_name => :sub_has_many_doc
+    end
+
     class TestImplicitHasManyDoc
       include MongoDoc::Document
 
@@ -157,6 +163,14 @@ describe "MongoDoc::Attributes" do
       TestImplicitHasManyDoc.new.sub_has_many_docs.assoc_class.should == SubHasManyDoc
     end
 
+    it "uses class_name attribute for the children's class name" do
+      TestHasManyDoc.new.sub_docs.assoc_class.should == SubHasManyDoc
+    end
+
+    it "uses class_name attribute for the children's class name" do
+      TestHasManyDoc2.new.sub_docs.assoc_class.should == SubHasManyDoc
+    end
+
     context "validations" do
       class HasManyValidationChild
         include MongoDoc::Document
@@ -171,8 +185,8 @@ describe "MongoDoc::Attributes" do
         has_many :subdocs, :class_name => 'HasManyValidationChild'
       end
 
-      let(:invalid_child) { HasHashValidationChild.new }
-      let(:doc) { HasHashValidationTest.new(:subdocs => {:key => invalid_child}) }
+      let(:invalid_child) { HasManyValidationChild.new }
+      let(:doc) { HasManyValidationTest.new(:subdocs => [invalid_child]) }
 
       it "cascades validations and marks it in the parent" do
         doc.should have(1).error_on(:subdocs)

data/spec/contexts/enumerable_spec.rb

@@ -0,0 +1,335 @@
+require "spec_helper"
+
+describe MongoDoc::Contexts::Enumerable do
+
+  class Address
+    include MongoDoc::Document
+    include MongoDoc::Matchers
+
+    key :number
+    key :street
+  end
+
+  before do
+    @london = Address.new(:number => 1, :street => "Bond Street")
+    @shanghai = Address.new(:number => 10, :street => "Nan Jing Dong Lu")
+    @melbourne = Address.new(:number => 20, :street => "Bourke Street")
+    @new_york = Address.new(:number => 20, :street => "Broadway")
+    @docs = [ @london, @shanghai, @melbourne, @new_york ]
+    @criteria = Mongoid::Criteria.new(Address)
+    @criteria.documents = @docs
+    @criteria.where(:street => "Bourke Street").only(:number)
+    @context = MongoDoc::Contexts::Enumerable.new(@criteria)
+  end
+
+  describe "#aggregate" do
+
+    before do
+      @counts = @context.aggregate
+    end
+
+    it "groups by the fields provided in the options" do
+      @counts.size.should == 3
+    end
+
+    it "stores the counts in proper groups" do
+      @counts[1].should == 1
+      @counts[10].should == 1
+      @counts[20].should == 2
+    end
+  end
+
+  describe "#count" do
+
+    it "returns the size of the enumerable" do
+      @context.count.should == 4
+    end
+
+  end
+
+  describe "#execute" do
+
+    before do
+      @criteria = Mongoid::Criteria.new(Address)
+      @criteria.documents = @docs
+    end
+
+    it "returns the matching documents from the array" do
+      @context.execute.should == [ @melbourne ]
+    end
+
+    context "when selector is empty" do
+
+      before do
+        @criteria.only(:number)
+        @context = MongoDoc::Contexts::Enumerable.new(@criteria)
+      end
+
+      it "returns all the documents" do
+        @context.execute.should == @docs
+      end
+    end
+
+    context "when skip and limit are in the options" do
+
+      before do
+        @criteria.skip(2).limit(2)
+        @context = MongoDoc::Contexts::Enumerable.new(@criteria)
+      end
+
+      it "properly narrows down the matching results" do
+        @context.execute.should == [ @melbourne, @new_york ]
+      end
+    end
+
+  end
+
+  describe "#first" do
+
+    context "when a selector is present" do
+
+      it "returns the first that matches the selector" do
+        @context.first.should == @melbourne
+      end
+    end
+
+  end
+
+  describe "#group" do
+
+    before do
+      @group = @context.group
+    end
+
+    it "groups by the fields provided in the options" do
+      @group.size.should == 3
+    end
+
+    it "stores the documents in proper groups" do
+      @group[1].should == [ @london ]
+      @group[10].should == [ @shanghai ]
+      @group[20].should == [ @melbourne, @new_york ]
+    end
+
+  end
+
+  describe ".initialize" do
+
+    let(:selector) { { :field => "value"  } }
+    let(:options) { { :skip => 20 } }
+    let(:documents) { [stub] }
+
+    before do
+      @criteria = Mongoid::Criteria.new(Address)
+      @criteria.documents = documents
+      @criteria.where(selector).skip(20)
+      @context = MongoDoc::Contexts::Enumerable.new(@criteria)
+    end
+
+    it "sets the selector" do
+      @context.selector.should == selector
+    end
+
+    it "sets the options" do
+      @context.options.should == options
+    end
+
+    it "sets the documents" do
+      @context.documents.should == documents
+    end
+
+  end
+
+  describe "#last" do
+
+    it "returns the last matching in the enumerable" do
+      @context.last.should == @melbourne
+    end
+
+  end
+
+  describe "#max" do
+
+    it "returns the max value for the supplied field" do
+      @context.max(:number).should == 20
+    end
+
+  end
+
+  describe "#min" do
+
+    it "returns the min value for the supplied field" do
+      @context.min(:number).should == 1
+    end
+
+  end
+
+  describe "#one" do
+
+    it "returns the first matching in the enumerable" do
+      @context.one.should == @melbourne
+    end
+
+  end
+
+  describe "#page" do
+
+    context "when the page option exists" do
+
+      before do
+        @criteria = Mongoid::Criteria.new(Address).extras({ :page => 5 })
+        @criteria.documents = []
+        @context = MongoDoc::Contexts::Enumerable.new(@criteria)
+      end
+
+      it "returns the page option" do
+        @context.page.should == 5
+      end
+
+    end
+
+    context "when the page option does not exist" do
+
+      before do
+        @criteria = Mongoid::Criteria.new(Address)
+        @criteria.documents = []
+        @context = MongoDoc::Contexts::Enumerable.new(@criteria)
+      end
+
+      it "returns 1" do
+        @context.page.should == 1
+      end
+
+    end
+
+  end
+
+  describe "#paginate" do
+
+    before do
+      @criteria = Mongoid::Criteria.new(Address).skip(2).limit(2)
+      @context = MongoDoc::Contexts::Enumerable.new(@criteria)
+      @results = @context.paginate
+    end
+
+    it "executes and paginates the results" do
+      @results.current_page.should == 2
+      @results.per_page.should == 2
+    end
+
+  end
+
+  describe "#per_page" do
+
+    context "when a limit option exists" do
+
+      it "returns 20" do
+        @context.per_page.should == 20
+      end
+
+    end
+
+    context "when a limit option does not exist" do
+
+      before do
+        @criteria = Mongoid::Criteria.new(Address).limit(50)
+        @criteria.documents = []
+        @context = MongoDoc::Contexts::Enumerable.new(@criteria)
+      end
+
+      it "returns the limit" do
+        @context.per_page.should == 50
+      end
+
+    end
+
+  end
+
+  describe "#sum" do
+
+    it "returns the sum of all the field values" do
+      @context.sum(:number).should == 51
+    end
+
+  end
+
+  context "#id_criteria" do
+
+    let(:criteria) do
+      criteria = Mongoid::Criteria.new(Address)
+      criteria.documents = []
+      criteria
+    end
+    let(:context) { criteria.context }
+
+    context "with a single argument" do
+
+      let(:id) { Mongo::ObjectID.new.to_s }
+
+      before do
+        criteria.should_receive(:id).with(id).and_return(criteria)
+      end
+
+      context "when the document is found" do
+
+        let(:document) { stub }
+
+        it "returns a matching document" do
+          context.should_receive(:one).and_return(document)
+          context.id_criteria(id).should == document
+        end
+
+      end
+
+      context "when the document is not found" do
+
+        it "returns nil" do
+          context.should_receive(:one).and_return(nil)
+          context.id_criteria(id).should be_nil
+        end
+
+      end
+
+    end
+
+    context "multiple arguments" do
+
+      context "when an array of ids" do
+
+        let(:ids) do
+          (0..2).inject([]) { |ary, i| ary << Mongo::ObjectID.new.to_s }
+        end
+
+        context "when documents are found" do
+
+          let(:docs) do
+            (0..2).inject([]) { |ary, i| ary << stub }
+          end
+
+          before do
+            criteria.should_receive(:id).with(ids).and_return(criteria)
+          end
+
+          it "returns matching documents" do
+            context.should_receive(:execute).and_return(docs)
+            context.id_criteria(ids).should == docs
+          end
+
+        end
+
+        context "when documents are not found" do
+
+          it "returns an empty array" do
+            context.should_receive(:execute).and_return([])
+            context.id_criteria(ids).should be_empty
+          end
+
+        end
+
+      end
+
+    end
+
+  end
+
+end