jekyll-maps 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff712952d8af10379eb6c0b661849966afda5d95
-  data.tar.gz: 7c177d50a81d48be0231d9b3f408d0b893d5143b
+  metadata.gz: c2839acbbfb16951bd477def2dba07291bb91138
+  data.tar.gz: c2e49939d84003b196940a466fa10761ff735678
 SHA512:
-  metadata.gz: b08891aa61f5a8206265a7eb89cb744f7e9762c71bc82442be66725104654dd0b883fe8b6498d223bcfe5d65eeca8ef4066c0ed8d2f1845f46cb89d642f62b30
-  data.tar.gz: 4e2253c2dfa01023e861b5b75ccf8258e1b81904f35a43b085350a82af7bb251c06e51ba9cc204841a5aafd08e7cea27fbd584165593bcfb6e1f24ea961a5829
+  metadata.gz: 56ea3c0abad7154d3879424cc55984f32083c02abb2575b9fd59b481cf78b712a0062ad345255b0086b51ca1d4caf29810416909afd9e6a9df0075dafb0f804f
+  data.tar.gz: c411f5e64cd2cd995aec23fd1f0f2939a738f07d1bdcc2ae9b58e3281c2ebc1f040868d1fcb626e5738d6daaa141cf174e9eb563736f5f1537925f704e7d9210

data/.rubocop.yml

@@ -12,6 +12,9 @@ Lint/UselessAccessModifier:
   Enabled: false
 Metrics/AbcSize:
   Max: 20
+Metrics/BlockLength:
+  Exclude:
+    - spec/**/*.rb
 Metrics/ClassLength:
   Max: 300
   Exclude:
@@ -19,6 +22,10 @@ Metrics/ClassLength:
 Metrics/CyclomaticComplexity:
   Max: 8
 Metrics/LineLength:
+  Exclude:
+    - Rakefile
+    - Gemfile
+    - jekyll-maps.gemspec
   Max: 90
   Severity: warning
 Metrics/MethodLength:
@@ -114,3 +121,7 @@ Style/StringLiteralsInInterpolation:
   EnforcedStyle: double_quotes
 Style/UnneededCapitalW:
   Enabled: false
+Style/IndentHeredoc:
+  Enabled: false
+Style/SymbolArray:
+  Enabled: false

data/.travis.yml

@@ -5,5 +5,7 @@ rvm:
 - 2.1
 - 2.0
 script: script/cibuild
+after_success:
+  - bundle exec codeclimate-test-reporter
 sudo: false
 cache: bundler

data/Gemfile

@@ -2,4 +2,4 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "codeclimate-test-reporter", group: :test, require: nil
+gem "codeclimate-test-reporter", :group => :test, :require => nil

data/History.md

@@ -1,3 +1,8 @@
+## 2.0.1 / 2017-04-11
+
+* add option to hide markers (show_marker="false")
+* do not show link in marker popup when no URL is set
+
 ## 2.0.0 / 2016-11-06
 
 * change default behaviour to load location from current page

data/README.md

@@ -28,6 +28,18 @@ GoogleMaps Marker Clusterer can be used if you have many points within close pro
 
 ## 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).
+
+Once you have your API Key you need to add it to Jekyll's `_config.yml`:
+
+  ```yml
+  maps:
+    google:
+      api_key: <YOUR_KEY>
+  ```
+
 ### Data Source
 
 First, add location information to your posts YAML front-matter:
@@ -54,16 +66,36 @@ Alternatively, you can add location info to your custom collection's documents o
       longitude: -3.8196204
   ```
   
-When you have your data ready, just add following tag to the page where you want to see the map:
+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!
+
+For example, this map will show locations from all posts from 2016:
+  
+  ```
+  {% google_map src="_posts/2016" %}
+  ```
+  
+This map will show locations from a collection called '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" %}
+  ```
+
 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" %}
   ```
   
 ### Filters
@@ -72,7 +104,7 @@ 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 lang:en %}
+  {% google_map src="_posts" lang="en" %}
   ```
 
 ### Marker Cluster

data/Rakefile

@@ -1,6 +1,6 @@
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task default: :spec
+task :default => :spec

data/jekyll-maps.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "jekyll-maps/version"

data/lib/jekyll-maps/google_map_api.js

@@ -66,6 +66,9 @@ var jekyllMaps = (function () {
 
     function createMarker (location) {
       var position = new google.maps.LatLng(location.latitude, location.longitude)
+      bounds.extend(position)
+      if (!mapOptions.showMarker) return false
+
       var marker = new google.maps.Marker({
         position: position,
         title: location.title,
@@ -73,21 +76,21 @@ var jekyllMaps = (function () {
         url: location.url,
         map: map
       })
-
-      bounds.extend(position)
       if (mapOptions.showMarkerPopup) marker.addListener('click', markerPopup)
 
       return marker
     }
 
     function markerPopup () {
-      var contentString = '<div class="map-info-window"><h5>' + this.title + '</h5>'
-      var link = 'View'
-      if (this.image.length > 0) {
-        link = '<img src="' + this.image + '" alt="' + this.title + '"/>'
+      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'
+        contentHtml += '<a href="' + this.url + '">' + linkText + '</a></div>'
+      } else if (this.image.length > 0) {
+        contentHtml += imageHtml
       }
-      contentString += '<a href="' + this.url + '">' + link + '</a></div>'
-      infoWindow.setContent(contentString)
+      infoWindow.setContent(contentHtml)
       infoWindow.open(map, this)
     }
   }

data/lib/jekyll-maps/google_map_tag.rb

@@ -56,6 +56,7 @@ HTML
       def map_options
         opts = {
           :useCluster      => !@args[:flags][:no_cluster],
+          :showMarker      => @args[:attributes][:show_marker] != "false",
           :showMarkerPopup => @args[:attributes][:show_popup] != "false"
         }
         if @args[:attributes][:zoom]

data/lib/jekyll-maps/location_finder.rb

@@ -72,11 +72,18 @@ module Jekyll
             :latitude  => document["location"]["latitude"],
             :longitude => document["location"]["longitude"],
             :title     => document["title"],
-            :url       => document["url"] || document.url,
+            :url       => fetch_url(document),
             :image     => document["image"] || ""
           }
         end
       end
+
+      private
+      def fetch_url(document)
+        return document["url"] if document.is_a?(Hash) && document.key?("url")
+        return document.url if document.respond_to? :url
+        return ""
+      end
     end
   end
 end

data/lib/jekyll-maps/options_parser.rb

@@ -10,6 +10,7 @@ module Jekyll
         width
         height
         class
+        show_marker
         show_popup
         zoom
       ).freeze

data/lib/jekyll-maps/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Maps
-    VERSION = "2.0.0".freeze
+    VERSION = "2.0.1".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-maps
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Anatoliy Yastreb
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-06 00:00:00.000000000 Z
+date: 2017-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll