mongomodel 0.1.6 → 0.2.0

data/spec/support/helpers/document_finder_stubs.rb

@@ -0,0 +1,40 @@
+require 'spec/mocks'
+
+module DocumentFinderStubs
+  include Spec::Mocks::ExampleMethods
+  
+  def stub_find(result)
+    find_result = mock('find result', :to_a => result.map { |doc| doc.to_mongo }, :count => result.size)
+    collection.stub!(:find).and_return(find_result)
+  end
+  
+  def should_find(expected={}, result=[])
+    selector, options = MongoModel::MongoOptions.new(self, expected).to_a
+    find_result = mock('find result', :to_a => result.map { |doc| doc.to_mongo })
+    collection.should_receive(:find).once.with(selector, options).and_return(find_result)
+    yield if block_given?
+  end
+
+  def should_not_find
+    collection.should_not_receive(:find)
+    yield if block_given?
+  end
+
+  def should_count(expected={}, result=[])
+    selector, options = MongoModel::MongoOptions.new(self, expected).to_a
+    find_result = mock('find result', :count => result)
+    collection.should_receive(:find).once.with(selector, options).and_return(find_result)
+    yield if block_given?
+  end
+  
+  def should_not_count
+    collection.should_not_receive(:find)
+    yield if block_given?
+  end
+  
+  def should_delete(conditions={})
+    selector, options = MongoModel::MongoOptions.new(self, :conditions => conditions).to_a
+    collection.should_receive(:remove).once.with(selector)
+    yield if block_given?
+  end
+end

data/spec/support/matchers/find_with.rb

@@ -0,0 +1,36 @@
+Spec::Matchers.define(:find_with) do |find_options|
+  extend Spec::Mocks::ExampleMethods
+  
+  match do |klass|
+    selector, options = MongoModel::MongoOptions.new(klass, find_options).to_a
+    
+    result = mock('find result', :to_a => (@result || []).map { |d| d.to_mongo })
+    klass.collection.should_receive(:find).once.with(selector, options).and_return(result)
+    
+    true
+  end
+  
+  def and_return(result)
+    @result = result
+    self
+  end
+end
+
+Spec::Matchers.define(:count_with) do |find_options|
+  extend Spec::Mocks::ExampleMethods
+  
+  match do |klass|
+    selector, options = MongoModel::MongoOptions.new(klass, find_options).to_a
+    result = mock('find result')
+    
+    klass.collection.should_receive(:find).once.with(selector, options).and_return(result)
+    result.should_receive(:count).once.and_return(@count || 5)
+    
+    true
+  end
+  
+  def and_return(count)
+    @count = count
+    self
+  end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 6
-  version: 0.1.6
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Sam Pohlenz
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-16 00:00:00 +09:30
+date: 2010-04-21 00:00:00 +09:30
 default_executable: console
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -125,7 +125,6 @@ files:
 - 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
@@ -137,8 +136,16 @@ files:
 - 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
@@ -186,16 +193,21 @@ files:
 - 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
@@ -264,14 +276,19 @@ test_files:
 - 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/lib/mongomodel/document/finders.rb

@@ -1,82 +0,0 @@
-require 'active_support/core_ext/hash/keys'
-
-module MongoModel
-  module DocumentExtensions
-    module Finders
-      def find(*args)
-        options = args.extract_options!
-      
-        case args.first
-        when :first then find_first(options)
-        when :last then  find_last(options)
-        when :all then   find_all(options)
-        else             find_by_ids(args, options)
-        end
-      end
-    
-      def first(options={})
-        find(:first, options)
-      end
-    
-      def last(options={})
-        find(:last, options)
-      end
-    
-      def all(options={})
-        find(:all, options)
-      end
-    
-      def count(conditions={})
-        _find(:conditions => conditions).count
-      end
-    
-      def exists?(id_or_conditions)
-        case id_or_conditions
-        when String
-          exists?(:id => id_or_conditions)
-        else
-          count(id_or_conditions) > 0
-        end
-      end
-  
-    private
-      def find_first(options={})
-        _find_and_instantiate(options.merge(:limit => 1)).first
-      end
-    
-      def find_last(options={})
-        order = MongoOrder.parse(options[:order]) || :id.asc
-        _find_and_instantiate(options.merge(:order => order.reverse, :limit => 1)).first
-      end
-    
-      def find_all(options={})
-        _find_and_instantiate(options)
-      end
-    
-      def find_by_ids(ids, options={})
-        ids.flatten!
-      
-        case ids.size
-        when 0
-          raise ArgumentError, "At least one id must be specified"
-        when 1
-          id = ids.first.to_s
-          _find_and_instantiate(options.deep_merge(:conditions => { :id => id })).first || raise(DocumentNotFound, "Couldn't find document with id: #{id}")
-        else
-          docs = _find_and_instantiate(options.deep_merge(:conditions => { :id.in => ids.map { |id| id.to_s } }))
-          raise DocumentNotFound if docs.size != ids.size
-          docs.sort_by { |doc| ids.index(doc.id) }
-        end
-      end
-    
-      def _find(options={})
-        selector, options = MongoOptions.new(self, options).to_a
-        collection.find(selector, options)
-      end
-    
-      def _find_and_instantiate(options={})
-        _find(options).to_a.map { |doc| from_mongo(doc) }
-      end
-    end
-  end
-end