mongo_doc 0.6.6 → 0.6.7

data/README.textile

@@ -1,6 +1,6 @@
 h1. MongoDoc
 
-Version: Hurricane (0.6.6) 2010/07/09
+Version: Hurricane (0.6.7) 2010/07/10
 
 h2. Notes
 

data/VERSION

@@ -1 +1 @@
-0.6.6
+0.6.7

data/features/step_definitions/query_steps.rb

@@ -10,6 +10,10 @@ When "I also want a $number query with criteria $criteria" do |number, criteria|
   instance_variable_set("@#{number}", eval("query.#{criteria}"))
 end
 
+When /^I requery$/ do
+  # do nothing
+end
+
 Then /^the query result is equal to the document '(.*)'$/ do |name|
   doc = instance_variable_get("@#{name}")
   query.should == doc
@@ -63,4 +67,3 @@ end
 Then /^the (.+) query (is|is not) (empty|blank)$/ do |number, is, empty|
   instance_variable_get("@#{number}").send("#{empty}?").should == (is == 'is')
 end
-

data/features/using_criteria.feature

@@ -123,6 +123,12 @@ Feature: MongoDoc::Base
     Then the first query result is the document 'contractor'
     And the last query result is the document 'rocketeer'
 
+  Scenario: Criteria can be reused
+    Given I query contacts with criteria in('interests' => ['ruby', 'rails']).order_by([[:name, :desc]])
+    And the first query result is the document 'rocketeer'
+    When I requery
+    Then the first query result is the document 'rocketeer'
+
   Scenario: Using skip on results
     When I query contacts with criteria all('interests' => ['ruby', 'rails']).skip(1)
     Then the size of the query result is 2

data/lib/mongo_doc/contexts/mongo.rb

@@ -55,7 +55,7 @@ module MongoDoc
       #
       # An +Integer+ count of documents.
       def count
-        @count ||= collection.find(selector, options).count
+        @count ||= collection.find(selector, find_options).count
       end
 
       # Gets an array of distinct values for the supplied field across the
@@ -75,7 +75,7 @@ module MongoDoc
       #
       # <tt>context.blank?</tt>
       def empty?
-        collection.find_one(selector, options).nil?
+        collection.find_one(selector, find_options).nil?
       end
       alias blank? empty?
 
@@ -92,7 +92,7 @@ module MongoDoc
       #
       # An enumerable +Cursor+.
       def execute(paginating = false)
-        cursor = collection.find(selector, options)
+        cursor = collection.find(selector, find_options)
         if cursor
           @count = cursor.count if paginating
           cursor
@@ -163,7 +163,7 @@ module MongoDoc
       def last
         sorting = options[:sort] || [[:_id, :asc]]
         options[:sort] = sorting.collect { |option| [ option[0], option[1].invert ] }
-        collection.find_one(selector, options)
+        collection.find_one(selector, find_options)
       end
 
       MAX_REDUCE = "function(obj, prev) { if (prev.max == 'start') { prev.max = obj.[field]; } " +
@@ -216,7 +216,7 @@ module MongoDoc
       #
       # The first document in the collection.
       def one
-        collection.find_one(selector, options)
+        collection.find_one(selector, find_options)
       end
 
       alias first one
@@ -267,6 +267,10 @@ module MongoDoc
           end
         end
       end
+
+      def find_options
+        options.except(:cache, :enslave)
+      end
     end
   end
 end

data/lib/mongo_doc.rb

@@ -3,7 +3,7 @@ require 'active_support'
 require 'active_support/core_ext'
 
 module MongoDoc
-  VERSION = '0.6.6'
+  VERSION = '0.6.7'
 end
 
 require 'mongo_doc/connection'

data/mongo_doc.gemspec

@@ -5,17 +5,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongo_doc}
-  s.version = "0.6.6"
+  s.version = "0.6.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Les Hill"]
-  s.date = %q{2010-07-09}
+  s.date = %q{2010-07-10}
   s.description = %q{ODM for MongoDB}
   s.email = %q{leshill@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.textile",
-     "TODO"
+     "README.textile"
   ]
   s.files = [
     ".document",
@@ -28,7 +27,6 @@ Gem::Specification.new do |s|
      "LICENSE",
      "README.textile",
      "Rakefile",
-     "TODO",
      "VERSION",
      "examples/simple_document.rb",
      "examples/simple_object.rb",

data/spec/contexts/mongo_spec.rb

@@ -69,6 +69,12 @@ describe "MongoDoc::Contexts::Mongo" do
     end
 
     context "#execute" do
+      it "uses filtered options" do
+        collection.should_receive(:find).with({},{})
+        criteria.cache
+        context.execute
+      end
+
       it "uses find" do
         collection.should_receive(:find)
         context.execute

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_doc
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 6
-  - 6
-  version: 0.6.6
+  - 7
+  version: 0.6.7
 platform: ruby
 authors: 
 - Les Hill
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-09 00:00:00 -04:00
+date: 2010-07-10 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -145,7 +145,6 @@ extensions: []
 extra_rdoc_files: 
 - LICENSE
 - README.textile
-- TODO
 files: 
 - .document
 - .gitignore
@@ -157,7 +156,6 @@ files:
 - LICENSE
 - README.textile
 - Rakefile
-- TODO
 - VERSION
 - examples/simple_document.rb
 - examples/simple_object.rb

data/TODO

@@ -1,40 +0,0 @@
-As of 2010-03-06
-
-Associations
-------------
-
-Pull associations out of attributes and refactor
-
-Criteria
---------
-
-Make critieria module; include into CriteriaProxy, Association?
-page, per_page, paginate shuould be wrapped or not?
-
-Contexts
---------
-
-Extract Mongo context as module, Document#collection => klass.collection Collection#collection => klass
-
-Documentation
--------------
-
-How to get started with Rails
-
-Dynamic Attributes
-------------------
-
-Document#[] => reads attribute
-Document#[]= => writes attribute
-Document#dynamic_attributes => key, value for each dynamic attribute
-Document#dynamic_attribute_names => list of dynamic attribute names
-
-Validations
------------
-
-validates_hash_keys :has_hash_name, :in => [array of names]
-
-
-Q
--
-What is Criteria#ids