populate-me 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbda9949e894e8d1c77c8ad65e0bfdd2bf037873
-  data.tar.gz: e7fcb6b304893759a53af5ae065a6674bf2b07bb
+  metadata.gz: c2e822a83612d9476257936de177d9f9fa1d2e84
+  data.tar.gz: 1c12f75c1b8b16f1ddd815483b5076ae0dfd4b65
 SHA512:
-  metadata.gz: e784e1176489b34f3f19331bef9d1800aca5d086eb0f481ea5002e45dfba8d36787b97b8b07c8d7ba2bd3c19f0719b06eb09d810531ce87f92d49d750f913ae5
-  data.tar.gz: 6a19f005cb13878124042a563eb621f596cf83d1a3fa063a62e99a5b75366a4a05665033ed8168a1f54fd521db8a8500b92f064e98915d656a3391d28e7f5e27
+  metadata.gz: 7a6e9cc6229589493feed226de03ed0b1858e69ecbbebeec2521f0e353ca73cc98ca17efdfbc6788e8ecdb6de3774d8e10dc3f15211d010663317589168020a3
+  data.tar.gz: 1e799cf84d985714c01229e5b4616e2d84b6ecfbed3242a43751aed6e4ef8ca9007d261ddcee9e9e8dfdb90eba6d7d941b97bffe39b3a0005482fffca06b7045

data/lib/populate_me/document_mixins/admin_adapter.rb

@@ -15,7 +15,7 @@ module PopulateMe
       def to_admin_list_item o={}
         {
           class_name: self.class.name,
-          id: self.id,
+          id: self.id.to_s,
           admin_url: to_admin_url,
           title: WebUtils.truncate(to_s, 60),
           image_url: admin_image_url,

data/lib/populate_me/document_mixins/persistence.rb

@@ -70,7 +70,7 @@ module PopulateMe
         end
 
         def set_indexes f, ids=[]
-          if self.fields[f.to_sym][:direction]==:desc
+          if self.fields and self.fields[f.to_sym] and self.fields[f.to_sym][:direction]==:desc
             ids = ids.dup.reverse
           end
           ids.each_with_index do |id,i|

data/lib/populate_me/mongo.rb

@@ -49,10 +49,11 @@ module PopulateMe
         if self.fields[f.to_sym][:direction]==:desc
           ids = ids.dup.reverse
         end
-        requests = ids.each_with_index.inject([]) do |list, (id, i)|
+        requests = ids.each_with_index.inject([]) do |list, (theid, i)|
+          theid = string_or_object_id theid
           list << {update_one: 
             {
-              filter: {self.id_string_key=>id}, 
+              filter: {self.id_string_key=>theid}, 
               update: {'$set'=>{f=>i}}
             }
           }
@@ -61,7 +62,7 @@ module PopulateMe
       end
 
       def admin_get theid
-        theid = BSON::ObjectId.from_string(theid) if BSON::ObjectId.legal?(theid)
+        theid = string_or_object_id theid
         self.cast{ collection.find({id_string_key => theid}).first }
       end
       alias_method :[], :admin_get
@@ -88,6 +89,14 @@ module PopulateMe
         self.collection.distinct field, query, o
       end
 
+      def string_or_object_id theid
+        if BSON::ObjectId.legal?(theid)
+          BSON::ObjectId.from_string(theid)
+        else
+          theid
+        end
+      end
+
     end
 
     attr_accessor :_id

data/lib/populate_me/version.rb

@@ -1,4 +1,4 @@
 module PopulateMe
-  VERSION = '0.6.2'
+  VERSION = '0.6.3'
 end
 

data/test/test_document_admin_adapter.rb

@@ -45,6 +45,10 @@ describe PopulateMe::Document, 'AdminAdapter' do
     class ContentTitle < PopulateMe::Document
       field :content
     end
+    it 'Sets ID as a string version' do
+      doc = ContentTitle.new id: 3
+      assert_equal '3', doc.to_admin_list_item[:id]
+    end
     describe 'When title is long' do
       it 'Is truncated' do
         doc = ContentTitle.new

data/test/test_mongo.rb

@@ -245,6 +245,17 @@ describe 'PopulateMe::Mongo' do
       assert_equal 2, MongoChampion.admin_get('b').reversed
       assert_equal 0, MongoChampion.admin_get('c').reversed
     end
+
+    it 'Sets the indexes correctly even if some ids are not string' do
+      MongoChampion.collection.drop
+      MongoChampion.new(id: 'a').perform_create
+      MongoChampion.new(id: BSON::ObjectId.from_string("507f1f77bcf86cd799439011")).perform_create
+      MongoChampion.new(id: BSON::ObjectId.from_string("507f191e810c19729de860ea")).perform_create
+      MongoChampion.set_indexes(:position,["507f1f77bcf86cd799439011",'a',"507f191e810c19729de860ea"])
+      assert_equal 0, MongoChampion.admin_get("507f1f77bcf86cd799439011").position
+      assert_equal 1, MongoChampion.admin_get('a').position
+      assert_equal 2, MongoChampion.admin_get("507f191e810c19729de860ea").position
+    end
   end
 
   describe '::admin_distinct' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: populate-me
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Mickael Riga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-07 00:00:00.000000000 Z
+date: 2018-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: web-utils