uorm 0.0.3 → 0.0.4

data/lib/uorm.rb

@@ -3,7 +3,6 @@ require 'uorm/version'
 require 'active_support/callbacks'
 require 'active_support/core_ext/hash'
 
-
 module Uorm
   autoload :Type,             'uorm/type'
   autoload :Field,            'uorm/field'

data/lib/uorm/dsl.rb

@@ -6,8 +6,8 @@ module Uorm
           persistance.all(args).map { |attrs| new attrs }
         end
 
-        def find args
-          new persistance.find args
+        def find id
+          new persistance.find id
         end
 
         def create attrs

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

@@ -2,18 +2,24 @@ module Uorm
   module EM::Mongo
     class DB
       class << self
-        attr_accessor :name
+        attr_accessor :name, :pool_size
 
         def collection coll
           db.collection coll
         end
 
         def db
-          @db ||= connection.db name
+          connection.db name
+        end
+
+        def pool_size
+          @pool_size ||= 2
         end
 
         def connection
-          @connection ||= ::EM::Mongo::Connection.new
+          @connection ||= ::EM::Synchrony::ConnectionPool.new(size: pool_size) do
+            ::EM::Mongo::Connection.new
+          end
         end
       end
     end

data/lib/uorm/redis.rb

@@ -14,7 +14,7 @@ module Uorm
       end
 
       def initialize values = {}
-        values[:id] ||= nil
+        values[:id] ||= values['id'] || nil
         super values
       end
 

data/lib/uorm/redis/db.rb

@@ -2,10 +2,16 @@ module Uorm
   module Redis
     class DB
       class << self
-        attr_accessor :nr
+        attr_accessor :nr, :pool_size
+
+        def pool_size
+          @pool_size ||= 2
+        end
 
         def client
-          @client ||= ::Redis.new driver: :synchrony, db: nr
+          @client ||= ::EM::Synchrony::ConnectionPool.new(size: pool_size) do
+            ::Redis.new driver: :synchrony, db: nr
+          end
         end
       end
     end

data/lib/uorm/redis/persistance.rb

@@ -14,13 +14,16 @@ module Uorm
 
       def all options = {}
         keys = collection.keys
+        return [] if keys.empty?
+
         collection.mget(keys).map do |val|
           MultiJson.load val if val
         end
       end
 
       def find id
-        MultiJson.load collection.get id
+        data = collection.get id
+        MultiJson.load data if data
       end
 
       def create object

data/lib/uorm/version.rb

@@ -1,3 +1,3 @@
 module Uorm
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/spec/redis_synchrony_spec.rb

@@ -55,12 +55,15 @@ describe ARedisModel do
     end
   end
 
-
   describe '.all' do
     it 'returns a collection of all objects' do
       ARedisModel.create attributes
       ARedisModel.all.should be_collection_of ARedisModel
     end
+
+    it 'returns an empty array if the collection is empty' do
+      ARedisModel.all.should =~ []
+    end
   end
 
   describe '.find' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uorm
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-27 00:00:00.000000000 Z
+date: 2012-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport