mongo_scope 0.0.3 → 0.0.4

data/Rakefile

@@ -9,6 +9,7 @@ begin
     gem.email = "mharris717@gmail.com"
     gem.homepage = "http://github.com/mharris717/mongo_scope"
     gem.authors = ["Mike Harris"]
+    gem.add_dependency 'mongo'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/mongo_scope.rb

@@ -1,6 +1,21 @@
 require 'rubygems'
 require File.join(File.dirname(__FILE__),'mongo_scope','util')
 
+class SumBdy
+  def sum_by_raw(ops)
+    reduce_function = "function (obj, prev) { prev.count += (obj.#{ops[:sum_field]} ? obj.#{ops[:sum_field]} : 0); }"
+    code = Mongo::Code.new(reduce_function)
+    group([ops[:key]].flatten, ops[:filter]||{}, {"count" => 0},code)
+  end
+  def sum_by(ops)
+    sum_by_raw(ops).inject({}) { |h,a| k = ops[:key]; h.merge(a[k] => a['count'])}
+  end
+end
+
+class Mongo::Collection
+  #include SumBy
+end
+
 module MongoScope
   module ScopeMethods
     def raw_scope(ops)
@@ -21,29 +36,69 @@ module MongoScope
     def count
       find.count
     end
+    def to_scoped
+      MongoScope::ScopedCollection.new(nil,self)
+    end
+  end
+  
+  class ScopedCursor
+    attr_accessor :cursor
+    include FromHash
+    def each(&b)
+      cursor.each do |x|
+        yield(MongoRow.new(x))
+      end
+    end
+    def method_missing(sym,*args,&b)
+      cursor.send(sym,*args,&b)
+    end
+  end
+  
+  class MongoRow
+    attr_accessor :h
+    def initialize(h)
+      @h = h
+    end
+    def method_missing(sym,*args,&b)
+      h.send(sym,*args,&b)
+    end
   end
 
   class ScopedCollection
     include ScopeMethods
     include CollMethods
+    #include SumBy
     attr_accessor :scope_obj, :coll
+    include Enumerable
     def initialize(scope_ops,coll)
-      self.scope_obj = Scope.new(scope_ops)
+      self.scope_obj = (scope_ops ? Scope.new(scope_ops) : nil)
       self.coll = coll
     end
     def scoped_ops(ops)
+      return ops unless scope_obj
       ops = {'_id' => ops} unless ops.kind_of?(Hash)
       ops.merge(scope_obj.find_ops)
     end
     def find(selector={},options={})
-      coll.find(scoped_ops(selector),options)
+      ScopedCursor.new(:cursor => coll.find(scoped_ops(selector),options))
     end
     def find_one(selector={},options={})
-      coll.find_one(scoped_ops(selector),options)
+      res = coll.find_one(scoped_ops(selector),options)
+      res ? MongoRow.new(res) : res
+    end
+    def remove(ops={})
+      coll.remove(scoped_ops(ops))
     end
     def method_missing(sym,*args,&b)
       coll.send(sym,*args,&b)
     end
+    def each(&b)
+      coll.each(&b) #should this be scoped?
+    end
+    def group(k,filter,*args)
+      filter = scoped_ops(filter || {})
+      coll.group(k,filter,*args)
+    end
   end
 
   class Scope

data/spec/mongo_scope_spec.rb

@@ -17,7 +17,7 @@ describe "MongoScope" do
   before(:all) do
     @connection = Mongo::Connection.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost', ENV['MONGO_RUBY_DRIVER_PORT'] || Mongo::Connection::DEFAULT_PORT)
     @db   = @connection.db('ruby-mongo-test')
-    @coll = @db.collection("test")
+    @coll = @db.collection("test").to_scoped
   end
   before(:each) do
     @coll.remove
@@ -64,5 +64,19 @@ describe "MongoScope" do
   it 'should save' do
     @coll.scope_eq(:first_name => 'Mike').save(:abc => 42)
   end
+  it 'scoped remove' do
+    @coll.scope_eq(:first_name => 'Mike').remove
+    @coll.count.should == 2
+  end
+  it 'scoped group' do
+    @coll.remove
+    # @coll.save('a' => 'a', 'b' => 1)
+    # @coll.save("a" => 'a', 'b' => 3)
+    # @coll.save('a' => 'b', 'b' => 2)
+    # 
+    # @coll.sum_by(:key => 'a', :sum_field => 'b').should == {'a' => 4, 'b' => 2}
+  end
   
 end
+
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_scope
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Mike Harris
@@ -9,10 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-11 00:00:00 -05:00
+date: 2010-04-15 00:00:00 -04:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: mongo
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: 
 email: mharris717@gmail.com
 executables: []