arosa 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f09b3cdb8e69dcc529ac94d1f2ec7ebfaa847b72a24a394f5f07eb3175151b8a
-  data.tar.gz: 12ef90466baf566e70e0eb6603f6bb216be2ce8e5905552266e918204a4bc3d9
+  metadata.gz: 7685471c75ede43f503a18f563da2f1374994f01ad3dffaea4a65c96faf9d6e9
+  data.tar.gz: 3e122ff6e1eac8bd6d0140bc3367329383538a7b9b7b6ee90ad4cbed37adbcea
 SHA512:
-  metadata.gz: 0b2f45d647c9d76c7246202b3be8d1368ec2fe940f06d4992c7e0a27c2e32ef817504f269d852192a74ba726426f3a159c2014e48ad21e179f8297bff21a296c
-  data.tar.gz: 16efd5e926b9990b09c3d1c4c68cd264e6e61d2c66138cfda25e233bb25c1f4ade06a93760d6d5e8aa1eaa09a01adc04c2146c5eca0fafe669cbab0cd8bc4a53
+  metadata.gz: 986b0ecdcd2d8e3fdb1f328b729276da2f7f370b30ff3261c2665d9c221ebd9ece4713e1303241cad61aad75829ad2c93b5e1e778ffb431420e9430d909ccf78
+  data.tar.gz: ef76f0213eabda3b4ef5a7ff760403cd3dc6e0f60fa2b08a3f68cc3bed36161e59ee7d14b083d81cf872b0b8136704b73a794b18e035f1a91aaacb4b0afd82e9

data/README.md

@@ -50,6 +50,7 @@ Arosa.config.twitter_site = "@acme"
 | `hreflang_pattern` | Custom URL pattern. Use `:locale` and `:path` as placeholders. Default: `/:locale/path` |
 | `hreflang_opt_in` | Pages must opt in to hreflang instead of global. Default: `false` |
 | `hreflang_default` | Locale for `x-default`. Default: first in the `hreflang` array |
+| `hreflang_prefix_default` | Prefix the default locale in URLs. Default: `false` |
 | `auto_og` | Auto-generate Open Graph tags from title/description. Default: `true` |
 | `auto_twitter` | Auto-generate Twitter Card tags from title/description. Default: `true` |
 | `twitter_site` | Your X/Twitter handle (e.g. `"@acme"`). Included in all Twitter Cards |
@@ -242,19 +243,23 @@ Output:
 
 Configure your locales in the initializer (see [Configuration](#configuration)). Hreflang tags are generated automatically on every page.
 
-Output (on `https://example.com/articles/1`):
+The default locale (first in the array) is unprefixed. Other locales get a `/:locale` prefix.
+
+Output (on `https://example.com/articles/1` with `hreflang: ["en", "de", "fr", "it"]`):
 
 ```html
-<link rel="alternate" hreflang="en" href="https://example.com/en/articles/1">
+<link rel="alternate" hreflang="en" href="https://example.com/articles/1">
 <link rel="alternate" hreflang="de" href="https://example.com/de/articles/1">
 <link rel="alternate" hreflang="fr" href="https://example.com/fr/articles/1">
 <link rel="alternate" hreflang="it" href="https://example.com/it/articles/1">
-<link rel="alternate" hreflang="x-default" href="https://example.com/en/articles/1">
+<link rel="alternate" hreflang="x-default" href="https://example.com/articles/1">
 ```
 
+If all locales are prefixed (including the default), set `hreflang_prefix_default` to `true` in the config.
+
 An `x-default` tag is automatically included, pointing to the first locale in the array. Override with `hreflang_default` in the config.
 
-By default, URLs are built as `/:locale/path`. For other structures, set `hreflang_pattern` in the config.
+For other URL structures, set `hreflang_pattern` in the config.
 
 URL parameters are also supported but [not recommended by Google](https://developers.google.com/search/docs/specialty/international/managing-multi-regional-sites):
 

data/lib/arosa/config.rb

@@ -3,8 +3,8 @@
 module Arosa
   class Config
     attr_accessor :separator, :hreflang, :hreflang_pattern,
-                  :hreflang_opt_in, :hreflang_default, :auto_canonical,
-                  :auto_og, :auto_twitter, :twitter_site
+                  :hreflang_opt_in, :hreflang_default, :hreflang_prefix_default,
+                  :auto_canonical, :auto_og, :auto_twitter, :twitter_site
 
     def to_h
       h = {}
@@ -13,6 +13,7 @@ module Arosa
       h[:hreflang_pattern] = hreflang_pattern if hreflang_pattern
       h[:hreflang_opt_in] = hreflang_opt_in unless hreflang_opt_in.nil?
       h[:hreflang_default] = hreflang_default if hreflang_default
+      h[:hreflang_prefix_default] = hreflang_prefix_default unless hreflang_prefix_default.nil?
       h[:auto_canonical] = auto_canonical unless auto_canonical.nil?
       h[:auto_og] = auto_og unless auto_og.nil?
       h[:auto_twitter] = auto_twitter unless auto_twitter.nil?

data/lib/arosa/meta.rb

@@ -110,14 +110,16 @@ module Arosa
       origin = "#{request.scheme}://#{request.host}"
 
       x_default = merged[:hreflang_default] || default_locales&.first
+      prefix_default = merged[:hreflang_prefix_default]
 
       tags = locales.map do |locale|
-        href = build_hreflang_href(locale, pattern, fullpath, origin)
+        skip = !prefix_default && locale.to_s == x_default.to_s
+        href = build_hreflang_href(locale, pattern, fullpath, origin, skip_prefix: skip)
         %(<link rel="alternate" hreflang="#{escape(locale)}" href="#{escape(href)}">)
       end
 
       if x_default
-        href = build_hreflang_href(x_default, pattern, fullpath, origin)
+        href = build_hreflang_href(x_default, pattern, fullpath, origin, skip_prefix: !prefix_default)
         tags << %(<link rel="alternate" hreflang="x-default" href="#{escape(href)}">)
       end
 
@@ -166,8 +168,10 @@ module Arosa
       fullpath
     end
 
-    def build_hreflang_href(locale, pattern, fullpath, origin)
-      if pattern
+    def build_hreflang_href(locale, pattern, fullpath, origin, skip_prefix: false)
+      if skip_prefix
+        "#{origin}#{fullpath}"
+      elsif pattern
         pattern.gsub(":locale", locale.to_s).gsub(":path", fullpath)
       else
         "#{origin}/#{locale}#{fullpath}"

data/lib/arosa/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Arosa
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arosa
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Samuenti