populate-me 0.11.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: faa748585887ab4c87b9a96b0fcbc1cb819933840e5ed916a3455ea677c10ada
-  data.tar.gz: '0548e4f13d04c8f9a5375029fc11e6cfdd00b7759b2a6b5ba171151640ee5159'
+  metadata.gz: 0e07006c1f567c3309a537233c482114dd0536b783c6e82b1cafcf7d5c53fa12
+  data.tar.gz: f36fc1cb24ac5b59ea7090c6ffc5c425d437ef95e36f528fb012bb721472d185
 SHA512:
-  metadata.gz: 3244bbeb680e2d0ffea098719cc228623115666b498330651563672455c2495cfd3955270943f4b0020fc54780e876dd644a9025b0ff7f325eb016586f75cc8f
-  data.tar.gz: 3489e40c4e16e1b75c005d09937c535de3eef8d52edf8de9b1aa54a43d71a7a8304a7e80ebaaec2486da4b344b28752b1451f82e224f2014cc00d74a0e417118
+  metadata.gz: 6e53cfb5b625bbb4835cb5ba5fa5e404dfaac6e23eb607d5f981ff6c60ed67f2939d0dd4a288476ce1bd486804264c6516b2a79439c6ba302a080c2a0270dd2c
+  data.tar.gz: 2ca83c16c743176e272793b3d411887b7b3ea9a7f4d01ba71cad0fcd2e1417423d526116d7f09ef4f24b4fc85c54b0c9399cb6a6445fb4c074d1ac09892fa1af

data/lib/populate_me/admin.rb

@@ -67,6 +67,7 @@ class PopulateMe::Admin < Sinatra::Base
     if request.path_info=='/menu'
       items.push({title: '?', href: "#{request.script_name}/help", new_page: false})
     end
+    content_type :json
     {
       template: 'template_menu',
       page_title: page_title,
@@ -76,6 +77,7 @@ class PopulateMe::Admin < Sinatra::Base
 
   get '/list/:class_name' do
     @model_class = resolve_model_class params[:class_name]
+    content_type :json
     @model_class.to_admin_list(request: request, params: params).to_json
   end
 
@@ -87,6 +89,7 @@ class PopulateMe::Admin < Sinatra::Base
     else
       @model_instance = resolve_model_instance @model_class, params[:id]
     end
+    content_type :json
     @model_instance.to_admin_form(
       request: request, 
       params: params,
@@ -102,6 +105,7 @@ class PopulateMe::Admin < Sinatra::Base
 
   not_found do
     response.headers['X-Cascade'] = 'pass'
+    content_type :json
     {'success'=>false,'message'=>'Not Found'}.to_json
   end
 
@@ -109,6 +113,7 @@ class PopulateMe::Admin < Sinatra::Base
     puts
     puts env['sinatra.error'].inspect
     puts
+    content_type :json
     {'success'=>false,'message'=>env['sinatra.error'].message}.to_json
   end
 

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

@@ -184,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,33 +174,54 @@ 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');
 
@@ -285,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);
                 }
               }]);
@@ -377,6 +413,8 @@ $(function() {
     process_data: function(data) {
       if (typeof data == 'object') {
         return PopulateMe.mustache_render(data);
+      } else if (typeof data == 'string' && data[0] == '{') {
+        return PopulateMe.mustache_render(JSON.parse(data));
       } else {
         return data;
       }

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

@@ -46,6 +46,9 @@
         {{/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>
+      <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>
@@ -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' />
@@ -142,7 +145,7 @@
 
     <script id="template-attachment-field" type="x-tmpl-mustache">
       {{#url}}
-        <img src='{{url}}{{cache_buster}}' alt='Preview' width='150' />
+        <img src='{{url}}{{cache_buster}}' alt='Preview' width='150' onerror="this.src='<%= request.script_name %>/__assets__/img/file.png'; this.onerror=null;" />
         <button class='attachment-deleter'>x</button>
         <br />
       {{/url}}
@@ -176,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,6 +124,7 @@ 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,
@@ -130,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/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/variation.rb

@@ -27,7 +27,7 @@ module PopulateMe
       end
 
       def default
-        self.new_image_magick_job(:populate_me_thumb, :jpg, "-flatten -resize '400x225^' -gravity center -extent 400x225")
+        self.new_image_magick_job(:populate_me_thumb, :jpg, "-flatten -resize '400x230' -gravity center -extent 400x230")
       end
 
     end

data/lib/populate_me/version.rb

@@ -1,4 +1,4 @@
 module PopulateMe
-  VERSION = '0.11.0'
+  VERSION = '0.14.0'
 end
 

data/test/test_document_schema.rb

@@ -1,5 +1,6 @@
 require 'helper'
 require 'populate_me/document'
+require 'populate_me/attachment'
 
 describe PopulateMe::Document, 'Schema' do
 

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.11.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Mickael Riga
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-09 00:00:00.000000000 Z
+date: 2021-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: web-utils
@@ -198,6 +198,7 @@ files:
 - lib/populate_me/admin/__assets__/css/asmselect.css
 - lib/populate_me/admin/__assets__/css/jquery-ui.min.css
 - lib/populate_me/admin/__assets__/css/main.css
+- lib/populate_me/admin/__assets__/img/file.png
 - lib/populate_me/admin/__assets__/img/help/children.png
 - lib/populate_me/admin/__assets__/img/help/create.png
 - lib/populate_me/admin/__assets__/img/help/delete.png
@@ -216,6 +217,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 +258,7 @@ homepage: https://github.com/mig-hub/populate-me
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -271,8 +273,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key:
+rubygems_version: 3.2.16
+signing_key: 
 specification_version: 4
 summary: PopulateMe is an admin system for web applications.
 test_files: