uorm 0.0.7 → 0.0.8

data/lib/uorm.rb

@@ -1,6 +1,5 @@
 require 'uorm/version'
 
-require 'active_support/callbacks'
 require 'active_support/core_ext/hash'
 
 require 'em-synchrony'
@@ -11,6 +10,7 @@ module Uorm
   autoload :FieldCollection,  'uorm/field_collection'
   autoload :Attributes,       'uorm/attributes'
   autoload :DSL,              'uorm/dsl'
+  autoload :Model,            'uorm/model'
   autoload :Callbacks,        'uorm/callbacks'
 
   autoload :Redis,            'uorm/redis'

data/lib/uorm/callbacks.rb

@@ -1,29 +1,11 @@
 module Uorm
   module Callbacks
-
-    def self.included base
-      base.instance_eval do
-        include ::ActiveSupport::Callbacks
-        define_callbacks :save, :create, :update, :delete, scope: [:kind, :name]
-      end
-    end
-
-    private
-
-    def perform_create
-      run_callbacks(:save) do
-        run_callbacks(:create) { super }
-      end
-    end
-
-    def perform_update
-      run_callbacks(:save) do
-        run_callbacks(:update) { super }
-      end
+    class Create
+      include ::EM::Deferrable
     end
 
-    def perform_delete
-      run_callbacks(:delete) { super }
+    class Update
+      include ::EM::Deferrable
     end
   end
 end

data/lib/uorm/dsl.rb

@@ -6,7 +6,7 @@ module Uorm
           if block_given?
             persistance.all(args) { |attrs| yield new(attrs) if attrs }
           else
-            persistance.all(args).map { |attrs| new attrs }
+            persistance.all(args).map { |attrs| new(attrs) }
           end
         end
 
@@ -14,19 +14,15 @@ module Uorm
           if block_given?
             persistance.find(id) { |attrs| yield new(attrs) if attrs }
           else
-            new persistance.find id
+            new persistance.find(id)
           end
         end
 
-        def create attrs
-          new(attrs).save
-        end
-
-        def exists? id, &block
+        def create attrs, &block
           if block_given?
-            peristance.exists?(id) { |bool| yield bool }
+            new(attrs).save &block
           else
-            persistance.exists? id
+            new(attrs).save
           end
         end
       end
@@ -36,8 +32,8 @@ module Uorm
       persistance.new? self
     end
 
-    def save
-      new? ? perform_create : perform_update
+    def save &block
+      new? ? perform_create(&block) : perform_update(&block)
       self
     end
 
@@ -54,12 +50,21 @@ module Uorm
 
     private
 
-    def perform_create
-      persistance.create self
+    def perform_create &block
+      fiber = Fiber.current
+      create_callback = Callbacks::Create.new
+      create_callback.callback &block
+      persistance.create(self) { |object_id| fiber.resume object_id }
+      self.id = Fiber.yield
+      create_callback.succeed self
     end
 
-    def perform_update
-      persistance.update self
+    def perform_update &block
+      update_callback = Callbacks::Update.new
+      update_callback.callback &block
+      persistance.update self do
+        update_callback.succeed self
+      end
     end
 
     def perform_delete

data/lib/uorm/model.rb

@@ -0,0 +1,10 @@
+module Uorm
+  module Model
+    def self.included base
+      base.class_eval do
+        include Uorm::DSL
+        include Uorm::Attributes
+      end
+    end
+  end
+end

data/lib/uorm/mongo/persistance.rb

@@ -24,7 +24,6 @@ module Uorm
 
       def find id, &block
         object_id = BSON::ObjectId(id.to_s)
-
         if block_given?
           collection.afirst(_id: object_id).callback &block
         else
@@ -32,14 +31,12 @@ module Uorm
         end
       end
 
-      def create object
-        object.id = ::EM::Synchrony.sync collection.safe_insert(object.attributes.except(:id), safe: false)
-      rescue
-        false
+      def create object, &block
+        collection.safe_insert(object.attributes.except(:id)).callback &block
       end
 
-      def update object
-        ::EM::Synchrony.sync collection.safe_update({_id: object.id}, object.attributes.except(:id), safe: false)
+      def update object, &block
+        collection.safe_update({_id: object.id}, object.attributes.except(:id)).callback &block
       end
 
       def delete object

data/lib/uorm/version.rb

@@ -1,3 +1,3 @@
 module Uorm
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/spec/em-mongo_spec.rb

@@ -6,8 +6,7 @@ require 'em-synchrony/em-mongo'
 Uorm::Mongo::DB.name = 'uorm_test'
 
 class AMongoModel
-  include Uorm::DSL
-  include Uorm::Attributes
+  include Uorm::Model
   include Uorm::Mongo
 
   field :reference, type: Uorm::Type::ObjectId
@@ -123,6 +122,24 @@ describe AMongoModel do
     it 'returns an object with the newly created attributes' do
       AMongoModel.create(attributes).should be_instance_of AMongoModel
     end
+
+    it 'runs given block passing the created object if its creation was flawless' do
+      called = false
+      AMongoModel.create(attributes) do |model|
+        model.should be_instance_of AMongoModel
+        called = true
+      end
+      called.should be_true
+    end
+
+    it 'does not run given block if the creation failed' do
+      called = false
+      first = AMongoModel.create(attributes)
+      AMongoModel.create(first.attributes) do |model|
+        called = true
+      end
+      called.should be_false
+    end
   end
 
   describe '#save' do

data/spec/spec_helper.rb

@@ -1,8 +1,6 @@
 require 'support/be_collection_of'
 require 'uorm'
 
-require 'em-synchrony'
-
 # monkey patch to wrap all tests in the reactor
 module RSpec
   module Core

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uorm
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -174,6 +174,7 @@ files:
 - lib/uorm/dsl.rb
 - lib/uorm/field.rb
 - lib/uorm/field_collection.rb
+- lib/uorm/model.rb
 - lib/uorm/mongo.rb
 - lib/uorm/mongo/db.rb
 - lib/uorm/mongo/object_id.rb