uorm 0.0.10 → 0.0.11

data/lib/uorm/redis.rb

@@ -1,26 +1,17 @@
+require 'redis'
+require 'hiredis'
+
 module Uorm
   module Redis
     def self.included base
       base.instance_eval do
-        field :id, type: Type::String
-
-        def persistance
-          @persistance ||= Persistance.new self
-        end
-
-        def collection
-          persistance.collection
-        end
+        field :id, type: :String
       end
 
       def initialize values = {}
-        values[:id] ||= values['id'] || nil
+        values[:id] ||= values['id']
         super values
       end
-
-      def persistance
-        self.class.persistance
-      end
     end
   end
 end

data/lib/uorm/redis/adapter.rb

@@ -0,0 +1,8 @@
+module Uorm
+  module Redis
+    class Adapter < Splash.new client: EM::Synchrony::ConnectionPool.new(2) do
+        Redis.new driver: :synchrony, db: 14
+      end
+    end
+ end
+end

data/lib/uorm/redis/persistance.rb

@@ -1,29 +1,19 @@
 module Uorm
   module Redis
-    class Persistance
-      attr_reader :collection, :model
-
-      def initialize model
-        @model = model
-        @collection = DB.client
-      end
-
-      def new? object
-        object.id ? false : true
-      end
+    class Persistance < Struct.new :model, :client
 
       def all options = {}
-        ids = collection.keys
+        ids = client.keys
         return [] if ids.empty?
         ids.map { |id| find id }
       end
 
       def find id
-        collection.mapped_hmget id, *model.fields.map(&:name)
+        client.mapped_hmget id, *model.fields.map(&:name)
       end
 
       def create object
-        object.id = SecureRandom.uuid
+        object.id = ::SecureRandom.uuid
         write object
       end
 
@@ -32,13 +22,13 @@ module Uorm
       end
 
       def delete object
-        collection.del object.id
+        client.del object.id
       end
 
       private
 
       def write object
-        collection.mapped_hmset object.id, object.attributes
+        client.mapped_hmset object.id, object.attributes
       end
     end
   end

data/spec/mongo_spec.rb

