populate-me 0.18.1 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbde94afb511faf76bbcf73fab4fcb0dba7109ac042df9eb76c2ea128de4b4a9
-  data.tar.gz: bc404f7572fc3a161942a88a403cab1e4d19a2c7042dcb84c285835b7fc7b30f
+  metadata.gz: e3359034df211dd6eef9b9142fd38b7a96db59d0f82bf05efc29ee594dcac332
+  data.tar.gz: e13861e7a4ea3b42e6587bf0ea492cd5ec8c0f2f3c38f8617169ad3864768152
 SHA512:
-  metadata.gz: 5e582594884b90d45f5a9e9894d73401cce46615818b7720c42f60e1ffb63084c45ddad9bfa53fd5c7e04d421b4da8145bbd1e49eed027e1f2c66fc4a752c7bd
-  data.tar.gz: 640d6e131ce2b2c8aba0f31669914249a64d1bb29a838e90a08519c5e8cefcbb359ef65f9d2fe3260b4bf19fb2d6e43c513dcd7ad8868f639def86b9d9666b37
+  metadata.gz: '08f7a97b54471d59a00f856a33190a44eecc9c0ea6e7191cc9177a52b92858d43f287b7839fcc481be04253ed1d8ccf409e14045f74892968af2cd0fe726b856'
+  data.tar.gz: 6cbb05d6aed20c6f8cd277c5944d85c8521fc6fc6371a8f338fb0cad6b180cc8b28365e59fb75a4993d48afafbb89cc079b30a7c160e376dc3fbf347e0a6a511

data/lib/populate_me/document_mixins/admin_adapter.rb

@@ -92,7 +92,17 @@ module PopulateMe
 
         def admin_find o={}
           o[:query] ||= {}
-          docs = self.cast{documents}.find_all do |d|
+          docs = self.cast do
+            if o.key?( :fields )
+              documents.map do |h|
+                h.select do |k,v|
+                  o[:fields].map(&:to_s).include?( k )
+                end
+              end
+            else
+              documents
+            end
+          end.find_all do |d|
             o[:query].inject(true) do |out,(k,v)|
               out && (d.__send__(k)==v)
             end

data/lib/populate_me/document_mixins/schema.rb

@@ -165,11 +165,19 @@ module PopulateMe
           end
         end
 
+        def default_select_fields
+          [
+            self.id_string_key,
+            self.label_field,
+            self.admin_image_field,
+          ].compact.uniq
+        end
+
         def to_select_options o={}
           proc do
             items = self.admin_find({
-              query: (o[:query]||{}), 
-              fields: [self.id_string_key, self.label_field, self.admin_image_field].compact.uniq
+              query: ( o[:query] || {} ),
+              fields: ( o[:fields] || default_select_fields ),
             })
             output = items.sort_by do |i|
               i.to_s.downcase

data/lib/populate_me/version.rb

@@ -1,4 +1,4 @@
 module PopulateMe
-  VERSION = '0.18.1'
+  VERSION = '0.20.0'
 end
 

data/populate-me.gemspec

@@ -18,14 +18,14 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_dependency 'web-utils', '~> 0'
-  s.add_dependency 'sinatra', '~> 2'
+  s.add_dependency 'sinatra', '~> 3'
   s.add_dependency 'json', '~> 2.1'
 
   s.add_development_dependency 'bundler', '>= 2.2.10'
   s.add_development_dependency 'minitest', '~> 5.8'
-  s.add_development_dependency 'rack-test', '~> 0.6'
+  s.add_development_dependency 'rack-test', '~> 2'
   s.add_development_dependency 'rack-cerberus', '~> 1.0'
-  s.add_development_dependency 'mongo', '~> 2.0'
+  s.add_development_dependency 'mongo', '~> 2.18'
   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_schema.rb

@@ -1,4 +1,5 @@
 require 'helper'
+require 'web_utils'
 require 'populate_me/document'
 require 'populate_me/attachment'
 
@@ -114,6 +115,14 @@ describe PopulateMe::Document, 'Schema' do
       ]
     end
 
+    class SelectWithMoreFields < PopulateMe::Document
+      field :name
+      field :parent_name
+      def to_s
+        WebUtils.blank?(self.parent_name) ? self.name : "#{ self.parent_name } / #{ self.name }"
+      end
+    end
+
     before do
       Selectoptionable.documents = []
       Selectoptionable.new(id: '1', name: 'Joe', slug: 'joe').save
@@ -122,10 +131,14 @@ describe PopulateMe::Document, 'Schema' do
       Selectoptionable.new(id: '4', name: 'Averell', slug: 'averell').save
       Selectpreviewable.documents = []
       Selectpreviewable.new(id: '1', name: 'Project', img: 'project.jpg').save
+      SelectWithMoreFields.documents = []
+      SelectWithMoreFields.new(id: '1', name: 'Product', parent_name: 'Collection').save
     end
 
     after do
       Selectoptionable.documents = []
+      Selectpreviewable.documents = []
+      SelectWithMoreFields.documents = []
     end
 
     it 'Formats all items for a select_options' do
@@ -156,6 +169,15 @@ describe PopulateMe::Document, 'Schema' do
       assert_equal '/attachment/selectpreviewable/project.populate_me_thumb.jpg', output[0][:preview_uri]
     end
 
+    it 'Adds fields to query if option is passed' do
+      output = SelectWithMoreFields.to_select_options.call
+      assert_equal 'Product', output[0][:description]
+      output = SelectWithMoreFields.to_select_options({
+        fields: SelectWithMoreFields.default_select_fields + [:parent_name],
+      }).call
+      assert_equal 'Collection / Product', output[0][:description]
+    end
+
   end
 
   describe 'Polymorphism' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: populate-me
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.20.0
 platform: ruby
 authors:
 - Mickael Riga
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-03 00:00:00.000000000 Z
+date: 2023-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: web-utils
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rack-cerberus
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.18'
 - !ruby/object:Gem::Dependency
   name: rack-grid-serve
   requirement: !ruby/object:Gem::Requirement
@@ -259,7 +259,7 @@ homepage: https://github.com/mig-hub/populate-me
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -274,8 +274,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.16
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: PopulateMe is an admin system for web applications.
 test_files: