blueberry_cms 0.1.1.7 → 0.1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a57056a3ee51993fb7d560df61aab3e9a167a842fa5e2d226327df16aba5a9bf
-  data.tar.gz: 98efdc9a3fde1da0051405c56276363090f8b3c53d2f2f2d4569faf9af493228
+  metadata.gz: bdc854d7f7cf83c642b9ab794e691b177fc22d30480e7768c3ed7a1af551752e
+  data.tar.gz: fc45c4f75f56c0a6d9e5c250cdb7b5a3fb6a264007619ea37e6eed4e39116f9f
 SHA512:
-  metadata.gz: ab36a01469dc5171c67deb72f73306826a0a55075c2d31e72f4ac50641dd098ef5f5cdd621ec282ff4a090801cf24d08b2ecf6eab453f395a28dee6d7d8b0a13
-  data.tar.gz: bd9f4eff12dca2b24adb05fc4be27ec159df79730f79b7831c8390b2adfb25fc7f62f8d6fc10d19382be9481c97e5c5b436f3691eb6524c1c073c0285abc30fb
+  metadata.gz: 234893a8482ee5a3538e1c0657770508da7a1992ec4d0addd3a5791bafab94ce049a697bbddc0d6961ef56eb4dfe6de87f5f8b16ee443d4ae69d8c29eae9121c
+  data.tar.gz: d3ab7e9e6d8c4c764b9aa68cd7b3b783a2e84ffeb00c2d48caa689884aa3203845d107bc9b4154cc852fc8e2171aa44f80f2331f3ec7e03aa9924aac98e5506a

data/app/controllers/blueberry_cms/pages_controller.rb

@@ -5,7 +5,7 @@ module BlueberryCMS
       def to_liquid; @context; end
     end
 
-    around_action :set_locale
+    around_action :set_locale, if: -> { BlueberryCMS.force_locale }
     helper_method :liquid_view_context
 
     def show

data/app/models/blueberry_cms/page.rb

@@ -56,7 +56,7 @@ module BlueberryCMS
     end
 
     def to_path
-      "/#{I18n.locale}#{path}"
+      BlueberryCMS.force_locale ? "/#{I18n.locale}#{path}" : path
     end
 
     def name_translations=(attributes)

data/config/routes.rb

@@ -4,11 +4,15 @@ BlueberryCMS::Engine.routes.draw do
     resources :menus, except: :show
   end
 
-  scope '/:locale', locale: Regexp.new(I18n.available_locales.join('|')) do
+  if BlueberryCMS.force_locale
+    scope '/:locale', locale: Regexp.new(I18n.available_locales.join('|')) do
+      get '/(*path)', to: 'pages#show', as: :page
+    end
+
+    get '/(*path)', to: 'root#index'
+  else
     get '/(*path)', to: 'pages#show', as: :page
   end
 
-  get '/(*path)', to: 'root#index'
-
   root to: 'root#index'
 end

data/lib/blueberry_cms/version.rb

@@ -1,3 +1,3 @@
 module BlueberryCMS
-  VERSION = '0.1.1.7'.freeze
+  VERSION = '0.1.1.8'.freeze
 end

data/lib/blueberry_cms.rb

@@ -3,10 +3,11 @@ require 'blueberry_cms/liquid_tags/page_link'
 require 'blueberry_cms/liquid_tags/page_url'
 
 module BlueberryCMS
-  mattr_accessor :page_admin_controller, :custom_blocks
+  mattr_accessor :page_admin_controller, :custom_blocks, :force_locale
 
   @@parent_controller = 'ApplicationController'
   @@custom_blocks     = []
+  @@force_locale      = true
 
   def self.config
     yield self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blueberry_cms
 version: !ruby/object:Gem::Version
-  version: 0.1.1.7
+  version: 0.1.1.8
 platform: ruby
 authors:
 - Martin Magnusek
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-23 00:00:00.000000000 Z
+date: 2019-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -371,7 +371,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Summary of BlueberryCMS.