middleman-ogp 1.0.3 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d59dba42be8e5b8512bf6ec22df723f202d2dd40
-  data.tar.gz: 1f211db3d5f975d00ebe96a8851a83f7baa27b11
+SHA256:
+  metadata.gz: e28b058adeca6fe8e0b7e97aafd4cf618400827679ee43d284e3ef6b8304a8fd
+  data.tar.gz: 9200114785f92ad9128b98a17b425b958d1d35c09e4a81e41751a342d3aab705
 SHA512:
-  metadata.gz: 371fffa46683019462bf0969620cfbcbdc0c71951aa53d5dc14192c4e044b4d02e5f1010568efb6d6f1560306c51ec35205972f57a0cfec56fad7ea785898fc4
-  data.tar.gz: 55985da4cd0415f0b849e699f87601f3c0eb5c901145ca5cef34522107922ca82616cf58893e5b7aa185449a32f244a81db1de3694e371049803adea434dbac9
+  metadata.gz: fa5956a7a27974dddfa2884361d6f3dce2a109c041f1037b6dcddcdf477b03a36127d80e4bd1e548f1496912af19b01e8dfda420613971ff0ef5ab8ad1e51d7d
+  data.tar.gz: 453fe68b5d44ba2d4de8038c5f3bc91216442c3b4612a21f976f37ab7e48b90465b26edfb635a6114b041441ce490093d18cfb23415d9d689650fcc9046ed03a

data/.github/workflows/rubygems.yml

@@ -0,0 +1,30 @@
+name: Publish to RubyGems
+on:
+  push:
+    tags:
+    - v[1-9].[0-9]+.[0-9]+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.7
+    - run: bundle install
+    - run: bundle exec rake build
+    - name: Export RubyGems Credentials
+      run: |
+        CRED=~/.gem/credentials
+        mkdir -p ~/.gem
+        echo "---" > $CRED
+        echo ":rubygems_api_key: ${{ secrets.RUBYGEMS_API_KEY }}" >> $CRED
+        chmod 0600 $CRED
+    - name: Push gem
+      run: |
+        VERSION=$(bundle exec rake print_version)
+        if [ "refs/tags/v${VERSION}" != $GITHUB_REF ]; then
+          echo "Ref ${GITHUB_REF} not match"
+          exit 1
+        fi
+        gem push "pkg/middleman-ogp-${VERSION}.gem"

data/.github/workflows/test.yml

@@ -0,0 +1,21 @@
+name: Run tests
+on:
+  push:
+    branches:
+    - '*'
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [2.5, 2.6, 2.7, head, debug]
+    continue-on-error: ${{ endsWith(matrix.ruby, 'head') || matrix.ruby == 'debug' }}
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - run: bundle install
+    - run: bundle exec rake rubocop
+    - run: bundle exec rake spec
+    - run: bundle exec rake cucumber

data/.gitignore

@@ -5,7 +5,7 @@ pkg
 .sass-cache
 .sassc
 .tmp
-Gemfile.lock
+Gemfile*.lock
 docs
 .rbenv-*
 .*.swp
@@ -16,3 +16,4 @@ tmp
 Makefile
 .mm-pid-*
 *.gem
+.ruby-version

data/.rubocop.yml

@@ -0,0 +1,28 @@
+Naming/FileName:
+  Enabled: false
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: true
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+Lint/DeprecatedOpenSSLConstant:
+  Enabled: true
+Lint/RaiseException:
+  Enabled: true
+Lint/StructNewOverride:
+  Enabled: true
+Style/ExponentialNotation:
+  Enabled: true
+Style/HashEachMethods:
+  Enabled: true
+Style/HashTransformKeys:
+  Enabled: true
+Style/HashTransformValues:
+  Enabled: true
+Style/SlicingWithRange:
+  Enabled: true
+Metrics/AbcSize:
+  Enabled: false
+Metrics/CyclomaticComplexity:
+  Enabled: false
+Metrics/PerceivedComplexity:
+  Enabled: false

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+1.0.4
+-----
+
+* Data merge order bugfix.
+
+1.0.3
+-----
+
+* middleman-blog support.
+
 1.0.2
 -----
 

data/Gemfile

@@ -1,21 +1,26 @@
-source "https://rubygems.org"
+# frozen_string_literal: true
 
-gem "middleman-core", '~> 3.2'
-gem "middleman-blog", '~> 3.5'
+source 'https://rubygems.org'
+
+gem 'middleman-blog', '~> 4.0'
+gem 'middleman-cli', '~> 4.3'
+gem 'middleman-core', '~> 4.3'
 
 # Specify your gem's dependencies in middleman-ogp.gemspec
 gemspec
 
-gem "rake",     "~> 10.1.0", :require => false
-gem "yard",     "~> 0.8.0", :require => false
+gem 'rake', '~> 13.0.1', require: false
+gem 'rubocop', '~> 0.84.0', require: false
+gem 'yard',     '~> 0.9.25', require: false
 
 # Test tools
-gem "cucumber", "~> 1.3.1"
-gem "fivemat"
-gem "aruba",    "~> 0.5.1"
-gem "rspec"
+gem 'aruba',    '~> 0.14.0'
+gem 'capybara', '~> 3.32.2'
+gem 'cucumber', '~> 3.1.2'
+gem 'fivemat'
+gem 'rspec'
 
-gem "slim"
+gem 'slim'
 
 # Code Quality
-gem "cane", :platforms => [:mri_19, :mri_20], :require => false
+gem 'cane', platforms: %i[mri_19 mri_20], require: false

data/README.md

@@ -1,11 +1,8 @@
-Middleman-OGP
-=============
+# Middleman-OGP
 
-`middleman-opg` is an extension for the [Middleman] static site generator that adds OpenGraph Protocol support.
+`middleman-ogp` is an extension for the [Middleman] static site generator that adds OpenGraph Protocol support.
 
-
-Configuration
--------------
+## Configuration
 
 ### In your `config.rb`
 
@@ -20,10 +17,27 @@ activate :ogp do |ogp|
     og: data.ogp.og
     # from data/ogp/og.yml
   }
-  og.base_url = 'http://mysite.tld/'
+  ogp.base_url = 'http://mysite.tld/'
 end
 ```
 
+### In your project's root directory
+
+Create `data/ogp/fb.yml` and `data/ogp/og.yml` files.
+
+Example:
+
+```yaml
+image:
+  "": http://mydomain.tld/path/to/fbimage.png
+  secure_url: https://secure.mydomain.tld/path/to/fbimage.png
+  type: image/png
+  width: 400
+  height: 300
+locale:
+  "": en_us
+```
+
 ### In your layout
 
 source/layout.slim
@@ -45,41 +59,38 @@ html
 
 Page data overrides default options. (deep merge).
 
-
 ```markdown
 ---
 ogp:
   og:
-    description: 'This is my fixture Middleman site.'
+    description: "This is my fixture Middleman site."
     image:
-      '': http://mydomain.tld/path/to/fbimage.png
+      "": http://mydomain.tld/path/to/fbimage.png
       secure_url: https://secure.mydomain.tld/path/to/fbimage.png
       type: image/png
       width: 400
       height: 300
     locale:
-      '': en_us
+      "": en_us
       alternate:
         - ja_jp
         - zh_tw
   fb:
-    description: 'This is my fixture Middleman site.'
+    description: "This is my fixture Middleman site."
     image:
-      '': http://mydomain.tld/path/to/fbimage.png
+      "": http://mydomain.tld/path/to/fbimage.png
       secure_url: https://secure.mydomain.tld/path/to/fbimage.png
       type: image/png
       width: 400
       height: 300
 ---
 
-Hello
-=====
+# Hello
 
-This is the __content__
+This is the **content**
 ```
 
-Blog Support
-------------
+## Blog Support
 
 `middleman-ogp` supports adding [article] properties like `article:published_time`, `article:tag` automatically for [middleman-blog] articles.
 
@@ -100,26 +111,19 @@ activate :ogp do |ogp|
 end
 ```
 
-
-Build & Dependency Status
--------------------------
+## Build & Dependency Status
 
 [![Gem Version](https://badge.fury.io/rb/middleman-ogp.png)][gem]
-[![Build Status](https://travis-ci.org/ngs/middleman-ogp.svg?branch=master)][travis]
-[![Dependency Status](https://gemnasium.com/ngs/middleman-ogp.png?travis)][gemnasium]
-[![Code Quality](https://codeclimate.com/github/ngs/middleman-ogp.png)][codeclimate]
+[![Run tests](https://github.com/ngs/middleman-ogp/workflows/Run%20tests/badge.svg)][ghaction]
 
-License
--------
+## License
 
-Copyright (c) 2014 [Atsushi Nagase]. MIT Licensed, see [LICENSE] for details.
+Copyright (c) 2014-2020 [Atsushi Nagase]. MIT Licensed, see [LICENSE] for details.
 
 [middleman]: http://middlemanapp.com
 [middleman-blog]: https://github.com/middleman/middleman-blog
 [gem]: https://rubygems.org/gems/middleman-ogp
-[travis]: http://travis-ci.org/ngs/middleman-ogp
-[gemnasium]: https://gemnasium.com/ngs/middleman-ogp
-[codeclimate]: https://codeclimate.com/github/ngs/middleman-ogp
-[LICENSE]: https://github.com/ngs/middleman-ogp/blob/master/LICENSE.md
-[Atsushi Nagase]: http://ngs.io/
+[ghaction]: https://github.com/ngs/middleman-ogp/actions?query=workflow%3A%22Run+tests%22
+[license]: https://github.com/ngs/middleman-ogp/blob/master/LICENSE.md
+[atsushi nagase]: http://ngs.io/
 [article]: http://ogp.me/#type_article

data/Rakefile

@@ -1,35 +1,45 @@
+# frozen_string_literal: true
+
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
 require 'cucumber/rake/task'
 require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
+RuboCop::RakeTask.new
 
 Cucumber::Rake::Task.new(:cucumber, 'Run features that should pass') do |t|
-  exempt_tags = ""
-  exempt_tags << "--tags ~@nojava " if RUBY_PLATFORM == "java"
+  exempt_tags = ''
+  exempt_tags << '--tags ~@nojava ' if RUBY_PLATFORM == 'java'
   t.cucumber_opts = "--color --tags ~@wip #{exempt_tags} --strict --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}"
 end
 
 require 'rake/clean'
 
-task :test => ["spec", "cucumber"]
+task test: %w[spec cucumber]
 
 begin
   require 'cane/rake_task'
 
-  desc "Run cane to check quality metrics"
+  desc 'Run cane to check quality metrics'
   Cane::RakeTask.new(:quality) do |cane|
     cane.no_style = true
     cane.no_doc = true
-    cane.abc_glob = "lib/middleman-ogp/**/*.rb"
+    cane.abc_glob = 'lib/middleman-ogp/**/*.rb'
   end
 rescue LoadError
   # warn "cane not available, quality task not provided."
 end
 
-desc "Build HTML documentation"
+desc 'Build HTML documentation'
 task :doc do
   sh 'bundle exec yard'
 end
+
+desc 'Print version'
+task :print_version do
+  require 'rubygems'
+  print Gem::Specification.load('middleman-ogp.gemspec').version
+end

data/features/blog.feature

@@ -14,8 +14,30 @@ Feature: Middleman Blog support
     Then I should see '<meta content="2014-04-12T04:00:00Z" property="article:published_time" />'
     Then I should see '<meta content="ruby" property="article:tag" />'
     Then I should see '<meta content="middleman" property="article:tag" />'
+    Then I should see '<meta content="Test" property="article:author:first_name" />'
+    Then I should see '<meta content="Author" property="article:author:last_name" />'
+    Then I should see '<meta content="test_author" property="article:author:username" />'
+    Then I should see '<meta content="female" property="article:author:gender" />'
+    Then I should see '<meta content="Test Section" property="article:section" />'
+    Then I should see '<meta content="2014-04-13T03:00:00Z" property="article:modified_time" />'
+    Then I should see '<meta content="2018-04-12T04:00:00Z" property="article:expiration_time" />'
     Then I should see '<meta content="blog" property="article:tag" />'
     Then I should see '<meta content="http://myblog.foo.tld/2014/04/12/my-test.html" property="og:url" />'
     Then I should see '<meta content="Fixture page" property="og:title" />'
 
+Scenario: multi author article page
+    Given the Server is running at "test-blog"
+    When I go to "2019/07/18/multi-author-test.html"
+    Then I should see '<meta content="article" property="og:type" />'
+    Then I should see '<meta content="Maria" property="article:author:first_name" />'
+    Then I should see '<meta content="Eaton" property="article:author:last_name" />'
+    Then I should see '<meta content="meaton" property="article:author:username" />'
+    Then I should see '<meta content="female" property="article:author:gender" />'
+    Then I should see '<meta content="Shawn" property="article:author:first_name" />'
+    Then I should see '<meta content="justshawn" property="article:author:username" />'
+    Then I should see '<meta content="male" property="article:author:gender" />'
+    Then I should see '<meta content="http://myblog.foo.tld/2019/07/18/multi-author-test.html" property="og:url" />'
+    Then I should see '<meta content="Multi author fixture page" property="og:title" />'
+
+
 

data/features/helper.feature

@@ -3,15 +3,9 @@ Feature: OpenGraph Protocol Tags with the "ogp_tags" helper method
   Scenario: Without page data
     Given the Server is running at "test-app"
     When I go to "/"
-    Then I should see '<meta content="This is my fixture Middleman site for Facebook." property="fb:description" />'
-    Then I should see '<meta content="http://mydomain.tld/path/to/fb-site-image.png" property="fb:image" />'
-    Then I should see '<meta content="https://secure.mydomain.tld/path/to/fb-site-image.png" property="fb:image:secure_url" />'
-    Then I should see '<meta content="image/png" property="fb:image:type" />'
-    Then I should see '<meta content="400" property="fb:image:width" />'
-    Then I should see '<meta content="300" property="fb:image:height" />'
+    Then I should see '<meta content="5678" property="fb:app_id" />'
     Then I should see '<meta content="My Description" property="og:description" />'
-    Then I should see '<meta content="http://mydomain.tld/path/to/og-site-image.png" property="og:image" />'
-    Then I should see '<meta content="https://secure.mydomain.tld/path/to/og-site-image.png" property="og:image:secure_url" />'
+    Then I should see '<meta content="https://images.mydomain.tld/path/to/og-site-image.png" property="og:image" />'
     Then I should see '<meta content="image/png" property="og:image:type" />'
     Then I should see '<meta content="400" property="og:image:width" />'
     Then I should see '<meta content="300" property="og:image:height" />'
@@ -24,15 +18,9 @@ Feature: OpenGraph Protocol Tags with the "ogp_tags" helper method
   Scenario: With page data
     Given the Server is running at "test-app"
     When I go to "/page.html"
-    Then I should see '<meta content="This is my fixture Middleman article for Facebook." property="fb:description" />'
-    Then I should see '<meta content="http://mydomain.tld/path/to/fb-article-image.png" property="fb:image" />'
-    Then I should see '<meta content="https://secure.mydomain.tld/path/to/fb-article-image.png" property="fb:image:secure_url" />'
-    Then I should see '<meta content="image/png" property="fb:image:type" />'
-    Then I should see '<meta content="400" property="fb:image:width" />'
-    Then I should see '<meta content="300" property="fb:image:height" />'
+    Then I should see '<meta content="1234" property="fb:app_id" />'
     Then I should see '<meta content="This is my fixture Middleman article." property="og:description" />'
-    Then I should see '<meta content="http://mydomain.tld/path/to/og-article-image.png" property="og:image" />'
-    Then I should see '<meta content="https://secure.mydomain.tld/path/to/og-article-image.png" property="og:image:secure_url" />'
+    Then I should see '<meta content="https://images.mydomain.tld/path/to/og-article-image.png" property="og:image" />'
     Then I should see '<meta content="image/png" property="og:image:type" />'
     Then I should see '<meta content="400" property="og:image:width" />'
     Then I should see '<meta content="300" property="og:image:height" />'

data/features/support/env.rb

@@ -1,6 +1,9 @@
+# frozen_string_literal: true
+
 PROJECT_ROOT_PATH = File.dirname(File.dirname(File.dirname(__FILE__)))
 ENV['TEST'] = 'true'
-require "middleman-core"
-require "middleman-blog"
-require "middleman-core/step_definitions"
+ENV['TZ'] = 'UTC'
+require 'middleman-core'
+require 'middleman-blog'
+require 'middleman-core/step_definitions'
 require File.join(PROJECT_ROOT_PATH, 'lib', 'middleman-ogp')

data/fixtures/test-app/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 activate :ogp do |ogp|
   #
   # register namespace with default options
@@ -9,4 +11,5 @@ activate :ogp do |ogp|
     # from data/ogp/og.yml
   }
   ogp.base_url = 'http://myshop.foo.tld/'
+  ogp.image_base_url = 'https://images.mydomain.tld/path/'
 end

data/fixtures/test-app/data/ogp/fb.yml

@@ -1,7 +1 @@
-description: 'This is my fixture Middleman site for Facebook.'
-image:
-  '': http://mydomain.tld/path/to/fb-site-image.png
-  secure_url: https://secure.mydomain.tld/path/to/fb-site-image.png
-  type: image/png
-  width: 400
-  height: 300
+app_id: 5678

data/fixtures/test-app/data/ogp/og.yml

@@ -1,7 +1,6 @@
 description: 'This is my fixture Middleman site for OpenGraph.'
 image:
-  '': http://mydomain.tld/path/to/og-site-image.png
-  secure_url: https://secure.mydomain.tld/path/to/og-site-image.png
+  '': to/og-site-image.png
   type: image/png
   width: 400
   height: 300
@@ -9,4 +8,4 @@ locale:
   '': en_us
   alternate:
     - ja_jp
-    - zh_tw
+    - zh_tw

data/fixtures/test-app/source/layout.slim

@@ -1,7 +1,7 @@
 html
   head
     meta charset="utf-8"
-    title= data.page.title
+    title= current_page.data.title
     - ogp_tags do|name, value|
       meta property=name content=value
 

data/fixtures/test-app/source/page.html.slim

@@ -5,8 +5,7 @@ ogp:
   og:
     description: 'This is my fixture Middleman article for OpenGraph.'
     image:
-      '': http://mydomain.tld/path/to/og-article-image.png
-      secure_url: https://secure.mydomain.tld/path/to/og-article-image.png
+      '': to/og-article-image.png
       type: image/png
       width: 400
       height: 300
@@ -16,13 +15,7 @@ ogp:
         - ja_jp
         - zh_tw
   fb:
-    description: 'This is my fixture Middleman article for Facebook.'
-    image:
-      '': http://mydomain.tld/path/to/fb-article-image.png
-      secure_url: https://secure.mydomain.tld/path/to/fb-article-image.png
-      type: image/png
-      width: 400
-      height: 300
+    app_id: 1234
 ---
 
 h1 Hello page

data/fixtures/test-blog/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 activate :blog do |blog|
 end
 

data/fixtures/test-blog/source/2014-04-12-my-test.html.slim

@@ -3,6 +3,14 @@ title: Fixture page
 description: This is a ficture page
 tags: ruby, middleman, blog
 date: 2014-04-12 04:00
+author:
+  first_name: Test
+  last_name: Author
+  username: test_author
+  gender: female
+section: Test Section
+modified_time: 2014-04-13 03:00
+expiration_time: 2018-04-12 04:00
 ---
 
 h1 Hello article

data/fixtures/test-blog/source/2019-07-18-multi-author-test.html.slim

@@ -0,0 +1,16 @@
+---
+title: Multi author fixture page
+date: 2019-07-18 16:45
+authors:
+- first_name: Maria
+  last_name: Eaton
+  username: meaton
+  gender: female
+- first_name: Shawn
+  username: justshawn
+  gender: male
+---
+
+h1 Hello multi author article
+
+p This is a multi author article

data/fixtures/test-blog/source/layout.slim

@@ -1,10 +1,10 @@
 html
   head
     meta charset="utf-8"
-    title= data.page.title
+    title= current_page.data.title
     - ogp_tags do|name, value|
       meta property=name content=value
 
   body
     .container
-      = yield
+      = yield

data/lib/middleman-ogp.rb

@@ -1,7 +1,9 @@
-require "middleman-core"
-require "middleman-ogp/version"
+# frozen_string_literal: true
+
+require 'middleman-core'
+require 'middleman-ogp/version'
 
 ::Middleman::Extensions.register(:ogp) do
-  require "middleman-ogp/extension"
+  require 'middleman-ogp/extension'
   ::Middleman::OGP::OGPExtension
 end

data/lib/middleman-ogp/extension.rb

@@ -1,32 +1,74 @@
+# frozen_string_literal: true
+
+require 'padrino-helpers'
+require 'active_support'
+require 'middleman-core/extensions'
+
 module Middleman
   module OGP
+    # Middleman::OGP::OGPExtension
     class OGPExtension < Extension
-      option :namespaces, {}, 'Default namespaces'
-      option :blog,       false, 'Middleman Blog support'
-      option :auto,       %w{title url description}, 'Properties to automatically fill from page data.'
-      option :base_url,   nil, 'Base URL to generate permalink for og:url'
+      option :namespaces,     {}, 'Default namespaces'
+      option :blog,           false, 'Middleman Blog support'
+      option :auto,           %w[title url description], 'Properties to automatically fill from page data.'
+      option :base_url,       nil, 'Base URL to generate permalink for og:url'
+      option :image_base_url, nil, 'Base URL to generate og:image'
 
       def after_configuration
         Middleman::OGP::Helper.namespaces = options[:namespaces] || {}
         Middleman::OGP::Helper.blog = options[:blog]
         Middleman::OGP::Helper.auto = options[:auto]
         Middleman::OGP::Helper.base_url = options[:base_url]
+        Middleman::OGP::Helper.image_base_url = options[:image_base_url]
       end
 
-      helpers do
-        def ogp_tags(&block)
-          opts = data.page.ogp || {}
+      #
+      helpers do # rubocop:disable Metrics/BlockLength
+        def ogp_tags(&block) # rubocop:disable all
+          opts = current_resource.data['ogp'] || {}
           is_blog_article = Middleman::OGP::Helper.blog && respond_to?(:is_blog_article?) && is_blog_article?
           if is_blog_article
             opts.deep_merge4!({
-              og: {
-                type: 'article',
-              },
-              article: {
-                published_time: current_article.date.to_time.utc.iso8601,
-                tag: current_article.tags,
-              }
-            })
+                                og: {
+                                  type: 'article'
+                                },
+                                article: {
+                                  published_time: current_article.date.to_time.utc.iso8601,
+                                  tag: current_article.tags
+                                }
+                              })
+            opts[:article][:section] = current_article.data.section if current_article.data.section
+            if current_article.data.expiration_time
+              expiration_time = if current_article.data.expiration_time.is_a? Time
+                                  current_article.data.expiration_time
+                                else
+                                  Time.parse(current_article.data.expiration_time.to_s)
+                                end
+              opts[:article][:expiration_time] = expiration_time.utc.iso8601
+            end
+            if current_article.data.modified_time
+              modified_time = if current_article.data.modified_time.is_a? Time
+                                current_article.data.modified_time
+                              else
+                                Time.parse(current_article.data.modified_time.to_s)
+                              end
+              opts[:article][:modified_time] = modified_time.utc.iso8601
+            end
+
+            if current_article.data.author || current_article.data.authors
+              authors = current_article.data.authors || [current_article.data.author]
+              opts[:article][:author] = []
+              authors.each do |author|
+                next unless author.is_a?(Hash)
+
+                opts[:article][:author] << author.to_h.symbolize_keys.slice(
+                  :first_name,
+                  :last_name,
+                  :username,
+                  :gender
+                )
+              end
+            end
           end
           opts[:og] ||= {}
           if Middleman::OGP::Helper.auto.include?('title')
@@ -44,10 +86,11 @@ module Middleman
             end
           end
           if Middleman::OGP::Helper.auto.include?('url') &&
-            Middleman::OGP::Helper.base_url
-            opts[:og][:url] = URI.join(Middleman::OGP::Helper.base_url, URI.encode(current_resource.url))
+             Middleman::OGP::Helper.base_url
+            opts[:og][:url] = URI.join(Middleman::OGP::Helper.base_url, current_resource.url)
           end
-          Middleman::OGP::Helper.ogp_tags(opts) do|name, value|
+
+          Middleman::OGP::Helper.ogp_tags(opts) do |name, value|
             if block_given?
               block.call name, value
             else
@@ -58,19 +101,21 @@ module Middleman
       end
     end
 
+    # Middleman::OGP::Helper
     module Helper
-      include Padrino::Helpers::TagHelpers
+      include ::Padrino::Helpers::TagHelpers
       mattr_accessor :namespaces
       mattr_accessor :blog
       mattr_accessor :auto
       mattr_accessor :base_url
+      mattr_accessor :image_base_url
 
-      def self.ogp_tags(opts = {}, &block)
+      def self.ogp_tags(opts = {}, &block) # rubocop:disable Metrics/MethodLength
         opts ||= {}
         options = (namespaces.respond_to?(:to_h) ? namespaces.to_h : namespaces || {}).dup
         opts.stringify_keys!
         options.stringify_keys!
-        options = options.deep_merge4(opts) {|k, old_value, new_value|
+        options = options.deep_merge4(opts) do |_k, old_value, new_value|
           if old_value.is_a?(Hash)
             if new_value.is_a? Hash
               old_value.deep_merge4 new_value
@@ -81,13 +126,13 @@ module Middleman
           else
             new_value
           end
-        }.symbolize_keys
-        options.map{|k, v|
+        end.symbolize_keys
+        options.map  do |k, v|
           og_tag([], v, k, &block)
-        }.join("\n")
+        end.join("\n")
       end
 
-      def self.og_tag(key, obj = nil, prefix = 'og', &block)
+      def self.og_tag(key, obj = nil, prefix = 'og', &block) # rubocop:disable Metrics/MethodLength
         case key
         when String, Symbol
           key = [key]
@@ -98,39 +143,50 @@ module Middleman
         end
         case obj
         when Hash
-          obj.map{|k, v|
-            og_tag(k.to_s.empty? ? key.dup : (key.dup << k.to_s) , v, prefix, &block)
-          }.join("\n")
+          obj.map do |k, v|
+            og_tag(k.to_s.empty? ? key.dup : (key.dup << k.to_s), v, prefix, &block)
+          end.join("\n")
         when Array
-          obj.map{|v|
+          obj.map do |v|
             og_tag(key, v, prefix, &block)
-          }.join("\n")
+          end.join("\n")
         else
-          block.call [prefix].concat(key).join(':'), obj.to_s
+          if obj.respond_to?(:value)
+            value = obj.value
+            raise 'Unknown value' unless value.is_a?(Hash)
+
+            value.map do |k, v|
+              og_tag(k.to_s.empty? ? key.dup : (key.dup << k.to_s), v, prefix, &block)
+            end.join("\n")
+          else
+            name = [prefix].concat(key).join(':')
+            value = obj.to_s
+            if Middleman::OGP::Helper.image_base_url && name == 'og:image' && !%r{^https?://}.match(value)
+              value = URI.join(Middleman::OGP::Helper.image_base_url, value)
+            end
+            block.call name, value
+          end
         end
       end
-
     end
   end
 end
 
-
+# Hash extension
 class Hash
-
   def deep_merge4(other_hash, &block)
     dup.deep_merge4!(other_hash, &block)
   end
 
   def deep_merge4!(other_hash, &block)
-    other_hash.each_pair do |k,v|
+    other_hash.each_pair do |k, v|
       tv = self[k]
-      if tv.is_a?(Hash) && v.is_a?(Hash)
-        self[k] = tv.deep_merge4(v, &block)
-      else
-        self[k] = block && tv ? block.call(k, tv, v) : v
-      end
+      self[k] = if tv.is_a?(Hash) && v.is_a?(Hash)
+                  tv.deep_merge4(v, &block)
+                else
+                  block && tv ? block.call(k, tv, v) : v
+                end
     end
     self
   end
-
 end

data/lib/middleman-ogp/middleman_extension.rb

@@ -1,2 +1,3 @@
-require 'middleman-ogp'
+# frozen_string_literal: true
 
+require 'middleman-ogp'

data/lib/middleman-ogp/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Middleman
   module OGP
-    VERSION = "1.0.3"
+    VERSION = '1.4.0'
   end
 end

data/middleman-ogp.gemspec

@@ -1,19 +1,20 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "middleman-ogp/version"
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
+require 'middleman-ogp/version'
 
 Gem::Specification.new do |s|
-  s.name = "middleman-ogp"
+  s.name = 'middleman-ogp'
   s.version = Middleman::OGP::VERSION
   s.platform = Gem::Platform::RUBY
-  s.authors = ["Atsushi Nagase"]
-  s.email = ["a@ngs.io"]
-  s.homepage = "https://github.com/ngs/middleman-ogp"
-  s.summary = %q{OpenGraph Protocol Helper for Middleman}
-  s.description = %q{OpenGraph Protocol Helper for Middleman}
-  s.license = "MIT"
+  s.authors = ['Atsushi Nagase']
+  s.email = ['a@ngs.io']
+  s.homepage = 'https://github.com/ngs/middleman-ogp'
+  s.summary = 'OpenGraph Protocol Helper for Middleman'
+  s.description = 'OpenGraph Protocol Helper for Middleman'
+  s.license = 'MIT'
   s.files = `git ls-files -z`.split("\0")
   s.test_files = `git ls-files -z -- {fixtures,features,spec}/*`.split("\0")
-  s.require_paths = ["lib"]
-  s.add_runtime_dependency("middleman-core", ["~> 3.2"])
+  s.require_paths = ['lib']
+  s.add_runtime_dependency('middleman-core', ['>= 4.0'])
 end

data/spec/helper_spec.rb

@@ -1,19 +1,21 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
-describe "Middleman::OGP::Helper" do
-  subject {
+describe 'Middleman::OGP::Helper' do # rubocop:disable Metrics/BlockLength
+  subject do
     Middleman::OGP::Helper.namespaces = namespaces
-    Middleman::OGP::Helper.ogp_tags(options) do|name, value|
-      %Q{<meta property="#{name}" content="#{value}" />}
+    Middleman::OGP::Helper.ogp_tags(options) do |name, value|
+      %(<meta property="#{name}" content="#{value}" />)
     end
-  }
-  describe "default namespace and options are nil" do
+  end
+  describe 'default namespace and options are nil' do
     let(:namespaces) { nil }
     let(:options)    { nil }
     it { subject.should eq '' }
   end
-  context "with default namespaces" do
-    let(:namespaces) {
+  context 'with default namespaces' do # rubocop:disable Metrics/BlockLength
+    let(:namespaces) do
       {
         og: {
           image: {
@@ -27,21 +29,21 @@ describe "Middleman::OGP::Helper" do
           description: 'foo'
         }
       }
-    }
-    describe "options is nil" do
-      let(:options)    { nil }
+    end
+    describe 'options is nil' do
+      let(:options) { nil }
       it {
-        subject.should eq <<-EOF.unindent
+        subject.should eq <<-HTML.unindent
           <meta property="og:image" content="http://mydomain.tld/mysite.png" />
           <meta property="og:image:type" content="image/png" />
           <meta property="og:image:width" content="300" />
           <meta property="og:image:height" content="400" />
           <meta property="fb:description" content="foo" />
-        EOF
+        HTML
       }
     end
-    describe "options are presented" do
-      let(:options)    {
+    describe 'options are presented' do
+      let(:options) do
         {
           og: {
             image: 'http://mydomain.tld/myarticle.png'
@@ -53,35 +55,35 @@ describe "Middleman::OGP::Helper" do
             id: '123'
           }
         }
-      }
+      end
       it {
-        subject.should eq <<-EOF.unindent
+        subject.should eq <<-HTML.unindent
           <meta property="og:image" content="http://mydomain.tld/myarticle.png" />
           <meta property="og:image:type" content="image/png" />
           <meta property="og:image:width" content="300" />
           <meta property="og:image:height" content="400" />
           <meta property="fb:description" content="bar" />
           <meta property="music:id" content="123" />
-        EOF
+        HTML
       }
     end
-    describe "only additional option is presented" do
-      let(:options)    {
+    describe 'only additional option is presented' do
+      let(:options) do
         {
           og: {
             type: 'article'
           }
         }
-      }
+      end
       it {
-        subject.should eq <<-EOF.unindent
+        subject.should eq <<-HTML.unindent
           <meta property="og:image" content="http://mydomain.tld/mysite.png" />
           <meta property="og:image:type" content="image/png" />
           <meta property="og:image:width" content="300" />
           <meta property="og:image:height" content="400" />
           <meta property="og:type" content="article" />
           <meta property="fb:description" content="foo" />
-        EOF
+        HTML
       }
     end
   end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 PROJECT_ROOT_PATH = File.dirname(File.dirname(__FILE__))
 
 require 'rubygems'
@@ -6,6 +8,6 @@ require File.join(PROJECT_ROOT_PATH, 'lib', 'middleman-ogp/extension')
 
 class String
   def unindent
-    gsub(/^#{scan(/^\s*/).min_by{|l|l.length}}/, "").sub(/\n$/, '')
+    gsub(/^#{scan(/^\s*/).min_by(&:length)}/, '').sub(/\n$/, '')
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: middleman-ogp
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.4.0
 platform: ruby
 authors:
 - Atsushi Nagase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-12 00:00:00.000000000 Z
+date: 2020-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
 description: OpenGraph Protocol Helper for Middleman
 email:
 - a@ngs.io
@@ -31,8 +31,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".github/workflows/rubygems.yml"
+- ".github/workflows/test.yml"
+- ".gitignore"
+- ".rubocop.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -52,6 +54,7 @@ files:
 - fixtures/test-blog/data/ogp/fb.yml
 - fixtures/test-blog/data/ogp/og.yml
 - fixtures/test-blog/source/2014-04-12-my-test.html.slim
+- fixtures/test-blog/source/2019-07-18-multi-author-test.html.slim
 - fixtures/test-blog/source/index.html.slim
 - fixtures/test-blog/source/layout.slim
 - lib/middleman-ogp.rb
@@ -71,36 +74,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: OpenGraph Protocol Helper for Middleman
-test_files:
-- features/blog.feature
-- features/helper.feature
-- features/support/env.rb
-- fixtures/test-app/config.rb
-- fixtures/test-app/data/ogp/fb.yml
-- fixtures/test-app/data/ogp/og.yml
-- fixtures/test-app/source/index.html.slim
-- fixtures/test-app/source/layout.slim
-- fixtures/test-app/source/page.html.slim
-- fixtures/test-blog/config.rb
-- fixtures/test-blog/data/ogp/fb.yml
-- fixtures/test-blog/data/ogp/og.yml
-- fixtures/test-blog/source/2014-04-12-my-test.html.slim
-- fixtures/test-blog/source/index.html.slim
-- fixtures/test-blog/source/layout.slim
-- spec/helper_spec.rb
-- spec/spec_helper.rb
-has_rdoc: 
+test_files: []

data/.travis.yml

@@ -1,14 +0,0 @@
-rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
-  - jruby-19mode
-
-# Bug in jRuby w/ Rouge: https://github.com/jruby/jruby/issues/1392
-matrix:
-  allow_failures:
-    - rvm: jruby-19mode
-
-script: "bundle exec rake test"
-
-env: TEST=true