mongomodel 0.1.6 → 0.2.0

data/lib/mongomodel/support/scope/dynamic_finders.rb

@@ -0,0 +1,21 @@
+module MongoModel
+  class Scope
+    module DynamicFinders
+      def respond_to?(method_id, include_private = false)
+        if DynamicFinder.match(self, method_id)
+          true
+        else
+          super
+        end
+      end
+      
+      def method_missing(method_id, *args, &block)
+        if finder = DynamicFinder.match(self, method_id)
+          finder.execute(*args)
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/lib/mongomodel/support/scope/finder_methods.rb

@@ -0,0 +1,61 @@
+module MongoModel
+  class Scope
+    module FinderMethods
+      def find(*ids, &block)
+        if block_given?
+          to_a.find(&block)
+        else
+          ids.flatten!
+
+          case ids.size
+          when 0
+            raise ArgumentError, "At least one id must be specified"
+          when 1
+            id = ids.first.to_s
+            where(:id => id).first || raise(DocumentNotFound, "Couldn't find document with id: #{id}")
+          else
+            docs = where(:id.in => ids.map { |id| id.to_s }).to_a
+            raise DocumentNotFound if docs.size != ids.size
+            docs.sort_by { |doc| ids.index(doc.id) }
+          end
+        end
+      end
+      
+      def first
+        if loaded?
+          @documents.first
+        else
+          @first ||= limit(1).to_a[0]
+        end
+      end
+      
+      def last
+        if loaded?
+          @documents.last
+        else
+          @last ||= reverse_order.limit(1).to_a[0]
+        end
+      end
+      
+      def all
+        to_a
+      end
+      
+      def exists?(id)
+        where(:id => id).any?
+      end
+      
+      def apply_finder_options(options={})
+        result = clone
+        
+        result = result.where(options[:conditions]) if options[:conditions]
+        result = result.order(options[:order])      if options[:order]
+        result = result.select(options[:select])    if options[:select]
+        result = result.limit(options[:limit])      if options[:limit]
+        result = result.offset(options[:offset])    if options[:offset]
+        
+        result
+      end
+    end
+  end
+end

data/lib/mongomodel/support/scope/query_methods.rb

@@ -0,0 +1,43 @@
+module MongoModel
+  class Scope
+    module QueryMethods
+      def initialize(*)
+        SINGLE_VALUE_METHODS.each { |m| instance_variable_set("@#{m}_value", nil) }
+        MULTI_VALUE_METHODS.each { |m| instance_variable_set("@#{m}_values", []) }
+      end
+      
+      MULTI_VALUE_METHODS.each do |query_method|
+        attr_accessor :"#{query_method}_values"
+        
+        class_eval <<-CEVAL, __FILE__
+          def #{query_method}(*args, &block)
+            new_scope = clone
+            value = Array.wrap(args.flatten).reject {|x| x.blank? }
+            new_scope.#{query_method}_values += value if value.present?
+            new_scope
+          end
+        CEVAL
+      end
+      
+      SINGLE_VALUE_METHODS.each do |query_method|
+        attr_accessor :"#{query_method}_value"
+
+        class_eval <<-CEVAL, __FILE__
+          def #{query_method}(value, &block)
+            new_scope = clone
+            new_scope.#{query_method}_value = value
+            new_scope
+          end
+        CEVAL
+      end
+      
+      def reverse_order
+        if order_values.empty?
+          order(:id.desc)
+        else
+          except(:order).order(MongoOrder.parse(order_values).reverse.to_a)
+        end
+      end
+    end
+  end
+end

data/lib/mongomodel/support/scope/spawn_methods.rb

@@ -0,0 +1,35 @@
+module MongoModel
+  class Scope
+    module SpawnMethods
+      def merge(scope)
+        result = clone
+        
+        MULTI_VALUE_METHODS.each do |method|
+          values = send(:"#{method}_values") + scope.send(:"#{method}_values")
+          result.send(:"#{method}_values=", values.uniq)
+        end
+        
+        SINGLE_VALUE_METHODS.each do |method|
+          value = scope.send(:"#{method}_value")
+          result.send(:"#{method}_value=", value) if value
+        end
+        
+        result
+      end
+      
+      def except(*exceptions)
+        result = self.class.new(klass)
+        
+        MULTI_VALUE_METHODS.each do |method|
+          result.send(:"#{method}_values=", send(:"#{method}_values")) unless exceptions.include?(method)
+        end
+        
+        SINGLE_VALUE_METHODS.each do |method|
+          result.send(:"#{method}_value=", send(:"#{method}_value")) unless exceptions.include?(method)
+        end
+        
+        result
+      end
+    end
+  end
+end

data/lib/mongomodel/version.rb

@@ -1,3 +1,3 @@
 module MongoModel
-  VERSION = "0.1.6"
+  VERSION = "0.2.0"
 end

data/mongomodel.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongomodel}
-  s.version = "0.1.6"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Pohlenz"]
-  s.date = %q{2010-04-16}
+  s.date = %q{2010-04-21}
   s.default_executable = %q{console}
   s.description = %q{MongoModel is a MongoDB ORM for Ruby/Rails similar to ActiveRecord and DataMapper.}
   s.email = %q{sam@sampohlenz.com}
@@ -59,7 +59,6 @@ Gem::Specification.new do |s|
      "lib/mongomodel/document.rb",
      "lib/mongomodel/document/callbacks.rb",
      "lib/mongomodel/document/dynamic_finders.rb",
-     "lib/mongomodel/document/finders.rb",
      "lib/mongomodel/document/indexes.rb",
      "lib/mongomodel/document/optimistic_locking.rb",
      "lib/mongomodel/document/persistence.rb",
@@ -71,8 +70,16 @@ Gem::Specification.new do |s|
      "lib/mongomodel/support/collection.rb",
      "lib/mongomodel/support/configuration.rb",
      "lib/mongomodel/support/core_extensions.rb",
+     "lib/mongomodel/support/dynamic_finder.rb",
      "lib/mongomodel/support/exceptions.rb",
+     "lib/mongomodel/support/mongo_operator.rb",
      "lib/mongomodel/support/mongo_options.rb",
+     "lib/mongomodel/support/mongo_order.rb",
+     "lib/mongomodel/support/scope.rb",
+     "lib/mongomodel/support/scope/dynamic_finders.rb",
+     "lib/mongomodel/support/scope/finder_methods.rb",
+     "lib/mongomodel/support/scope/query_methods.rb",
+     "lib/mongomodel/support/scope/spawn_methods.rb",
      "lib/mongomodel/support/types.rb",
      "lib/mongomodel/support/types/array.rb",
      "lib/mongomodel/support/types/boolean.rb",
@@ -120,16 +127,21 @@ Gem::Specification.new do |s|
      "spec/mongomodel/embedded_document_spec.rb",
      "spec/mongomodel/mongomodel_spec.rb",
      "spec/mongomodel/support/collection_spec.rb",
+     "spec/mongomodel/support/mongo_operator_spec.rb",
      "spec/mongomodel/support/mongo_options_spec.rb",
+     "spec/mongomodel/support/mongo_order_spec.rb",
      "spec/mongomodel/support/property_spec.rb",
+     "spec/mongomodel/support/scope_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
      "spec/specdoc.opts",
      "spec/support/callbacks.rb",
      "spec/support/helpers/define_class.rb",
+     "spec/support/helpers/document_finder_stubs.rb",
      "spec/support/helpers/specs_for.rb",
      "spec/support/matchers/be_a_subclass_of.rb",
      "spec/support/matchers/be_truthy.rb",
+     "spec/support/matchers/find_with.rb",
      "spec/support/matchers/respond_to_boolean.rb",
      "spec/support/matchers/run_callbacks.rb",
      "spec/support/models.rb",
@@ -174,14 +186,19 @@ Gem::Specification.new do |s|
      "spec/mongomodel/embedded_document_spec.rb",
      "spec/mongomodel/mongomodel_spec.rb",
      "spec/mongomodel/support/collection_spec.rb",
+     "spec/mongomodel/support/mongo_operator_spec.rb",
      "spec/mongomodel/support/mongo_options_spec.rb",
+     "spec/mongomodel/support/mongo_order_spec.rb",
      "spec/mongomodel/support/property_spec.rb",
+     "spec/mongomodel/support/scope_spec.rb",
      "spec/spec_helper.rb",
      "spec/support/callbacks.rb",
      "spec/support/helpers/define_class.rb",
+     "spec/support/helpers/document_finder_stubs.rb",
      "spec/support/helpers/specs_for.rb",
      "spec/support/matchers/be_a_subclass_of.rb",
      "spec/support/matchers/be_truthy.rb",
+     "spec/support/matchers/find_with.rb",
      "spec/support/matchers/respond_to_boolean.rb",
      "spec/support/matchers/run_callbacks.rb",
      "spec/support/models.rb",

data/spec/mongomodel/concerns/associations/has_many_by_foreign_key_spec.rb

@@ -142,7 +142,7 @@ module MongoModel
           Chapter.create!(:id => '999')
           Chapter.create!(:id => '998')
           
-          result = subject.chapters.find(:all, :order => :id.desc)
+          result = subject.chapters.order(:id.desc)
           result.should == [chapter2, chapter1]
         end
         

data/spec/mongomodel/concerns/associations/has_many_by_ids_spec.rb

@@ -141,7 +141,7 @@ module MongoModel
           Chapter.create!(:id => '999')
           Chapter.create!(:id => '998')
           
-          result = subject.chapters.find(:all, :order => :id.desc)
+          result = subject.chapters.order(:id.desc)
           result.should == [chapter2, chapter1]
         end
         

data/spec/mongomodel/document/dynamic_finders_spec.rb

@@ -66,7 +66,6 @@ module MongoModel
         it_should_behave_like "a dynamic finder"
         
         should_find("John") { @john }
-        should_find("John", :conditions => { :age.lt => 20 }) { @young_john }
         should_find("Jane") { nil }
       end
       

data/spec/mongomodel/document/finders_spec.rb

@@ -82,150 +82,6 @@ module MongoModel
           end
         end
       end
-      
-      describe "first" do
-        context "documents exist" do
-          subject { User.find(:first) }
-          
-          it "should return the first document" do
-            subject.id.should == '1'
-            subject.name.should == 'Fred'
-          end
-          
-          it "should be aliased as #first" do
-            User.first.should == subject
-          end
-          
-          context "with order" do
-            it "should find first document by order" do
-              User.find(:first, :order => :name.asc).name.should == 'Alistair'
-            end
-          end
-        end
-        
-        context "no documents" do
-          before(:each) { User.collection.remove }
-          
-          it "should return nil" do
-            User.find(:first).should be_nil
-          end
-        end
-      end
-      
-      describe "last" do
-        context "documents exist" do
-          subject { User.find(:last) }
-          
-          it "should return the last document (by id)" do
-            subject.id.should == '3'
-            subject.name.should == 'Barney'
-          end
-          
-          it "should be aliased as #last" do
-            User.last.should == subject
-          end
-          
-          context "with order" do
-            it "should find last document by order" do
-              User.find(:last, :order => :name.asc).name.should == 'Fred'
-            end
-          end
-        end
-        
-        context "no documents" do
-          before(:each) { User.collection.remove }
-          
-          it "should return nil" do
-            User.find(:last).should be_nil
-          end
-        end
-      end
-      
-      describe "all" do
-        subject { User.find(:all, :order => 'id ASC') }
-        
-        it "should return all documents as User instances" do
-          subject.should have(3).users
-          subject.each { |d| d.should be_a(User) }
-        end
-        
-        it "should load attributes for each document" do
-          subject[0].name.should == 'Fred'
-          subject[1].name.should == 'Alistair'
-          subject[2].name.should == 'Barney'
-        end
-        
-        it "should be aliased as #all" do
-          User.all.should == subject
-        end
-        
-        context "with exact-match conditions" do
-          subject { User.find(:all, :conditions => { :name => 'Alistair' }) }
-          
-          it "should only return documents matching conditions" do
-            subject.should have(1).user
-            subject[0].name.should == 'Alistair'
-          end
-        end
-        
-        context "with inequality conditions" do
-          subject { User.find(:all, :conditions => { :age.lt => 21 }) }
-          
-          it "should only return documents matching conditions" do
-            subject.should have(2).users
-            subject[0].name.should == 'Alistair'
-            subject[1].name.should == 'Barney'
-          end
-        end
-      end
-    end
-    
-    describe "#count" do
-      before(:each) do
-        5.times { User.create(:age => 18) }
-        7.times { User.create(:age => 42) }
-        3.times { NonUser.create }
-      end
-      
-      context "without arguments" do
-        it "should return the count for that particular model" do
-          User.count.should == 12
-          NonUser.count.should == 3
-        end
-      end
-      
-      context "with conditions" do
-        it "should return the count for the model that match the conditions" do
-          User.count(:age => 18).should == 5
-          User.count(:age.gte => 18).should == 12
-        end
-      end
-    end
-    
-    describe "#exists?" do
-      before(:each) do
-        User.create(:id => 'user-1', :name => 'Test', :age => 10)
-      end
-      
-      context "by id" do
-        it "should return true if the document exists" do
-          User.exists?('user-1').should == true
-        end
-        
-        it "should return false if the document does not exist" do
-          User.exists?('user-2').should == false
-        end
-      end
-      
-      context "by conditions" do
-        it "should return true if the document exists" do
-          User.exists?(:name => 'Test').should == true
-        end
-        
-        it "should return false if the document does not exist" do
-          User.exists?(:name => 'Nonexistant').should == false
-        end
-      end
     end
   end
 end

data/spec/mongomodel/document/indexes_spec.rb

@@ -60,13 +60,13 @@ module MongoModel
       describe "#_find" do
         it "should run ensure_indexes!" do
           Article.should_receive(:ensure_indexes!)
-          Article.find(:first)
+          Article.first
         end
       
         it "should rerun ensure_indexes! if indexes are initialized" do
           Article.ensure_indexes!
           Article.should_not_receive(:ensure_indexes!)
-          Article.find(:first)
+          Article.first
         end
       end
     end

data/spec/mongomodel/document/persistence_spec.rb

@@ -183,14 +183,7 @@ module MongoModel
           User.exists?('user-1').should be_false
           User.exists?('user-2').should be_true
         end
-
-        it "should delete by conditions" do
-          User.delete(:age.gt => 15)
-
-          User.exists?('user-2').should be_false
-          User.exists?('user-1').should be_true
-        end
-
+        
         it "should delete by multiple ids in array" do
           User.delete(['user-1', 'user-2'])
 
@@ -270,13 +263,6 @@ module MongoModel
           User.exists?('user-2').should be_true
         end
 
-        it "should destroy by conditions" do
-          User.destroy(:age.gt => 15)
-
-          User.exists?('user-2').should be_false
-          User.exists?('user-1').should be_true
-        end
-
         it "should destroy by multiple ids in array" do
           User.destroy(['user-1', 'user-2'])