jekyll-maps 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9017b81a9491708709221e31c9e6131bb2eec5a
-  data.tar.gz: 07c63633b3c8873380da1e806a8bea997c3193f7
+  metadata.gz: 4fd53874b13c6ba9f3170a3f1e0f33111859d9c2
+  data.tar.gz: e8c452dced878ab7ee030ee6b1effe3ebefd935e
 SHA512:
-  metadata.gz: 6535079eb86812d6f9656a6f63c7fbc9c5ae8c11a9ff5336700b9dca3ac618c9ca38ece6467ad8ebd8814b7859d5bbc02523b3eb86ab60afac31e9361c48f35a
-  data.tar.gz: 9cd8a8528036d954f6904f4160d65c636c566bb5ac3cb88c995ed3fbf2733178c1b99ff3d09bf235272da0b7411c63573b94d86a9424793ffd6e029e7b0a909d
+  metadata.gz: 0df5d97537d323d0359547b23185307110e94169436acc3c201543b4a71893f3cae53e2649d9034a4adab6c9b2c7d53f5d9d79779f7df4489fcf4eecbe0f4c4d
+  data.tar.gz: e487f20b8232ba92b4171723ce2433f90ab5b25b25330b75a99e2ab5e345fd1957ca84dae5e99fbf5fcf47721a8dbcc5b1098427978edc86a13dd5a11df4c257

data/.travis.yml

@@ -1,9 +1,9 @@
 language: ruby
 rvm:
+- 2.4.1
 - 2.3.0
 - 2.2
 - 2.1
-- 2.0
 script: script/cibuild
 after_success:
   - bundle exec codeclimate-test-reporter

data/History.md

@@ -1,3 +1,8 @@
+## 2.0.4 / 2017-07-19
+
+* allow multiple locations per document (fix #6)
+* allow inline locations with map attributes, e.g. `{% google_map laititude='42.23323' longitude='3.213232' %}` (fix #23)
+
 ## 2.0.3 / 2017-05-17
 
 * load locations from specific data file (fix #26)

data/lib/jekyll-maps/location_finder.rb

@@ -7,14 +7,27 @@ module Jekyll
       end
 
       def find(site, page)
-        if @options[:filters].empty?
-          @documents << page if location?(page)
+        if @options[:attributes][:latitude] && @options[:attributes][:longitude]
+          return [location_from_options(page)]
+        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) }
         end
 
-        convert
+        documents_to_locations
+      end
+
+      private
+      def location_from_options(page)
+        {
+          :latitude  => @options[:attributes][:latitude],
+          :longitude => @options[:attributes][:longitude],
+          :title     => @options[:attributes][:marker_title] || page["title"],
+          :url       => @options[:attributes][:marker_url] || fetch_url(page),
+          :image     => @options[:attributes][:marker_img] || page["image"] || ""
+        }
       end
 
       private
@@ -48,12 +61,12 @@ module Jekyll
       private
       def filter(docs)
         docs.each do |doc|
-          @documents << doc if location?(doc) && match_filters?(doc)
+          @documents << doc if with_location?(doc) && match_filters?(doc)
         end
       end
 
       private
-      def location?(doc)
+      def with_location?(doc)
         !doc["location"].nil? && !doc["location"].empty?
       end
 
@@ -70,23 +83,36 @@ module Jekyll
       end
 
       private
-      def convert
-        @documents.map do |document|
-          {
-            :latitude  => document["location"]["latitude"],
-            :longitude => document["location"]["longitude"],
-            :title     => document["title"],
-            :url       => fetch_url(document),
-            :image     => document["image"] || ""
-          }
+      def documents_to_locations
+        locations = []
+        @documents.each do |document|
+          if document["location"].is_a?(Array)
+            document["location"].each do |location|
+              locations.push(convert(document, location))
+            end
+          else
+            locations.push(convert(document, document["location"]))
+          end
         end
+        locations
+      end
+
+      private
+      def convert(document, location)
+        {
+          :latitude  => location["latitude"],
+          :longitude => location["longitude"],
+          :title     => location["title"] || document["title"],
+          :url       => location["url"] || fetch_url(document),
+          :image     => location["image"] || document["image"] || ""
+        }
       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

data/lib/jekyll-maps/options_parser.rb

@@ -13,6 +13,11 @@ module Jekyll
         show_marker
         show_popup
         zoom
+        latitude
+        longitude
+        marker_title
+        marker_img
+        marker_url
       ).freeze
 
       class << self

data/lib/jekyll-maps/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-maps
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Anatoliy Yastreb
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-17 00:00:00.000000000 Z
+date: 2017-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll