populate-me 0.18.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75cccfbdfe22ccdd34b88440988118fd1720a9915188e34a4e6140c2a1e3a240
-  data.tar.gz: c64e93f4fcf7990773a5bc18ec1a6d2d55e0cce82f76a150e784e5f59e1a3faf
+  metadata.gz: d5df767f90ac00a4c7d0ba71fcecde372cf97d5be50bc15ae658765a4ec824ad
+  data.tar.gz: 7a7d5bb403a9ed932a39efa5b7aa83060536ba3c0a49dba59a6e8b4faef46171
 SHA512:
-  metadata.gz: b789d3cefb18deec65e19457e734fffe5c3d92f75183c9ac98a29191604a4e4ec8c1f7263c3900a85e7d41e09a077e3e6bc58baeb1d85b40662f1175bed5f3e0
-  data.tar.gz: f13e107dba08eb63e1753e897b54039cf3cbefdcc9b22c9e40596f6033b1c4ffa873b9e611f4cb9d2547f7a6a8ca25aded561c0789dfbe4a112588fea55b8bf9
+  metadata.gz: 3050513b41fc1ed44b6e43157fe7f77dd16f03e210e9b4207ce6e691f72508cb4cc9eb95280a63951cf2769c7a1cc597a66ebaf4f253fb9537919a99e6fb3853
+  data.tar.gz: 6412fb04a742195c9ae4e77c085fe16d27b4412760e455b958aa3fefa954149b3d0dce1da393bd6f0480671eb3c166e4409e7da06b563e68865780591fcb57d4

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

@@ -44,6 +44,12 @@
 	background-color: #e5e5e5;
 }
 
