uorm 0.0.13 → 0.0.14

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    uorm (0.0.13)
+    uorm (0.0.14)
       em-synchrony
 
 GEM
@@ -11,7 +11,7 @@ GEM
     bson_ext (1.8.2)
       bson (~> 1.8.2)
     columnize (0.3.6)
-    debugger (1.2.4)
+    debugger (1.3.0)
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.1.1)
       debugger-ruby_core_source (~> 1.1.7)
@@ -35,7 +35,7 @@ GEM
     rspec-core (2.12.2)
     rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.1)
+    rspec-mocks (2.12.2)
 
 PLATFORMS
   ruby

data/lib/uorm/crud.rb

@@ -11,15 +11,15 @@ module Uorm
       base.instance_eval do
         def all args = {}, &block
           if block_given?
-            persistance.all(args) { |attrs| yield new(attrs) if attrs }
+            persistance.all(args) { |attrs| Fiber.new { yield new(attrs) }.resume if attrs }
           else
-            persistance.all(args).map { |attrs| new(attrs) }
+            persistance.all(args).map! { |attrs| new(attrs) }
           end
         end
 
         def find id, &block
           if block_given?
-            persistance.find(id) { |attrs| yield new(attrs) if attrs }
+            persistance.find(id) { |attrs| Fiber.new { yield new(attrs) }.resume if attrs }
           else
             new persistance.find(id)
           end
@@ -27,7 +27,7 @@ module Uorm
 
         def create attrs, &block
           obj = new(attrs)
-          (block_given?) ? obj.save(&block) : obj.save
+          block_given? ? obj.save(&block) : obj.save
         end
       end
     end
@@ -58,7 +58,7 @@ module Uorm
       update_attributes attrs
       if block_given?
         cb = ::Uorm::CRUD::Callbacks::Update.new
-        cb.callback(&block) if block_given?
+        cb.callback(&block)
         persistance.update self, cb
       else
         persistance.update self

data/lib/uorm/crud/callbacks.rb

@@ -8,6 +8,14 @@ module Uorm
       class Update
         include ::EM::Deferrable
       end
+
+      class Find
+        include ::EM::Deferrable
+      end
+
+      class All
+        include ::EM::Deferrable
+      end
     end
   end
 end

data/lib/uorm/crud/persistance_helper.rb

@@ -4,11 +4,11 @@ module Uorm
       def self.included base
         base.instance_eval do
           def persistance= value
-            @@persistance = value
+            @persistance = value
           end
 
           def persistance
-            @@persistance
+            @persistance
           end
         end
       end

data/lib/uorm/hash.rb

@@ -1,6 +1,5 @@
 module Uorm
   class Hash < ::Hash
-
     def except keys
       self.dup.except! keys
     end

data/lib/uorm/mongo/persistance.rb

@@ -34,7 +34,9 @@ module Uorm
       def update object, cb = nil
         if cb
           safe_update = client.safe_update({ _id: object.id }, attributes_without_id(object))
-          safe_update.callback { cb.succeed object }
+          safe_update.callback do
+            cb.succeed object
+          end
         else
           ::EM::Synchrony.sync client.safe_update({ _id: object.id }, attributes_without_id(object))
         end

data/lib/uorm/redis/persistance.rb

@@ -2,10 +2,13 @@ module Uorm
   module Redis
     class Persistance < Struct.new :model, :client
 
-      def all options = {}
-        ids = client.keys
-        return [] if ids.empty?
-        ids.map { |id| find id }
+      def all q = {}
+        arr = client.keys.map { |id| self.find id }
+        return arr if q.empty? or arr.empty?
+
+        if have_query?(q, arr)
+          arr.select! { |attrs| q.all? { |key, value| attrs[key] == value } }
+        end
       end
 
       def find id
@@ -27,6 +30,10 @@ module Uorm
 
       private
 
+      def have_query? q, coll
+        q and coll.all? { |attrs| attrs.respond_to?(:[]) }
+      end
+
       def write object
         client.mapped_hmset object.id, object.attributes
       end

data/spec/redis_spec.rb

@@ -26,8 +26,8 @@ describe ARedisModel do
   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 }
+  let(:persistance) { ARedisModel.persistance = Uorm::Redis::Persistance.new ARedisModel, client }
+  let(:test_persistance) { ARedisModel.persistance = Uorm::Mongo::TestPerstistance.new }
 
   before { test_persistance }
 
@@ -66,7 +66,26 @@ describe ARedisModel do
 
     it 'returns an empty array if the client is empty' do
       EM.synchrony do
-        ARedisModel.all.should =~ []
+        ARedisModel.all.should be_empty
+
+        EM.stop
+      end
+    end
+
+    it 'retuns all objects for the given query' do
+      EM.synchrony do
+        persistance.create ARedisModel.new name: 'findme'
+        persistance.create ARedisModel.new dollars: 3.2
+        ARedisModel.all(name: 'findme').should be_collection_of ARedisModel
+
+        EM.stop
+      end
+    end
+
+    it 'resturns an empty array if the given query gives no match' do
+      EM.synchrony do
+        persistance.create ARedisModel.new name: 'dont'
+        ARedisModel.all(name: 'find').should be_empty
 
         EM.stop
       end

data/uorm.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = 'uorm'
-  gem.version       = '0.0.13'
+  gem.version       = '0.0.14'
   gem.authors       = ['Dennis Rogenius']
   gem.email         = ['denro03@gmail.com']
   gem.description   = %q{A modular, flexible and lightweight ORM}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uorm
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-22 00:00:00.000000000 Z
+date: 2013-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-synchrony
@@ -167,7 +167,6 @@ files:
 - lib/uorm/mongo/object_id.rb
 - lib/uorm/mongo/persistance.rb
 - lib/uorm/redis.rb
-- lib/uorm/redis/adapter.rb
 - lib/uorm/redis/persistance.rb
 - spec/mongo_spec.rb
 - spec/redis_spec.rb
@@ -189,7 +188,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1722119232113746489
+      hash: -591575284162330363
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -198,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1722119232113746489
+      hash: -591575284162330363
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/lib/uorm/redis/adapter.rb

@@ -1,8 +0,0 @@
-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