populate-me 0.10.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87883ab18f9a959d6daf5cad99481133789cff2885c591fb40f949706d107791
-  data.tar.gz: c8940abefcdc04241dccd0e27eef54f8685c45b57e5e6ea5eeb32392657dcf0d
+  metadata.gz: faa748585887ab4c87b9a96b0fcbc1cb819933840e5ed916a3455ea677c10ada
+  data.tar.gz: '0548e4f13d04c8f9a5375029fc11e6cfdd00b7759b2a6b5ba171151640ee5159'
 SHA512:
-  metadata.gz: 5355320979fd0a372e4b9ce52fd02a1de06d7fb2ca5308f863c18ce649e5f16cf21c4e9f0f2553165fdbece27dc08fbab5e5549381755c1fcf8cba7dc2d5dd5e
-  data.tar.gz: 50bb43b8ff626e5d3a1232bc46f44f19ec126e23f3ceb3150d88ad1bdef3b7ea1cd19fc69ea1735c3920a741ffb80a11405ebf059c59a0ecbba8f2f83c2e7f64
+  metadata.gz: 3244bbeb680e2d0ffea098719cc228623115666b498330651563672455c2495cfd3955270943f4b0020fc54780e876dd644a9025b0ff7f325eb016586f75cc8f
+  data.tar.gz: 3489e40c4e16e1b75c005d09937c535de3eef8d52edf8de9b1aa54a43d71a7a8304a7e80ebaaec2486da4b344b28752b1451f82e224f2014cc00d74a0e417118

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

@@ -195,6 +195,30 @@ PopulateMe.init_column = function(c) {
   // 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);

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

@@ -134,9 +134,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">

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

@@ -1,4 +1,4 @@
 module PopulateMe
-  VERSION = '0.10.1'
+  VERSION = '0.11.0'
 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: populate-me
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Mickael Riga
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-08 00:00:00.000000000 Z
+date: 2020-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: web-utils