populate-me 0.22.1 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e61285e7d53d8b5337b323559d62baf02008d11cfed7bff21f1780544de26c8
-  data.tar.gz: adb51ab13e6840852167c8615eec94d9b021ec6461b9130a73ade99159e0e36e
+  metadata.gz: 755c27b5a876d2405fa770ff952f67ed52627cb5c9eb43eb08bb8e2e1fc893e8
+  data.tar.gz: ac8e9c0c6f635025b7df65147f2eff229a965317318db44e603f8dd84c73351d
 SHA512:
-  metadata.gz: c188a9f59df60376f70e3e262f0c4d5856b2212dea2f483bccc1c611cf013a14dae4b2bc0ea1aee927379ebf9f6e5acca31a8733e8852dff3ff81c6a381163a1
-  data.tar.gz: f7cf11e6d35e009422e6c61afc1e312b36988b25c089c8fc7262a0f3528391eb5ecbf1101c439c96985877d6fca82b68e03807f6e8bcad06c27bf8324f622479
+  metadata.gz: 94dd1bc25eb28bfba53c5f377e8b31085a26ecc827664c9f8852ec91e96337548bc2469a02809cfd098c86c0c50164d4cc054c9233816884aa06c1f2468693ff
+  data.tar.gz: 621b36da76ed9bc8d12312c981ea16be38baff25a3ad6875842a313132cd5cd2c37208748e871e92efe1c23e28f31903dc4b259539b67184df43badcca43cfaf

data/lib/populate_me/document_mixins/admin_adapter.rb

@@ -85,9 +85,16 @@ module PopulateMe
             documents.find{|doc| doc[id_string_key] == id }
           end
         end
+        alias_method :[], :admin_get
 
         def admin_get_multiple ids, o={sort: nil}
-          self.admin_find(o.merge(query: {id_string_key => {'$in' => ids.uniq.compact}}))
+          clean_ids = ids.uniq.compact
+          items = self.cast do
+            documents.select{|doc| clean_ids.include?(doc[id_string_key]) }
+          end
+          clean_ids.map do |id|
+            items.find{|item| item.id == id}
+          end.compact
         end
 
         def admin_find o={}

data/lib/populate_me/mongo.rb

@@ -6,7 +6,7 @@ module PopulateMe
   class MissingMongoDBError < StandardError; end
 
   class Mongo < Document
-    
+
     self.settings.instance_eval do
       def collection_name
         puts 'yo'
@@ -95,10 +95,13 @@ module PopulateMe
       alias_method :[], :admin_get
 
       def admin_get_multiple theids, o={sort: nil}
-        theids = theids.uniq.compact.map{|theid| string_or_object_id(theid) }
-        self.admin_find(o.merge({
-          query: {id_string_key => {'$in' => theids} }
+        clean_ids = theids.uniq.compact.map{|theid| string_or_object_id(theid) }
+        items = self.admin_find(o.merge({
+          query: {id_string_key => {'$in' => clean_ids} }
         }))
+        clean_ids.map do |id|
+          items.find{|item| item.id == id}
+        end.compact
       end
 
       def admin_find o={}

data/lib/populate_me/variation.rb

@@ -21,7 +21,7 @@ module PopulateMe
         defaults << "-strip " if o[:strip]
         defaults << "-interlace Plane " if o[:progressive] and [:jpg,:jpeg].include?(ext.to_sym)
         job = lambda{ |src,dst|
-          Kernel.system "convert \"#{src}\" #{defaults}#{convert_string} \"#{dst}\""
+          Kernel.system "magick \"#{src}\" #{defaults}#{convert_string} \"#{dst}\""
         }
         self.new name, ext, job
       end

data/lib/populate_me/version.rb

@@ -1,4 +1,4 @@
 module PopulateMe
-  VERSION = '0.22.1'
+  VERSION = '0.24.0'
 end
 

data/test/test_document_admin_adapter.rb

@@ -97,12 +97,12 @@ describe PopulateMe::Document, 'AdminAdapter' do
   end
 
   describe '::admin_find ::admin_find_first' do
-    
+
     class FindablePerson < PopulateMe::Document
       field :first_name
       field :last_name
     end
-    
+
     before do
       FindablePerson.documents = []
       FindablePerson.new(first_name: 'Bobby', last_name: 'Peru').save
@@ -136,6 +136,46 @@ describe PopulateMe::Document, 'AdminAdapter' do
 
   end
 
+  describe '::admin_get' do
+
+    class GetablePerson < PopulateMe::Document
+      field :name
+      field :lastname
+    end
+
+    before do
+      GetablePerson.documents = []
+    end
+
+    it "Should get correct item" do
+      jackson_id = GetablePerson.new(name: "jackson").save
+      assert_equal "jackson", GetablePerson.admin_get(jackson_id).name
+      assert_equal "jackson", GetablePerson.admin_get(jackson_id.to_s).name
+      assert_nil GetablePerson.admin_get("nonexistentid")
+
+      regular_id = GetablePerson.new(id: 87, name: "regular").save
+      # need to test with .to_s
+      assert_equal "regular", GetablePerson.admin_get(regular_id).name
+    end
+
+    it "Should get multiple items" do
+      # Order is not respected
+      alpha_id = GetablePerson.new(name: "alpha").save
+      beta_id = GetablePerson.new(name: "beta").save
+      gamma_id = GetablePerson.new(name: "gamma").save
+      items = GetablePerson.admin_get([beta_id, "nonexistentid", alpha_id, beta_id, nil, alpha_id])
+      assert items.is_a?(Array)
+      assert_equal 2, items.count
+      refute_nil items.find{|i| i.id == alpha_id}
+      refute_nil items.find{|i| i.id == beta_id}
+      assert_nil items.find{|i| i.id == gamma_id}
+      # respects natural order of uniq compact elements
+      assert_equal beta_id, items[0].id
+      assert_equal alpha_id, items[1].id
+    end
+
+  end
+
   describe '::admin_distinct' do
 
     class Distinction < PopulateMe::Document

data/test/test_mongo.rb

@@ -131,12 +131,15 @@ describe 'PopulateMe::Mongo' do
       alpha_id = LowFish.new(name: "alpha").perform_create
       beta_id = LowFish.new(name: "beta").perform_create
       gamma_id = LowFish.new(name: "gamma").perform_create
-      items = LowFish.admin_get([alpha_id, beta_id, nil, alpha_id])
+      items = LowFish.admin_get([beta_id, "nonexistentid", alpha_id, beta_id, nil, alpha_id])
       assert items.is_a?(Array)
       assert_equal 2, items.count
       refute_nil items.find{|i| i.id == alpha_id}
       refute_nil items.find{|i| i.id == beta_id}
       assert_nil items.find{|i| i.id == gamma_id}
+      # respects natural order of uniq compact elements
+      assert_equal beta_id, items[0].id
+      assert_equal alpha_id, items[1].id
     end
 
     it 'Should have the [] shortcut for admin_get' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: populate-me
 version: !ruby/object:Gem::Version
-  version: 0.22.1
+  version: 0.24.0
 platform: ruby
 authors:
 - Mickael Riga
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-25 00:00:00.000000000 Z
+date: 2025-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: web-utils