mongoid 0.9.12 → 0.10.0

data/VERSION

@@ -1 +1 @@
-0.9.12
+0.10.0

data/lib/mongoid.rb

@@ -40,6 +40,7 @@ require "mongoid/associations"
 require "mongoid/associations/options"
 require "mongoid/attributes"
 require "mongoid/commands"
+require "mongoid/complex_criterion"
 require "mongoid/criteria"
 require "mongoid/dynamic_finder"
 require "mongoid/extensions"

data/lib/mongoid/complex_criterion.rb

@@ -0,0 +1,9 @@
+module Mongoid #:nodoc:
+  class ComplexCriterion
+    attr_accessor :key, :operator
+
+    def initialize opts = {}
+      @key, @operator = opts[:key], opts[:operator]
+    end
+  end
+end

data/lib/mongoid/criteria.rb

@@ -465,7 +465,7 @@ module Mongoid #:nodoc:
       when String
         @selector.update("$where" => selector)
       else
-        @selector.update(selector || {})
+        @selector.update(selector ? selector.expand_complex_criteria : {})
       end
       self
     end

data/lib/mongoid/extensions.rb

@@ -10,6 +10,7 @@ require "mongoid/extensions/float/conversions"
 require "mongoid/extensions/hash/accessors"
 require "mongoid/extensions/hash/assimilation"
 require "mongoid/extensions/hash/conversions"
+require "mongoid/extensions/hash/criteria_helpers"
 require "mongoid/extensions/integer/conversions"
 require "mongoid/extensions/object/conversions"
 require "mongoid/extensions/string/conversions"
@@ -44,6 +45,7 @@ class Hash #:nodoc
   include Mongoid::Extensions::Hash::Accessors
   include Mongoid::Extensions::Hash::Assimilation
   extend Mongoid::Extensions::Hash::Conversions
+  include Mongoid::Extensions::Hash::CriteriaHelpers
 end
 
 class Integer #:nodoc

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

@@ -0,0 +1,19 @@
+module Mongoid #:nodoc:
+  module Extensions #:nodoc:
+    module Hash #:nodoc:
+      module CriteriaHelpers #:nodoc:
+        def expand_complex_criteria
+          hsh = {}
+          self.each_pair do |k,v|
+            if k.class == Mongoid::ComplexCriterion
+              hsh[k.key] = {"$#{k.operator}" => v}
+            else
+              hsh[k] = v
+            end
+          end
+          hsh
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/extensions/symbol/inflections.rb

@@ -23,6 +23,13 @@ module Mongoid #:nodoc:
           to_s.plural?
         end
 
+        ["gt", "lt", "gte", "lte", "ne", "in", "nin", "mod", "all", "size", "exists"].each do |oper|
+          class_eval <<-OPERATORS
+            def #{oper}
+              ComplexCriterion.new(:key => self, :operator => "#{oper}")
+            end
+          OPERATORS
+        end
       end
     end
   end

data/mongoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "0.9.12"
+  s.version = "0.10.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
-  s.date = %q{2009-12-21}
+  s.date = %q{2009-12-24}
   s.email = %q{durran@gmail.com}
   s.extra_rdoc_files = [
     "README.textile"
@@ -39,6 +39,7 @@ Gem::Specification.new do |s|
      "lib/mongoid/commands/destroy.rb",
      "lib/mongoid/commands/destroy_all.rb",
      "lib/mongoid/commands/save.rb",
+     "lib/mongoid/complex_criterion.rb",
      "lib/mongoid/criteria.rb",
      "lib/mongoid/document.rb",
      "lib/mongoid/dynamic_finder.rb",
@@ -55,6 +56,7 @@ Gem::Specification.new do |s|
      "lib/mongoid/extensions/hash/accessors.rb",
      "lib/mongoid/extensions/hash/assimilation.rb",
      "lib/mongoid/extensions/hash/conversions.rb",
+     "lib/mongoid/extensions/hash/criteria_helpers.rb",
      "lib/mongoid/extensions/integer/conversions.rb",
      "lib/mongoid/extensions/object/casting.rb",
      "lib/mongoid/extensions/object/conversions.rb",
@@ -69,6 +71,7 @@ Gem::Specification.new do |s|
      "mongoid.gemspec",
      "perf/benchmark.rb",
      "spec/integration/mongoid/associations_spec.rb",
+     "spec/integration/mongoid/criteria_spec.rb",
      "spec/integration/mongoid/document_spec.rb",
      "spec/integration/mongoid/finders_spec.rb",
      "spec/spec.opts",
@@ -104,6 +107,7 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/extensions/hash/accessors_spec.rb",
      "spec/unit/mongoid/extensions/hash/assimilation_spec.rb",
      "spec/unit/mongoid/extensions/hash/conversions_spec.rb",
+     "spec/unit/mongoid/extensions/hash/criteria_helpers_spec.rb",
      "spec/unit/mongoid/extensions/integer/conversions_spec.rb",
      "spec/unit/mongoid/extensions/object/conversions_spec.rb",
      "spec/unit/mongoid/extensions/string/conversions_spec.rb",
@@ -123,6 +127,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/criteria_spec.rb",
      "spec/integration/mongoid/document_spec.rb",
      "spec/integration/mongoid/finders_spec.rb",
      "spec/spec_helper.rb",
@@ -157,6 +162,7 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/extensions/hash/accessors_spec.rb",
      "spec/unit/mongoid/extensions/hash/assimilation_spec.rb",
      "spec/unit/mongoid/extensions/hash/conversions_spec.rb",
+     "spec/unit/mongoid/extensions/hash/criteria_helpers_spec.rb",
      "spec/unit/mongoid/extensions/integer/conversions_spec.rb",
      "spec/unit/mongoid/extensions/object/conversions_spec.rb",
      "spec/unit/mongoid/extensions/string/conversions_spec.rb",

data/spec/integration/mongoid/criteria_spec.rb

@@ -0,0 +1,109 @@
+require "spec_helper"
+
+describe Mongoid::Criteria do
+
+  before do
+    @person = Person.create(:title => "Sir", :age => 33, :aliases => ["D", "Durran"])
+  end
+
+  after do
+    Person.delete_all
+  end
+
+  describe "#where" do
+
+    context "with complex criterion" do
+
+      context "#all" do
+
+        it "returns those matching an all clause" do
+          Person.criteria.where(:title.all => ["Sir"]).should == [@person]
+        end
+
+      end
+
+      context "#exists" do
+
+        it "returns those matching an exists clause" do
+          Person.criteria.where(:title.exists => true).should == [@person]
+        end
+
+      end
+
+      context "#gt" do
+
+        it "returns those matching a gt clause" do
+          Person.criteria.where(:age.gt => 30).should == [@person]
+        end
+
+      end
+
+      context "#gte" do
+
+        it "returns those matching a gte clause" do
+          Person.criteria.where(:age.gte => 33).should == [@person]
+        end
+
+      end
+
+      context "#in" do
+
+        it "returns those matching an in clause" do
+          Person.criteria.where(:title.in => ["Sir", "Madam"]).should == [@person]
+        end
+
+      end
+
+      context "#lt" do
+
+        it "returns those matching a lt clause" do
+          Person.criteria.where(:age.lt => 34).should == [@person]
+        end
+
+      end
+
+      context "#lte" do
+
+        it "returns those matching a lte clause" do
+          Person.criteria.where(:age.lte => 33).should == [@person]
+        end
+
+      end
+
+      context "#mod" do
+
+        it "returns those matching a mod clause" do
+          Person.criteria.where(:age.lte => 33).should == [@person]
+        end
+
+      end
+
+      context "#ne" do
+
+        it "returns those matching a ne clause" do
+          Person.criteria.where(:age.ne => 50).should == [@person]
+        end
+
+      end
+
+      context "#nin" do
+
+        it "returns those matching a nin clause" do
+          Person.criteria.where(:title.nin => ["Esquire", "Congressman"]).should == [@person]
+        end
+
+      end
+
+      context "#size" do
+
+        it "returns those matching a size clause" do
+          Person.criteria.where(:aliases.size => 2).should == [@person]
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/spec/spec_helper.rb

@@ -30,6 +30,7 @@ class Person < Mongoid::Document
   field :mixed_drink, :type => MixedDrink
   field :employer_id
   field :lunch_time, :type => Time
+  field :aliases, :type => Array
 
   has_many :addresses
   has_many :phone_numbers, :class_name => "Phone"

data/spec/unit/mongoid/criteria_spec.rb

@@ -885,9 +885,23 @@ describe Mongoid::Criteria do
 
     context "when provided a hash" do
 
-      it "adds the clause to the selector" do
-        @criteria.where(:title => "Title", :text => "Text")
-        @criteria.selector.should == { :title => "Title", :text => "Text" }
+      context "with simple hash keys" do
+
+        it "adds the clause to the selector" do
+          @criteria.where(:title => "Title", :text => "Text")
+          @criteria.selector.should == { :title => "Title", :text => "Text" }
+        end
+
+      end
+
+      context "with complex hash keys" do
+
+        it "adds the correct clause to the selector" do
+          dob = 40.years.ago
+          @criteria.where(:age.gt => 40, :title => "Title", :dob.lt => dob)
+          @criteria.selector.should == {:age => {"$gt" => 40}, :title => "Title", :dob => {"$lt" => dob}}
+        end
+
       end
 
     end

data/spec/unit/mongoid/extensions/hash/criteria_helpers_spec.rb

@@ -0,0 +1,17 @@
+require "spec_helper"
+
+describe Mongoid::Extensions::Hash::CriteriaHelpers do
+
+  describe "#expand_complex_criteria" do
+
+    before do
+      @hash = {:age.gt => 40, :title => "Title"}
+    end
+
+    it "expands complex criteria to form a valid `where` hash" do
+      @hash.expand_complex_criteria.should == {:age => {"$gt" => 40}, :title => "Title"}
+    end
+
+  end
+
+end

data/spec/unit/mongoid/extensions/symbol/inflections_spec.rb

@@ -78,4 +78,14 @@ describe Mongoid::Extensions::Symbol::Inflections do
 
   end
 
+  describe "#gt" do
+
+    it 'returns :"foo $gt"' do
+      ret = :foo.gt
+      ret.key.should == :foo
+      ret.operator.should == "gt"
+    end
+
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 0.9.12
+  version: 0.10.0
 platform: ruby
 authors: 
 - Durran Jordan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-21 00:00:00 +01:00
+date: 2009-12-24 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -115,6 +115,7 @@ files:
 - lib/mongoid/commands/destroy.rb
 - lib/mongoid/commands/destroy_all.rb
 - lib/mongoid/commands/save.rb
+- lib/mongoid/complex_criterion.rb
 - lib/mongoid/criteria.rb
 - lib/mongoid/document.rb
 - lib/mongoid/dynamic_finder.rb
@@ -131,6 +132,7 @@ files:
 - lib/mongoid/extensions/hash/accessors.rb
 - lib/mongoid/extensions/hash/assimilation.rb
 - lib/mongoid/extensions/hash/conversions.rb
+- lib/mongoid/extensions/hash/criteria_helpers.rb
 - lib/mongoid/extensions/integer/conversions.rb
 - lib/mongoid/extensions/object/casting.rb
 - lib/mongoid/extensions/object/conversions.rb
@@ -145,6 +147,7 @@ files:
 - mongoid.gemspec
 - perf/benchmark.rb
 - spec/integration/mongoid/associations_spec.rb
+- spec/integration/mongoid/criteria_spec.rb
 - spec/integration/mongoid/document_spec.rb
 - spec/integration/mongoid/finders_spec.rb
 - spec/spec.opts
@@ -180,6 +183,7 @@ files:
 - spec/unit/mongoid/extensions/hash/accessors_spec.rb
 - spec/unit/mongoid/extensions/hash/assimilation_spec.rb
 - spec/unit/mongoid/extensions/hash/conversions_spec.rb
+- spec/unit/mongoid/extensions/hash/criteria_helpers_spec.rb
 - spec/unit/mongoid/extensions/integer/conversions_spec.rb
 - spec/unit/mongoid/extensions/object/conversions_spec.rb
 - spec/unit/mongoid/extensions/string/conversions_spec.rb
@@ -221,6 +225,7 @@ specification_version: 3
 summary: ODM framework for MongoDB
 test_files: 
 - spec/integration/mongoid/associations_spec.rb
+- spec/integration/mongoid/criteria_spec.rb
 - spec/integration/mongoid/document_spec.rb
 - spec/integration/mongoid/finders_spec.rb
 - spec/spec_helper.rb
@@ -255,6 +260,7 @@ test_files:
 - spec/unit/mongoid/extensions/hash/accessors_spec.rb
 - spec/unit/mongoid/extensions/hash/assimilation_spec.rb
 - spec/unit/mongoid/extensions/hash/conversions_spec.rb
+- spec/unit/mongoid/extensions/hash/criteria_helpers_spec.rb
 - spec/unit/mongoid/extensions/integer/conversions_spec.rb
 - spec/unit/mongoid/extensions/object/conversions_spec.rb
 - spec/unit/mongoid/extensions/string/conversions_spec.rb