uorm 0.0.5 → 0.0.6

data/lib/uorm/dsl.rb

@@ -2,12 +2,20 @@ module Uorm
   module DSL
     def self.included base
       base.instance_eval do
-        def all args = {}
-          persistance.all(args).map { |attrs| new attrs }
+        def all args = {}, &block
+          if block_given?
+            persistance.all(args) { |attrs| yield new(attrs) if attrs }
+          else
+            persistance.all(args).map { |attrs| new attrs }
+          end
         end
 
-        def find id
-          new persistance.find id
+        def find id, &block
+          if block_given?
+            persistance.find(id) { |attrs| yield new(attrs) if attrs }
+          else
+            new persistance.find id
+          end
         end
 
         def create attrs

data/lib/uorm/em-mongo/persistance.rb

@@ -12,12 +12,24 @@ module Uorm
         object.id ? false : true
       end
 
-      def all query = {}
-        collection.find format_query(query)
+      def all query = {}, &block
+        formatted = format_query(query)
+
+        if block_given?
+          collection.afind(formatted).each &block
+        else
+          collection.find formatted
+        end
       end
 
-      def find id
-        collection.find_one _id: BSON::ObjectId(id.to_s)
+      def find id, &block
+        object_id = BSON::ObjectId(id.to_s)
+
+        if block_given?
+          collection.afirst(_id: object_id).callback &block
+        else
+          collection.first(_id: object_id)
+        end
       end
 
       def create object

data/lib/uorm/version.rb

@@ -1,3 +1,3 @@
 module Uorm
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/spec/em-mongo_spec.rb

@@ -91,6 +91,11 @@ describe AMongoModel do
       AMongoModel.all(reference: '50995b8c15529d4676000001', created: '2003-01-01').
         should be_collection_of AMongoModel
     end
+
+    it 'runs async given a block' do
+      AMongoModel.collection.insert reference: BSON::ObjectId('50995b8c15529d4676000001')
+      AMongoModel.all { |model| model.should be_instance_of AMongoModel }
+    end
   end
 
   describe '.find' do
@@ -103,6 +108,11 @@ describe AMongoModel do
       model = AMongoModel.create attributes
       AMongoModel.find(model.id.to_s).should be_instance_of AMongoModel
     end
+
+    it 'runs async given a block' do
+      model = AMongoModel.create attributes
+      AMongoModel.find(model.id) { |model| model.should be_instance_of AMongoModel }
+    end
   end
 
   describe '.create' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uorm
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors: