wcc-contentful-app 1.3.0 → 1.4.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bf429e535dc9c5c753e3468a8595bf049e633bc75fdda5e3d9bca30ff971e02
-  data.tar.gz: bd25d75d2a97383392614936177d307ddb0577a3f7afba8a1d02234bdf81631a
+  metadata.gz: 73ab139e60d82fa6cde5ba6da5b16c816aeaa736d6b687e56edf4c9593b18ce1
+  data.tar.gz: 3356071c23c83e81044322e9a01f3ecd7f1ccfbd5a0115b2fc874ecc3118ded7
 SHA512:
-  metadata.gz: a713913402d4b69b17ed490e4c25ac1e6c3110b9698e87ed6ab1e23f67aaebbc12acb209dfaaec44e5a2b16937cb08751ef7321020f2c3e1955bbf1d5ba34500
-  data.tar.gz: 3ce3e2b1f5d6a064faef9c86154b983febae13aaddd392c5a0575d3044ea8b9812ec2a2ed15943f0ca711165eae7429c7c744f7f281c3c891ce874b015cf8e47
+  metadata.gz: 392f48b520c2f1598192dbe096cc22c8367d87f8d5ab53f933079c99605542c1b45924e2b0f356bddb93782721e803e86226e8d2900c1cb5de9d60db67ce4d64
+  data.tar.gz: d4babcf7d71c49486d64fa4f48955062f96fae8ee942347ccd22c933d3f1c899f773018fd7f1b613fc199e77252e51cb1cd7cd5f820b477143790698e0a74cc9

data/app/controllers/wcc/contentful/app/pages_controller.rb

@@ -43,6 +43,6 @@ class WCC::Contentful::App::PagesController < ApplicationController
   def global_site_config
     return unless model = site_config_model
 
-    @global_site_config ||= model.instance(preview?)
+    @global_site_config ||= model.instance(preview?, locale: I18n.locale)
   end
 end

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

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

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

@@ -16,10 +16,10 @@ class WCC::Contentful::Model::MenuButton < WCC::Contentful::Model
     return external_link if external_link
 
     url = (link&.try(:slug) || link&.try(:url))
-    return url unless fragment.present?
-
     url = URI(url || '')
-    url.fragment = fragment
+
+    url.path = "/#{sys.locale}#{url.path}" if sys.locale != WCC::Contentful.configuration.default_locale
+    url.fragment = fragment if fragment.present?
     url.to_s
   end
 

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class WCC::Contentful::Model::SiteConfig < WCC::Contentful::Model
-  def self.instance(preview = false) # rubocop:disable Style/OptionalBooleanParameter
-    find_by(foreign_key: 'default', options: { include: 4, preview: preview })
+  def self.instance(preview = false, locale: nil) # rubocop:disable Style/OptionalBooleanParameter
+    find_by(foreign_key: 'default', options: { include: 4, preview: preview, locale: locale })
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wcc-contentful-app
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0.rc1
 platform: ruby
 authors:
 - Watermark Dev
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-19 00:00:00.000000000 Z
+date: 2023-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -338,14 +338,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0.rc1
 description: Models, Controllers, and Views common to Watermark Church apps
 email:
 - dev@watermark.org
@@ -444,9 +444,9 @@ homepage: https://github.com/watermarkchurch/wcc-contentful
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://watermarkchurch.github.io/wcc-contentful/1.3/wcc-contentful-app
+  documentation_uri: https://watermarkchurch.github.io/wcc-contentful/1.4/wcc-contentful-app
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -457,12 +457,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: "[![Gem Version](https://badge.fury.io/rb/wcc-contentful-app.svg)](https://rubygems.org/gems/wcc-contentful-app)
   [![Build Status](https://circleci.com/gh/watermarkchurch/wcc-contentful.svg?style=svg)](https://circleci.com/gh/watermarkchurch/wcc-contentful)