peace_love 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/examples/eg.helper.rb

@@ -18,4 +18,13 @@ class Object
 end
 
 require 'mongo'
+
+class BSON::ObjectID
+  def to_yaml(opts = {})
+    YAML.quick_emit(nil, opts) do |out|
+      out.scalar(nil, "oid(#{to_s})", :plain)
+    end
+  end
+end
+
 $db = Mongo::Connection.new.db('sample-db')

data/examples/loading.eg.rb

@@ -2,9 +2,6 @@ require 'eg.helper'
 require 'angry_hash'
 require 'peace_love'
 
-eg.setup do
-  PeaceLove.db = $db
-end
 
 module Kind
   def claws; "dainty" end
@@ -25,6 +22,12 @@ module Bear
   end
 end
 
+eg.setup do
+  PeaceLove.db = $db
+  PeaceLove['bears'].mixin = nil
+end
+
+
 eg 'loading doc' do
   $db['bears'].remove()
   $db['bears'].insert(:name => 'yogi', :liver => 'pure', :kind => {:fictional => true, :cartoon => true})
@@ -49,6 +52,8 @@ eg 'wrapping the cursor' do
   $db['bears'].remove()
   $db['bears'].insert(:name => 'yogi'    , :liver => 'pure', :kind => {:fictional => true, :cartoon => true})
   $db['bears'].insert(:name => 'humphrey', :liver => 'cihrrotic', :kind => {:fictional => true, :cartoon => false})
+
+  PeaceLove['bears'].mixin = Bear
   
   i = 0
   PeaceLove['bears'].find.each {|b|
@@ -69,9 +74,9 @@ eg 'sub collection' do
                         {:name => 'mrs. yogi', :liver => 'donated'}, {:name => 'yogi paw', :liver => 'jaundiced'}
                       ])
 
+  PeaceLove['bears'].mixin = Bear
   yogi = PeaceLove['bears'].find_one(:name => 'yogi')
 
-  Show(yogi.lovers)
   Assert(yogi.lovers[0].liver == 'DONATED')
   Assert(yogi.lovers[1].liver == 'JAUNDICED')
 end
@@ -87,3 +92,7 @@ eg 'saving object' do
   id = PeaceLove['bears'].insert( h )
   PeaceLove['bears'].find_one(id)
 end
+
+eg 'id accessor' do
+  Assert(Bear.build(:id => 'abc').id == 'abc')
+end

data/lib/peace_love/collection.rb

@@ -23,6 +23,8 @@ module PeaceLove
       end
     end
 
+    # TODO find_and_modify
+
     def __wrap_cursor(cursor)
       PeaceLove::Cursor.new(cursor,self)
     end
@@ -31,12 +33,14 @@ module PeaceLove
       return nil unless hash.respond_to?(:to_hash)
 
       hash = __extend( AngryHash[ hash ] )
-      hash.extend mixin if mixin
       hash
     end
 
     def __extend(hash)
-      hash.extend mixin if mixin
+      if mixin
+        hash.extend mixin 
+        hash.__source_collection = self if hash.respond_to?(:__source_collection=)
+      end
       hash
     end
 

data/lib/peace_love/cursor.rb

@@ -23,7 +23,7 @@ module PeaceLove
 
     (Mongo::Cursor.instance_methods - self.instance_methods).each do |name|
       next if name[-1] == ?=
-      class_eval "def #{name}(*args,&block); @collection.#{name}(*args,&block) end" unless method_defined?(name)
+      class_eval "def #{name}(*args,&block); @cursor.#{name}(*args,&block) end" unless method_defined?(name)
     end
   end
 end

data/lib/peace_love/document.rb

@@ -31,13 +31,18 @@ module PeaceLove
         mixin_registry[target_class][field.to_s] = [:array, mod, options]
       end
 
+      def extend_doc(doc,mod,parent_obj)
+        doc.extend mod
+        doc.__parent_doc = parent_obj if doc.respond_to?(:__parent_doc=)
+        doc
+      end
+
       def mixin_to(parent_obj,field,obj)
         # XXX - what does having multiple extensions really mean here?
         extensions = object_extensions[parent_obj.__id__]
 
         mixins = mixin_registry.values_at(*extensions).map {|m| m[field.to_s]}.compact
 
-        
         mixins.each {|(kind,mod,options)|
           if options.key?(:default) && obj.nil?
             obj = options[:default]
@@ -47,10 +52,12 @@ module PeaceLove
 
           case kind
             when :single
-              obj.extend mod
+              extend_doc(obj,mod,parent_obj)
             when :array
               # XXX - this is ok for now... we really need to typecheck, perhaps wrap in a smart-array
-              obj.map! {|elt| elt.extend mod}
+
+
+              obj.map! {|elt| extend_doc elt, mod, parent_obj}
             end
         }
 
@@ -62,6 +69,26 @@ module PeaceLove
       Doc.mixin_to(self,key,super)
     end
 
+    def id
+      self['id']
+    end
+
+    def __source_collection=(col)
+      @source_collection = col
+    end
+    def __parent_doc(doc)
+      self.__source_collection = doc.__source_collection if doc.respond_to?(:__source_collection)
+      @parent_doc = doc
+    end
+
+    def __parent_doc
+      @parent_doc
+    end
+
+    def __source_collection
+      @source_collection
+    end
+
     module ClassMethods
       def sub_document(field,mod,options={})
         Doc.register_mixin(self,field,mod,options)

data/peace_love.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{peace_love}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lachie Cox"]
-  s.date = %q{2010-06-28}
+  s.date = %q{2010-07-14}
   s.description = %q{A simple mixin layer for enhancing hashes retrieved from MongoDB. It eschews the normal 'mapping' compulsion of mongo libraries.}
   s.email = %q{lachie@smartbomb.com.au}
   s.files = [

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Lachie Cox
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-28 00:00:00 +10:00
+date: 2010-07-14 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency