populate-me 0.13.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 514291d44eb8b068db7c98d742dc8395a5a2821255ac31ba054522823f6c55d9
-  data.tar.gz: 5a5c76cec480ed1c057ee70d33a38f21f1bd536c3ca5eabfdbbf2bf1d14c4b3c
+  metadata.gz: 85deae1b12e76c47c378e2f3843d5e840d06b95cc5359edd130fd64ffa9b88d0
+  data.tar.gz: 7078d10da19910b9962bfd3656c3543dd5389be624d11896e8248246f4170eeb
 SHA512:
-  metadata.gz: 72e7c460a58523cf8cd9a1e9dadba107f5bfa810ec552b93af0fe113d4bf98f0941cb168ac4323291ab5fee478c1d018ceaa017c2f4bf5ea3460ce6d0b4a4130
-  data.tar.gz: 41cf0a2e8705a2b184e3c840b001424cd4d69f00a447da72b89d2339ee0390a24b76c07e886b48127594ed73ad762e43560497097aa672dbc89ff2d7c9af2141
+  metadata.gz: 44c9c3cabe40c90112e0cc4af8e4e1b9f3105f9c7baff24e568cda0e3fb697c84ad00f62e2812fa323ac18475fe3d9d85b711409b1a07f8ba3077b0d9e8973b2
+  data.tar.gz: 3a9f806d103a25e7444cda57035bcd5fbfd6fbfa4492458b340c4a56324a4bca990f5e65c3f489728a0d07aa28e62f8c855c9a9cb602b7abc71ba12622d565e4

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

@@ -413,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/views/page.erb

@@ -117,7 +117,14 @@
     </script>
     
     <script id="template-string-field" type="x-tmpl-mustache">
-      <input name='{{input_name}}' value='{{input_value}}' {{#required}}required{{/required}}{{{build_input_attributes}}} />
+      <input name='{{input_name}}' value='{{input_value}}' {{#required}}required{{/required}}{{{build_input_attributes}}} {{#autocomplete.length}}list='datalist-{{id}}'{{/autocomplete.length}} />
+      {{#autocomplete.length}}
+        <datalist id='datalist-{{id}}'>
+          {{#autocomplete}}
+            <option value='{{.}}' />
+          {{/autocomplete}}
+        </datalist>
+      {{/autocomplete.length}}
     </script>
 
     <script id="template-text-field" type="x-tmpl-mustache">
@@ -145,7 +152,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}}

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/document_mixins/outcasting.rb

@@ -21,6 +21,14 @@ module PopulateMe
         end
       end
 
+      def outcast_string field, item, o={}
+        if item.key? :autocomplete
+          item = item.dup
+          item[:autocomplete] = WebUtils.deep_copy(WebUtils.get_value(item[:autocomplete],self))
+        end
+        item
+      end
+
       def outcast_list field, item, o={}
         item = item.dup
         item[:items] = self.__send__(field).map do |nested|

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.13.0'
+  VERSION = '0.15.0'
 end
 

data/populate-me.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'sinatra', '~> 2'
   s.add_dependency 'json', '~> 2.1'
 
-  s.add_development_dependency 'bundler', '~> 1.13'
+  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-cerberus', '~> 1.0'

data/test/test_document_outcasting.rb

@@ -6,6 +6,7 @@ class Outcasted < PopulateMe::Document
   set :default_attachment_class, PopulateMe::Attachment
 
   field :name
+  field :category, autocomplete: ['Fish', 'Cat', 'Bunny']
   field :size, type: :select, select_options: [
     {description: 'small', value: 's'},
     {description: 'medium', value: 'm'},
@@ -23,6 +24,10 @@ class Outcasted < PopulateMe::Document
   field :weirdo, type: :strange
   field :price, type: :price
 
+  def get_category_autocomplete_list
+    ['Horse', 'Bear']
+  end
+
   def get_size_options
     [
       [:small, :s],
@@ -65,6 +70,36 @@ describe PopulateMe::Document, 'Outcasting' do
 
   end
 
+  describe '#outcast_string' do
+
+    it 'Generates the autocomplete options when needed' do
+      original = Outcasted.fields[:category]
+      output = Outcasted.new.outcast(:category, original, {input_name_prefix: 'data'})
+      assert_equal ['Fish', 'Cat', 'Bunny'], output[:autocomplete]
+      refute original.equal?(output)
+
+      original = Outcasted.fields[:name]
+      output = Outcasted.new.outcast(:name, original, {input_name_prefix: 'data'})
+      refute output.key?(:autocomplete)
+    end
+
+    it 'Generates the autocomplete options from a proc' do
+      original = Outcasted.fields[:category].dup
+      original[:autocomplete] = proc{ ['Dog', 'Snake'] }
+      output = Outcasted.new.outcast(:category, original, {input_name_prefix: 'data'})
+      assert_equal ['Dog', 'Snake'], output[:autocomplete]
+      assert original[:autocomplete].is_a?(Proc)
+    end
+
+    it 'Generates the autocomplete options from a method name' do
+      original = Outcasted.fields[:category].dup
+      original[:autocomplete] = :get_category_autocomplete_list
+      output = Outcasted.new.outcast(:category, original, {input_name_prefix: 'data'})
+      assert_equal ['Horse', 'Bear'], output[:autocomplete]
+      assert original[:autocomplete].is_a?(Symbol)
+    end
+  end
+
   describe '#outcast_list' do
 
     it 'Has no value and an empty list of items when list is empty' do

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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: populate-me
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Mickael Riga
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-13 00:00:00.000000000 Z
+date: 2021-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: web-utils
@@ -56,16 +56,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: 2.2.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: 2.2.10
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -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
@@ -257,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
@@ -272,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: