mongodoc 0.2.2 → 0.2.4

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Les Hill
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-16 00:00:00 -05:00
+date: 2010-02-23 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -125,23 +125,22 @@ files:
 - features/finders.feature
 - features/mongodb.yml
 - features/mongodoc_base.feature
-- features/named_scopes.feature
 - features/new_record.feature
 - features/partial_updates.feature
 - features/removing_documents.feature
 - features/saving_an_object.feature
+- features/scopes.feature
 - features/step_definitions/collection_steps.rb
-- features/step_definitions/criteria_steps.rb
 - features/step_definitions/document_steps.rb
 - features/step_definitions/documents.rb
 - features/step_definitions/finder_steps.rb
 - features/step_definitions/json_steps.rb
-- features/step_definitions/named_scope_steps.rb
 - features/step_definitions/object_steps.rb
 - features/step_definitions/objects.rb
 - features/step_definitions/partial_update_steps.rb
 - features/step_definitions/query_steps.rb
 - features/step_definitions/removing_documents_steps.rb
+- features/step_definitions/scope_steps.rb
 - features/step_definitions/util_steps.rb
 - features/support/support.rb
 - features/using_criteria.feature
@@ -154,6 +153,9 @@ files:
 - lib/mongodoc/bson.rb
 - lib/mongodoc/collection.rb
 - lib/mongodoc/connection.rb
+- lib/mongodoc/contexts.rb
+- lib/mongodoc/contexts/enumerable.rb
+- lib/mongodoc/contexts/mongo.rb
 - lib/mongodoc/criteria.rb
 - lib/mongodoc/cursor.rb
 - lib/mongodoc/document.rb
@@ -173,10 +175,30 @@ files:
 - lib/mongodoc/ext/symbol.rb
 - lib/mongodoc/ext/time.rb
 - lib/mongodoc/finders.rb
-- lib/mongodoc/named_scope.rb
+- lib/mongodoc/matchers.rb
 - lib/mongodoc/query.rb
+- lib/mongodoc/scope.rb
 - lib/mongodoc/validations/macros.rb
 - lib/mongodoc/validations/validates_embedded.rb
+- lib/mongoid/contexts/paging.rb
+- lib/mongoid/criteria.rb
+- lib/mongoid/criterion/complex.rb
+- lib/mongoid/criterion/exclusion.rb
+- lib/mongoid/criterion/inclusion.rb
+- lib/mongoid/criterion/optional.rb
+- lib/mongoid/extensions/hash/criteria_helpers.rb
+- lib/mongoid/extensions/symbol/inflections.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
 - mongod.example.yml
 - mongodb.example.yml
 - mongodoc.gemspec
@@ -191,6 +213,9 @@ files:
 - spec/bson_spec.rb
 - spec/collection_spec.rb
 - spec/connection_spec.rb
+- spec/contexts/enumerable_spec.rb
+- spec/contexts/mongo_spec.rb
+- spec/contexts_spec.rb
 - spec/criteria_spec.rb
 - spec/cursor_spec.rb
 - spec/document_ext.rb
@@ -198,11 +223,12 @@ files:
 - spec/embedded_save_spec.rb
 - spec/finders_spec.rb
 - spec/hash_matchers.rb
+- spec/matchers_spec.rb
 - spec/mongodb.yml
 - spec/mongodb_pairs.yml
-- spec/named_scope_spec.rb
 - spec/new_record_spec.rb
 - spec/query_spec.rb
+- spec/scope_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
@@ -231,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6.pre.3
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: ODM for MongoDB
@@ -244,6 +270,9 @@ test_files:
 - spec/bson_spec.rb
 - spec/collection_spec.rb
 - spec/connection_spec.rb
+- spec/contexts/enumerable_spec.rb
+- spec/contexts/mongo_spec.rb
+- spec/contexts_spec.rb
 - spec/criteria_spec.rb
 - spec/cursor_spec.rb
 - spec/document_ext.rb
@@ -251,9 +280,10 @@ test_files:
 - spec/embedded_save_spec.rb
 - spec/finders_spec.rb
 - spec/hash_matchers.rb
-- spec/named_scope_spec.rb
+- spec/matchers_spec.rb
 - spec/new_record_spec.rb
 - spec/query_spec.rb
+- spec/scope_spec.rb
 - spec/spec_helper.rb
 - examples/simple_document.rb
 - examples/simple_object.rb

data/features/step_definitions/criteria_steps.rb

@@ -1,42 +0,0 @@
-When /^I query (.*) with 'all'$/ do |doc|
-  query(doc).all
-end
-
-When /^I query (.*) to select fields? "([^\"]*)"$/ do |doc, fields|
-  fields = fields.split
-  query(doc).only(*fields)
-end
-
-When /^I query (.*) where "([^\"]*)"$/ do |doc, where_text|
-  where = eval(where_text)
-  query(doc).where(where)
-end
-
-When /^I query (.*) that excludes "([^\"]*)"$/ do |doc, exclude_text|
-  exclude = eval(exclude_text)
-  query(doc).excludes(exclude)
-end
-
-When /^I set the query on (.*) to (limit|skip) (.*)$/ do |doc, op, count|
-  query(doc).send(op, count.to_i)
-end
-
-
-When /^I query (.*) with (every|not in|in) "([^\"]*)"$/ do |doc, op, hash_text|
-  hash = eval(hash_text)
-  query(doc).send(op.gsub(' ', '_'), hash)
-end
-
-When /^I query (.*) with the '(.*)' id$/ do |doc, name|
-  object = instance_variable_get("@#{name}")
-  query(doc).id(object.id)
-end
-
-When /^I set the query extras limit on (.*) to (.*)$/ do |doc, count|
-  query(doc).limit(count.to_i)
-end
-
-When /^I order the (.*) query by "([^\"]*)"$/ do |doc, order_text|
-  order = eval(order_text)
-  query(doc).order_by(order)
-end

data/lib/mongodoc/named_scope.rb

@@ -1,68 +0,0 @@
-# Based on ActiveRecord::NamedScope
-module MongoDoc
-  module NamedScope
-    def scopes
-      read_inheritable_attribute(:scopes) || write_inheritable_attribute(:scopes, {})
-    end
-
-    def named_scope(name, options = {}, &block)
-      name = name.to_sym
-      scopes[name] = lambda do |parent_scope, *args|
-        CriteriaProxy.new(parent_scope, Hash === options ? options : options.call(*args), &block)
-      end
-      (class << self; self; end).class_eval <<-EOT
-        def #{name}(*args)
-          scopes[:#{name}].call(self, *args)
-        end
-      EOT
-    end
-
-    class CriteriaProxy
-      attr_accessor :conditions, :klass, :parent_scope
-
-      delegate :scopes, :to => :parent_scope
-
-      def initialize(parent_scope, conditions, &block)
-        conditions ||= {}
-        [conditions.delete(:extend)].flatten.each { |extension| extend extension } if conditions.include?(:extend)
-        extend Module.new(&block) if block_given?
-        self.klass = parent_scope unless CriteriaProxy === parent_scope
-        self.parent_scope, self.conditions = parent_scope, conditions
-      end
-
-      def respond_to?(method, include_private = false)
-        super || if klass
-          proxy_found.respond_to?(method, include_private)
-        else
-          parent_scope.respond_to?(method, include_private)
-        end
-      end
-
-      protected
-
-      def proxy_found
-        @found || load_found
-      end
-
-      private
-
-      def method_missing(method, *args, &block)
-        if scopes.include?(method)
-          scopes[method].call(self, *args)
-        elsif klass
-          proxy_found.send(method, *args, &block)
-        else
-          parent_scope.criteria(conditions)
-          parent_scope.send(method, *args, &block)
-        end
-      end
-
-      def load_found
-        @found = Criteria.new(klass)
-        @found.criteria(conditions)
-        @found
-      end
-    end
-  end
-end
-

data/spec/named_scope_spec.rb

@@ -1,82 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper.rb"))
-
-describe MongoDoc::NamedScope do
-
-  module Extension
-    def extension_module_method
-      "extension module method"
-    end
-  end
-
-  class NamedScopeTest
-    include MongoDoc::Document
-
-    key :active
-    key :count
-
-    named_scope :active, :where => {:active => true} do
-      def extension_method
-        "extension method"
-      end
-    end
-    named_scope :count_gt_one, :where => {:count => {'$gt' => 1}}, :extend => Extension
-    named_scope :at_least_count, lambda {|count| {:where => {:count => {'$gt' => count}}}}
-  end
-
-  context ".named_scope" do
-    it "adds the named scope to the hash of scopes" do
-      NamedScopeTest.scopes.should have_key(:active)
-    end
-
-    it "creates a class method for the named scope" do
-      NamedScopeTest.should respond_to(:active)
-    end
-  end
-
-  context "accessing a named scope" do
-    it "is a criteria proxy" do
-      MongoDoc::NamedScope::CriteriaProxy.should === NamedScopeTest.active
-    end
-
-    it "responds like a criteria" do
-      NamedScopeTest.active.should respond_to(:selector)
-    end
-
-    it "instantiates the criteria" do
-      criteria = MongoDoc::Criteria.new(NamedScopeTest)
-      MongoDoc::Criteria.should_receive(:new).and_return(criteria)
-      NamedScopeTest.active.selector
-    end
-
-    it "has set the conditions on the criteria" do
-      NamedScopeTest.active.selector.should has_entry(:active => true)
-    end
-
-    it "sets the association extension by block" do
-      NamedScopeTest.active.extension_method.should == "extension method"
-    end
-
-    it "sets the association extension by :extend" do
-      NamedScopeTest.count_gt_one.extension_module_method.should == "extension module method"
-    end
-
-    context "when using a lambda" do
-      it "accepts parameters to the criteria" do
-        NamedScopeTest.at_least_count(3).selector.should has_entry(:count => {'$gt' => 3})
-      end
-    end
-  end
-
-  context "chained scopes" do
-    it "instantiates the criteria" do
-      criteria = MongoDoc::Criteria.new(NamedScopeTest)
-      MongoDoc::Criteria.should_receive(:new).and_return(criteria)
-      NamedScopeTest.active.count_gt_one.selector
-    end
-
-    it "merges the criteria" do
-      NamedScopeTest.active.count_gt_one.selector.should has_entry(:count => {'$gt' => 1}, :active => true)
-    end
-  end
-end
-