Switch go Gulp 4 for builds

Fixes #2 and #3.

.gitignore

@@ -1,5 +1,6 @@
 # Do not index node.js modules that are used for building
 node_modules
+package-lock.json
 
 # Do not index bower components
 vendor

Plugin.php

@@ -75,16 +75,13 @@ class Plugin extends \Mibew\Plugin\AbstractPlugin implements \Mibew\Plugin\Plugi
     public function usersFunctionCallHandler(&$function)
     {
         if ($function['function'] == 'googleMapsGetInfo') {
-            // An IP string can contain more than one IP adress. For example it
-            // can be something like this: "x.x.x.x (x.x.x.x)". Thus we need to
-            // extract all IPS from the string and use the last one.
-            $count = preg_match_all(
-                "/(?:(?:[0-9]{1,3}\.){3}[0-9]{1,3})/",
-                $function['arguments']['ip'],
-                $matches
-            );
-            if (!$count) {
-                // There is no IP in the string. An error should be returned.
+            // An IP string can contain more than one IP address. For example it
+            // can be something like this: "x.x.x.x (x.x.x.x)". We need to
+            // use only first one.
+            $ips = explode(' ', $function['arguments']['ip'], 2);
+            $ip = filter_var($ips[0], FILTER_VALIDATE_IP);
+            if (!$ip) {
+                // There is no valid IP in the string. An error should be returned.
                 $function['results'] = array(
                     'errorCode' => 1,
                     'errorMessage' => 'The specified IP is invalid!',
@@ -92,7 +89,6 @@ class Plugin extends \Mibew\Plugin\AbstractPlugin implements \Mibew\Plugin\Plugi
 
                 return;
             }
-            $ip = end($matches[0]);
             $info = PluginManager::getInstance()
                 ->getPlugin('Mibew:GeoIp')
                 ->getGeoInfo($ip, get_current_locale());
@@ -114,12 +110,13 @@ class Plugin extends \Mibew\Plugin\AbstractPlugin implements \Mibew\Plugin\Plugi
     public function pageAddJsHandler(&$args)
     {
         if ($args['request']->attributes->get('_route') == 'users') {
-            $args['js'][] = $this->getFilesPath() . '/vendor/jquery-colorbox/jquery.colorbox-min.js';
+            $filepath = str_replace(DIRECTORY_SEPARATOR, '/', $this->getFilesPath());
+            $args['js'][] = $filepath . '/vendor/jquery-colorbox/jquery.colorbox-min.js';
             $args['js'][] = array(
                 'content' => $this->getApiUrl(),
                 'type' => AssetManagerInterface::ABSOLUTE_URL,
             );
-            $args['js'][] = $this->getFilesPath() . '/js/plugin.js';
+            $args['js'][] = $filepath . '/js/plugin.js';
         }
     }
 
@@ -131,8 +128,9 @@ class Plugin extends \Mibew\Plugin\AbstractPlugin implements \Mibew\Plugin\Plugi
     public function pageAddCssHandler(&$args)
     {
         if ($args['request']->attributes->get('_route') == 'users') {
-            $args['css'][] = $this->getFilesPath() . '/vendor/jquery-colorbox/example3/colorbox.css';
-            $args['css'][] = $this->getFilesPath() . '/css/styles.css';
+            $filepath = str_replace(DIRECTORY_SEPARATOR, '/', $this->getFilesPath());
+            $args['css'][] = $filepath . '/vendor/jquery-colorbox/example3/colorbox.css';
+            $args['css'][] = $filepath . '/css/styles.css';
         }
     }
 
@@ -141,7 +139,7 @@ class Plugin extends \Mibew\Plugin\AbstractPlugin implements \Mibew\Plugin\Plugi
      */
     public static function getVersion()
     {
-        return '1.0.0';
+        return '1.1.1';
     }
 
     /**
@@ -164,7 +162,7 @@ class Plugin extends \Mibew\Plugin\AbstractPlugin implements \Mibew\Plugin\Plugi
             throw new \RuntimeException('Google API key cannot be empty');
         }
 
-        return 'http://maps.googleapis.com/maps/api/js?key='
+        return '//maps.googleapis.com/maps/api/js?key='
             . $this->config['api_key']
             . '&sensor=false';
     }

README.md

@@ -5,7 +5,7 @@ It shows your clients' location at Google maps!
 
 ## Installation
 
-1. Get the archive with the plugin sources. At the moment the only option is to build the plugin from sources.
+1. Get the archive with the plugin sources. You can download it from the [official site](https://mibew.org/plugins#mibew-google-maps) or build the plugin from sources.
 
 2. Untar/unzip the plugin's archive.
 

gulpfile.js

@@ -18,7 +18,7 @@ gulp.task('bower', function(callback) {
         });
 });
 
-gulp.task('prepare-release', ['bower'], function() {
+gulp.task('prepare-release', gulp.series('bower', function() {
     var version = require('./package.json').version;
 
     return eventStream.merge(
@@ -30,12 +30,10 @@ gulp.task('prepare-release', ['bower'], function() {
     )
     .pipe(chmod(0644))
     .pipe(gulp.dest('release'));
-});
+}));
 
 // Builds and packs plugins sources
-gulp.task('default', ['prepare-release'], function() {
-    // The "default" task is just an alias for "prepare-release" task.
-});
+gulp.task('default', gulp.series('prepare-release'));
 
 /**
  * Returns files stream with the plugin sources.

package.json

@@ -1,13 +1,13 @@
 {
-    "version": "1.0.0",
+    "version": "1.1.1",
     "devDependencies": {
-        "bower": "~1.3.12",
-        "gulp": "~3.8.10",
+        "bower": "~1.8.8",
+        "gulp": "~4.0.0",
         "event-stream": "~3.1.7",
         "gulp-zip": "~2.0.2",
-        "gulp-tar": "~1.3.1",
+        "gulp-tar": "~3.1.0",
         "gulp-gzip": "~0.0.8",
-        "gulp-chmod": "~1.2.0",
+        "gulp-chmod": "~3.0.0",
         "gulp-rename": "~1.2.0"
     }
-}
+}