uorm 0.0.6 → 0.0.7

data/lib/uorm.rb

@@ -3,6 +3,8 @@ require 'uorm/version'
 require 'active_support/callbacks'
 require 'active_support/core_ext/hash'
 
+require 'em-synchrony'
+
 module Uorm
   autoload :Type,             'uorm/type'
   autoload :Field,            'uorm/field'
@@ -15,17 +17,13 @@ module Uorm
   module Redis
     autoload :Persistance,    'uorm/redis/persistance'
     autoload :DB,             'uorm/redis/db'
-    require 'multi_json'
   end
 
-  module EM
-    autoload :Mongo,          'uorm/em-mongo'
+  autoload :Mongo,            'uorm/mongo'
+  module Mongo
+    require 'uorm/mongo/object_id'
 
-    module Mongo
-      require 'uorm/em-mongo/object_id'
-      autoload :DB,           'uorm/em-mongo/db'
-      autoload :Persistance,  'uorm/em-mongo/persistance'
-    end
+    autoload :DB,             'uorm/mongo/db'
+    autoload :Persistance,    'uorm/mongo/persistance'
   end
-
 end

data/lib/uorm/dsl.rb

@@ -21,6 +21,14 @@ module Uorm
         def create attrs
           new(attrs).save
         end
+
+        def exists? id, &block
+          if block_given?
+            peristance.exists?(id) { |bool| yield bool }
+          else
+            persistance.exists? id
+          end
+        end
       end
     end
 

data/lib/uorm/{em-mongo.rb → mongo.rb}

@@ -1,5 +1,7 @@
+require 'em-synchrony/em-mongo'
+
 module Uorm
-  module EM::Mongo
+  module Mongo
     def self.included base
       base.instance_eval do
         field :id, type: Type::ObjectId

data/lib/uorm/{em-mongo → mongo}/db.rb

@@ -1,5 +1,5 @@
 module Uorm
-  module EM::Mongo
+  module Mongo
     class DB
       class << self
         attr_accessor :name, :pool_size

data/lib/uorm/{em-mongo → mongo}/persistance.rb

@@ -1,5 +1,5 @@
 module Uorm
-  module EM::Mongo
+  module Mongo
     class Persistance
       attr_reader :collection, :model
 
@@ -33,11 +33,13 @@ module Uorm
       end
 
       def create object
-        object.id = collection.insert object.attributes.except(:id)
+        object.id = ::EM::Synchrony.sync collection.safe_insert(object.attributes.except(:id), safe: false)
+      rescue
+        false
       end
 
       def update object
-        collection.update({_id: object.id}, object.attributes.except(:id))
+        ::EM::Synchrony.sync collection.safe_update({_id: object.id}, object.attributes.except(:id), safe: false)
       end
 
       def delete object

data/lib/uorm/version.rb

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

data/spec/em-mongo_spec.rb

@@ -3,12 +3,12 @@ require 'spec_helper'
 require 'em-mongo'
 require 'em-synchrony/em-mongo'
 
-Uorm::EM::Mongo::DB.name = 'uorm_test'
+Uorm::Mongo::DB.name = 'uorm_test'
 
 class AMongoModel
   include Uorm::DSL
   include Uorm::Attributes
-  include Uorm::EM::Mongo
+  include Uorm::Mongo
 
   field :reference, type: Uorm::Type::ObjectId
   field :name,      type: Uorm::Type::String

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uorm
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-28 00:00:00.000000000 Z
+date: 2012-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -172,12 +172,12 @@ files:
 - lib/uorm/attributes.rb
 - lib/uorm/callbacks.rb
 - lib/uorm/dsl.rb
-- lib/uorm/em-mongo.rb
-- lib/uorm/em-mongo/db.rb
-- lib/uorm/em-mongo/object_id.rb
-- lib/uorm/em-mongo/persistance.rb
 - lib/uorm/field.rb
 - lib/uorm/field_collection.rb
+- lib/uorm/mongo.rb
+- lib/uorm/mongo/db.rb
+- lib/uorm/mongo/object_id.rb
+- lib/uorm/mongo/persistance.rb
 - lib/uorm/redis.rb
 - lib/uorm/redis/db.rb
 - lib/uorm/redis/persistance.rb