mongoid 0.11.8 → 0.11.9

data/HISTORY

@@ -1,3 +1,22 @@
+=== 0.11.9
+- Fixed issue with non-us time zones and formats
+  parsing incorrectly.
+
+- Fixed error when specifying field restrictions
+  in criteria and not providing the _type. It
+  will now automaticall get added if it is not
+  present.
+
+- Slight cleanup of delegated methods in Document.
+
+- Dynamic attributes no longer create setters and
+  getters on the class. They can be accessed from
+  the attributes hash directly. If they are used
+  frequently it is preferrable to just add a field
+  to the class manually.
+
+- Criteria#min no longer always returns 0.0.
+
 === 0.11.8
 - Added #min and #max to criteria which takes a
   single field argument.

data/VERSION

@@ -1 +1 @@
-0.11.8
+0.11.9

data/lib/mongoid/attributes.rb

@@ -14,10 +14,11 @@ module Mongoid #:nodoc:
       # put into the document's attributes.
       def process(attrs = {})
         attrs.each_pair do |key, value|
-          unless respond_to?("#{key}=")
-            self.class.field key, :type => value.class if Mongoid.allow_dynamic_fields
+          if Mongoid.allow_dynamic_fields && !respond_to?("#{key}=")
+            @attributes[key] = value
+          else
+            send("#{key}=", value) unless value.blank?
           end
-          send("#{key}=", value) unless value.blank?
         end
       end
 

data/lib/mongoid/criteria.rb

@@ -100,7 +100,7 @@ module Mongoid #:nodoc:
     #
     # Returns: <tt>Integer</tt>
     def count
-      @count ||= @klass.collection.find(@selector, @options.dup).count
+      @count ||= @klass.collection.find(@selector, process_options).count
     end
 
     # Iterate over each +Document+ in the results. This can take an optional
@@ -228,7 +228,7 @@ module Mongoid #:nodoc:
     #
     # <tt>Criteria.select(:name).where(:name = "Chrissy").last</tt>
     def last
-      opts = @options.dup
+      opts = process_options
       sorting = opts[:sort]
       sorting = [[:_id, :asc]] unless sorting
       opts[:sort] = sorting.collect { |option| [ option[0], option[1].invert ] }
@@ -253,6 +253,38 @@ module Mongoid #:nodoc:
       @options[:limit] = value; self
     end
 
+    MIN_REDUCE = "function(obj, prev) { if (prev.min == 'start') { prev.min = obj.[field]; } " +
+      "if (prev.min > obj.[field]) { prev.min = obj.[field]; } }"
+    # Return the min value for a 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 sums.
+    #
+    # Example:
+    #
+    # <tt>criteria.min(:age)</tt>
+    def min(field)
+      grouped(:min, field.to_s, MIN_REDUCE)
+    end
+
+    MAX_REDUCE = "function(obj, prev) { if (prev.max == 'start') { prev.max = obj.[field]; } " +
+      "if (prev.max < obj.[field]) { prev.max = obj.[field]; } }"
+    # Return the max value for a 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 sums.
+    #
+    # Example:
+    #
+    # <tt>criteria.max(:age)</tt>
+    def max(field)
+      grouped(:max, field.to_s, MAX_REDUCE)
+    end
+
     # Merges another object into this +Criteria+. The other object may be a
     # +Criteria+ or a +Hash+. This is used to combine multiple scopes together,
     # where a chained scope situation may be desired.
@@ -340,7 +372,7 @@ module Mongoid #:nodoc:
     #
     # <tt>Criteria.select(:name).where(:name = "Chrissy").one</tt>
     def one
-      attributes = @klass.collection.find_one(@selector, @options.dup)
+      attributes = @klass.collection.find_one(@selector, process_options)
       attributes ? attributes["_type"].constantize.instantiate(attributes) : nil
     end
 
@@ -421,7 +453,7 @@ module Mongoid #:nodoc:
       @options[:skip] = value; self
     end
 
-    SUM_REDUCE = "function(obj, prev) { prev.sum += obj.[field]; }"
+    SUM_REDUCE = "function(obj, prev) { if (prev.sum == 'start') { prev.sum = 0; } prev.sum += obj.[field]; }"
     # Sum the criteria.
     #
     # This will take the internally built selector and options
@@ -436,36 +468,6 @@ module Mongoid #:nodoc:
       grouped(:sum, field.to_s, SUM_REDUCE)
     end
 
-    MIN_REDUCE = "function(obj, prev) { if (prev.max > obj.[field]) { prev.max = obj.[field]; } }"
-    # Return the min value for a 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 sums.
-    #
-    # Example:
-    #
-    # <tt>criteria.min(:age)</tt>
-    def min(field)
-      grouped(:min, field.to_s, MIN_REDUCE)
-    end
-
-    MAX_REDUCE = "function(obj, prev) { if (prev.max < obj.[field]) { prev.max = obj.[field]; } }"
-    # Return the max value for a 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 sums.
-    #
-    # Example:
-    #
-    # <tt>criteria.max(:age)</tt>
-    def max(field)
-      grouped(:max, field.to_s, MAX_REDUCE)
-    end
-
     # Translate the supplied arguments into a +Criteria+ object.
     #
     # If the passed in args is a single +String+, then it will
@@ -535,7 +537,7 @@ module Mongoid #:nodoc:
     # If this is a +Criteria+ to find multiple results, will return an +Array+ of
     # objects of the type of class provided.
     def execute
-      attributes = @klass.collection.find(@selector, @options.dup)
+      attributes = @klass.collection.find(@selector, process_options)
       if attributes
         @count = attributes.count
         attributes.collect { |doc| doc["_type"].constantize.instantiate(doc) }
@@ -544,6 +546,17 @@ module Mongoid #:nodoc:
       end
     end
 
+    # Filters the field list. If no fields have been supplied, then it will be
+    # empty. If fields have been defined then _type will be included as well.
+    def process_options
+      fields = @options[:fields]
+      if fields && fields.size > 0 && !fields.include?(:_type)
+        fields << :_type
+        @options[:fields] = fields
+      end
+      @options.dup
+    end
+
     # Filters the unused options out of the options +Hash+. Currently this
     # takes into account the "page" and "per_page" options that would be passed
     # in if using will_paginate.
@@ -556,23 +569,24 @@ module Mongoid #:nodoc:
       end
     end
 
-    # Update the selector setting the operator on the value for each key in the
-    # supplied attributes +Hash+.
-    def update_selector(attributes, operator)
-      attributes.each { |key, value| @selector[key] = { operator => value } }; self
-    end
-
     # Common functionality for grouping operations. Currently used by min, max
     # and sum. Will gsub the field name in the supplied reduce function.
     def grouped(start, field, reduce)
       collection = @klass.collection.group(
         nil,
         @selector,
-        { start => 0 },
+        { start => "start" },
         reduce.gsub("[field]", field),
         true
       )
       collection.first[start.to_s]
     end
+
+    # Update the selector setting the operator on the value for each key in the
+    # supplied attributes +Hash+.
+    def update_selector(attributes, operator)
+      attributes.each { |key, value| @selector[key] = { operator => value } }; self
+    end
+
   end
 end

data/lib/mongoid/document.rb

@@ -28,7 +28,7 @@ module Mongoid #:nodoc:
         attr_accessor :association_name, :_parent
         attr_reader :attributes, :new_record
 
-        delegate :collection, :defaults, :embedded?, :fields, :primary_key, :to => :klass
+        delegate :collection, :defaults, :embedded?, :fields, :primary_key, :to => "self.class"
 
         # Define all the callbacks that are accepted by the document.
         define_callbacks :before_create, :before_destroy, :before_save, :before_update, :before_validation
@@ -348,11 +348,6 @@ module Mongoid #:nodoc:
         @attributes[:_type] ||= self.class.name
       end
 
-      # Convenience method to get the document's class
-      def klass
-        self.class
-      end
-
     end
 
   end

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

@@ -5,12 +5,12 @@ module Mongoid #:nodoc:
       module Conversions #:nodoc:
         def set(value)
           return nil if value.blank?
-          time = ::Time.parse(value.to_s)
+          time = ::Time.parse(value.is_a?(::Time) ? value.strftime("%Y-%m-%d %H:%M:%S %Z") : value.to_s)
           time.utc? ? time : time.utc
         end
         def get(value)
           return nil if value.blank?
-          ::Time.zone ? ::Time.zone.parse(value.to_s).getlocal : value
+          ::Time.zone ? value.getlocal : value
         end
       end
     end

data/mongoid.gemspec

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

data/spec/integration/mongoid/criteria_spec.rb

@@ -14,8 +14,8 @@ describe Mongoid::Criteria do
       Person.delete_all
     end
 
-    it "provides sums for all the fields provided" do
-      Person.criteria.max(:age).should == 90.0
+    it "provides max for the field provided" do
+      Person.max(:age).should == 90.0
     end
 
   end
@@ -24,7 +24,7 @@ describe Mongoid::Criteria do
 
     before do
       10.times do |n|
-        Person.create(:title => "Sir", :age => (n * 10), :aliases => ["D", "Durran"])
+        Person.create(:title => "Sir", :age => ((n + 1) * 10), :aliases => ["D", "Durran"])
       end
     end
 
@@ -32,8 +32,8 @@ describe Mongoid::Criteria do
       Person.delete_all
     end
 
-    it "provides sums for all the fields provided" do
-      Person.criteria.min(:age).should == 0.0
+    it "provides min for the field provided" do
+      Person.min(:age).should == 10.0
     end
 
   end
@@ -50,7 +50,7 @@ describe Mongoid::Criteria do
       Person.delete_all
     end
 
-    it "provides sums for all the fields provided" do
+    it "provides sum for the field provided" do
       Person.where(:age.gt => 3).sum(:age).should == 50.0
     end
 

data/spec/integration/mongoid/document_spec.rb

@@ -193,6 +193,15 @@ describe Mongoid::Document do
 
     end
 
+    context "limiting result fields" do
+
+      it "adds the type field to the options" do
+        people = Person.all(:fields => [ :title ])
+        people.first.title.should == "Test"
+      end
+
+    end
+
   end
 
   describe "#find_by_id" do

data/spec/spec_helper.rb

@@ -48,10 +48,11 @@ class Person
   accepts_nested_attributes_for :addresses, :reject_if => lambda { |attrs| attrs["street"].blank? }
   accepts_nested_attributes_for :name
 
-  index :title
-  index :dob
+  index :age
   index :addresses
+  index :dob
   index :name
+  index :title
 
   has_one_related :game
   has_many_related :posts

data/spec/unit/mongoid/attributes_spec.rb

@@ -111,20 +111,15 @@ describe Mongoid::Attributes do
         context "when attribute is a string" do
 
           it "adds a string field" do
-            @person.nofieldstring.should == "Testing"
-            @person.nofieldstring = "Test"
-            @person.nofieldstring.should == "Test"
+            @person.attributes[:nofieldstring].should == "Testing"
           end
 
         end
 
-
         context "when attribute is not a string" do
 
           it "adds a properly typed field" do
-            @person.nofieldint.should == 5
-            @person.nofieldint = 50
-            @person.nofieldint.should == 50
+            @person.attributes[:nofieldint].should == 5
           end
 
         end

data/spec/unit/mongoid/criteria_spec.rb

@@ -495,7 +495,7 @@ describe Mongoid::Criteria do
   describe "#max" do
 
     before do
-      @reduce = "function(obj, prev) { if (prev.max < obj.age) { prev.max = obj.age; } }"
+      @reduce = Mongoid::Criteria::MAX_REDUCE.gsub("[field]", "age")
       @collection = mock
       Person.expects(:collection).returns(@collection)
     end
@@ -504,7 +504,7 @@ describe Mongoid::Criteria do
       @collection.expects(:group).with(
         nil,
         {:_type => { "$in" => ["Doctor", "Person"] } },
-        {:max => 0},
+        {:max => "start"},
         @reduce,
         true
       ).returns([{"max" => 200.0}])
@@ -615,7 +615,7 @@ describe Mongoid::Criteria do
   describe "#min" do
 
     before do
-      @reduce = "function(obj, prev) { if (prev.max > obj.age) { prev.max = obj.age; } }"
+      @reduce = Mongoid::Criteria::MIN_REDUCE.gsub("[field]", "age")
       @collection = mock
       Person.expects(:collection).returns(@collection)
     end
@@ -624,7 +624,7 @@ describe Mongoid::Criteria do
       @collection.expects(:group).with(
         nil,
         {:_type => { "$in" => ["Doctor", "Person"] } },
-        {:min => 0},
+        {:min => "start"},
         @reduce,
         true
       ).returns([{"min" => 4.0}])
@@ -891,7 +891,7 @@ describe Mongoid::Criteria do
     context "when klass not provided" do
 
       before do
-        @reduce = "function(obj, prev) { prev.sum += obj.age; }"
+        @reduce = Mongoid::Criteria::SUM_REDUCE.gsub("[field]", "age")
         @collection = mock
         Person.expects(:collection).returns(@collection)
       end
@@ -900,7 +900,7 @@ describe Mongoid::Criteria do
         @collection.expects(:group).with(
           nil,
           {:_type => { "$in" => ["Doctor", "Person"] } },
-          {:sum => 0},
+          {:sum => "start"},
           @reduce,
           true
         ).returns([{"sum" => 50.0}])

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

@@ -3,7 +3,7 @@ require "spec_helper"
 describe Mongoid::Extensions::Time::Conversions do
 
   before do
-    Time.zone = "Eastern Time (US & Canada)"
+    Time.zone = "Canberra"
     @time = Time.local(1976, 11, 19)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 0.11.8
+  version: 0.11.9
 platform: ruby
 authors: 
 - Durran Jordan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-06 00:00:00 -05:00
+date: 2010-01-07 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency