From a321a7f2f709a2a539803a4a064eda85851f5a3b Mon Sep 17 00:00:00 2001
From: Josh Habdas <jhabdas@gmail.com>
Date: Fri, 13 Jan 2017 12:37:53 +0800
Subject: [PATCH] Incorporate feedback, add unit tests

---
 README.md                   | 11 ++++++++--
 lib/template.html           | 22 +++++++++++++------
 spec/jekyll_seo_tag_spec.rb | 44 +++++++++++++++++++++++++++++++++++++
 3 files changed, 68 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 550a9b6..58b17fa 100644
--- a/README.md
+++ b/README.md
@@ -92,8 +92,15 @@ The SEO tag will respect any of the following if included in your site's `_confi
     ```
 
 * `google_site_verification` for verifying ownership via Google webmaster tools
-* `bing_site_verification` for verifying ownership via Bing webmaster tools
-* `yandex_site_verification` for verifying ownership via Yandex webmaster tools
+* Alternatively, verify ownership with several services at once using the following format:
+
+```yml
+webmaster_verifications:
+  google: 1234
+  bing: 1234
+  alexa: 1234
+  yandex: 1234
+```
 
 The SEO tag will respect the following YAML front matter if included in a post, page, or document:
 
diff --git a/lib/template.html b/lib/template.html
index dfd3ec1..1c9f3ea 100644
--- a/lib/template.html
+++ b/lib/template.html
@@ -172,15 +172,23 @@
   {% endif %}
 {% endif %}
 
-{% if site.google_site_verification %}
+{% if site.webmaster_verifications %}
+  {% if site.webmaster_verifications.google %}
+    <meta name="google-site-verification" content="{{ site.webmaster_verifications.google }}">
+  {% endif %}
+  {% if site.webmaster_verifications.bing %}
+    <meta name="msvalidate.01" content="{{ site.webmaster_verifications.bing }}">
+  {% endif %}
+  {% if site.webmaster_verifications.alexa %}
+    <meta name="alexaVerifyID" content="{{ site.webmaster_verifications.alexa }}">
+  {% endif %}
+  {% if site.webmaster_verifications.yandex %}
+    <meta name="yandex-verification" content="{{ site.webmaster_verifications.yandex }}">
+  {% endif %}
+{% elsif site.google_site_verification %}
   <meta name="google-site-verification" content="{{ site.google_site_verification }}" />
 {% endif %}
-{% if site.bing_site_verification %}
-  <meta name="msvalidate.01" content="{{ site.bing_site_verification }}">
-{% endif %}
-{% if site.yandex_site_verification %}
-  <meta name="yandex-verification" content="{{ site.yandex_site_verification }}">
-{% endif %}
+
 
 <script type="application/ld+json">
   {
diff --git a/spec/jekyll_seo_tag_spec.rb b/spec/jekyll_seo_tag_spec.rb
index 07d3a59..d273a26 100644
--- a/spec/jekyll_seo_tag_spec.rb
+++ b/spec/jekyll_seo_tag_spec.rb
@@ -440,4 +440,48 @@ EOS
       expect(output).to match(%r!<link rel="next" href="/bar">!)
     end
   end
+
+  context "webmaster verification" do
+    context "with site.webmaster_verifications" do
+      let(:site_verifications) do
+        {
+          "google" => "foo",
+          "bing"   => "bar",
+          "alexa"  => "baz",
+          "yandex" => "bat"
+        }
+      end
+
+      let(:site) { make_site("webmaster_verifications" => site_verifications) }
+
+      it "outputs google verification meta" do
+        expected = %r!<meta name="google-site-verification" content="foo">!
+        expect(output).to match(expected)
+      end
+
+      it "outputs bing verification meta" do
+        expected = %r!<meta name="msvalidate.01" content="bar">!
+        expect(output).to match(expected)
+      end
+
+      it "outputs alexa verification meta" do
+        expected = %r!<meta name="alexaVerifyID" content="baz">!
+        expect(output).to match(expected)
+      end
+
+      it "outputs yandex verification meta" do
+        expected = %r!<meta name="yandex-verification" content="bat">!
+        expect(output).to match(expected)
+      end
+    end
+
+    context "with site.google_site_verification" do
+      let(:site) { make_site("google_site_verification" => "foo") }
+
+      it "outputs google verification meta" do
+        expected = %r!<meta name="google-site-verification" content="foo" />!
+        expect(output).to match(expected)
+      end
+    end
+  end
 end