populate-me 0.9.2 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2e11800f347033e3d25223ba4b1296e07e1bdd7f3231d35888b6bd56c2cb126
-  data.tar.gz: 10a0e20a877ad1c9ae25f9096cf55f253eab4b1014e50368af6cb8ac28e39976
+  metadata.gz: 514291d44eb8b068db7c98d742dc8395a5a2821255ac31ba054522823f6c55d9
+  data.tar.gz: 5a5c76cec480ed1c057ee70d33a38f21f1bd536c3ca5eabfdbbf2bf1d14c4b3c
 SHA512:
-  metadata.gz: 28d96b6d98af49675ee4bd2050528cdfd387032fb7390464334d789c7c7e2bd0fe5730e13e545f88383a6aa19602d95472c8a72ffeaa8ace60e580a3e6af4ca9
-  data.tar.gz: 52692b913a4d6f3083a283c0638571d90e96aab8b1bf8ace375de6c108bccaad0f919323dbffa5be715ff52d4fc0990a3d7e9c3859bbbcfd64da757e5e86f6a0
+  metadata.gz: 72e7c460a58523cf8cd9a1e9dadba107f5bfa810ec552b93af0fe113d4bf98f0941cb168ac4323291ab5fee478c1d018ceaa017c2f4bf5ea3460ce6d0b4a4130
+  data.tar.gz: 41cf0a2e8705a2b184e3c840b001424cd4d69f00a447da72b89d2339ee0390a24b76c07e886b48127594ed73ad762e43560497097aa672dbc89ff2d7c9af2141

data/lib/populate_me/admin.rb

@@ -62,10 +62,10 @@ class PopulateMe::Admin < Sinatra::Base
     end
     items = current_level.map do |l|
       href = l[1].is_a?(String) ? l[1] : "#{request.script_name}/menu#{levels.map{|level|'/'+level}.join}/#{slugify(l[0])}" 
-      { title: l[0], href: href }
+      { title: l[0], href: href, new_page: (not href.start_with?('/')) }
     end
     if request.path_info=='/menu'
-      items.push({title: '?', href: "#{request.script_name}/help"})
+      items.push({title: '?', href: "#{request.script_name}/help", new_page: false})
     end
     {
       template: 'template_menu',

data/lib/populate_me/admin/__assets__/css/main.css

@@ -140,10 +140,25 @@ button.admin-delete:focus, button.admin-delete-nested:focus, .handle-button:focu
   -ms-user-select: none;
   user-select: none;
 }
+.documents.grid {
+  width: 90%; width: 90vw;
+}
 .documents > li, .nested-documents > li {
   display: block;
   margin-bottom: 1em;
 }
+.documents.grid > li {
+  display: inline-block;
+  vertical-align: top;
+  width: 200px;
+  margin-right: 1em;
+}
+.documents.grid > li > a {
+  word-break: break-word;
+}
+.documents.grid > li img {
+  width: 200px;
+}
 .documents > li:hover, .nested-documents > li:hover {
   background-color: #eee8d5;
   outline: 0.5em solid #eee8d5;
@@ -169,16 +184,20 @@ form {
   margin-bottom: 1em;
 }
 
-input[type=text], input[type=email],
+input[type=text], input[type=email], input[type=search],
 textarea {
   border: 0px;
   color: #839496;
-  background: #ffffff;
+  background-color: #ffffff;
   width: 400px;
   padding: 0.5em;
   font-size: 1em;
+  outline: 0;
+}
+input[type=text].search-items {
+  border-radius: 1em;
 }
-input[type=text]:focus, input[type=email]:focus,
+input[type=text]:focus, input[type=email]:focus, input[type=email]:focus,
 textarea:focus {
   /* color: #002b36; */
 }

data/lib/populate_me/admin/__assets__/js/columnav.js

@@ -45,14 +45,18 @@
      root.busy = false;
      root.on('push.columnav', function(e,data,cb) {
        var $data = $("<li class='"+settings.column_class+"'>"+data+"</li>");
-       root.append($data);
-       new_column($data, root);
-       var cb_object = {event:e,column:$data,container:root,settings:settings};
-       root.animate({scrollLeft: root.width()},function(){
+       async function push_callback_stack() {
+         await root.append($data);
+         await new_column($data, root);
+         var cb_object = {event:e,column:$data,container:root,settings:settings};
+         await settings.on_push(cb_object);
+         if (typeof cb == 'function') await cb(cb_object);
          root.busy = false;
-         settings.on_push(cb_object);
-         if (typeof cb == 'function') cb(cb_object);
-       });
+         root.find('> li:last-child').get(0).scrollIntoView({
+           behavior: 'smooth', inline: 'start'
+         });
+       }
+       push_callback_stack();
      });
      root.on('getandpush.columnav', function(e,url,cb) {
        $.get(url, function(data) {
@@ -63,7 +67,7 @@
        });
      });
      root.on('pop.columnav', function(e,removable,cb) {
-       removable = removable || root.children().last();
+       removable = removable || root.find('> li:last-child');
        removable.css({visibility:'hidden'})
        .animate({width:0},function(){
          // Trick to make sure it runs only once

data/lib/populate_me/admin/__assets__/js/main.js

@@ -94,12 +94,24 @@ PopulateMe.make_sortable = function(selector,context) {
   });
 };
 
+// Copy and restore column search.
+// Used when saving pops the columns.
+PopulateMe.copy_column_search = function(column) {
+  return column.find('.search-items').val();
+};
+PopulateMe.restore_column_search = function(column, value) {
+  if (value !== '' && column.data('qs')) {
+    column.find('.search-items').val(value);
+    column.data('qs').search(value);
+  }
+};
+
 // Scroll to an element, possibly in a specific column.
 PopulateMe.scroll_to = function(el, column) {
   if (!column) {
     column = el.closest('.column');
   }
-  column.animate({scrollTop: el.position().top});
+  el.get(0).scrollIntoView({ behavior: 'smooth'});
 };
 
 // Mark errors for report after form validation.
@@ -162,39 +174,84 @@ PopulateMe.jsValidationsPassed = function(context) {
 // in case you have things to put in your custom javascript.
 PopulateMe.init_column = function(c) {
 
+  var documents = $('.documents', c); 
+
   // Sort list item
-  PopulateMe.make_sortable('.documents',c).bind('sortupdate', function(e, ui) {
-    var list = $(ui.item).closest('.documents');
-    var ids = list.children().map(function() {
-      return $(this).data().id;
-    }).get();
-    $.ajax({
-      url: list.data().sortUrl,
-      type: 'put',
-      data: {
-        action: 'sort',
-        field: list.data().sortField,
-        ids: ids
-      }
+  if (documents.data('sort-field') !== '') {
+    PopulateMe.make_sortable(documents).bind('sortupdate', function(e, ui) {
+      var list = $(ui.item).closest('.documents');
+      var ids = list.children().map(function() {
+        return $(this).data().id;
+      }).get();
+      $.ajax({
+        url: list.data().sortUrl,
+        type: 'put',
+        data: {
+          action: 'sort',
+          field: list.data().sortField,
+          ids: ids
+        }
+      });
+      /*
+      ui.item contains the current dragged element.
+      ui.item.index() contains the new index of the dragged element
+      ui.oldindex contains the old index of the dragged element
+      ui.startparent contains the element that the dragged item comes from
+      ui.endparent contains the element that the dragged item was added to
+      */
     });
-    /*
-    ui.item contains the current dragged element.
-    ui.item.index() contains the new index of the dragged element
-    ui.oldindex contains the old index of the dragged element
-    ui.startparent contains the element that the dragged item comes from
-    ui.endparent contains the element that the dragged item was added to
-    */
-  });
+  }
 
   // Sort nested documents
   PopulateMe.make_sortable('.nested-documents',c);
 
+  $('.search-items', c).each(function() {
+    var field = $(this)
+    var qs = field.quicksearch($('.admin-list-item', c), {
+      selector: '.item-title',
+      onAfter: function() {
+        if (documents.is('.ui-sortable')) {
+          if (field.val() == '') {
+            documents.sortable('enable');
+          } else {
+            documents.sortable('disable');
+          }
+        }
+      }
+    });
+    c.data('qs', qs);
+  });
+
   // Init textareas
   $('textarea',c).trigger('input');
 
   // Init multiple select with asmSelect
   $('select[multiple]', c).asmSelect({ sortable: true, removeLabel: '×' });
 
+  // Select with preview
+  $('select:not([multiple])', c).change(function() {
+    var $this = $(this);
+    var container;
+    if ($this.data('preview-container')) {
+      container = $($this.data('preview-container'), c);
+    } else {
+      container = $this.next('.preview-container');
+    }
+    if (container.size() == 0) return;
+    var path = $this.find(':selected:first').data('preview');
+    if (path) {
+      var img = container.find('img:first');
+      if (img.size() < 1) {
+        img = $("<img src='' alt='Preview' title='Preview' width='250' />");
+        container.html(img);
+      }
+      img.attr('src', path);
+    } else {
+      container.html('');
+    }
+  });
+  $('option:selected[data-preview]').parent().change();
+
   // Polymorphic selector
   $('select.polymorphic_type_values').change(function() {
     var $this = $(this);
@@ -261,11 +318,14 @@ $(function() {
         contentType: false,
         success: function(res) {
           if (res.success==true) {
-            var reloader = PopulateMe.finder.find('> li:nth-last-child(3) .selected')
+            var reloader = PopulateMe.finder.find('> li:nth-last-child(3) .selected');
             if (reloader.size()>0) {
+              var reloadee = PopulateMe.finder.find('> li:nth-last-child(2)');
+              var current_search = PopulateMe.copy_column_search(reloadee);
               reloader.trigger('click.columnav',[function(cb_object) {
-                var target = $('[data-id='+res.data.id+']', cb_object.column);
+                var target = $('[data-id='+res.data._id+']', cb_object.column);
                 if (target.size()>0) {
+                  PopulateMe.restore_column_search(cb_object.column, current_search);
                   PopulateMe.scroll_to(target, cb_object.column);
                 }
               }]);

data/lib/populate_me/admin/__assets__/js/quicksearch.js

@@ -0,0 +1 @@
+(function($,window,document,undefined){$.fn.quicksearch=function(target,opt){var timeout,cache,rowcache,jq_results,val="",e=this,options=$.extend({delay:100,selector:null,stripeRows:null,loader:null,noResults:"",matchedResultsCount:0,bind:"keyup",onBefore:function(){return},onAfter:function(){return},show:function(){this.style.display=""},hide:function(){this.style.display="none"},prepareQuery:function(val){return val.toLowerCase().split(" ")},testQuery:function(query,txt,_row){for(var i=0;i<query.length;i+=1){if(txt.indexOf(query[i])===-1){return false}}return true}},opt);this.go=function(){var i=0,numMatchedRows=0,noresults=true,query=options.prepareQuery(val),val_empty=val.replace(" ","").length===0;for(var i=0,len=rowcache.length;i<len;i++){if(val_empty||options.testQuery(query,cache[i],rowcache[i])){options.show.apply(rowcache[i]);noresults=false;numMatchedRows++}else{options.hide.apply(rowcache[i])}}if(noresults){this.results(false)}else{this.results(true);this.stripe()}this.matchedResultsCount=numMatchedRows;this.loader(false);options.onAfter();return this};this.search=function(submittedVal){val=submittedVal;e.trigger()};this.currentMatchedResults=function(){return this.matchedResultsCount};this.stripe=function(){if(typeof options.stripeRows==="object"&&options.stripeRows!==null){var joined=options.stripeRows.join(" ");var stripeRows_length=options.stripeRows.length;jq_results.not(":hidden").each(function(i){$(this).removeClass(joined).addClass(options.stripeRows[i%stripeRows_length])})}return this};this.strip_html=function(input){var output=input.replace(new RegExp("<[^<]+>","g"),"");output=$.trim(output.toLowerCase());return output};this.results=function(bool){if(typeof options.noResults==="string"&&options.noResults!==""){if(bool){$(options.noResults).hide()}else{$(options.noResults).show()}}return this};this.loader=function(bool){if(typeof options.loader==="string"&&options.loader!==""){bool?$(options.loader).show():$(options.loader).hide()}return this};this.cache=function(){jq_results=$(target);if(typeof options.noResults==="string"&&options.noResults!==""){jq_results=jq_results.not(options.noResults)}var t=typeof options.selector==="string"?jq_results.find(options.selector):$(target).not(options.noResults);cache=t.map(function(){return e.strip_html(this.innerHTML)});rowcache=jq_results.map(function(){return this});val=val||this.val()||"";return this.go()};this.trigger=function(){this.loader(true);options.onBefore();window.clearTimeout(timeout);timeout=window.setTimeout(function(){e.go()},options.delay);return this};this.cache();this.results(true);this.stripe();this.loader(false);return this.each(function(){$(this).on(options.bind,function(){val=$(this).val();e.trigger()})})}})(jQuery,this,document);

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

@@ -26,7 +26,7 @@
       <h1>{{page_title}}</h1>
       <ol class='menu'>
         {{#items}}
-          <li><a href="{{href}}" class='column-push' title='Open'>{{title}}</a></li>
+          <li><a href="{{href}}" {{#new_page}}target='_blank'{{/new_page}}{{^new_page}}class='column-push'{{/new_page}} title='Open'>{{title}}</a></li>
         {{/items}}
       </ol>
     </script>
@@ -46,7 +46,10 @@
         {{/is_polymorphic}}
         <a href="<%= request.script_name %>/form/{{dasherized_class_name}}{{#new_data}}?{{new_data}}{{/new_data}}" class='column-push new-document-btn' title='Create'>+</a>
       </p>
-      <ol class='documents' data-sort-field='{{sort_field}}' data-sort-url='<%= request.script_name %>/api/{{dasherized_class_name}}'>
+      <form class='form-search-items'>
+        <input type='text' class='search-items' placeholder='Search'>
+      </form>
+      <ol class='documents {{#grid_view}}grid{{/grid_view}}' data-sort-field='{{sort_field}}' data-sort-url='<%= request.script_name %>/api/{{dasherized_class_name}}'>
         {{#items}}{{#custom_partial_or_default}}template_document{{/custom_partial_or_default}}{{/items}}
       </ol>
     </script>
@@ -57,7 +60,7 @@
           <button type='button' class='admin-delete' title='Delete' value='<%= request.script_name %>/api/{{admin_url}}'>&times;</button>
         </header>
         <a href="<%= request.script_name %>/form/{{admin_url}}" class='column-push' title='Edit'>
-          {{title}}
+          <span class='item-title'>{{title}}</span>
           {{#image_url}}
             <br />
             <img src='{{image_url}}{{cache_buster}}' alt='{{title}}' width='300' />
@@ -134,9 +137,10 @@
       {{/multiple}}
       <select name='{{input_name}}' {{#multiple}}multiple title='?'{{/multiple}}{{{build_input_attributes}}}>
         {{#select_options}}
-          <option value='{{value}}' {{#selected}}selected{{/selected}}>{{description}}</option>
+          <option value='{{value}}' {{#selected}}selected{{/selected}} {{#preview_uri}}data-preview='{{preview_uri}}'{{/preview_uri}}>{{description}}</option>
         {{/select_options}}
       </select>
+      <div class='preview-container'></div>
     </script>
 
     <script id="template-attachment-field" type="x-tmpl-mustache">
@@ -175,6 +179,7 @@
     <script src="<%= request.script_name %>/__assets__/js/columnav.js" type="text/javascript" charset="utf-8"></script>
     <%# <script src="<%= request.script_name %1>/__assets__/js/sortable.js" type="text/javascript" charset="utf-8"></script> %>
     <script src="<%= request.script_name %>/__assets__/js/asmselect.js" type="text/javascript" charset="utf-8"></script>
+    <script src="<%= request.script_name %>/__assets__/js/quicksearch.js" type="text/javascript" charset="utf-8"></script>
     <script type="text/javascript">
       window.admin_path = "<%= request.script_name %>";
       window.index_path = "<%= settings.index_path %>";

data/lib/populate_me/document_mixins/admin_adapter.rb

@@ -76,11 +76,16 @@ module PopulateMe
         end
 
         def admin_get id
+          return self.admin_get_multiple(id) if id.is_a?(Array)
           self.cast do
-            documents.find{|doc| doc[id_string_key]==id }
+            documents.find{|doc| doc[id_string_key] == id }
           end
         end
 
+        def admin_get_multiple ids, o={sort: nil}
+          self.admin_find(o.merge(query: {id_string_key => {'$in' => ids.uniq.compact}}))
+        end
+
         def admin_find o={}
           o[:query] ||= {}
           docs = self.cast{documents}.find_all do |d|
@@ -119,8 +124,10 @@ module PopulateMe
             end
             new_data = Rack::Utils.build_nested_query(data: o[:params][:filter])
           end
+          items = self.admin_find(query: query)
           {
             template: 'template_list',
+            grid_view: self.settings[:grid_view]==true,
             page_title: self.to_s_short_plural,
             dasherized_class_name: WebUtils.dasherize_class_name(self.name),
             new_data: new_data,
@@ -129,7 +136,7 @@ module PopulateMe
             sort_field: self.sort_field_for(o),
             # 'command_plus'=> !self.populate_config[:no_plus],
             # 'command_search'=> !self.populate_config[:no_search],
-            items: self.admin_find(query: query).map do |d| 
+            items: items.map do |d| 
               d.to_admin_list_item(o) 
             end
           }

data/lib/populate_me/document_mixins/schema.rb

@@ -160,13 +160,20 @@ module PopulateMe
 
         def to_select_options o={}
           proc do
-            items = self.admin_find(query: (o[:query]||{}), fields: [self.id_string_key, self.label_field])
+            items = self.admin_find({
+              query: (o[:query]||{}), 
+              fields: [self.id_string_key, self.label_field, self.admin_image_field].compact.uniq
+            })
             output = items.sort_by do |i|
               i.to_s.downcase
             end.map do |i|
-              [i.to_s, i.id]
+              item = { description: i.to_s, value: i.id }
+              unless self.admin_image_field.nil?
+                item.merge! preview_uri: i.admin_image_url
+              end
+              item
             end
-            output.unshift(['?','']) if o[:allow_empty]
+            output.unshift(description: '?', value: '') if o[:allow_empty]
             output
           end
         end

data/lib/populate_me/mongo.rb

@@ -88,11 +88,19 @@ module PopulateMe
       end
 
       def admin_get theid
+        return self.admin_get_multiple(theid) if theid.is_a?(Array)
         theid = string_or_object_id theid
         self.cast{ collection.find({id_string_key => theid}).first }
       end
       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} }
+        }))
+      end
+
       def admin_find o={}
         query = o.delete(:query) || {}
         o[:sort] ||= @current_sort

data/lib/populate_me/version.rb

@@ -1,4 +1,4 @@
 module PopulateMe
-  VERSION = '0.9.2'
+  VERSION = '0.13.0'
 end
 

data/populate-me.gemspec

@@ -29,6 +29,6 @@ Gem::Specification.new do |s|
   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'
-  s.add_development_dependency 'rake', '~> 10.1'
+  s.add_development_dependency 'rake', '>= 12.3.3'
 end
 

data/test/test_admin.rb

@@ -124,6 +124,10 @@ describe PopulateMe::Admin do
 
   describe 'Handlers' do
 
+    let(:help_item) {
+      { 'title' => '?', 'href' => '/help', 'new_page' => false }
+    }
+
     describe '/menu' do
 
       describe 'when url is root' do
@@ -133,18 +137,22 @@ describe PopulateMe::Admin do
           assert_json last_response
           assert_for_view json, 'template_menu', 'Menu'
           expected_h = {
-            'title'=> 'Home Details', 'href'=> '/admin/form/home-details/0'
+            'title' => 'Home Details', 
+            'href' => '/admin/form/home-details/0', 
+            'new_page' => false
           }
           assert_equal expected_h, json['items'][0]
           expected_h = {
-            'title'=> 'Project Page', 'href'=> '/menu/project-page'
+            'title' => 'Project Page', 
+            'href' => '/menu/project-page',
+            'new_page' => false
           }
           assert_equal expected_h, json['items'][1]
         end
         it 'Adds help link' do
           get '/menu'
           assert_equal 3, json['items'].size
-          assert_equal({'title'=>'?', 'href'=>'/help'}, json['items'].last)
+          assert_equal(help_item, json['items'].last)
         end
       end
       describe 'when url is nested' do
@@ -155,13 +163,15 @@ describe PopulateMe::Admin do
           assert_for_view json, 'template_menu', 'Checks'
           assert_equal 2, json['items'].size
           expected_h = {
-            'title'=> 'Check 1', 'href'=> '/check/1'
+            'title' => 'Check 1', 
+            'href' => '/check/1', 
+            'new_page' => false
           }
           assert_equal expected_h, json['items'][0]
         end
         it 'Does not add help link' do
           get '/menu/project-page/checks'
-          refute_equal({'title'=>'?', 'href'=>'/help'}, json['items'].last)
+          refute_equal(help_item, json['items'].last)
         end
       end
 

data/test/test_document_outcasting.rb

@@ -11,6 +11,11 @@ class Outcasted < PopulateMe::Document
     {description: 'medium', value: 'm'},
     {description: 'large', value: 'l'}
   ]
+  field :availability, type: :select, select_options: [
+    {description: 'Available', value: 'yes', preview_uri: 'http://www.example.org/yes.jpg' },
+    {description: 'On offer', value: 'almost', preview_uri: 'http://www.example.org/almost.jpg' },
+    {description: 'Sold', value: 'no', preview_uri: 'http://www.example.org/no.jpg' }
+  ]
   field :tags, type: :select, select_options: ['art','sport','science'], multiple: true
   field :related_properties, type: :select, select_options: ['prop1','prop2','prop3'], multiple: true
   field :pdf, type: :attachment
@@ -98,6 +103,17 @@ describe PopulateMe::Document, 'Outcasting' do
       formated_options?(original, output)
     end
 
+    it 'Can have more fields when they are already formated' do
+      # Mainly for adding a preview_uri but also future tweaks
+      original = Outcasted.fields[:availability]
+      output = Outcasted.new.outcast(:availability, original, {input_name_prefix: 'data'})
+      assert(output[:select_options].all?{|o| o.key?(:preview_uri)})
+      last = output[:select_options].last
+      assert_equal 'Sold', last[:description]
+      assert_equal 'no', last[:value]
+      assert_equal 'http://www.example.org/no.jpg', last[:preview_uri]
+    end
+
     it 'Formats the options when it is a 2 strings array' do
       original = Outcasted.fields[:size].dup
       original[:select_options] = [

data/test/test_document_schema.rb

@@ -85,12 +85,22 @@ describe PopulateMe::Document, 'Schema' do
       label :slug
     end
 
+    class Selectpreviewable < PopulateMe::Document
+      set :default_attachment_class, PopulateMe::Attachment
+      field :name
+      field :img, type: :attachment, variations: [
+        PopulateMe::Variation.default
+      ]
+    end
+
     before do
       Selectoptionable.documents = []
       Selectoptionable.new(id: '1', name: 'Joe', slug: 'joe').save
       Selectoptionable.new(id: '2', name: 'William', slug: 'william').save
       Selectoptionable.new(id: '3', name: 'Jack', slug: 'jack').save
       Selectoptionable.new(id: '4', name: 'Averell', slug: 'averell').save
+      Selectpreviewable.documents = []
+      Selectpreviewable.new(id: '1', name: 'Project', img: 'project.jpg').save
     end
 
     after do
@@ -102,19 +112,27 @@ describe PopulateMe::Document, 'Schema' do
       assert output_proc.is_a?(Proc)
       output = output_proc.call
       assert_equal 4, output.size
-      assert output.all?{|o| o.is_a?(Array) and o.size==2}
-      assert_equal '1', output.find{|o|o[0]=='joe'}[1]
+      assert output.all?{|o| o.is_a?(Hash) and o.size==2}
+      assert_equal '1', output.find{|o|o.fetch(:description)=='joe'}.fetch(:value)
     end
 
     it 'Puts items in alphabetical order of their label' do
       output= Selectoptionable.to_select_options.call
-      assert_equal ['averell', '4'], output[0]
+      assert_equal({description: 'averell', value: '4'}, output[0])
     end
 
     it 'Has an option for prepending empty choice' do
       output= Selectoptionable.to_select_options(allow_empty: true).call
-      assert_equal ['?', ''], output[0]
-      assert_equal ['averell', '4'], output[1]
+      assert_equal({description: '?', value: ''}, output[0])
+      assert_equal({description: 'averell', value: '4'}, output[1])
+    end
+
+    it 'Adds a :preview_uri when there is a thumbnail' do
+      output= Selectpreviewable.to_select_options.call
+      assert output[0].key?(:preview_uri)
+      assert_equal 'Project', output[0][:description]
+      assert_equal '1', output[0][:value]
+      assert_equal '/attachment/selectpreviewable/project.populate_me_thumb.jpg', output[0][:preview_uri]
     end
 
   end

data/test/test_mongo.rb

@@ -126,6 +126,19 @@ describe 'PopulateMe::Mongo' do
       assert_equal "regular", LowFish.admin_get(regular_fish_id).name
     end
 
+    it "Should get multiple items" do
+      # Order is not respected
+      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])
+      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}
+    end
+
     it 'Should have the [] shortcut for admin_get' do
       LowFish.collection.insert_one(_id: 42, name: "H2G2")
       assert_equal LowFish[42], LowFish.admin_get(42)
@@ -138,7 +151,7 @@ describe 'PopulateMe::Mongo' do
       LowFish.collection.insert_one(_id: 40, name: "Bran")
       items = LowFish.admin_find
       assert items.is_a?(Array)
-      assert 4, items.count
+      assert_equal 4, items.count
       assert_equal 10, items[0].id
       items = LowFish.admin_find query: {name: 'Bran'}
       assert items.is_a?(Array)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: populate-me
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.13.0
 platform: ruby
 authors:
 - Mickael Riga
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-10-01 00:00:00.000000000 Z
+date: 2020-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: web-utils
@@ -168,16 +168,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: 12.3.3
 description: PopulateMe is an admin system for managing structured content of web
   applications. It is built on top of the Sinatra framework, but can be used along
   any framework using Rack.
@@ -216,6 +216,7 @@ files:
 - lib/populate_me/admin/__assets__/js/jquery-ui.min.js
 - lib/populate_me/admin/__assets__/js/main.js
 - lib/populate_me/admin/__assets__/js/mustache.js
+- lib/populate_me/admin/__assets__/js/quicksearch.js
 - lib/populate_me/admin/__assets__/js/sortable.js
 - lib/populate_me/admin/views/help.erb
 - lib/populate_me/admin/views/page.erb
@@ -256,7 +257,7 @@ homepage: https://github.com/mig-hub/populate-me
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -272,7 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: PopulateMe is an admin system for web applications.
 test_files: