middleman-meta-tags 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6b5508919401357afff08347fbb15c8492c6f8f
-  data.tar.gz: e7208180d65aa063c36a3acaffda2e0660756ad2
+  metadata.gz: 315f41669e5f4f22a78d163a99f104fed348b3f6
+  data.tar.gz: a2445224c7ccd61088e85d6919a7c361c6b6b606
 SHA512:
-  metadata.gz: f0f24f7206d6de484d69b514eb099f1c6bfd2ae029bf8c9bb3a27b952753d50e1e84eb02927cce76cc7d99f3a8c304074b6255c729d5fc08e766c65e54a978f7
-  data.tar.gz: 9c1003785ae089d120d1ee111086d75ad116ff992f324b3689c6bc94e596f0c4d1256c2e817b61153a4683f7eb33adf84b18fe60f9fce2c35c515479a6862938
+  metadata.gz: b6e559fe8e507542b8dd7bfd0e4cdd68de568a95446d786e26694ebb4418fa1624190528a27e8baf172d92dab8b8eaec48c6ffed4b3f427be92d9f41090a607c
+  data.tar.gz: 8d26f130b0abb3669ddd08c0f28d7f70ff6070fa961a20b826dfdaf9c1bea32492df088aaa242d78f70b2edf79534b78e43dde544f0a79058313a03f140cf879

data/.ruby-gemset

@@ -0,0 +1 @@
+middleman-meta-tags

data/.ruby-version

@@ -0,0 +1 @@
+2.2

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Next release
 
+## 0.3.0 (01/30/17)
+
+* Keywords can be an Array
+* Calculate pull_image path with image_path
+
 ## 0.2.0 (03/30/16)
 
 * Allow gem to work with middleman 4.0

data/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Baptiste Lecocq
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -86,6 +86,7 @@ Then it looks the page meta data to attempt to display the following keys:
 - MM `pull_image` => META `og:image`
 - MM `site` => META `og:site_name`
 - MM `title` => META `og:title`
+- MM `host` => optional attribute for composing `pull_image` src with asset helper
 
 In addition, if you want to customize meta tags by each page's frontmatter, you
 can add `customize_by_frontmatter: true` in `data/site.yml`. The priority would
@@ -105,6 +106,28 @@ end
 
 And add it to the layouts and views that you need.
 
+### Pull images
+
+For the `pull_image` to render for twitter metatags, a full url must be used:
+
+```
+pull_image: 'http://example.com/path/to/image.jpg'
+```
+
+If pointing to an image in your Middleman source, you can instead specify the
+relative image path as you would with an asset helper provided you have also
+configured the `host` in your `site.yml`. If your Middleman build activates
+extensions like `:asset_hash`, the full, hashed URL will be generated in your
+metatags.
+
+```
+# site.yml
+host: http://example.com
+
+# your article
+pull_image 'page/to/image/jpg'
+```
+
 ## Contributing
 
 1. [Fork it](http://github.com/tiste/middleman-meta-tags/fork)

data/lib/middleman-meta-tags/helpers.rb

@@ -34,6 +34,7 @@ module Middleman
         result << tag(:meta, name: :description, content: description) unless description.blank?
 
         keywords = meta_tags.delete(:keywords)
+        keywords = keywords.join(', ') if keywords.is_a?(Array)
         result << tag(:meta, name: :keywords, content: keywords) unless keywords.blank?
 
         meta_tags.each do |name, content|
@@ -68,13 +69,13 @@ module Middleman
         fall_through(site_data, 'twitter:card', 'twitter_card', 'summary_large_image')
         fall_through(site_data, 'twitter:creator', 'twitter_author')
         fall_through(site_data, 'twitter:description', 'description')
-        fall_through(site_data, 'twitter:image:src', 'pull_image')
+        fall_through_image(site_data, 'twitter:image:src', 'pull_image')
         fall_through(site_data, 'twitter:site', 'publisher_twitter')
         fall_through(site_data, 'twitter:title', 'title')
 
         # Open Graph
         fall_through(site_data, 'og:description', 'description')
-        fall_through(site_data, 'og:image', 'pull_image')
+        fall_through_image(site_data, 'og:image', 'pull_image')
         fall_through(site_data, 'og:title', 'title')
       end
 
@@ -86,10 +87,31 @@ module Middleman
                 (need_customized && current_page.data[key]) ||
                 site_data[key] ||
                 default
+        value = yield value if block_given?
         set_meta_tags name => value unless value.blank?
         value
       end
 
+      def fall_through_image(*args)
+        fall_through(*args) do |path|
+          is_uri?(path) ? path : meta_tags_image_url(path)
+        end
+      end
+
+      def meta_tags_image_url(source)
+        meta_tags_host + image_path(source)
+      end
+
+      def meta_tags_host
+        (data['site'] || {})['host'] || ''
+      end
+
+      # borrowed from Rails 3
+      # http://apidock.com/rails/v3.2.8/ActionView/AssetPaths/is_uri%3F
+      def is_uri?(path)
+        path =~ %r{^[-a-z]+://|^(?:cid|data):|^//}
+      end
+
       def full_title(meta_tags)
         separator   = meta_tags[:separator] || '|'
         full_title  = ''

data/lib/middleman-meta-tags/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module MetaTags
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-meta-tags
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Baptiste Lecocq
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2017-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -60,9 +60,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
 - CHANGELOG.md
 - Gemfile
-- LICENSE.txt
+- LICENSE
 - README.md
 - Rakefile
 - lib/middleman-meta-tags.rb

data/LICENSE.txt

@@ -1,22 +0,0 @@
-Copyright (c) 2014 Baptiste Lecocq
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.