populate-me 0.13.1 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77ffe6684618f49dc39e02b871af4e4099fe306f95e78fbe4ebcd6610910cdde
-  data.tar.gz: 884fd2dd42222de62bc684ab6671c88671836d764d0b985a808fb4990eee062c
+  metadata.gz: a92596c5ed11fb3d67f18b48fdc1011ecf423f26390c2f71c3587c3c2cae93cf
+  data.tar.gz: 70e4e6572ed7e98ace3444ee6c6c18ff937b0ed72aa35b80a5c5d2ad99865d91
 SHA512:
-  metadata.gz: 454c3c3bbfd309e6449ec58f9c46246dcc359fee2ae04aa04e684285c68619d8f9a8b529ec9d843e5ab722a52dfff0e70aac697d8713f023e45f5bace935a42a
-  data.tar.gz: 22786caacc68f4b8d9ca60837a416c86ab037b87a3826519506b0eadf78b97693232b07312206e72cafba69b9e8bf447a02d38fe57c3585981b88f68f14580e7
+  metadata.gz: cd01c21a0a760cb1691453ca86f22a75cbabd423134bd25c699fbd0ea96ef6a1845a88d130c61f62fcec9a2f77fb527759152307fb0fb762f0778a2f657bbe3d
+  data.tar.gz: fc764eb27f6c4dd76bde7b952432dc0a647872a061f564f3ac9104511b7baecd0a67866b9777726e329619cd6e1b3663e107f3e774d908e794cfe100592c44b4

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
 
@@ -118,11 +123,17 @@ class PopulateMe::Admin < Sinatra::Base
       # Method = overridable = testable
       ENV['CERBERUS_PASS']
     end
+
     def cerberus_available?
       # Method = overridable = testable
       Rack.const_defined?(:Cerberus)
     end
 
+    def cerberus_auth user, pass, req
+      pass == cerberus_pass
+    end
+
+
     private
 
     def setup_default_middleware builder
@@ -146,8 +157,8 @@ class PopulateMe::Admin < Sinatra::Base
       return unless settings.cerberus_active
       cerberus_settings = settings.cerberus==true ? {} : settings.cerberus
       cerberus_settings[:session_key] = 'populate_me_user'
-      builder.use Rack::Cerberus, cerberus_settings do |user,pass,req|
-        pass==cerberus_pass
+      builder.use Rack::Cerberus, cerberus_settings do |user, pass, req|
+        cerberus_auth user, pass, req
       end
     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/version.rb

@@ -1,4 +1,4 @@
 module PopulateMe
-  VERSION = '0.13.1'
+  VERSION = '0.16.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_admin.rb

@@ -22,6 +22,12 @@ class AdminWithCerberusPass < Admin
   end
 end
 
+class AdminWithCustomCerberusAuth < AdminWithCerberusPass
+  def self.cerberus_auth user, pass, req
+    [user, pass] == ['mario', '1234']
+  end
+end
+
 class AdminCerberusNotAvailable < AdminWithCerberusPass
   def self.cerberus_available?
     false
@@ -106,19 +112,54 @@ describe PopulateMe::Admin do
       assert_equal 'text/css', last_response.content_type
     end
 
-    describe 'when cerberus is active' do
+    describe 'When cerberus is active' do
       let(:app) { AdminWithCerberusPass.new }
       it 'Uses Cerberus for authentication' do
         get '/'
         assert_equal 401, last_response.status
       end
+      it 'Authenticates with right login details' do
+        get '/', {
+          cerberus_login: 'admin',
+          cerberus_pass: '123',
+          _method: 'get'
+        }
+        assert_equal 200, last_response.status
+      end
+      it 'Fails authentication when login details are wrong' do
+        get '/', {
+          cerberus_login: 'admin',
+          cerberus_pass: 'xxx',
+          _method: 'get'
+        }
+        assert_equal 401, last_response.status
+      end
     end
-    describe 'when cerberus is inactive' do
+    describe 'When cerberus is inactive' do
       it 'Does not use Cerberus' do
         get '/'
         assert_predicate last_response, :ok?
       end
     end
+    describe 'When cerberus_auth is overridden' do
+      let(:app) { AdminWithCustomCerberusAuth.new }
+      it 'Authenticates with right login details' do
+        get '/', {
+          cerberus_login: 'mario',
+          cerberus_pass: '1234',
+          _method: 'get'
+        }
+        assert_equal 200, last_response.status
+      end
+      it 'Fails authentication when login details are wrong' do
+        get '/', {
+          cerberus_login: 'admin',
+          cerberus_pass: '123',
+          _method: 'get'
+        }
+        assert_equal 401, last_response.status
+      end
+    end
 
   end
 

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.1
+  version: 0.16.0
 platform: ruby
 authors:
 - Mickael Riga
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-28 00:00:00.000000000 Z
+date: 2021-12-07 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: