wcc-contentful-app 1.4.0.rc1 → 1.4.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73ab139e60d82fa6cde5ba6da5b16c816aeaa736d6b687e56edf4c9593b18ce1
-  data.tar.gz: 3356071c23c83e81044322e9a01f3ecd7f1ccfbd5a0115b2fc874ecc3118ded7
+  metadata.gz: cb8544accdf8bb9c26bcf200d5fdff9b4ae21c1292e6878958bc72d99cf38bb2
+  data.tar.gz: 955a3aaeb9d8bbee66955e29df093637a005fd58886369c2114a7df178cb53a7
 SHA512:
-  metadata.gz: 392f48b520c2f1598192dbe096cc22c8367d87f8d5ab53f933079c99605542c1b45924e2b0f356bddb93782721e803e86226e8d2900c1cb5de9d60db67ce4d64
-  data.tar.gz: d4babcf7d71c49486d64fa4f48955062f96fae8ee942347ccd22c933d3f1c899f773018fd7f1b613fc199e77252e51cb1cd7cd5f820b477143790698e0a74cc9
+  metadata.gz: 7a7e458f40876b6eb374f7916b55854ead7ff0b619ae741b068a2c3871699ca9f31dc87cbf450a5474bf8f3026baaa109519ff2030ecb49981f6b8abd2cb0386
+  data.tar.gz: 81c39f1053eff4f0144b5a1b536bf1cec297c4c061b7a2eefd789e3d8668654b8dcfa4ce17e0fe883ee1ee8fccfc4fc39e174a2886542ad80aab30eb976762c8

data/lib/wcc/contentful/app/version.rb

@@ -3,7 +3,7 @@
 module WCC
   module Contentful
     module App
-      VERSION = '1.4.0.rc1'
+      VERSION = '1.4.0.rc2'
     end
   end
 end

data/lib/wcc/contentful/model/menu_button.rb

@@ -18,7 +18,8 @@ class WCC::Contentful::Model::MenuButton < WCC::Contentful::Model
     url = (link&.try(:slug) || link&.try(:url))
     url = URI(url || '')
 
-    url.path = "/#{sys.locale}#{url.path}" if sys.locale != WCC::Contentful.configuration.default_locale
+    url = rewrite_to_locale(url, sys.locale) if default_locale && sys.locale != default_locale
+
     url.fragment = fragment if fragment.present?
     url.to_s
   end
@@ -26,4 +27,16 @@ class WCC::Contentful::Model::MenuButton < WCC::Contentful::Model
   def fragment
     WCC::Contentful::App::SectionHelper.section_id(section_link) if section_link
   end
+
+  private
+
+  def default_locale
+    WCC::Contentful.configuration&.default_locale
+  end
+
+  def rewrite_to_locale(uri, locale)
+    uri = URI(uri)
+    uri.path = File.join("/#{locale}", uri.path)
+    uri.to_s
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wcc-contentful-app
 version: !ruby/object:Gem::Version
-  version: 1.4.0.rc1
+  version: 1.4.0.rc2
 platform: ruby
 authors:
 - Watermark Dev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-28 00:00:00.000000000 Z
+date: 2023-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -338,14 +338,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0.rc1
+        version: 1.4.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0.rc1
+        version: 1.4.0.rc2
 description: Models, Controllers, and Views common to Watermark Church apps
 email:
 - dev@watermark.org