populate-me 0.22.0 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9685bd65706f352405ea07aa4ea887e92b29f1fa13451d37841d4ac77d13426c
-  data.tar.gz: 996dc804bff57498ed194f482eb8e71022a80150d5c047a51239e120761e4c65
+  metadata.gz: 55d30e2228d61d7b09c44f2b10aec8b9f807bac471c93d98891e82dd3e1f4d00
+  data.tar.gz: bd4d649fb3a4db45361dff0c7b83cf90978ae1a55223f25419b95b93681c509f
 SHA512:
-  metadata.gz: 5ed346ccb8270eb4ad447d2e7dffda0010cb9e27f911a45b6f295a3bd9dbf45e8a22871d4065dbca437db80a7deda8701123bad64bd97744e99d5e2209ebc5e6
-  data.tar.gz: 829956b8fa1305e8f601297dc16d1686a495f29f475209743bad9fd020a91d6a8b2a90627e6dae2b3d853633edebc373a66d586607d598256eaaec7de93be9a4
+  metadata.gz: f6230c8dee48e0540ce3f72a595e710be140d910458ded8b68141885c36eda7f87eba45895da9fc07f40d89d1e4baefdb6dbd9a94efe3a8c25948194fb1f19de
+  data.tar.gz: f0d345e9f161ae45a93ccc79697d1419d31474625323ab2d03cc022fa3feb5b4396d56d782214d7ea7e42c53f5b541617f7e741110049a2b23c11c4b67ce995f

data/lib/populate_me/admin/views/page.erb

@@ -129,9 +129,9 @@
     </script>
 
     <script id="template-string-field" type="x-tmpl-mustache">
-      <input name='{{input_name}}' value='{{input_value}}' {{#required}}required{{/required}}{{{build_input_attributes}}} {{#autocomplete.length}}list='datalist-{{id}}'{{/autocomplete.length}} />
+      <input name='{{input_name}}' value='{{input_value}}' {{#required}}required{{/required}}{{{build_input_attributes}}} {{#autocomplete.length}}list='datalist-{{field_name}}'{{/autocomplete.length}} />
       {{#autocomplete.length}}
-        <datalist id='datalist-{{id}}'>
+        <datalist id='datalist-{{field_name}}'>
           {{#autocomplete}}
             <option value='{{.}}' />
           {{/autocomplete}}

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/version.rb

@@ -1,4 +1,4 @@
 module PopulateMe
-  VERSION = '0.22.0'
+  VERSION = '0.23.0'
 end
 

data/populate-me.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'minitest', '~> 5.8'
   s.add_development_dependency 'rack-test', '~> 2'
   s.add_development_dependency 'rack-cerberus', '~> 1.0'
-  s.add_development_dependency 'mongo', '~> 2.18'
+  s.add_development_dependency 'mongo', '~> 2.19'
   s.add_development_dependency 'rack-grid-serve', '~> 0.0.8'
   s.add_development_dependency 'aws-sdk-s3', '~> 1'
   s.add_development_dependency 'racksh', '~> 1.0'

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.0
+  version: 0.23.0
 platform: ruby
 authors:
 - Mickael Riga
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-04 00:00:00.000000000 Z
+date: 2024-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: web-utils
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.18'
+        version: '2.19'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.18'
+        version: '2.19'
 - !ruby/object:Gem::Dependency
   name: rack-grid-serve
   requirement: !ruby/object:Gem::Requirement