@@ -0,0 +1,258 @@
+require 'spec_helper'
+
+
+class AMongoModel
+  include Uorm::Model
+  include Uorm::Mongo
+
+  field :reference, type: :ObjectId
+  field :name,      type: :String
+  field :count,     type: :Integer
+  field :dollars,   type: :Float
+  field :favorite,  type: :Boolean
+  field :created,   type: :Time
+end
+
+describe AMongoModel do
+
+  let!(:attributes) do
+    {
+      reference: '50995b8c15529d4676000001',
+      name: 'whatever',
+      count: 5.to_s,
+      dollars: 2.3.to_s,
+      favorite: true.to_s,
+      created: Time.utc(0).to_s
+    }
+  end
+  let(:collection) { EM::Mongo::Collection.new('uorm', 'test').tap(&:remove) }
+  let(:persistance) { AMongoModel.persistance = Uorm::Mongo::Persistance.new AMongoModel, collection }
+  let(:test_persistance) { AMongoModel.persistance = Uorm::Mongo::TestPerstistance.new }
+
+  before { test_persistance }
+
+  describe '.new' do
+    subject { AMongoModel.new attributes }
+
+    its(:reference) { should == BSON::ObjectId('50995b8c15529d4676000001') }
+    its(:name)      { should == 'whatever' }
+    its(:count)     { should == 5 }
+    its(:dollars)   { should == 2.3 }
+    its(:favorite)  { should be_true }
+    its(:created)   { should == Time.utc(0) }
+
+    its(:as_json) do
+      should == {
+        reference: '50995b8c15529d4676000001',
+        name: "whatever",
+        count: 5,
+        dollars: 2.3,
+        favorite: true,
+        created: Time.utc(0).to_i,
+        id: nil
+      }
+    end
+  end
+
+  describe '.all' do
+    it 'returns a collection of all objects' do
+      EM.synchrony do
+        test_persistance.create AMongoModel.new name: 'findme'
+
+        AMongoModel.all.should be_collection_of AMongoModel
+
+        EM.stop
+      end
+    end
+
+    it 'returns a collection of objects with the query' do
+      EM.synchrony do
+        persistance.create AMongoModel.new name: 'findme'
+
+        AMongoModel.all(name: 'findme').should be_collection_of AMongoModel
+
+        EM.stop
+      end
+    end
+
+    it 'returns an empty array if the client is empty' do
+      EM.synchrony do
+        AMongoModel.all.should =~ []
+
+        EM.stop
+      end
+    end
+
+    it 'converts time strings into time objects' do
+      EM.synchrony do
+        persistance.create AMongoModel.new created: Time.parse('2001-01-02')
+
+        AMongoModel.all(created: { '$gt' => '2001-01-01' }).
+          should be_collection_of AMongoModel
+
+        AMongoModel.all(created: { '$lt' => Time.parse('2001-01-01')}).
+          should be_empty
+
+        EM.stop
+      end
+    end
+
+    it 'converts reference strings into BSON::ObjectId objects' do
+      EM.synchrony do
+        persistance.create AMongoModel.new reference: BSON::ObjectId('50995b8c15529d4676000001')
+
+        AMongoModel.all(reference: '50995b8c15529d4676000001').
+          should be_collection_of AMongoModel
+
+        EM.stop
+      end
+    end
+
+    it 'converts multiple query parameters' do
+      EM.synchrony do
+        persistance.create AMongoModel.new reference: BSON::ObjectId('50995b8c15529d4676000001'), created: Time.parse('2003-01-01')
+
+        AMongoModel.all(reference: '50995b8c15529d4676000001', created: '2003-01-01').
+          should be_collection_of AMongoModel
+
+        EM.stop
+      end
+    end
+
+    it 'runs async given a block' do
+      EM.synchrony do
+        persistance.create AMongoModel.new reference: BSON::ObjectId('50995b8c15529d4676000001')
+        fail_in 1
+
+        AMongoModel.all do |model|
+          model.should be_instance_of AMongoModel
+
+          EM.stop
+        end
+      end
+    end
+  end
+
+  describe '.find' do
+    it 'returns the first object with the given id' do
+      EM.synchrony do
+        AMongoModel.find(subject.save.id).should be_instance_of AMongoModel
+
+        EM.stop
+      end
+    end
+
+    it 'converts id BSON::ObjectId' do
+      EM.synchrony do
+        AMongoModel.find(subject.save.id.to_s).should be_instance_of AMongoModel
+
+        EM.stop
+      end
+    end
+
+    it 'runs async given a block' do
+      EM.synchrony do
+        id = persistance.create AMongoModel.new attributes
+        fail_in 1
+
+        AMongoModel.find(id) do |found|
+          found.should be_instance_of AMongoModel
+
+          EM.stop
+        end
+      end
+    end
+  end
+
+  describe '.create' do
+    it 'adds the object to the collection' do
+      EM.synchrony do
+        expect { subject.save }.to change { test_persistance.size }
+
+        EM.stop
+      end
+    end
+
+    it 'returns an object with the newly created attributes' do
+      EM.synchrony do
+        AMongoModel.create(attributes).should be_instance_of AMongoModel
+
+        EM.stop
+      end
+    end
+
+    it 'runs async given a block' do
+      EM.synchrony do
+        persistance
+        fail_in 1
+
+        AMongoModel.create(attributes) do |model|
+          model.should be_instance_of AMongoModel
+
+          EM.stop
+        end
+
+      end
+    end
+  end
+
+  describe '#save' do
+    subject { AMongoModel.new attributes }
+
+    it 'creates the object if it does not have an id' do
+      EM.synchrony do
+        persistance
+
+        expect { subject.save }.to change { subject.id }
+        EM.stop
+      end
+    end
+
+    it 'maintains the same id of the record if it exists' do
+      EM.synchrony do
+        persistance
+        subject.save
+
+        expect { subject.save }.to_not change { subject.id }
+        EM.stop
+      end
+    end
+  end
+
+  describe '#update' do
+    subject { AMongoModel.new attributes }
+
+    it 'updates the object with the given attributes' do
+      EM.synchrony do
+        persistance
+
+        expect { subject.update name: 'new' }.to change { subject.name }
+
+        EM.stop
+      end
+    end
+
+    it 'updates the collection with the given attributes' do
+      EM.synchrony do
+        persistance
+
+        expect { subject.update name: 'another' }.to_not change { persistance.count }
+
+        EM.stop
+      end
+    end
+  end
+
+  describe '#delete' do
+    subject { AMongoModel.new attributes }
+    it 'removes the object from the collection' do
+      EM.synchrony do
+        test_persistance.create subject
+
+        expect { subject.delete }.to change { test_persistance.size }
+
+        EM.stop
+      end
+    end
+  end
+end

data/spec/redis_spec.rb

@@ -0,0 +1,161 @@
+require 'spec_helper'
+
+class ARedisModel
+  include Uorm::Model
+  include Uorm::Redis
+
+  field :reference, type: :String
+  field :name,      type: :String
+  field :count,     type: :Integer
+  field :dollars,   type: :Float
+  field :favorite,  type: :Boolean
+  field :created,   type: :Time
+end
+
+describe ARedisModel do
+
+  let(:attributes) do
+    {
+      reference: '2d931510-d99f-494a-8c67-87feb05e1594',
+      name: 'whatever',
+      count: 5.to_s,
+      dollars: 2.3.to_s,
+      favorite: true.to_s,
+      created: Time.utc(0).to_s
+    }
+  end
+
+  let(:client) { Redis.new(db: 15, driver: :synchrony).tap(&:flushdb) }
+  let(:persistance) { AMongoModel.persistance = Uorm::Redis::Persistance.new ARedisModel, client }
+  let(:test_persistance) { AMongoModel.persistance = Uorm::Mongo::TestPerstistance.new }
+
+  before { test_persistance }
+
+  describe '.new' do
+    subject { ARedisModel.new attributes }
+
+    its(:reference) { should == '2d931510-d99f-494a-8c67-87feb05e1594' }
+    its(:name)      { should == 'whatever' }
+    its(:count)     { should == 5 }
+    its(:dollars)   { should == 2.3 }
+    its(:favorite)  { should be_true }
+    its(:created)   { should == Time.utc(0) }
+
+    its(:as_json) do
+      should == {
+        reference: '2d931510-d99f-494a-8c67-87feb05e1594',
+        name: "whatever",
+        count: 5,
+        dollars: 2.3,
+        favorite: true,
+        created: Time.utc(0).to_i,
+        id: nil
+      }
+    end
+  end
+
+  describe '.all' do
+    it 'returns a client of all objects' do
+      EM.synchrony do
+        test_persistance.create ARedisModel.new attributes
+        ARedisModel.all.should be_collection_of ARedisModel
+
+        EM.stop
+      end
+    end
+
+    it 'returns an empty array if the client is empty' do
+      EM.synchrony do
+        ARedisModel.all.should =~ []
+
+        EM.stop
+      end
+    end
+  end
+
+  describe '.find' do
+    it 'returns the first object with the given id' do
+      EM.synchrony do
+        id = persistance.create ARedisModel.new attributes
+        ARedisModel.find(id).should be_instance_of ARedisModel
+
+        EM.stop
+      end
+    end
+  end
+
+  describe '.create' do
+    it 'adds the object to the client' do
+      EM.synchrony do
+
+        expect { ARedisModel.create attributes }.to change { test_persistance.size }
+
+        EM.stop
+      end
+    end
+
+    it 'returns an object with the newly created attributes' do
+      EM.synchrony do
+        ARedisModel.create(attributes).should be_instance_of ARedisModel
+
+        EM.stop
+      end
+    end
+  end
+
+  describe '#save' do
+    it 'creates the object if it does not have an id' do
+      EM.synchrony do
+        persistance
+
+        model = ARedisModel.new attributes
+        expect { model.save }.to change { model.id }
+
+        EM.stop
+      end
+    end
+
+    it 'updates the object if it does exist' do
+      EM.synchrony do
+        persistance
+
+        model = ARedisModel.create attributes
+        expect { model.save }.to_not change { model.id }
+
+        EM.stop
+      end
+    end
+  end
+
+  describe '#update' do
+    it 'updates the object with the given attributes' do
+      EM.synchrony do
+        model = ARedisModel.create attributes
+        expect { model.update name: 'new' }.to change { model.name }
+
+        EM.stop
+      end
+    end
+
+    it 'updates the client with the given attributes' do
+      EM.synchrony do
+        model = ARedisModel.create attributes
+        expect { model.update name: 'another' }.
+          to change { ARedisModel.find(model.id).name }
+
+        EM.stop
+      end
+    end
+  end
+
+  describe '#delete' do
+    it 'removes the object from the client' do
+      EM.synchrony do
+        model = ARedisModel.create attributes
+        expect { model.delete }.to change { test_persistance.size }
+
+        EM.stop
+      end
+    end
+  end
+end