+.asmListItemPreview {
+	height: 3em;
+	display: inline-block;
+	margin-right: 1em;
+}
+
 .asmListItemLabel {
 	/* this is a span that surrounds the text in the item, except for the remove link */
 	padding: 5px; 

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

@@ -4,13 +4,13 @@ html, body {
   margin: 0;
   padding: 0;
   color: #002b36;
-  background-color: #eee8d5;
+  background-color: #ffffff;
   height: 100%;
   font-family: 'Avenir', sans-serif;
 }
 
 body {
-  line-height: 1.5em;
+  line-height: 1.5;
 }
 
 #finder {
@@ -18,11 +18,12 @@ body {
 }
 
 .column {
-  background: #fdf6e3;
+  position: relative;
+  background: #eeeeee;
   height: 100%;
   min-width: 250px;
   overflow: auto;
-  box-shadow: 0px 0px 10px #586e75;
+  box-shadow: 0px 0px 10px #555555;
 }
 
 .column > h1, .column > ol,
@@ -63,6 +64,16 @@ body {
   border: 1px solid #002b36;
 }
 
+.column > footer.main-footer {
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  width: 100%;
+  font-size: 0.5em;
+  padding: 20px;
+  box-sizing: border-box;
+}
+
 ol {
   list-style: none;
   margin: 0;
@@ -75,10 +86,7 @@ a {
   /* border-bottom: 1px solid #002b36; */
 }
 a:hover, a.selected {
-  /* Blue */
   color: #268bd2;
-  /* Green/Blue */
-  /* color: #2aa198; */
 }
 
 button { cursor: pointer; }
@@ -116,7 +124,7 @@ button.admin-delete:focus, button.admin-delete-nested:focus, .handle-button:focu
   cursor: -webkit-grab;
   cursor: grab;
 }
-.handle:active { 
+.handle:active {
   cursor: -moz-grabbing;
   cursor: -webkit-grabbing;
   cursor: grabbing;
@@ -125,7 +133,7 @@ button.admin-delete:focus, button.admin-delete-nested:focus, .handle-button:focu
 [type=submit] {
   border: 0px;
   cursor: pointer;
-  color: #fdf6e3;
+  color: #ffffff;
   background-color: #859900;
 }
 [type=submit]:hover {
@@ -141,11 +149,12 @@ button.admin-delete:focus, button.admin-delete-nested:focus, .handle-button:focu
   user-select: none;
 }
 .documents.grid {
-  width: 90%; width: 90vw;
+  width: 80%; width: 80vw;
 }
 .documents > li, .nested-documents > li {
   display: block;
   margin-bottom: 1em;
+  border-top: 1px solid #dddddd;
 }
 .documents.grid > li {
   display: inline-block;
@@ -160,8 +169,8 @@ button.admin-delete:focus, button.admin-delete-nested:focus, .handle-button:focu
   width: 200px;
 }
 .documents > li:hover, .nested-documents > li:hover {
-  background-color: #eee8d5;
-  outline: 0.5em solid #eee8d5;
+  background-color: #dddddd;
+  outline: 0.5em solid #dddddd;
 }
 .nested-documents > li > header {
   background: #002b36;
@@ -172,7 +181,7 @@ button.admin-delete:focus, button.admin-delete-nested:focus, .handle-button:focu
   border: 1px dashed #839496;
   background-color: #eee8d5;
 }
-.local-menu { font-size: 0.7em; }
+.local-menu { font-size: 0.8em; margin-top: 0.5em; }
 
 /* Forms */
 
@@ -187,7 +196,7 @@ form {
 input[type=text], input[type=email], input[type=search],
 textarea {
   border: 0px;
-  color: #839496;
+  color: #555555;
   background-color: #ffffff;
   width: 400px;
   padding: 0.5em;
@@ -202,8 +211,9 @@ textarea:focus {
   /* color: #002b36; */
 }
 
-textarea { height: 6em; resize: vertical; }
+textarea { height: 4em; resize: vertical; transition: 0.2s; }
 textarea.oneline { height: 1em; resize: none; }
+textarea:focus { height: 50vh; }
 
 fieldset {
   border: 0;
@@ -226,9 +236,9 @@ fieldset {
 
 .asmListItem {
   background-color: #ffffff;
-  border: 1px solid #fdf6e3;
+  border: 1px solid #eeeeee;
 }
-.asmListItem:hover { background-color: #eee8d5; }
+.asmListItem:hover { background-color: #dddddd; }
 .asmListItemLabel { padding-right: 2em; }
 .asmListSortable .asmListItemLabel {
   cursor: move;

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

@@ -263,6 +263,17 @@
 					.addClass(options.listItemLabelClass)
 					.html($O.html()); 
 
+				if ( $O.data('preview') ) {
+
+					var $itemPreview = $("<img/>")
+						.attr("alt", '')
+						.attr("src", $O.data('preview'))
+						.addClass('asmListItemPreview');
+
+					$itemLabel.prepend($itemPreview);
+
+				}
+
 				var $item = $("<li></li>")
 					.attr('rel', optionId)
 					.addClass(options.listItemClass)

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

@@ -19,6 +19,9 @@
       <% if settings.logout_path? %>
         <p><a href="<%= request.script_name %><%= settings.logout_path %>">Logout</a></p>
       <% end %>
+      <footer class='main-footer'>
+        Populate Me is Content Managment System for premium design-led websites coded by <a href="https://www.rive.studio" target="_blank">Rive Studio</a>.<br/>&copy; <%= Time.now.year %> Mickaël Riga
+      </footer>
     </li></ol>
 
     <!-- Templates -->
@@ -61,21 +64,23 @@
 
     <script id="template-document" type="x-tmpl-mustache">
       <li class='admin-list-item' data-id='{{id}}'>
-        <header class='{{#sort_field}}handle{{/sort_field}}' title='{{#sort_field}}Drag and drop{{/sort_field}}'>
-          <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'>
-          <span class='item-title'>{{title}}</span>
-          {{#image_url}}
-            <br />
-            <img src='{{image_url}}{{cache_buster}}' alt='{{title}}' width='300' />
-          {{/image_url}}
-        </a>
-        <ol class='local-menu'>
-          {{#local_menu}}
-            <li>&rarr; <a href="{{href}}" {{#new_page}}target='_blank'{{/new_page}}{{^new_page}}class='column-push'{{/new_page}} title='Open'>{{title}}</a></li>
-          {{/local_menu}}
-        </ol>
+        <div class="{{#sort_field}}handle{{/sort_field}}" title='{{#sort_field}}Drag and drop{{/sort_field}}'>
+          <header>
+            <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'>
+            <span class='item-title'>{{title}}</span>
+            {{#image_url}}
+              <br />
+              <img src='{{image_url}}{{cache_buster}}' alt='{{title}}' width='300' />
+            {{/image_url}}
+          </a>
+          <ol class='local-menu'>
+            {{#local_menu}}
+              <li>&rarr; <a href="{{href}}" {{#new_page}}target='_blank'{{/new_page}}{{^new_page}}class='column-push'{{/new_page}} title='Open'>{{title}}</a></li>
+            {{/local_menu}}
+          </ol>
+        </div>
       </li>
     </script>
 

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.0'
+  VERSION = '0.19.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', '~> 0.6'
   s.add_development_dependency 'rack-cerberus', '~> 1.0'
-  s.add_development_dependency 'mongo', '~> 2.0'
+  s.add_development_dependency 'mongo', '~> 2.17'
   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.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Mickael Riga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-30 00:00:00.000000000 Z
+date: 2023-02-03 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.0'
+        version: '2.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.17'
 - !ruby/object:Gem::Dependency
   name: rack-grid-serve
   requirement: !ruby/object:Gem::Requirement