middleman-metaman 0.1.6 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a2a8ce9708336d9c838361407fdbde3a054d0e86e30fef8ffebfd11e91f0d73
-  data.tar.gz: d0d52a5e5b7cb944dbbe27d55ffd9f11bc8a6638af33db012ec599ec6477fcec
+  metadata.gz: 8e08c257ca67ade428e6d27121867bf6c05e2be373a8323372d5d8979b51248b
+  data.tar.gz: c0ecba8075673e6f81a0f5b31e14389fa3355b2de3c111f2f571500a69c97d3c
 SHA512:
-  metadata.gz: ea892ec190985247ba925cf9142b7ed06790d4b0a3a649825fdcb6cb237b7c89df82185181baa1da31f9d6ca066c2f1d7a6aeabd339fa43ac3e2797b05b31cba
-  data.tar.gz: 84254ab7e70d46a0ca33a0fd240f36c0ddb40322888952bb16e0c1b8874832a5849c2dbbefee5f03c1ef0c58ea4888e2127ed9da6a86e059a81605c5cdf267be
+  metadata.gz: 2a02a8f451e0fae5cd7b48db6b76f241d84cb9fd70ff4c89773224bfe67f4743e9bf2f674532b67dd75e9682477786b8b362dc4108631511328d661ca8074cff
+  data.tar.gz: 074c59989a98cf4784fe901c773f422e0bd3f075d3c8439311d5dda6522bc89d529c8e45db314522832addefe39a692ba63569a7c4a8946638120f1707665e37

data/README.md

@@ -50,7 +50,7 @@ Nested parameters like `{ og: { title: 'My Title' } }` will become `og:title`.
 ### Setting via Templates
 
 ```erb
-<% set_page_meta(title: 'My Title', og: { image: 'meta-image.png' } )
+<% set_meta_tags(title: 'My Title', og: { image: 'meta-image.png' } )
 ```
 
 ### Setting via Front Matter

data/lib/middleman-metaman/helpers.rb

@@ -11,14 +11,18 @@ module Middleman
         @meta_tags ||= ActiveSupport::HashWithIndifferentAccess.new
         @meta_tags[:og] ||= ActiveSupport::HashWithIndifferentAccess.new
         @meta_tags[:twitter] ||= ActiveSupport::HashWithIndifferentAccess.new
+        @meta_tags[:canonical] = true
+
         if data['meta_tags']
           site_meta_tags = data['meta_tags'].with_indifferent_access
           @meta_tags.merge!(site_meta_tags)
         end
 
         # get meta from translation
-        t_page = current_page.url.gsub('-', '_').gsub('/', '.')
-        t_key = "#{t_page}.meta"
+        page_array = current_page.page_id.gsub('-', '_').split('/')
+        lang = page_array.first&.to_s&.gsub('_', '-')&.to_sym
+        page_array.shift if I18n.available_locales.include?(lang)
+        t_key = "#{page_array.join('.')}.meta"
         @meta_tags.merge!(I18n.t(t_key)) if I18n.exists?(t_key)
 
         # get meta from frontmatter
@@ -34,8 +38,14 @@ module Middleman
         html = []
         @meta_tags[:title] = full_title(@meta_tags[:title])
         html.push content_tag(:title, @meta_tags[:title])
+        if @meta_tags[:canonical]
+          html.push(
+            tag(:link, rel: 'canonical', href: "#{host}#{current_page.url}")
+          )
+        end
 
-        excluded_keys = %w(site_name separator title image)
+
+        excluded_keys = %w(site_name separator title image canonical)
         meta_hash = @meta_tags.reject { |k| excluded_keys.include?(k) }.merge(
           og: meta_open_graph,
           twitter: meta_twitter
@@ -90,7 +100,7 @@ module Middleman
 
       # determine key for meta tag based on name
       def meta_key(key)
-        key.match?(/^(og|music|video|article|book|profile):/i) ? 'propery' : 'name'
+        key.match?(/^(og|music|video|article|book|profile):/i) ? 'property' : 'name'
       end
 
       # generate open graph meta
@@ -126,7 +136,10 @@ module Middleman
 
       # get the meta image url
       def meta_image_url(image)
-        "#{host}#{image_path(image)}" if image
+        return nil unless image
+        return image unless URI(image).scheme.nil?
+
+        "#{host}#{image_path(image)}"
       end
 
       def default_value(scope, key, default = nil)

data/lib/middleman-metaman/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Metaman
-    VERSION = '0.1.6'.freeze
+    VERSION = '0.1.11'.freeze
   end
 end

data/middleman-metaman.gemspec

@@ -6,7 +6,6 @@ require 'middleman-metaman/version'
 Gem::Specification.new do |s|
   s.name        = "middleman-metaman"
   s.version     = Middleman::Metaman::VERSION
-  s.platform    = Gem::Platform::RUBY
   s.authors     = ['Jarrett Lusso']
   s.email       = ['jarrett@cacheventures.com']
   s.homepage    = 'https://github.com/cacheventures/middleman-metaman'
@@ -19,9 +18,5 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  # The version of middleman-core your extension depends on
-  s.add_runtime_dependency("middleman-core", [">= 4.2.1"])
-
-  # Additional dependencies
-  # s.add_runtime_dependency("gem-name", "gem-version")
+  s.add_runtime_dependency('middleman-core', ['>= 4.2.1'])
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-metaman
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.11
 platform: ruby
 authors:
 - Jarrett Lusso
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-05-14 00:00:00.000000000 Z
+date: 2021-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -48,7 +48,7 @@ homepage: https://github.com/cacheventures/middleman-metaman
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -63,8 +63,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Manage your middleman meta tags.
 test_files: []