fixturize 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62a329addf4e8f7170727de9a13ab77ee939b9bc
-  data.tar.gz: 40a7a2359de3a3d267ef131d074b7590617b3fb0
+  metadata.gz: c6b35e34022bad9e7c2219f5d246b213dcfbbecb
+  data.tar.gz: 61577b83f233220ddf5987784199d71b430bd240
 SHA512:
-  metadata.gz: 9e7266619c26ad5aa91133cc4a9cc36b122fd5e6ca32ae6eff409bb10f915d6415e03f4af44f2820cfe40b0bec22c90f57d7c6bf6448e609a56a82ca89ac52d2
-  data.tar.gz: 5d6d1e8780c85e4eb84dce7036f9074c5498a5f31e677858b15c820bd2476b76e10f0a5b844db193e08741afbdf3b5ade0e54ed876b28fd75a946eef32dd1d24
+  metadata.gz: 8cbfaf5ea7e20fed5b139ca0b4bfcabe10c5da384368806bec7b481799bb1d09d0a44de94358f637f39252953d5baf1078e53c7d564a469179e802677be93b04
+  data.tar.gz: 35047bc2a104ceba398ec73c5294588e6f71b18f9bb6fbbe67c06f680fe31e8d22e632f42994898ac1bfd30a7d11aac8a88c1b82c9aa8ab495bf2c73f64cea8f

data/lib/fixturize.rb

@@ -82,7 +82,10 @@ class Fixturize
     def index!
       return unless enabled?
 
-      collection.ensure_index({ :name => Mongo::ASCENDING, :type => Mongo::ASCENDING, :timestamp => Mongo::ASCENDING })
+      collection.ensure_index({
+        :name => Mongo::ASCENDING,
+        :type => Mongo::ASCENDING,
+      })
     end
 
     def fixture_name(name = nil, &block)
@@ -115,11 +118,13 @@ class Fixturize
       name = fixture_name(name, &block)
       self.current_instrumentation = name
 
-      db_instrumentations = collection.
-        find({ :name => name, :type => INSTRUMENT_DATABASE }).
-        sort({ :timestamp => Mongo::ASCENDING }).
+      all_instrumentations = collection.
+        find({ :name => name }).
+        sort({ :'$natural' => Mongo::ASCENDING }).
         to_a
 
+      db_instrumentations = all_instrumentations.select { |i| i['type'] == INSTRUMENT_DATABASE }
+
       if db_instrumentations.any?
         uninstall!
 
@@ -127,10 +132,7 @@ class Fixturize
           load_data_from(instrumentation)
         end
 
-        ivar_instrumentations = collection.
-          find({ :name => name, :type => INSTRUMENT_IVARS }).
-          sort({ :timestamp => Mongo::ASCENDING }).
-          to_a
+        ivar_instrumentations = all_instrumentations.select { |i| i['type'] == INSTRUMENT_IVARS }
 
         if ivar_instrumentations.any?
           ivar_instrumentations.each do |instrumentation|
@@ -149,7 +151,7 @@ class Fixturize
         :collection_name => collection_name.to_s,
         :method_name => method_name.to_s,
         :args => BSON::Binary.new(Marshal.dump(args)),
-        :timestamp => Time.now.to_f
+        :timestamp => Time.now.to_f, # unused, just for reference
         # :json_args => args.to_json,
       })
     end
@@ -168,7 +170,7 @@ class Fixturize
             :ivar => ivar,
             :model => obj.class.to_s,
             :id => obj.id,
-            :timestamp => Time.now.to_f
+            :timestamp => Time.now.to_f, # unused, just for reference
           })
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fixturize
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - Scott Taylor
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-24 00:00:00.000000000 Z
+date: 2017-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: method_source