zentradi 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/zentradi.rb

@@ -2,7 +2,7 @@ require 'hashie'
 require 'mongo'
 
 module Zdi
-  autoload :Delegate        , 'zentradi/delegate'
+  autoload :DocumentHelpers , 'zentradi/document_helpers'
   autoload :DocumentWrapper , 'zentradi/document_wrapper'
   autoload :Collection      , 'zentradi/collection'
 
@@ -10,9 +10,8 @@ module Zdi
     attr_accessor :default_database
 
     def Collection(collection, database = Zdi.default_database)
-      Class.new(Zdi::Collection) do
-        instance_variable_set("@collection", database[collection])
-      end
+      raise ArgumentError, "please provide a database. The default one is #{database.inspect}" unless database.is_a?(Mongo::DB)
+      Class.new(Zdi::Collection) { instance_variable_set("@collection", database[collection]) }
     end
   end
 end

data/lib/zentradi/collection.rb

@@ -1,9 +1,5 @@
 module Zdi
   class Collection
-    class << self
-      extend Zdi::Delegate
-      delegate *(Mongo::Collection.public_instance_methods - public_instance_methods), :to => :collection
-    end
 
     module ClassMethods
       attr_accessor :collection
@@ -29,9 +25,7 @@ module Zdi
       end
 
       def create(attributes = {})
-        doc = build(attributes)
-        doc.save
-        doc
+        build(attributes).tap { |o| o.save }
       end
 
       def find_or_build(attributes)
@@ -42,15 +36,22 @@ module Zdi
         update(attributes, attributes, :upsert => true)
       end
 
-      def all
-        find
+      def delegate_to_collection(methods)
+        Array(methods).each { |meth| extend(Module.new { module_eval(<<-METHOD, __FILE__, __LINE__ + 1) }) }
+          def #{ meth }(*args, &block)
+            Zdi::DocumentWrapper.mongo_collection_method_wrap(collection, #{ meth.inspect }, self, *args, &block)
+          end
+        METHOD
       end
     end
 
     extend ClassMethods
 
+    delegate_to_collection(Mongo::Collection.public_instance_methods - public_instance_methods)
+
     class << self
       alias_method :first, :find_one
+      alias_method :all, :find
     end
   end
 end

data/lib/zentradi/document_helpers.rb

@@ -0,0 +1,27 @@
+module Zdi
+  module DocumentHelpers
+
+    def id
+      super || _id
+    end
+
+    def new?
+      id.nil? || @collection.find("_id" => id).count == 0
+    end
+
+    def save
+      if id.nil?
+        self.id = @collection.save(self)
+      else
+        @collection.update({"_id" => id}, self)
+      end
+      raise RuntimeError, "document lacks an id after save!" if id.nil?
+      self
+    end
+
+    def destroy
+      @collection.remove("_id" => id)
+    end
+
+  end
+end

data/lib/zentradi/document_wrapper.rb

@@ -1,37 +1,53 @@
 module Zdi
   class DocumentWrapper < Hashie::Mash
 
-    attr_reader :collection
-
-    def initialize(collection, hash = {})
-      super(hash)
-      @collection = collection
-    end
+    module ClassMethods
+      # Sends a method to a mongo collection.
+      # On send, all DocumentWrapper args are converted to hash.
+      # On return, all hashes in the result are converted to DocumentWrappers.
+      def mongo_collection_method_wrap(mongo_collection, method, zdi_collection_class, *args, &block)
+        new_args = Zdi::DocumentWrapper.unwrap(args)
+        result = mongo_collection.send(method, *new_args, &block)
+        Zdi::DocumentWrapper.wrap(zdi_collection_class, result)
+      end
 
-    def id
-      super || _id
-    end
+      # Convert DocumentWrapper instance/s to normal hashes.
+      def unwrap(object)
+        case object
+        when DocumentWrapper then object.to_hash
+        when Array           then object.map { |e| DocumentWrapper.unwrap(e) }
+        else
+          object
+        end
+      end
 
-    def new?
-      id.nil? || @collection.find("_id" => id).count == 0
+      # Convert hashes instance/s to normal DocumentWrapper instances.
+      def wrap(zdi_collection_class, object)
+        case object
+        when Hash          then DocumentWrapper.new(zdi_collection_class, object)
+        when Array         then object.map { |e| DocumentWrapper.wrap(zdi_collection_class, e) }
+        when Mongo::Cursor then object.extend(MongoCursorMethods).zentradi_collection = zdi_collection_class; object
+        else
+          object
+        end
+      end
     end
 
-    def save
-      if id.nil?
-        self.id = @collection.save(self)
-      else
-        @collection.update({"_id" => id}, self)
+    module MongoCursorMethods
+      def next_document
+        Zdi::DocumentWrapper.wrap(zentradi_collection, super)
       end
-      self
+      attr_accessor :zentradi_collection
     end
 
-    def update(attributes)
-      super(attributes)
-      save
-    end
+    extend ClassMethods
+    include DocumentHelpers
+
+    attr_reader :collection
 
-    def destroy
-      @collection.remove("_id" => id)
+    def initialize(collection, hash = {})
+      super(hash)
+      @collection = collection
     end
 
   end

data/spec/zentradi/document_spec.rb

@@ -39,16 +39,17 @@ describe Zdi::Collection do
     post.save
 
     post.update(:title => post.title + " DEF")
+    post.save
 
     from_db = Post.first("_id" => post.id)
     from_db.title.should == "ABC DEF"
   end
 
   it "destroys a document" do
-    @post = Post.create(:title => "Hola Mundo", :body => "Hi.")
-    id = @post.id
-    @post.should_not be_new
-    @post.destroy
+    post = Post.create(:title => "Hola Mundo", :body => "Hi.")
+    id = post.id
+    post.should_not be_new
+    post.destroy
     Post.first(id).should be_nil
   end
 

data/zentradi.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zentradi}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Emmanuel Oga"]
-  s.date = %q{2010-03-29}
+  s.date = %q{2010-04-04}
   s.description = %q{minimalistic tools for accessing mongodb}
   s.email = %q{EmmanuelOga@gmail.com}
   s.extra_rdoc_files = [
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
      "VERSION",
      "lib/zentradi.rb",
      "lib/zentradi/collection.rb",
-     "lib/zentradi/delegate.rb",
+     "lib/zentradi/document_helpers.rb",
      "lib/zentradi/document_wrapper.rb",
      "spec/spec_helper.rb",
      "spec/zentradi/document_spec.rb",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Emmanuel Oga
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-29 00:00:00 -03:00
+date: 2010-04-04 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -98,7 +98,7 @@ files:
 - VERSION
 - lib/zentradi.rb
 - lib/zentradi/collection.rb
-- lib/zentradi/delegate.rb
+- lib/zentradi/document_helpers.rb
 - lib/zentradi/document_wrapper.rb
 - spec/spec_helper.rb
 - spec/zentradi/document_spec.rb

data/lib/zentradi/delegate.rb

@@ -1,32 +0,0 @@
-module Zdi
-  module Delegate
-    def delegate(*methods)
-      include Wrapper unless ancestors.include?(Wrapper)
-      to = methods.pop[:to]
-      methods.each do |name|
-        module_eval(<<-EOMETHOD, __FILE__, __LINE__ + 1)
-          def #{ name }(*args, &block)
-            new_args = args.map { |a| a.is_a?(DocumentWrapper) ? a.to_hash : a }
-
-            result = #{to}.send :#{name}, *new_args, &block
-
-            return wrap_if_document(result)
-          end
-        EOMETHOD
-      end
-    end
-
-    module Wrapper
-      def wrap_if_document(object)
-        if object.is_a?(OrderedHash)
-          DocumentWrapper.new(self, object)
-        elsif object.respond_to?(:map)
-          object.map { |e| wrap_if_document(e) }
-        else
-          return object
-        end
-      end
-    end
-
-  end
-end