jekyll-maps 2.0.4 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fd53874b13c6ba9f3170a3f1e0f33111859d9c2
-  data.tar.gz: e8c452dced878ab7ee030ee6b1effe3ebefd935e
+  metadata.gz: ef80d68f5c5d8060d8f50b0510fae948d8522a36
+  data.tar.gz: 09d328775dfe11292d30e826bf5e6d8543612cc5
 SHA512:
-  metadata.gz: 0df5d97537d323d0359547b23185307110e94169436acc3c201543b4a71893f3cae53e2649d9034a4adab6c9b2c7d53f5d9d79779f7df4489fcf4eecbe0f4c4d
-  data.tar.gz: e487f20b8232ba92b4171723ce2433f90ab5b25b25330b75a99e2ab5e345fd1957ca84dae5e99fbf5fcf47721a8dbcc5b1098427978edc86a13dd5a11df4c257
+  metadata.gz: 23e6448c9dc8ae22e3718a932d63e2cf11bf59bb035387560c935c106024e1e88ac003f2166d630300ffe783aa6241b7085986a2743c56074986321c228575d0
+  data.tar.gz: 5a0da93c3f4ee6572db0b581c429134ddb5320c9f788163c993f7618d4e025371038e8cf689445315c36b97979b1ea073fab3903ac168a3a2bb3cdaadc66bcba

data/README.md

@@ -15,119 +15,151 @@ GoogleMaps Marker Clusterer can be used if you have many points within close pro
 
 1. Add the following to your site's `Gemfile`:
 
-  ```ruby
-  gem 'jekyll-maps'
-  ```
+
+```ruby
+gem 'jekyll-maps'
+```
 
 2. Add the following to your site's `_config.yml`:
 
-  ```yml
-  gems:
-    - jekyll-maps
-  ```
+
+```yml
+plugins:
+  - jekyll-maps
+```
 
 ## Usage
 
 ### Configure Google API Key
 
-To be able to use Google Maps you need to obtain [API Key](https://developers.google.com/maps/documentation/javascript/get-api-key).
+To be able to use Google Maps you need to obtain
+[API Key](https://developers.google.com/maps/documentation/javascript/get-api-key).
 
 Once you have your API Key you need to add it to Jekyll's `_config.yml`:
 
-  ```yml
-  maps:
-    google:
-      api_key: <YOUR_KEY>
-  ```
+```yml
+maps:
+  google:
+    api_key: <YOUR_KEY>
+```
 
 ### Data Source
 
 First, add location information to your posts YAML front-matter:
 
-  ```yml
-  location:
+```yml
+location:
+  latitude: 51.5285582
+  longitude: -0.2416807
+```
+
+You can specify multiple locations per post:
+
+```yml
+location:
+  - latitude: 51.5285582
+    longitude: -0.2416807
+  - latitude: 52.5285582
+    longitude: -2.2416807
+  - title: custom marker title
+    image: custom marker image
+    url: custom marker url
     latitude: 51.5285582
     longitude: -0.2416807
-  ```
-
-Alternatively, you can add location info to your custom collection's documents or even in data files:
-
-  ```yml
-  - title: Paris
-    url: http://google.fr
-    location:
-      latitude: 48.8587741
-      longitude: 2.2074741
-  
-  - title: Madrid
-    url: http://google.es
-    location:
-      latitude: 40.4378698
-      longitude: -3.8196204
-  ```
-  
+```
+
+Alternatively, you can add location info to your custom collection's documents or even in data
+files:
+
+```yml
+- title: Paris
+  url: http://google.fr
+  location:
+    latitude: 48.8587741
+    longitude: 2.2074741
+
+- title: Madrid
+  url: http://google.es
+  location:
+    latitude: 40.4378698
+    longitude: -3.8196204
+```
+
 By default this plugin will display location from the page it's placed on:
 
-  ```
-  {% google_map %}
-  ```
-  
-But you can use src attribute to load locations from other places, like posts, collections or data files!
+```
+{% google_map %}
+```
+
+But you can use src attribute to load locations from other places, like posts, collections or data
+files!
 
 For example, this map will show locations from all posts from 2016:
-  
-  ```
-  {% google_map src="_posts/2016" %}
-  ```
-  
+
+```
+{% google_map src="_posts/2016" %}
+```
+
 This map will show locations from a collection called 'my_collection':
 
-  ```
-  {% google_map src="_collections/my_collection" %}
-  ```
-  
+```
+{% google_map src="_collections/my_collection" %}
+```
+
 This map will show locations from all data files located in 'my_points' sub-folder:
 
-  ```
-  {% google_map src="_data/my_points" %}
-  ```
+```
+{% google_map src="_data/my_points" %}
+```
 
 You can configure map's dimensions and assign custom CSS class to the element:
 
-  ```
-  {% google_map width="100%" height="400" class="my-map" %}
-  ```
-  
+```
+{% google_map width="100%" height="400" class="my-map" %}
+```
+
+You can also just set marker coordinates directly in tag attributes:
+
+```
+{% google_map latitude="48.8587741" longitude="2.2074741" marker_title="My Location" marker_img="/img.jpg" marker_url="/my-location.html" %}
+```
+
+This will create a map with single marker in given location. `marker_title`, `marker_img` and
+`marker_url` attributes are optional and current page's data will be used by default.
+
 ### Filters
 
-You can also filter which locations to display on the map!<br/>
-For instance, following tag will only display locations from documents which have `lang: en` in their front-matter data.
+You can also filter which locations to display on the map!<br/> For instance, following tag will
+only display locations from documents which have `lang: en` in their front-matter data.
 
-  ```
-  {% google_map src="_posts" lang="en" %}
-  ```
+```
+{% google_map src="_posts" lang="en" %}
+```
 
 ### Marker Cluster
 
-By default [Marker Clusterer](https://github.com/googlemaps/js-marker-clusterer) is enabled.
-If you have many markers on the map, it will group them and show icon with the count of markers in each cluster - [see example](https://googlemaps.github.io/js-marker-clusterer/examples/advanced_example.html).
+By default [Marker Clusterer](https://github.com/googlemaps/js-marker-clusterer) is enabled. If you
+have many markers on the map, it will group them and show icon with the count of markers in each
+cluster -
+[see example](https://googlemaps.github.io/js-marker-clusterer/examples/advanced_example.html).
 
 If you don't want to use marker cluster, you can disable it globally in `_config.yml`:
 
-  ```yml
-  maps:
-    google:
-      marker_cluster:
-        enabled: false
-  ```
+```yml
+maps:
+  google:
+    marker_cluster:
+      enabled: false
+```
 
 Or you can disable it per single map tag:
 
-  ```
-  {% google_map no_cluster %}
-  ```
+```
+{% google_map no_cluster %}
+```
 
-If you have any questions or proposals - open up an [issue](https://github.com/ayastreb/jekyll-maps/issues/new)!
+If you have any questions or proposals - open up an
+[issue](https://github.com/ayastreb/jekyll-maps/issues/new)!
 
 ## Examples
 
@@ -143,4 +175,5 @@ Want to see it in action? Check out [Demo Page](https://ayastreb.me/jekyll-maps/
 
 ## License
 
-[MIT](https://github.com/ayastreb/jekyll-maps/blob/master/LICENSE). Feel free to use, copy or distribute it.
+[MIT](https://github.com/ayastreb/jekyll-maps/blob/master/LICENSE). Feel free to use, copy or
+distribute it.

data/jekyll-maps.gemspec

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "jekyll-maps/version"
@@ -12,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Anatoliy Yastreb"]
   spec.email         = ["anatoliy.yastreb@gmail.com"]
 
-  spec.homepage      = "https://github.com/ayastreb/jekyll-maps"
+  spec.homepage      = "https://ayastreb.me/jekyll-maps/"
   spec.licenses      = ["MIT"]
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r!^(test|spec|features)/!) }
   spec.require_paths = ["lib"]
@@ -21,5 +19,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "rake", "~> 11.0"
   spec.add_development_dependency "rspec", "~> 3.5"
-  spec.add_development_dependency "rubocop", "~> 0.41"
+  spec.add_development_dependency "rubocop", "0.49.1"
 end

data/lib/jekyll-maps/google_map_api.js

@@ -1,7 +1,7 @@
 /* global google */
 /* global MarkerClusterer */
 // eslint-disable-next-line no-unused-vars
-var jekyllMaps = (function () {
+var jekyllMaps = (function() {
   'use strict'
   var clusterSettings = {}
   var clusterReady = false
@@ -19,7 +19,7 @@ var jekyllMaps = (function () {
   /**
    * Setup Google Maps options and call renderer.
    */
-  function initializeMap () {
+  function initializeMap() {
     options = {
       mapTypeId: google.maps.MapTypeId.ROADMAP,
       center: new google.maps.LatLng(0, 0)
@@ -35,7 +35,7 @@ var jekyllMaps = (function () {
    * @param Array locations
    * @param Object settings
    */
-  function register (id, locations, options) {
+  function register(id, locations, options) {
     data.push({ id: id, locations: locations, options: options })
     render()
   }
@@ -43,14 +43,17 @@ var jekyllMaps = (function () {
   /**
    * Render maps data if Google Maps API is loaded.
    */
-  function render () {
+  function render() {
     if (!mapReady) return
 
     while (data.length > 0) {
       var item = data.pop()
       var bounds = new google.maps.LatLngBounds()
       var mapOptions = Object.assign({}, options, item.options)
-      var map = new google.maps.Map(document.getElementById(item.id), mapOptions)
+      var map = new google.maps.Map(
+        document.getElementById(item.id),
+        mapOptions
+      )
       var infoWindow = new google.maps.InfoWindow()
       var markers = item.locations.map(createMarker)
 
@@ -64,8 +67,11 @@ var jekyllMaps = (function () {
       }
     }
 
-    function createMarker (location) {
-      var position = new google.maps.LatLng(location.latitude, location.longitude)
+    function createMarker(location) {
+      var position = new google.maps.LatLng(
+        location.latitude,
+        location.longitude
+      )
       bounds.extend(position)
       if (!mapOptions.showMarker) return false
 
@@ -73,7 +79,7 @@ var jekyllMaps = (function () {
         position: position,
         title: location.title,
         image: location.image,
-        url: location.url,
+        url: location.url.length > 0 ? mapOptions.baseUrl + location.url : '',
         map: map
       })
       if (mapOptions.showMarkerPopup) marker.addListener('click', markerPopup)
@@ -81,8 +87,9 @@ var jekyllMaps = (function () {
       return marker
     }
 
-    function markerPopup () {
-      var contentHtml = '<div class="map-info-window"><h5>' + this.title + '</h5>'
+    function markerPopup() {
+      var contentHtml =
+        '<div class="map-info-window"><h5>' + this.title + '</h5>'
       var imageHtml = '<img src="' + this.image + '" alt="' + this.title + '"/>'
       if (this.url.length > 0) {
         var linkText = this.image.length > 0 ? imageHtml : 'View'
@@ -95,13 +102,13 @@ var jekyllMaps = (function () {
     }
   }
 
-  function initializeCluster (settings) {
+  function initializeCluster(settings) {
     clusterReady = true
     clusterSettings = settings || {}
     processCluster()
   }
 
-  function processCluster () {
+  function processCluster() {
     if (!clusterReady) return
 
     while (maps.length > 0) {
@@ -109,14 +116,15 @@ var jekyllMaps = (function () {
       // eslint-disable-next-line no-new
       new MarkerClusterer(obj.map, obj.markers, {
         gridSize: clusterSettings.grid_size || 25,
-        imagePath: 'https://cdn.rawgit.com/googlemaps/js-marker-clusterer/gh-pages/images/m'
+        imagePath:
+          'https://cdn.rawgit.com/googlemaps/js-marker-clusterer/gh-pages/images/m'
       })
     }
   }
-}())
+})()
 /* Object.assign polyfill */
 if (typeof Object.assign !== 'function') {
-  Object.assign = function (target) {
+  Object.assign = function(target) {
     'use strict'
     if (target == null) {
       throw new TypeError('Cannot convert undefined or null to object')
@@ -124,11 +132,11 @@ if (typeof Object.assign !== 'function') {
 
     target = Object(target)
     for (var index = 1; index < arguments.length; index++) {
-      var source = arguments[ index ]
+      var source = arguments[index]
       if (source != null) {
         for (var key in source) {
           if (Object.prototype.hasOwnProperty.call(source, key)) {
-            target[ key ] = source[ key ]
+            target[key] = source[key]
           }
         }
       }

data/lib/jekyll-maps/google_map_tag.rb

@@ -21,7 +21,7 @@ module Jekyll
   #{JS_LIB_NAME}.register(
     '#{@args[:attributes][:id]}',
     #{locations.to_json},
-    #{map_options.to_json}
+    #{map_options(context.registers[:site]).to_json}
   );
 </script>
 HTML
@@ -53,8 +53,9 @@ HTML
       end
 
       private
-      def map_options
+      def map_options(site)
         opts = {
+          :baseUrl         => site.baseurl || "/",
           :useCluster      => !@args[:flags][:no_cluster],
           :showMarker      => @args[:attributes][:show_marker] != "false",
           :showMarkerPopup => @args[:attributes][:show_popup] != "false"

data/lib/jekyll-maps/location_finder.rb

@@ -12,8 +12,8 @@ module Jekyll
         elsif @options[:filters].empty?
           @documents << page if with_location?(page)
         else
-          site.collections.each { |_, collection| filter(collection.docs) }
-          site_data(site).each { |_, items| traverse(items) }
+          site.collections.each_value { |collection| filter(collection.docs) }
+          site_data(site).each_value { |items| traverse(items) }
         end
 
         documents_to_locations
@@ -55,7 +55,7 @@ module Jekyll
       def traverse(items)
         return filter(items) if items.is_a?(Array)
 
-        items.each { |_, children| traverse(children) } if items.is_a?(Hash)
+        items.each_value { |children| traverse(children) } if items.is_a?(Hash)
       end
 
       private

data/lib/jekyll-maps/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Maps
-    VERSION = "2.0.4".freeze
+    VERSION = "2.1.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-maps
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.1.0
 platform: ruby
 authors:
 - Anatoliy Yastreb
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-19 00:00:00.000000000 Z
+date: 2018-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -56,16 +56,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.41'
+        version: 0.49.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.41'
+        version: 0.49.1
 description: Google Maps support in Jekyll blog to easily embed maps with posts' locations
 email:
 - anatoliy.yastreb@gmail.com
@@ -92,7 +92,7 @@ files:
 - lib/jekyll-maps/version.rb
 - script/bootstrap
 - script/cibuild
-homepage: https://github.com/ayastreb/jekyll-maps
+homepage: https://ayastreb.me/jekyll-maps/
 licenses:
 - MIT
 metadata: {}