mongoid 1.0.6 → 1.1.0

data/lib/mongoid/document.rb

@@ -19,7 +19,7 @@ module Mongoid #:nodoc:
         self.collection_name = self.name.collectionize
 
         attr_accessor :association_name, :_parent
-        attr_reader :attributes, :new_record
+        attr_reader :new_record
 
         delegate :collection, :embedded, :primary_key, :to => "self.class"
       end
@@ -59,13 +59,12 @@ module Mongoid #:nodoc:
       #
       # <tt>Person.instantiate(:title => "Sir", :age => 30)</tt>
       def instantiate(attrs = {}, allocating = false)
-        attributes = attrs.with_indifferent_access
-        if attributes[:_id] || allocating
+        if attrs["_id"] || allocating
           document = allocate
-          document.instance_variable_set(:@attributes, attributes)
+          document.instance_variable_set(:@attributes, attrs)
           return document
         else
-          return new(attributes)
+          return new(attrs)
         end
       end
 
@@ -109,7 +108,7 @@ module Mongoid #:nodoc:
       # all attributes excluding timestamps on the object.
       def ==(other)
         return false unless other.is_a?(Document)
-        @attributes.except(:modified_at).except(:created_at) ==
+        attributes.except(:modified_at).except(:created_at) ==
           other.attributes.except(:modified_at).except(:created_at)
       end
 
@@ -131,10 +130,15 @@ module Mongoid #:nodoc:
         parentize(parent, options.name); notify; self
       end
 
+      # Return the attributes hash with indifferent access.
+      def attributes
+        @attributes.with_indifferent_access
+      end
+
       # Clone the current +Document+. This will return all attributes with the
       # exception of the document's id and versions.
       def clone
-        self.class.instantiate(@attributes.except(:_id).except(:versions).dup, true)
+        self.class.instantiate(@attributes.except("_id").except("versions").dup, true)
       end
 
       # Generate an id for this +Document+.
@@ -157,8 +161,9 @@ module Mongoid #:nodoc:
       #
       # <tt>Person.new(:title => "Mr", :age => 30)</tt>
       def initialize(attrs = {})
-        @attributes = {}.with_indifferent_access
-        process(defaults.merge(attrs))
+        @attributes = {}
+        process(attrs)
+        @attributes = defaults.merge(@attributes)
         @new_record = true if id.nil?
         document = yield self if block_given?
         identify
@@ -206,13 +211,13 @@ module Mongoid #:nodoc:
       # <tt>address.parentize(person, :addresses)</tt>
       def parentize(object, association_name)
         self._parent = object
-        self.association_name = association_name
+        self.association_name = association_name.to_s
         add_observer(object)
       end
 
       # Reloads the +Document+ attributes from the database.
       def reload
-        @attributes = collection.find_one(:_id => id).with_indifferent_access
+        @attributes = collection.find_one(:_id => id)
       end
 
       # Remove a child document from this parent +Document+. Will reset the
@@ -244,7 +249,7 @@ module Mongoid #:nodoc:
       #
       # <tt>person.to_json</tt>
       def to_json
-        @attributes.to_json
+        attributes.to_json
       end
 
       # Returns the id of the Document, used in Rails compatibility.
@@ -269,7 +274,8 @@ module Mongoid #:nodoc:
       # there is any.
       def update(child, clear = false)
         name = child.association_name
-        clear ? @attributes.delete(name) : @attributes.insert(name, child.attributes)
+        attrs = child.instance_variable_get(:@attributes)
+        clear ? @attributes.delete(name) : @attributes.insert(name, attrs)
         notify
       end
     end

data/lib/mongoid/extensions.rb

@@ -74,6 +74,7 @@ class String #:nodoc
 end
 
 class Symbol #:nodoc
+  remove_method :size if instance_methods.include? :size # temporal fix for ruby 1.9
   include Mongoid::Extensions::Symbol::Inflections
 end
 

data/lib/mongoid/extensions/array/accessors.rb

@@ -6,9 +6,11 @@ module Mongoid #:nodoc:
         # If the attributes already exists in the array then they will be
         # updated, otherwise they will be appended.
         def update(attributes)
-          delete_if { |e| attributes[:_id] && (e[:_id] == attributes[:_id]) }
+          delete_if { |e| attributes["_id"] && (e["_id"] == attributes["_id"]) }
           self.<< attributes
         end
+
+        alias :merge! :update
       end
     end
   end

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

@@ -4,7 +4,7 @@ module Mongoid #:nodoc:
     module Float #:nodoc:
       module Conversions #:nodoc:
         def set(value)
-          return 0.0 if value.blank?
+          return nil if value.blank?
           value =~ /\d/ ? value.to_f : value
         end
         def get(value)

data/lib/mongoid/extensions/hash/accessors.rb

@@ -21,7 +21,7 @@ module Mongoid #:nodoc:
         def insert(key, attrs)
           elements = self[key]
           if elements
-            elements.update(attrs)
+            elements.merge!(attrs)
           else
             self[key] = key.singular? ? attrs : [attrs]
           end

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

@@ -4,6 +4,7 @@ module Mongoid #:nodoc:
     module Integer #:nodoc:
       module Conversions #:nodoc:
         def set(value)
+          return nil if value.blank?
           value =~ /\d/ ? value.to_i : value
         end
         def get(value)

data/lib/mongoid/fields.rb

@@ -8,8 +8,8 @@ module Mongoid #:nodoc
         # These include defaults, fields
         class_inheritable_accessor :defaults, :fields
 
-        self.defaults = {}.with_indifferent_access
-        self.fields = {}.with_indifferent_access
+        self.defaults = {}
+        self.fields = {}
 
         delegate :defaults, :fields, :to => "self.class"
       end
@@ -29,15 +29,16 @@ module Mongoid #:nodoc
       #
       # <tt>field :score, :default => 0</tt>
       def field(name, options = {})
-        set_field(name, options)
-        set_default(name, options)
+        access = name.to_s
+        set_field(access, options)
+        set_default(access, options)
       end
 
       protected
       # Define a field attribute for the +Document+.
       def set_field(name, options = {})
         meth = options.delete(:as) || name
-        fields[name] = Field.new(name.to_s, options)
+        fields[name] = Field.new(name, options)
         create_accessors(name, meth, options)
       end
 

data/lib/mongoid/matchers.rb

@@ -0,0 +1,36 @@
+# encoding: utf-8
+require "mongoid/matchers/default"
+require "mongoid/matchers/all"
+require "mongoid/matchers/exists"
+require "mongoid/matchers/gt"
+require "mongoid/matchers/gte"
+require "mongoid/matchers/in"
+require "mongoid/matchers/lt"
+require "mongoid/matchers/lte"
+require "mongoid/matchers/ne"
+require "mongoid/matchers/nin"
+require "mongoid/matchers/size"
+
+module Mongoid #:nodoc:
+  module Matchers
+    # Determines if this document has the attributes to match the supplied
+    # MongoDB selector. Used for matching on embedded associations.
+    def matches?(selector)
+      selector.each_pair do |key, value|
+        return false unless matcher(key, value).matches?(value)
+      end
+      true
+    end
+
+    protected
+    # Get the matcher for the supplied key and value. Will determine the class
+    # name from the key.
+    def matcher(key, value)
+      if value.is_a?(Hash)
+        name = "Mongoid::Matchers::#{value.keys.first.gsub("$", "").camelize}"
+        return name.constantize.new(attributes[key])
+      end
+      Default.new(attributes[key])
+    end
+  end
+end

data/lib/mongoid/matchers/all.rb

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

data/lib/mongoid/matchers/default.rb

@@ -0,0 +1,20 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Matchers #:nodoc:
+    class Default
+      # Creating a new matcher only requires the value.
+      def initialize(attribute)
+        @attribute = attribute
+      end
+      # Return true if the attribute and value are equal.
+      def matches?(value)
+        @attribute == value
+      end
+
+      protected
+      def first(value)
+        value.values.first
+      end
+    end
+  end
+end

data/lib/mongoid/matchers/exists.rb

@@ -0,0 +1,13 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Matchers #:nodoc:
+    class Exists < Default
+      # Return true if the attribute exists and checking for existence or
+      # return true if the attribute does not exist and checking for
+      # non-existence.
+      def matches?(value)
+        @attribute.nil? != value.values.first
+      end
+    end
+  end
+end

data/lib/mongoid/matchers/gt.rb

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

data/lib/mongoid/matchers/gte.rb

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

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)
+        @attribute ? @attribute < first(value) : false
+      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)
+        @attribute ? @attribute <= first(value) : false
+      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/lib/mongoid/scope.rb

@@ -2,7 +2,23 @@
 module Mongoid #:nodoc:
   class Scope #:nodoc:
 
-    delegate :scopes, :to => "@parent"
+    delegate :scopes, :to => :parent
+
+    attr_reader :parent, :conditions
+
+    # If the other is a scope then compare the parent and conditions, otherwise
+    # if its enumerable collect and compare.
+    def ==(other)
+      case other
+      when Scope
+        @parent == other.parent && @conditions == other.conditions
+      when Enumerable
+        @collection ||= entries
+        return (@collection == other)
+      else
+        return false
+      end
+    end
 
     # Create the new +Scope+. If a block is passed in, this Scope will extend
     # the block.

data/mongoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "1.0.6"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
-  s.date = %q{2010-01-14}
+  s.date = %q{2010-01-21}
   s.email = %q{durran@gmail.com}
   s.extra_rdoc_files = [
     "README.rdoc"
@@ -45,6 +45,10 @@ Gem::Specification.new do |s|
      "lib/mongoid/complex_criterion.rb",
      "lib/mongoid/components.rb",
      "lib/mongoid/config.rb",
+     "lib/mongoid/contexts.rb",
+     "lib/mongoid/contexts/enumerable.rb",
+     "lib/mongoid/contexts/mongo.rb",
+     "lib/mongoid/contexts/paging.rb",
      "lib/mongoid/criteria.rb",
      "lib/mongoid/document.rb",
      "lib/mongoid/errors.rb",
@@ -75,6 +79,18 @@ Gem::Specification.new do |s|
      "lib/mongoid/finders.rb",
      "lib/mongoid/identity.rb",
      "lib/mongoid/indexes.rb",
+     "lib/mongoid/matchers.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",
      "lib/mongoid/memoization.rb",
      "lib/mongoid/named_scope.rb",
      "lib/mongoid/scope.rb",
@@ -83,6 +99,7 @@ Gem::Specification.new do |s|
      "mongoid.gemspec",
      "perf/benchmark.rb",
      "spec/integration/mongoid/associations_spec.rb",
+     "spec/integration/mongoid/attributes_spec.rb",
      "spec/integration/mongoid/commands_spec.rb",
      "spec/integration/mongoid/criteria_spec.rb",
      "spec/integration/mongoid/document_spec.rb",
@@ -110,6 +127,8 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/commands/save_spec.rb",
      "spec/unit/mongoid/commands_spec.rb",
      "spec/unit/mongoid/config_spec.rb",
+     "spec/unit/mongoid/contexts/enumerable_spec.rb",
+     "spec/unit/mongoid/contexts/mongo_spec.rb",
      "spec/unit/mongoid/criteria_spec.rb",
      "spec/unit/mongoid/document_spec.rb",
      "spec/unit/mongoid/errors_spec.rb",
@@ -139,6 +158,18 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/finders_spec.rb",
      "spec/unit/mongoid/identity_spec.rb",
      "spec/unit/mongoid/indexes_spec.rb",
+     "spec/unit/mongoid/matchers/all_spec.rb",
+     "spec/unit/mongoid/matchers/default_spec.rb",
+     "spec/unit/mongoid/matchers/exists_spec.rb",
+     "spec/unit/mongoid/matchers/gt_spec.rb",
+     "spec/unit/mongoid/matchers/gte_spec.rb",
+     "spec/unit/mongoid/matchers/in_spec.rb",
+     "spec/unit/mongoid/matchers/lt_spec.rb",
+     "spec/unit/mongoid/matchers/lte_spec.rb",
+     "spec/unit/mongoid/matchers/ne_spec.rb",
+     "spec/unit/mongoid/matchers/nin_spec.rb",
+     "spec/unit/mongoid/matchers/size_spec.rb",
+     "spec/unit/mongoid/matchers_spec.rb",
      "spec/unit/mongoid/memoization_spec.rb",
      "spec/unit/mongoid/named_scope_spec.rb",
      "spec/unit/mongoid/scope_spec.rb",
@@ -153,6 +184,7 @@ Gem::Specification.new do |s|
   s.summary = %q{ODM framework for MongoDB}
   s.test_files = [
     "spec/integration/mongoid/associations_spec.rb",
+     "spec/integration/mongoid/attributes_spec.rb",
      "spec/integration/mongoid/commands_spec.rb",
      "spec/integration/mongoid/criteria_spec.rb",
      "spec/integration/mongoid/document_spec.rb",
@@ -179,6 +211,8 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/commands/save_spec.rb",
      "spec/unit/mongoid/commands_spec.rb",
      "spec/unit/mongoid/config_spec.rb",
+     "spec/unit/mongoid/contexts/enumerable_spec.rb",
+     "spec/unit/mongoid/contexts/mongo_spec.rb",
      "spec/unit/mongoid/criteria_spec.rb",
      "spec/unit/mongoid/document_spec.rb",
      "spec/unit/mongoid/errors_spec.rb",
@@ -208,6 +242,18 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/finders_spec.rb",
      "spec/unit/mongoid/identity_spec.rb",
      "spec/unit/mongoid/indexes_spec.rb",
+     "spec/unit/mongoid/matchers/all_spec.rb",
+     "spec/unit/mongoid/matchers/default_spec.rb",
+     "spec/unit/mongoid/matchers/exists_spec.rb",
+     "spec/unit/mongoid/matchers/gt_spec.rb",
+     "spec/unit/mongoid/matchers/gte_spec.rb",
+     "spec/unit/mongoid/matchers/in_spec.rb",
+     "spec/unit/mongoid/matchers/lt_spec.rb",
+     "spec/unit/mongoid/matchers/lte_spec.rb",
+     "spec/unit/mongoid/matchers/ne_spec.rb",
+     "spec/unit/mongoid/matchers/nin_spec.rb",
+     "spec/unit/mongoid/matchers/size_spec.rb",
+     "spec/unit/mongoid/matchers_spec.rb",
      "spec/unit/mongoid/memoization_spec.rb",
      "spec/unit/mongoid/named_scope_spec.rb",
      "spec/unit/mongoid/scope_spec.rb",
@@ -221,14 +267,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, [">= 2.2.2"])
+      s.add_runtime_dependency(%q<activesupport>, ["<= 2.3.5"])
       s.add_runtime_dependency(%q<mongo>, [">= 0.18.2"])
       s.add_runtime_dependency(%q<durran-validatable>, [">= 2.0.1"])
       s.add_runtime_dependency(%q<leshill-will_paginate>, [">= 2.3.11"])
       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.2.2"])
+      s.add_dependency(%q<activesupport>, ["<= 2.3.5"])
       s.add_dependency(%q<mongo>, [">= 0.18.2"])
       s.add_dependency(%q<durran-validatable>, [">= 2.0.1"])
       s.add_dependency(%q<leshill-will_paginate>, [">= 2.3.11"])
@@ -236,7 +282,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<mocha>, [">= 0.9.8"])
     end
   else
-    s.add_dependency(%q<activesupport>, [">= 2.2.2"])
+    s.add_dependency(%q<activesupport>, ["<= 2.3.5"])
     s.add_dependency(%q<mongo>, [">= 0.18.2"])
     s.add_dependency(%q<durran-validatable>, [">= 2.0.1"])
     s.add_dependency(%q<leshill-will_paginate>, [">= 2.3.11"])