jekyll-maps 1.1.6 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3bf3fffa8b6a67a476bdbe5fc43b4448098bb365
-  data.tar.gz: a2907b6e1a100ed5ed7d66bdbfcd2278b2316127
+  metadata.gz: ff712952d8af10379eb6c0b661849966afda5d95
+  data.tar.gz: 7c177d50a81d48be0231d9b3f408d0b893d5143b
 SHA512:
-  metadata.gz: a326efc82dd3efa73f3c140137c0f87f29f86e93d8d795883cd4a83f57d7064ee8868e3e250932c04cda356fa784eada946ea9ba612ad9a85c107a8d5dfcaf38
-  data.tar.gz: f7bb0962ad9a89794a2c767b88a92870bb995048b313c678e92fe8ed71fd7bb8672ca3dee3b14bdefbfab2168a9929f903b3473b9e7575b6c8581ca1d125b612
+  metadata.gz: b08891aa61f5a8206265a7eb89cb744f7e9762c71bc82442be66725104654dd0b883fe8b6498d223bcfe5d65eeca8ef4066c0ed8d2f1845f46cb89d642f62b30
+  data.tar.gz: 4e2253c2dfa01023e861b5b75ccf8258e1b81904f35a43b085350a82af7bb251c06e51ba9cc204841a5aafd08e7cea27fbd584165593bcfb6e1f24ea961a5829

data/History.md

@@ -1,3 +1,9 @@
+## 2.0.0 / 2016-11-06
+
+* change default behaviour to load location from current page
+* removed on-page flag
+* change attributes syntax to HTML-style
+
 ## 1.1.6 / 2016-09-07
 * fix #15 - broken page if there is <header> tag used
 * allow setting custom zoom level with `zoom:10` attribute

data/lib/jekyll-maps.rb

@@ -1,4 +1,5 @@
 require "securerandom"
+require "ostruct"
 require "jekyll-maps/google_map_api"
 require "jekyll-maps/google_map_tag"
 require "jekyll-maps/location_finder"

data/lib/jekyll-maps/location_finder.rb

@@ -7,16 +7,40 @@ module Jekyll
       end
 
       def find(site, page)
-        if @options[:flags][:on_page]
+        if @options[:filters].empty?
           @documents << page if location?(page)
         else
           site.collections.each { |_, collection| filter(collection.docs) }
-          site.data.each { |_, docs| filter(docs) }
+          site_data(site).each { |_, items| traverse(items) }
         end
 
         convert
       end
 
+      private
+      def site_data(site)
+        return {} unless data_source?
+
+        path = @options[:filters]["src"].scan(%r!_data\/([^\/]+)!).join(".")
+        return site.data if path.empty?
+
+        data = OpenStruct.new(site.data)
+        data[path]
+      end
+
+      private
+      def data_source?
+        filters = @options[:filters]
+        filters.key?("src") && filters["src"].start_with?("_data")
+      end
+
+      private
+      def traverse(items)
+        return filter(items) if items.is_a?(Array)
+
+        items.each { |_, children| traverse(children) } if items.is_a?(Hash)
+      end
+
       private
       def filter(docs)
         docs.each do |doc|
@@ -31,8 +55,13 @@ module Jekyll
 
       private
       def match_filters?(doc)
-        @options[:filters].each do |key, value|
-          return false if doc[key].nil? || doc[key] != value
+        @options[:filters].each do |filter, value|
+          if filter == "src"
+            return true unless doc.respond_to?(:relative_path)
+            return false unless doc.relative_path.start_with?(value)
+          elsif doc[filter].nil? || doc[filter] != value
+            return false
+          end
         end
       end
 

data/lib/jekyll-maps/options_parser.rb

@@ -1,10 +1,9 @@
 module Jekyll
   module Maps
     class OptionsParser
-      OPTIONS_SYNTAX     = %r!([^\s]+)\s*:\s*([^\s]+)!
+      OPTIONS_SYNTAX     = %r!([^\s]+)\s*=\s*['"]+([^\s'"]+)['"]+!
       ALLOWED_FLAGS      = %w(
         no_cluster
-        on_page
       ).freeze
       ALLOWED_ATTRIBUTES = %w(
         id

data/lib/jekyll-maps/version.rb

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

metadata

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