maglevcms 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45b336e791f110d5c7c1982631955c14664c2a66184b44b83a31f5689800d1d0
-  data.tar.gz: 65ea43f9f7006d128a21adad2c832f896d314715d83bc47283070ae60fb41dff
+  metadata.gz: 2a35a72786acd44915a401d53a74083908efa9c65d444095b644c2c90f1fb845
+  data.tar.gz: 9dc69364e99fb0ea74ee46d4c4b838072ea559fa183a624874e1af9bcd4e447f
 SHA512:
-  metadata.gz: 17be0c14ba106d648cf9fa13953adff4e63f342a6d7d6acaa215cc6200f41c8d710e2d0b3c14d803f92ee4521c977f03b8c8389cd5351eb60bd87c23fbe50d73
-  data.tar.gz: 0adbc6d304a7b46cf1f4b1b6640fde924bad6d456931f0527adba2b01bcf3f06211f2cbe14f80c0fa93950f05d64eb01c7fb67cd136988d756103b2346b7c177
+  metadata.gz: 2b0c05384244019fe6b8e816d1be6361eddbe10a87681c15bf4ea0fe15dffa938cc07520ef03def22a3ea338aa69165c898b10a1667d0583f1338a9ff5c9057b
+  data.tar.gz: c451bc95b1405150fafb5c80c12604263c26a00ce87080adb82f513df99d46dc367956d0a827ca41c59385fbc53340c74ec1de803fd8ceaa32a5182ed083bbb4

data/app/controllers/concerns/maglev/services_concern.rb

@@ -16,9 +16,13 @@ module Maglev
     end
 
     def maglev_services
-      @maglev_services ||= ::Maglev.services(
+      @maglev_services ||= ::Maglev.services(maglev_services_overrides)
+    end
+
+    def maglev_services_overrides
+      {
         context: build_maglev_service_context
-      )
+      }
     end
 
     def build_maglev_service_context

data/app/services/maglev/fetch_site.rb

@@ -6,13 +6,17 @@ module Maglev
     include Injectable
 
     def call
-      @site ||= Maglev::Site.first.tap do |site|
+      site.tap do |site|
         change_default_locales(site)
       end
     end
 
     private
 
+    def site
+      @site ||= Maglev::Site.first
+    end
+
     def change_default_locales(site)
       Maglev::I18n.available_locales = site.locale_prefixes
     end

data/lib/generators/maglev/templates/install/config/initializers/maglev.rb

@@ -79,5 +79,5 @@ Maglev.configure do |config|
 
   # Prevent the content editors to create pages sharing the same path with other
   # existing pages of the application.
-  # config.reserved_paths = %w(products sign-in search)
+  # config.reserved_paths = %w(products sign-in search posts/*)
 end

data/lib/maglev/preview_constraint.rb

@@ -4,7 +4,7 @@ require 'uri'
 
 module Maglev
   class PreviewConstraint
-    CRAWLER_USER_AGENTS = /Googlebot|Twitterbot|facebookexternalhit/o.freeze
+    CRAWLER_USER_AGENTS = /Googlebot|Twitterbot|facebookexternalhit|LinkedInBot/o.freeze
 
     attr_reader :preview_host
 

data/lib/maglev/reserved_paths.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Maglev
+  class ReservedPaths < ::Array
+    def include?(value)
+      each do |path|
+        return true if path == value ||
+                       (path.include?('*') && value && File.fnmatch(path, value))
+      end
+      false
+    end
+  end
+end

data/lib/maglev/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Maglev
-  VERSION = '1.6.0'
+  VERSION = '1.6.1'
 end

data/lib/maglev.rb

@@ -6,6 +6,7 @@ require_relative 'maglev/config'
 require_relative 'maglev/errors'
 require_relative 'maglev/i18n'
 require_relative 'maglev/preview_constraint'
+require_relative 'maglev/reserved_paths'
 
 require 'injectable'
 require 'jbuilder'
@@ -20,7 +21,7 @@ module Maglev
 
     # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
     def config
-      @config ||= Config.new.tap do |c|
+      @config ||= config_klass.new.tap do |c|
         c.title = 'Maglev - EDITOR'
         c.favicon = nil
         c.logo = nil
@@ -43,7 +44,10 @@ module Maglev
     # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
     def configure
-      yield config
+      config.tap do
+        yield(config)
+        config.reserved_paths = Maglev::ReservedPaths.new(config.reserved_paths)
+      end
     end
 
     def uploader
@@ -61,5 +65,9 @@ module Maglev
       config = Rails.configuration.generators
       @uuid_as_primary_key = config.options[config.orm][:primary_key_type] == :uuid
     end
+
+    def config_klass
+      ::Maglev::Config
+    end
   end
 end