populate-me 0.20.0 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3359034df211dd6eef9b9142fd38b7a96db59d0f82bf05efc29ee594dcac332
-  data.tar.gz: e13861e7a4ea3b42e6587bf0ea492cd5ec8c0f2f3c38f8617169ad3864768152
+  metadata.gz: aae26b6056ce44152b109789786ed2e364c224c8b909944ccd331ce7cacb687b
+  data.tar.gz: 907b296590c89a4182b2ee7ebeb68db302a867f2c611d9e11f527848f4b030fa
 SHA512:
-  metadata.gz: '08f7a97b54471d59a00f856a33190a44eecc9c0ea6e7191cc9177a52b92858d43f287b7839fcc481be04253ed1d8ccf409e14045f74892968af2cd0fe726b856'
-  data.tar.gz: 6cbb05d6aed20c6f8cd277c5944d85c8521fc6fc6371a8f338fb0cad6b180cc8b28365e59fb75a4993d48afafbb89cc079b30a7c160e376dc3fbf347e0a6a511
+  metadata.gz: 7ee5f83a895efc0ce9b8a9b7ac0122e7e0ff9489cb19f2ffda038717eb4abea556dca1b1a7a369446d9fa1cad6e9bca91a511596f6c1d8de20b354d0587e6fed
+  data.tar.gz: c00b2f1dce9f4abf97dffb956ed5d8620eaca3b4f76d4a58885c6f45ba7efe18aa4857e000ab81fbb8e4c705ce27fb5ec8c60cd9297b9d2cb38616bc85051e82

data/README.md

@@ -79,6 +79,7 @@ Available types are:
 - `:text` Multiline text.
 - `:boolean` Which is `true` or `false`.
 - `:select` Dropdown list of options (records a string).
+- `:lnglat` Coordinates field of the form "Longitude, Latitude" with a Mapbox interface.
 
 A `:list` type exists as well for nested documents, but it is not 
 fully working yet.

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

@@ -253,6 +253,10 @@ fieldset {
 }
 .asmListItemRemove, .asmListItemRemove:hover { color: #dc322f; }
 
+.map.mapboxgl-map {
+  aspect-ratio: 4/3;
+}
+
 
          /\
         / *\

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

@@ -214,6 +214,32 @@ PopulateMe.jsValidationsPassed = function(context) {
   return true;
 };
 
+PopulateMe.lngLatRegex = /^[-+]?([0-9]*[.])?[0-9]+\s*,\s*[-+]?([0-9]*[.])?[0-9]+$/;
+
+PopulateMe.isLngLatString = function(str) {
+  return typeof str === 'string' && str.match( PopulateMe.lngLatRegex );
+};
+
+PopulateMe.defaultLngLat = {
+  lng: -0.07820128620232675,
+  lat: 51.52270386882307
+};
+
+PopulateMe.parseLngLat = function(str) {
+  if ( !PopulateMe.isLngLatString( str ) ) {
+    return PopulateMe.defaultLngLat;
+  }
+  var atoms = str.split(/\s*,\s*/);
+  return {
+    lng: parseFloat( atoms[0] ),
+    lat: parseFloat( atoms[1] )
+  };
+};
+
+PopulateMe.lngLatString = function( lnglat ) {
+  return lnglat.lng + ', ' + lnglat.lat;
+};
+
 // Init column
 // Bind events and init things that need to happen when 
 // a new column is added to the finder.
@@ -221,7 +247,7 @@ PopulateMe.jsValidationsPassed = function(context) {
 // in case you have things to put in your custom javascript.
 PopulateMe.init_column = function(c) {
 
-  var documents = $('.documents', c); 
+  var documents = $('.documents', c);
 
   // Sort list item
   if (documents.data('sort-field') !== '') {
@@ -306,6 +332,42 @@ PopulateMe.init_column = function(c) {
     link.attr('href', PopulateMe.update_query_parameter(link.attr('href'), 'data[polymorphic_type]', $this.val()));
   }).change();
 
+  // LngLat fields
+  $('.lnglat-input', c).each( function( index, input ) {
+    var $input = $(input);
+    var $map = $( "<div class='map'></div>" );
+    $input.before( $map );
+    var map = new mapboxgl.Map({
+      container: $map.get(0),
+      // Choose from Mapbox's core styles, or make your own style with Mapbox Studio
+      style: 'mapbox://styles/mapbox/streets-v12',
+      center: PopulateMe.defaultLngLat,
+      doubleClickZoom: false,
+      zoom: 10
+    });
+    var marker;
+    var currentLngLat;
+    function mapReadsField( mapCenter) {
+      mapCenter = typeof mapCenter !== 'undefined' ? mapCenter : true;
+      if ( marker ) marker.remove();
+      if ( PopulateMe.isLngLatString( $input.val() ) ) {
+        currentLngLat = PopulateMe.parseLngLat( $input.val() );
+        marker = new mapboxgl.Marker({ color: 'black' })
+          .setLngLat( currentLngLat )
+          .addTo(map);
+      } else {
+        currentLngLat = PopulateMe.defaultLngLat;
+      }
+      if ( mapCenter ) map.setCenter( currentLngLat )
+    };
+    mapReadsField();
+    $input.change( mapReadsField );
+    map.on('click', function(e) {
+      $input.val( PopulateMe.lngLatString( e.lngLat ) );
+      mapReadsField( false );
+    });
+  });
+
   // Warning when date input not supported
   var dateFields = $('[type="date"]', c);
   if ( dateFields.size()>0 && dateFields.prop('type') != 'date' ) {

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

@@ -7,6 +7,7 @@
     <link href="<%= request.script_name %>/__assets__/img/favicon.png" rel="icon" type="image/png">
     <link rel="stylesheet" href="<%= request.script_name %>/__assets__/css/jquery-ui.min.css" type="text/css" media='screen' />
     <link rel="stylesheet" href="<%= request.script_name %>/__assets__/css/asmselect.css" type="text/css" media='screen' />
+    <link href="https://api.mapbox.com/mapbox-gl-js/v2.15.0/mapbox-gl.css" rel="stylesheet">
     <link rel="stylesheet" href="<%= request.script_name %>/__assets__/css/main.css" type="text/css" media='screen' />
     <% if settings.respond_to? :custom_css_url %>
       <link rel="stylesheet" href="<%= settings.custom_css_url %>" type="text/css" media='screen' />
@@ -125,7 +126,7 @@
         {{#adapted_field}}{{/adapted_field}}
       {{/wrap}}
     </script>
-    
+
     <script id="template-string-field" type="x-tmpl-mustache">
       <input name='{{input_name}}' value='{{input_value}}' {{#required}}required{{/required}}{{{build_input_attributes}}} {{#autocomplete.length}}list='datalist-{{id}}'{{/autocomplete.length}} />
       {{#autocomplete.length}}
@@ -137,6 +138,10 @@
       {{/autocomplete.length}}
     </script>
 
+    <script id="template-lnglat-field" type="x-tmpl-mustache">
+      <input class='lnglat-input' name='{{input_name}}' value='{{input_value}}' {{#required}}required{{/required}}{{{build_input_attributes}}} pattern="^[-+]?([0-9]*[.])?[0-9]+\s*,\s*[-+]?([0-9]*[.])?[0-9]+$" placeholder="Longitude, Latitude" />
+    </script>
+
     <script id="template-text-field" type="x-tmpl-mustache">
       <textarea name='{{input_name}}' {{#required}}required{{/required}}{{{build_input_attributes}}}>{{input_value}}</textarea>
     </script>
@@ -197,7 +202,9 @@
     <%# <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 src="https://api.mapbox.com/mapbox-gl-js/v2.15.0/mapbox-gl.js"></script>
     <script type="text/javascript">
+      mapboxgl.accessToken = "pk.eyJ1IjoibWlja2FlbHJpZ2EiLCJhIjoiY2xsYXA3Y25lMWIxNzNlbzY0MW1hdm15ZCJ9.bBJwnlHVNkPyF-ZKA5J6Dg";
       window.admin_path = "<%= request.script_name %>";
       window.index_path = "<%= settings.index_path %>";
     </script>

data/lib/populate_me/version.rb

@@ -1,4 +1,4 @@
 module PopulateMe
-  VERSION = '0.20.0'
+  VERSION = '0.21.0'
 end
 

data/test/test_s3_attachment.rb

@@ -99,6 +99,14 @@ describe 'PopulateMe::S3Attachment' do
     file.unlink
   end
 
+  it "Can have filenames with accents" do
+    uploaded_file = Rack::Multipart::UploadedFile.new('test/Léonidas.txt')
+    book = S3Book.new
+
+    attachment = book.attachment(:content)
+    assert_equal 'yo', attachment.next_available_filename(uploaded_file.original_filename)
+  end
+
   it "Can override the url_prefix at document class level" do
     file = Tempfile.new('foo')
     book = S3BookNoPrefix.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: populate-me
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.21.0
 platform: ruby
 authors:
 - Mickael Riga
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-15 00:00:00.000000000 Z
+date: 2023-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: web-utils