mongoid 1.2.13 → 1.2.14

data/.watchr

@@ -23,7 +23,7 @@ watch("spec/.*/*_spec\.rb") do |match|
   spec(match[0])
 end
 
-watch('lib/(.*/.*)\.rb') do |match|
+watch("lib/(.*/.*)\.rb") do |match|
   p match[1]
   spec("spec/unit/#{match[1]}_spec.rb")
 end

data/README.rdoc

@@ -8,20 +8,13 @@ Mongoid is an ODM (Object-Document-Mapper) framework for MongoDB in Ruby.
 
 * {Mongoid on Pivotal Tracker}[http://www.pivotaltracker.com/projects/27482]
 * {Mongoid Google Group}[http://groups.google.com/group/mongoid]
-* {Mongoid on CI Joe}[http://mongoid.org:4444/]
+* {Mongoid on CI Joe}[http://ci.mongoid.org/]
 * {Mongoid Website and Documentation}[http://mongoid.org]
 
 == Compatibility
 
 Mongoid is developed against Ruby 1.8.6, 1.8.7, 1.9.1, 1.9.2
 
-Note API changes will be frequent until 1.0, releases will be
-frequent, and backwards compatibility will not be supported. Do not
-expect the gem to be of full production quality until that
-point. However, once 1.0 is released I will be providing backwards
-compatibility through each minor version upgrade, as well as detailed
-release notes and documentation with each release.
-
 = Documentation
 
 Please see the new Mongoid website for up-to-date documentation:

data/Rakefile

@@ -13,7 +13,7 @@ begin
     gem.authors = ["Durran Jordan"]
 
     gem.add_dependency("activesupport", "<= 2.3.5")
-    gem.add_dependency("mongo", ">= 0.18.3")
+    gem.add_dependency("mongo", ">= 0.19.1")
     gem.add_dependency("durran-validatable", ">= 2.0.1")
     gem.add_dependency("will_paginate", "< 2.9")
 

data/VERSION

@@ -1 +1 @@
-1.2.13
+1.2.14

data/lib/mongoid.rb

@@ -22,7 +22,7 @@
 require "rubygems"
 
 gem "activesupport", ">= 2.2.2", "<3.0.pre"
-gem "mongo", ">= 0.18.3"
+gem "mongo", ">= 0.19.1"
 gem "durran-validatable", ">= 2.0.1"
 gem "will_paginate", ">= 2.3.11", "< 2.9"
 

data/lib/mongoid/contexts/enumerable.rb

@@ -20,11 +20,35 @@ module Mongoid #:nodoc:
         counts
       end
 
+      # Get the average value for the supplied field.
+      #
+      # Example:
+      #
+      # <tt>context.avg(:age)</tt>
+      #
+      # Returns:
+      #
+      # A numeric value that is the average.
+      def avg(field)
+        total = sum(field)
+        total ? (total.to_f / count) : nil
+      end
+
       # Gets the number of documents in the array. Delegates to size.
       def count
         @count ||= documents.size
       end
 
+      # Gets an array of distinct values for the supplied field across the
+      # entire array or the susbset given the criteria.
+      #
+      # Example:
+      #
+      # <tt>context.distinct(:title)</tt>
+      def distinct(field)
+        execute.collect { |doc| doc.send(field) }.uniq
+      end
+
       # Enumerable implementation of execute. Returns matching documents for
       # the selector, and adds options if supplied.
       #

data/lib/mongoid/contexts/mongo.rb

@@ -23,6 +23,25 @@ module Mongoid #:nodoc:
         klass.collection.group(options[:fields], selector, { :count => 0 }, Javascript.aggregate, true)
       end
 
+      # Get the average value for the supplied field.
+      #
+      # This will take the internally built selector and options
+      # and pass them on to the Ruby driver's +group()+ method on the collection. The
+      # collection itself will be retrieved from the class provided, and once the
+      # query has returned it will provided a grouping of keys with averages.
+      #
+      # Example:
+      #
+      # <tt>context.avg(:age)</tt>
+      #
+      # Returns:
+      #
+      # A numeric value that is the average.
+      def avg(field)
+        total = sum(field)
+        total ? (total / count) : nil
+      end
+
       # Determine if the context is empty or blank given the criteria. Will
       # perform a quick has_one asking only for the id.
       #
@@ -48,6 +67,16 @@ module Mongoid #:nodoc:
         @count ||= klass.collection.find(selector, process_options).count
       end
 
+      # Gets an array of distinct values for the supplied field across the
+      # entire collection or the susbset given the criteria.
+      #
+      # Example:
+      #
+      # <tt>context.distinct(:title)</tt>
+      def distinct(field)
+        klass.collection.distinct(field, selector)
+      end
+
       # Execute the context. This will take the selector and options
       # and pass them on to the Ruby driver's +find()+ method on the collection. The
       # collection itself will be retrieved from the class provided, and once the
@@ -87,8 +116,7 @@ module Mongoid #:nodoc:
           options[:fields],
           selector,
           { :group => [] },
-          Javascript.group,
-          true
+          Javascript.group
         ).collect do |docs|
           docs["group"] = docs["group"].collect do |attrs|
             Mongoid::Factory.build(klass, attrs)
@@ -222,8 +250,7 @@ module Mongoid #:nodoc:
           nil,
           selector,
           { start => "start" },
-          reduce.gsub("[field]", field),
-          true
+          reduce.gsub("[field]", field)
         )
         collection.empty? ? nil : collection.first[start.to_s]
       end

data/lib/mongoid/criteria.rb

@@ -26,13 +26,14 @@ module Mongoid #:nodoc:
     include Enumerable
 
     attr_reader :collection, :ids, :klass, :options, :selector
-
     attr_accessor :documents
 
     delegate \
       :aggregate,
+      :avg,
       :blank?,
       :count,
+      :distinct,
       :empty?,
       :execute,
       :first,

data/lib/mongoid/extensions.rb

@@ -23,6 +23,7 @@ require "mongoid/extensions/string/conversions"
 require "mongoid/extensions/string/inflections"
 require "mongoid/extensions/symbol/inflections"
 require "mongoid/extensions/time/conversions"
+require "mongoid/extensions/objectid/conversions"
 
 class Array #:nodoc
   include Mongoid::Extensions::Array::Accessors
@@ -92,3 +93,7 @@ end
 class Time #:nodoc
   extend Mongoid::Extensions::Time::Conversions
 end
+
+class Mongo::ObjectID #:nodoc
+  extend Mongoid::Extensions::ObjectID::Conversions
+end

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

@@ -0,0 +1,15 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Extensions #:nodoc:
+    module ObjectID #:nodoc:
+      module Conversions #:nodoc:
+        def set(value)
+          value
+        end
+        def get(value)
+          value
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/finders.rb

@@ -4,7 +4,7 @@ module Mongoid #:nodoc:
 
     # Delegate to the criteria methods that are natural for creating a new
     # criteria.
-    [ :all_in, :any_in, :excludes, :limit, :max, :min,
+    [ :all_in, :any_in, :avg, :excludes, :limit, :max, :min,
       :not_in, :only, :order_by, :skip, :sum, :where ].each do |name|
       define_method(name) do |*args|
         criteria.send(name, *args)

data/mongoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "1.2.13"
+  s.version = "1.2.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
-  s.date = %q{2010-03-12}
+  s.date = %q{2010-03-17}
   s.email = %q{durran@gmail.com}
   s.extra_rdoc_files = [
     "README.rdoc"
@@ -85,6 +85,7 @@ Gem::Specification.new do |s|
      "lib/mongoid/extensions/integer/conversions.rb",
      "lib/mongoid/extensions/nil/assimilation.rb",
      "lib/mongoid/extensions/object/conversions.rb",
+     "lib/mongoid/extensions/objectid/conversions.rb",
      "lib/mongoid/extensions/proc/scoping.rb",
      "lib/mongoid/extensions/string/conversions.rb",
      "lib/mongoid/extensions/string/inflections.rb",
@@ -369,14 +370,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, ["<= 2.3.5"])
-      s.add_runtime_dependency(%q<mongo>, [">= 0.18.3"])
+      s.add_runtime_dependency(%q<mongo>, [">= 0.19.1"])
       s.add_runtime_dependency(%q<durran-validatable>, [">= 2.0.1"])
       s.add_runtime_dependency(%q<will_paginate>, ["< 2.9"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_development_dependency(%q<mocha>, [">= 0.9.8"])
     else
       s.add_dependency(%q<activesupport>, ["<= 2.3.5"])
-      s.add_dependency(%q<mongo>, [">= 0.18.3"])
+      s.add_dependency(%q<mongo>, [">= 0.19.1"])
       s.add_dependency(%q<durran-validatable>, [">= 2.0.1"])
       s.add_dependency(%q<will_paginate>, ["< 2.9"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
@@ -384,7 +385,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<activesupport>, ["<= 2.3.5"])
-    s.add_dependency(%q<mongo>, [">= 0.18.3"])
+    s.add_dependency(%q<mongo>, [">= 0.19.1"])
     s.add_dependency(%q<durran-validatable>, [">= 2.0.1"])
     s.add_dependency(%q<will_paginate>, ["< 2.9"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])

data/spec/integration/mongoid/criteria_spec.rb

@@ -10,6 +10,27 @@ describe Mongoid::Criteria do
     Person.delete_all
   end
 
+  describe "#avg" do
+
+    context "without results" do
+      it "should return nil" do
+        Person.avg(:age).should == nil
+      end
+    end
+
+    context "with results" do
+      before do
+        10.times do |n|
+          Person.create(:title => "Sir", :age => ((n + 1) * 10), :aliases => ["D", "Durran"], :ssn => "#{n}")
+        end
+      end
+
+      it "provides min for the field provided" do
+        Person.avg(:age).should == 55
+      end
+    end
+  end
+
   describe "#excludes" do
 
     before do

data/spec/unit/mongoid/contexts/enumerable_spec.rb

@@ -31,6 +31,13 @@ describe Mongoid::Contexts::Enumerable do
     end
   end
 
+  describe "#avg" do
+
+    it "returns the avg value for the supplied field" do
+      @context.avg(:number).should == 12.75
+    end
+  end
+
   describe "#count" do
 
     it "returns the size of the enumerable" do
@@ -39,6 +46,30 @@ describe Mongoid::Contexts::Enumerable do
 
   end
 
+  describe "#distinct" do
+
+    context "when the criteria is limited" do
+
+      it "returns an array of distinct values for the field" do
+        @context.distinct(:street).should == [ "Bourke Street" ]
+      end
+    end
+
+    context "when the criteria is not limited" do
+
+      before do
+        @criteria = Mongoid::Criteria.new(Address)
+        @criteria.documents = @docs
+        @context = Mongoid::Contexts::Enumerable.new(@criteria)
+      end
+
+      it "returns an array of distinct values for the field" do
+        @context.distinct(:street).should ==
+          [ "Bond Street", "Nan Jing Dong Lu", "Bourke Street", "Broadway" ]
+      end
+    end
+  end
+
   describe "#execute" do
 
     before do

data/spec/unit/mongoid/contexts/mongo_spec.rb

@@ -22,9 +22,30 @@ describe Mongoid::Contexts::Mongo do
         @collection.expects(:group).with([:field1], {:_type => {'$in' => ['Doctor', 'Person']}}, {:count => 0}, @reduce, true)
         @context.aggregate
       end
+    end
+  end
 
+  describe "#avg" do
+
+    before do
+      @reduce = Mongoid::Javascript.sum.gsub("[field]", "age")
+      @collection = mock
+      Person.expects(:collection).twice.returns(@collection)
+      @criteria = Mongoid::Criteria.new(Person)
+      @context = Mongoid::Contexts::Mongo.new(@criteria)
     end
 
+    it "calls group on the collection with the aggregate js" do
+      @collection.expects(:group).with(
+        nil,
+        {:_type => {'$in' => ['Doctor', 'Person']}},
+        {:sum => "start"},
+        @reduce
+      ).returns([{"sum" => 100.0}])
+      @cursor = mock(:count => 10)
+      @collection.expects(:find).returns(@cursor)
+      @context.avg(:age).should == 10
+    end
   end
 
   describe "blank?" do
@@ -102,6 +123,22 @@ describe Mongoid::Contexts::Mongo do
 
   end
 
+  describe "#distinct" do
+
+    before do
+      @criteria = Mongoid::Criteria.new(Person)
+      @criteria.where(:test => 'Testing')
+      @context = Mongoid::Contexts::Mongo.new(@criteria)
+      @collection = mock
+      Person.expects(:collection).returns(@collection)
+    end
+
+    it "returns delegates to distinct on the collection" do
+      @collection.expects(:distinct).with(:title, @criteria.selector).returns(["Sir"])
+      @context.distinct(:title).should == ["Sir"]
+    end
+  end
+
   describe "#execute" do
 
     let(:selector) { { :field => "value"  } }
@@ -179,8 +216,7 @@ describe Mongoid::Contexts::Mongo do
           [:field1],
           {:_type => { "$in" => ["Doctor", "Person"] }},
           {:group => []},
-          @reduce,
-          true
+          @reduce
         ).returns(@grouping)
         @context.group
       end
@@ -323,7 +359,10 @@ describe Mongoid::Contexts::Mongo do
         @criteria = Mongoid::Criteria.new(Person)
         @criteria.order_by([[:title, :asc]])
         @context = Mongoid::Contexts::Mongo.new(@criteria)
-        @collection.expects(:find_one).with({:_type => {'$in' => ['Doctor', 'Person']}}, { :sort => [[:title, :desc]] }).returns(
+        @collection.expects(:find_one).with(
+          {:_type => {'$in' => ['Doctor', 'Person']}},
+          { :sort => [[:title, :desc]] }
+        ).returns(
           { "title" => "Sir", "_type" => "Person" }
         )
       end
@@ -340,7 +379,10 @@ describe Mongoid::Contexts::Mongo do
         @criteria = Mongoid::Criteria.new(Person)
         @criteria.order_by([[:_id, :asc]])
         @context = Mongoid::Contexts::Mongo.new(@criteria)
-        @collection.expects(:find_one).with({:_type => {'$in' => ['Doctor', 'Person']}}, { :sort => [[:_id, :desc]] }).returns(nil)
+        @collection.expects(:find_one).with(
+          {:_type => {'$in' => ['Doctor', 'Person']}},
+          { :sort => [[:_id, :desc]] }
+        ).returns(nil)
       end
 
       it "returns nil" do
@@ -355,7 +397,10 @@ describe Mongoid::Contexts::Mongo do
         @criteria = Mongoid::Criteria.new(Person)
         @criteria.order_by([[:_id, :asc]])
         @context = Mongoid::Contexts::Mongo.new(@criteria)
-        @collection.expects(:find_one).with({:_type => {'$in' => ['Doctor', 'Person']}}, { :sort => [[:_id, :desc]] }).returns(
+        @collection.expects(:find_one).with(
+          {:_type => {'$in' => ['Doctor', 'Person']}},
+          { :sort => [[:_id, :desc]] }
+        ).returns(
           { "title" => "Sir", "_type" => "Person" }
         )
       end
@@ -383,8 +428,7 @@ describe Mongoid::Contexts::Mongo do
         nil,
         {:_type => {'$in' => ['Doctor', 'Person']}},
         {:max => "start"},
-        @reduce,
-        true
+        @reduce
       ).returns([{"max" => 200.0}])
       @context.max(:age).should == 200.0
     end
@@ -406,8 +450,7 @@ describe Mongoid::Contexts::Mongo do
         nil,
         {:_type => {'$in' => ['Doctor', 'Person']}},
         {:min => "start"},
-        @reduce,
-        true
+        @reduce
       ).returns([{"min" => 4.0}])
       @context.min(:age).should == 4.0
     end
@@ -518,8 +561,7 @@ describe Mongoid::Contexts::Mongo do
           nil,
           {:_type => {'$in' => ['Doctor', 'Person']}},
           {:sum => "start"},
-          @reduce,
-          true
+          @reduce
         ).returns([{"sum" => 50.0}])
         @context.sum(:age).should == 50.0
       end

data/spec/unit/mongoid/criteria_spec.rb

@@ -120,6 +120,19 @@ describe Mongoid::Criteria do
 
   end
 
+  describe "#avg" do
+
+    before do
+      @context = stub.quacks_like(Mongoid::Contexts::Mongo.allocate)
+      @criteria.instance_variable_set(:@context, @context)
+    end
+
+    it "delegates to the context" do
+      @context.expects(:avg).with(:age)
+      @criteria.avg(:age)
+    end
+  end
+
   describe "#blank?" do
 
     before do
@@ -200,6 +213,19 @@ describe Mongoid::Criteria do
 
   end
 
+  describe "#distinct" do
+
+    before do
+      @context = stub.quacks_like(Mongoid::Contexts::Mongo.allocate)
+      @criteria.instance_variable_set(:@context, @context)
+    end
+
+    it "delegates to the context" do
+      @context.expects(:distinct).with(:title)
+      @criteria.distinct(:title)
+    end
+  end
+
   describe "#entries" do
 
     context "filtering" do

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

@@ -6,7 +6,14 @@ describe Mongoid::Extensions::Object::Conversions do
 
     it "returns its attributes" do
       Person.new(:_id => 1, :title => "Sir").mongoidize.should ==
-        { "_id" => 1, "title" => "Sir", "age" => 100, "_type" => "Person", "blood_alcohol_content" => 0.0, "pets" => false}
+        {
+          "_id" => 1,
+          "title" => "Sir",
+          "age" => 100,
+          "_type" => "Person",
+          "blood_alcohol_content" => 0.0,
+          "pets" => false
+        }
     end
 
   end
@@ -28,7 +35,14 @@ describe Mongoid::Extensions::Object::Conversions do
     context "when object has attributes" do
 
       before do
-        @attributes = { "_id" => "test", "title" => "Sir", "age" => 100, "_type" => "Person", "blood_alcohol_content" => 0.0, "pets" => false }
+        @attributes = {
+          "_id" => "test",
+          "title" => "Sir",
+          "age" => 100,
+          "_type" => "Person",
+          "blood_alcohol_content" => 0.0,
+          "pets" => false
+        }
         @person = Person.new(@attributes)
       end
 

data/spec/unit/mongoid/fields_spec.rb

@@ -13,6 +13,7 @@ describe Mongoid::Fields do
   describe "#defaults" do
 
     context "with defaults specified as a non-primitive" do
+
       before do
         Person.field(:hash_testing, :type => Hash, :default => {})
         Person.field(:array_testing, :type => Array, :default => [])
@@ -20,6 +21,11 @@ describe Mongoid::Fields do
         @second_person = Person.new
       end
 
+      after do
+        Person.fields.delete("hash_testing")
+        Person.fields.delete("array_testing")
+      end
+
       it "should not return the same object when calling defaults with a default hash" do
         @first_person.hash_testing.object_id.should_not == @second_person.hash_testing.object_id
       end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 2
-  - 13
-  version: 1.2.13
+  - 14
+  version: 1.2.14
 platform: ruby
 authors: 
 - Durran Jordan
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-12 00:00:00 -05:00
+date: 2010-03-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,9 +40,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 18
-        - 3
-        version: 0.18.3
+        - 19
+        - 1
+        version: 0.19.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -179,6 +179,7 @@ files:
 - lib/mongoid/extensions/integer/conversions.rb
 - lib/mongoid/extensions/nil/assimilation.rb
 - lib/mongoid/extensions/object/conversions.rb
+- lib/mongoid/extensions/objectid/conversions.rb
 - lib/mongoid/extensions/proc/scoping.rb
 - lib/mongoid/extensions/string/conversions.rb
 - lib/mongoid/extensions/string/inflections.rb