jekyll-maps 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b00622803d1ea55c166f6dd5a7eb8603092d07f
-  data.tar.gz: 8faf047b0c0b139ca3141f6e1d8f596b70ce9575
+  metadata.gz: 1d991367839c14b8f67ff64821219fc0ebcf9290
+  data.tar.gz: ab2ab30d54e9f1ed120f377f0350cc53d5f52d12
 SHA512:
-  metadata.gz: f7bd47ce22e43f4a26b5659295164f4900fd2ad7bef769838f231991fdd4fade909531cb8a5d9ce60e31461a8d6afdc5bb03f45b0ddacdda3f23280b62bf0990
-  data.tar.gz: a5f32d206c1a08008a6145ddfcf35d60a0721c4dd9367a0df68ee70655a5709f85ffa9dc5a11104617a9521b40b963e215023723ada79c2ddfd894460a760529
+  metadata.gz: 34ee237acea3325e5c7fa62defb1f41b829586bafa05135c917cd54e8ab085fe98fdf177cd1f1299b8467843777c24662ad841331cabe119e94371310538ec62
+  data.tar.gz: e31ce264d925ae834ae80e0ae9fb2e0b8b1cee5ab15cf94bd1a38c0e4d0b074521aa2f3095c1f1cb619304c470d52b206df9317ae8377ad831fa8a5ecf1a4bfb

data/.gitignore

@@ -3,3 +3,4 @@
 Gemfile.lock
 tmp
 spec/dest
+coverage

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+- 2.3.0
+- 2.2
+- 2.1
+- 2.0
+script: script/cibuild
+sudo: false
+cache: bundler

data/Gemfile

@@ -1,3 +1,5 @@
 source "https://rubygems.org"
 
 gemspec
+
+gem "codeclimate-test-reporter", group: :test, require: nil

data/History.md

@@ -0,0 +1,8 @@
+## 1.0.2 / 2016-07-18
+
+* fix script loading
+* look for location coordinates in all collections
+
+## 1.0.1 / 2016-07-17
+
+* implement Google Maps tag

data/README.md

@@ -1,2 +1,8 @@
-# jekyll-maps
+# Jekyll Maps
+
+[![Gem Version](https://badge.fury.io/rb/jekyll-maps.svg)](https://badge.fury.io/rb/jekyll-maps)
+[![Build Status](https://travis-ci.org/ayastreb/jekyll-maps.svg?branch=master)](https://travis-ci.org/ayastreb/jekyll-maps)
+[![Code Climate](https://codeclimate.com/github/ayastreb/jekyll-maps/badges/gpa.svg)](https://codeclimate.com/github/ayastreb/jekyll-maps)
+[![Test Coverage](https://codeclimate.com/github/ayastreb/jekyll-maps/badges/coverage.svg)](https://codeclimate.com/github/ayastreb/jekyll-maps/coverage)
+
 Google Maps support in Jekyll blog to easily embed maps with posts' locations

data/lib/jekyll-maps.rb

@@ -1,4 +1,6 @@
 require "jekyll-maps/google_map_tag"
+require "jekyll-maps/location_finder"
+require "jekyll-maps/options_parser"
 require "jekyll-maps/version"
 
 module Jekyll

data/lib/jekyll-maps/google_map.html

@@ -27,15 +27,13 @@
               var position = new google.maps.LatLng(location.latitude, location.longitude);
               var marker = new google.maps.Marker({
                 position: position,
-                map: map,
-                title: location.title,
-                url: location.url
+                title:    location.title,
+                url:      location.url,
+                map:      map
               });
 
               marker.addListener('click', function () {
-                if (this.url) {
-                  window.location.href = this.url;
-                }
+                window.location.href = this.url
               });
               bounds.extend(position);
 
@@ -50,9 +48,6 @@
       },
     };
   }());
-
-  window.onload = function () {
-    jekyllMaps.loadScript('https://googlemaps.github.io/js-marker-clusterer/src/markerclusterer.js');
-    jekyllMaps.loadScript('http://maps.googleapis.com/maps/api/js?callback=jekyllMaps.initialize');
-  };
 </script>
+<script src='https://googlemaps.github.io/js-marker-clusterer/src/markerclusterer.js'></script>
+<script src='https://maps.googleapis.com/maps/api/js?callback=jekyllMaps.initialize'></script>

data/lib/jekyll-maps/google_map_tag.rb

@@ -1,50 +1,21 @@
 module Jekyll
   module Maps
     class GoogleMapTag < Liquid::Tag
-      attr_accessor :context
-
       def initialize(_, args, _)
-        unless args.empty?
-          @filter_key   = args.split(":").first.strip
-          @filter_value = args.split(":").last.strip
-        end
-
+        options = OptionsParser.parse(args)
+        @finder = LocationFinder.new(options)
         super
       end
 
       def render(context)
-        @context = context
-        template.render!({ "locations" => locations.to_json })
-      end
-
-      private
-      def locations
-        filter_posts.map do |post|
-          {
-            :latitude  => post["location"]["latitude"],
-            :longitude => post["location"]["longitude"],
-            :title     => post["title"],
-            :url       => post.url
-          }
-        end
-      end
-
-      def filter_posts
-        posts = context.registers[:site].posts.docs.reject do |post|
-          post["location"].nil? || post["location"].empty?
-        end
-        if @filter_key
-          posts.reject do |post|
-            post[@filter_key].nil? || post[@filter_key] != @filter_value
-          end
-        else
-          posts
-        end
+        template.render!({
+          "locations" => @finder.find(context.registers[:site]).to_json
+        })
       end
 
       private
       def template
-        @template ||= Liquid::Template.parse template_contents
+        @template ||= Liquid::Template.parse(template_contents)
       end
 
       private
@@ -57,7 +28,7 @@ module Jekyll
       private
       def template_path
         @template_path ||= begin
-          File.expand_path "./google_map.html", File.dirname(__FILE__)
+          File.expand_path("./google_map.html", File.dirname(__FILE__))
         end
       end
     end

data/lib/jekyll-maps/location_finder.rb

@@ -0,0 +1,43 @@
+module Jekyll
+  module Maps
+    class LocationFinder
+      def initialize(options)
+        @options = options
+      end
+
+      def find(site)
+        matching_documents(site).map do |document|
+          {
+            :latitude  => document["location"]["latitude"],
+            :longitude => document["location"]["longitude"],
+            :title     => document["title"],
+            :url       => document.url
+          }
+        end
+      end
+
+      private
+      def matching_documents(site)
+        documents = []
+        site.collections.each do |_, collection|
+          collection.docs.each do |doc|
+            documents << doc if location?(doc) && match_filters?(doc)
+          end
+        end
+        documents
+      end
+
+      private
+      def location?(doc)
+        !doc["location"].nil? && !doc["location"].empty?
+      end
+
+      private
+      def match_filters?(doc)
+        @options[:filters].each do |key, value|
+          return false if doc[key].nil? || doc[key] != value
+        end
+      end
+    end
+  end
+end

data/lib/jekyll-maps/options_parser.rb

@@ -0,0 +1,18 @@
+module Jekyll
+  module Maps
+    class OptionsParser
+      class << self
+        def parse(raw_options)
+          options = { :filters => {} }
+          raw_options.strip.split(" ").each do |pair|
+            key   = pair.split(":").first.strip
+            value = pair.split(":").last.strip
+            value = value.split(",") if value.include?(",")
+            options[:filters][key] = value
+          end
+          options
+        end
+      end
+    end
+  end
+end

data/lib/jekyll-maps/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Maps
-    VERSION = "1.0.1".freeze
+    VERSION = "1.0.2".freeze
   end
 end

data/script/cibuild

@@ -0,0 +1,4 @@
+#! /bin/sh
+
+bundle exec rspec --color $@
+bundle exec rubocop -S -D

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-maps
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Anatoliy Yastreb
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-17 00:00:00.000000000 Z
+date: 2016-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -75,7 +75,9 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
+- History.md
 - LICENSE
 - README.md
 - Rakefile
@@ -83,8 +85,11 @@ files:
 - lib/jekyll-maps.rb
 - lib/jekyll-maps/google_map.html
 - lib/jekyll-maps/google_map_tag.rb
+- lib/jekyll-maps/location_finder.rb
+- lib/jekyll-maps/options_parser.rb
 - lib/jekyll-maps/version.rb
 - script/bootstrap
+- script/cibuild
 homepage: https://github.com/ayastreb/jekyll-google-maps
 licenses:
 - MIT