entity_store 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97880958b956196cf02002393b06adf365a1bfba
-  data.tar.gz: 06471d12f5bacc7f5ad7409c2bf0ffa3e336b1aa
+  metadata.gz: e43b6eb661aca44b6787f609047b1d26a8f7ce35
+  data.tar.gz: 1539522bfe305d04047a248b2b9fce12847fe163
 SHA512:
-  metadata.gz: 85747f4ddb273c8b9f80430445cf5100b92ebd136a4ba1e1d2a7e7017357057fbe14996cdb76d45d296958d849f9aa8eab3ec442f5397ff85ca70914ffe7e2b1
-  data.tar.gz: 2d1e8c46d5480b12a52b857ee1469d5a857f63ef27f6fde2c890b735c9bd08af312ef4341c7abe75ac3e61570f9cd246966240ba4ff3d3bacf0543655f84e7cf
+  metadata.gz: 46d856ef7e4ca152fe3859da3563ac5f33f15fca7805d42b86b4c3e2536ee4dcd1df1c6779b19c13daeea7983d2b62c31d2e9538c7adbe0e90436d6dec0345ee
+  data.tar.gz: 6de4e6ae68378f4f3e4083fd7723ff1447722afe2f36fb377f5a4cdb5d9d6281457c08a2000868a1b2c886d1c0f1bedb2753a18100df7e9d20f62dbd31100e66

data/lib/entity_store/event.rb

@@ -53,4 +53,4 @@ module EntityStore
       "<#{self.class.name} #{self.attributes.inspect}>"
     end
   end
-end
+end

data/lib/entity_store/mongo_entity_store.rb

@@ -161,19 +161,30 @@ module EntityStore
 
       query = { '$or' => query_items }
 
-      options = {
-        :sort => [['entity_version', Mongo::ASCENDING], ['_id', Mongo::ASCENDING]]
-      }
-
       result = Hash[ criteria.map { |item| [ item[:id], [] ] } ]
 
-      events.find(query, options).each do |attrs|
-        begin
-          result[attrs['_entity_id'].to_s] << EntityStore::Config.load_type(attrs['_type']).new(attrs)
-        rescue => e
-          log_error "Error loading type #{attrs['_type']}", e
+      events.find(query).each do |attrs|
+        result[attrs['_entity_id'].to_s] << attrs
+      end
+
+      result.each do |id, events|
+        # Have to do the sort client side as otherwise the query will not use
+        # indexes (http://docs.mongodb.org/manual/reference/operator/query/or/#or-and-sort-operations)
+        events.sort_by! { |attrs| [attrs['entity_version'], attrs['_id']] }
+
+        # Convert the attributes into event objects
+        events.map! do |attrs|
+          begin
+            EntityStore::Config.load_type(attrs['_type']).new(attrs)
+          rescue => e
+            log_error "Error loading type #{attrs['_type']}", e
+            nil
+          end
         end
+
+        events.compact!
       end
+
       result
     end
   end

data/lib/entity_store/version.rb

@@ -1,3 +1,3 @@
 module EntityStore
-  VERSION = "0.3.2".freeze
+  VERSION = "0.3.3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: entity_store
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Adam Bird
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-23 00:00:00.000000000 Z
+date: 2014-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo