pages_core 3.4.3 → 3.7.0

data/lib/pages_core/templates/template_configuration.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module PagesCore
   module Templates
@@ -7,7 +7,41 @@ module PagesCore
 
       class << self
         def all_blocks
-          new(:index).all_blocks
+          (config.get(:default, :blocks).keys +
+           all_templates.map { |t| configured_block_names(t) } +
+           all_templates.map do |t|
+             enabled_block_names(t)
+           end).flatten.compact.uniq
+        end
+
+        def all_templates
+          Array(config.get(:templates).try(&:keys))
+        end
+
+        def config
+          PagesCore::Templates.configuration
+        end
+
+        def localized_blocks
+          template_blocks = all_templates.flat_map do |t|
+            config.get(:templates, t, :blocks).to_a
+          end
+
+          (config.get(:default, :blocks).to_a + template_blocks)
+            .compact
+            .select { |_, opts| opts[:localized] }.map(&:first)
+        end
+
+        private
+
+        def configured_block_names(template)
+          Array(config.get(:default, :blocks).try(&:keys)) +
+            Array(config.get(:templates, template, :blocks).try(&:keys))
+        end
+
+        def enabled_block_names(template)
+          Array(config.get(:default, :enabled_blocks, :value)) +
+            Array(config.get(:templates, template, :enabled_blocks, :value))
         end
       end
 
@@ -16,7 +50,7 @@ module PagesCore
       end
 
       def config
-        PagesCore::Templates.configuration
+        self.class.config
       end
 
       def value(*path)
@@ -37,9 +71,9 @@ module PagesCore
 
       def block(block_name)
         default_block_options(block_name)
-          .deep_merge(config.get(*[:default, :blocks, block_name]) || {})
+          .deep_merge(config.get(:default, :blocks, block_name) || {})
           .deep_merge(
-            config.get(*[:templates, @template_name, :blocks, block_name]) || {}
+            config.get(:templates, @template_name, :blocks, block_name) || {}
           )
       end
 
@@ -60,44 +94,23 @@ module PagesCore
         blocks
       end
 
-      # Returns a list of all configured blocks
-      def all_blocks
-        (
-          all_templates.map { |t| configured_block_names(t) } +
-            all_templates.map { |t| enabled_block_names(t) }
-        ).flatten.compact.uniq
-      end
-
       private
 
-      def configured_block_names(template)
-        Array(config.get(:default, :blocks).try(&:keys)) +
-          Array(config.get(:templates, template, :blocks).try(&:keys))
-      end
-
-      def enabled_block_names(template)
-        Array(config.get(:default, :enabled_blocks, :value)) +
-          Array(config.get(:templates, template, :enabled_blocks, :value))
-      end
-
       def default_block_options(block_name)
         {
-          title:    block_name.to_s.humanize,
+          title: block_name.to_s.humanize,
           optional: true,
-          size:     :small
+          size: :small
         }
       end
-
-      def all_templates
-        Array(config.get(:templates).try(&:keys))
-      end
     end
 
     class << self
       def configure(options = {}, &_block)
-        if options[:reset] == :defaults
+        case options[:reset]
+        when :defaults
           load_default_configuration
-        elsif options[:reset] == true
+        when true
           @configuration = PagesCore::Templates::Configuration.new
         end
         yield configuration if block_given?
@@ -108,15 +121,7 @@ module PagesCore
 
         # Default template options
         config.default do |default|
-          default.template :autodetect, root: "index"
-          default.image :enabled, linkable: false
-          default.comments :disabled
-          default.comments_allowed :enabled
-          default.files :disabled
-          default.images :disabled
-          default.text_filter :textile
-          default.enabled_blocks [:headline, :excerpt, :body]
-          default.tags :disabled
+          default_configuration(default)
           default_block_configuration(default)
         end
       end
@@ -125,74 +130,73 @@ module PagesCore
         load_default_configuration unless defined? @configuration
         @configuration
       end
-      alias_method :config, :configuration
+      alias config configuration
 
       def metadata_block_names
-        [
-          :meta_title,
-          :meta_description,
-          :open_graph_title,
-          :open_graph_description
-        ]
+        %i[meta_title
+           meta_description
+           open_graph_title
+           open_graph_description]
       end
 
       private
 
+      def default_configuration(config)
+        config.template :autodetect, root: "index"
+        config.image :enabled, linkable: false
+        config.files :disabled
+        config.images :disabled
+        config.text_filter :textile
+        config.enabled_blocks %i[headline excerpt body]
+        config.tags :disabled
+        config.dates :disabled
+      end
+
+      def default_blocks
+        {
+          name: { size: :field, class: "page_title" },
+          body: { size: :large },
+          headline: { size: :field },
+          excerpt: {},
+          boxout: {}
+        }.merge(default_meta_blocks)
+      end
+
+      def default_meta_blocks
+        {
+          meta_title: { size: :field },
+          meta_description: { size: :small },
+          open_graph_title: { size: :field },
+          open_graph_description: { size: :small }
+        }
+      end
+
       def default_block_configuration(default)
         default.blocks do |block|
-          block.name(
-            "Name",
-            size: :field,
-            description: "This is the name of the page, and it will also " \
-              "be the name of the link to this page.",
-            class: "page_title"
-          )
-          block.body(
-            "Body",
-            size: :large
-          )
-          block.headline(
-            "Headline",
-            description: "Optional, use if the headline should differ from " \
-              "the page name.",
-            size: :field
-          )
-          block.excerpt(
-            "Standfirst",
-            description: "An introductory paragraph before the start " \
-              "of the body."
-          )
-          block.boxout(
-            "Boxout",
-            description: "Part of the page, usually background info or " \
-              "facts related to the article."
-          )
-          block.meta_title(
-            "Title",
-            size: :field,
-            description: "Document title. Will fall back to the page name " \
-              "if empty. Recommended length: Up to 56 characters."
-          )
-          block.meta_description(
-            "Description",
-            size: :small,
-            description: "Description for search engines. Will fall back to " \
-              "Standfirst if empty. Recommended length: Up to 156 characters."
-          )
-          block.open_graph_title(
-            "Open Graph Title",
-            size: :field,
-            description: "Page title for Facebook sharing. Will fall back to " \
-              "the document title."
-          )
-          block.open_graph_description(
-            "Open Graph Description",
-            size: :small,
-            description: "Description for Facebook sharing. Will fall back " \
-              "to Description or Standfirst if empty."
-          )
+          default_blocks.each_key do |name|
+            block.send(
+              name,
+              template_block_localization("#{name}.name"),
+              default_block_options(name)
+            )
+          end
         end
       end
+
+      def default_block_options(name)
+        {
+          description: template_block_localization("#{name}.description")
+        }.merge(default_blocks[name])
+      end
+
+      def template_block_localization(str)
+        # Templates are configured in an initializer, and
+        # localizations aren't usually configured at this time. This
+        # forces loading of localizations from the plugin.
+        PagesCore::PagesPlugin.configure_localizations!
+
+        I18n.t("templates.default.blocks.#{str}")
+      end
     end
   end
 end

data/lib/pages_core/version.rb

@@ -1,5 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module PagesCore
-  VERSION = "3.4.3" unless PagesCore.const_defined?("VERSION")
+  VERSION = "3.7.0" unless PagesCore.const_defined?("VERSION")
 end

data/lib/rails/generators/pages_core/frontend/frontend_generator.rb

@@ -1,15 +1,10 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module PagesCore
   module Generators
     class FrontendGenerator < Rails::Generators::Base
       desc "Creates the default Pages frontend"
-      source_root File.expand_path("../templates", __FILE__)
-
-      def install_gems
-        gem "modernizr-rails"
-        gem "selectivizr-rails"
-      end
+      source_root File.expand_path("templates", __dir__)
 
       def create_layout
         copy_file(
@@ -20,8 +15,8 @@ module PagesCore
 
       def create_application_scss
         template(
-          "application.css.scss.erb",
-          File.join("app/assets/stylesheets/application.css.scss")
+          "application.scss.erb",
+          File.join("app/assets/stylesheets/application.scss")
         )
       end
 
@@ -38,22 +33,22 @@ module PagesCore
 
       def create_breakpoints_css
         template(
-          "breakpoints.css.scss.erb",
-          File.join("app/assets/stylesheets/mixins/breakpoints.css.scss")
+          "breakpoints.scss.erb",
+          File.join("app/assets/stylesheets/mixins/breakpoints.scss")
         )
       end
 
-      def create_hidpi_css
+      def create_clearfix_css
         template(
-          "hidpi.css.scss.erb",
-          File.join("app/assets/stylesheets/mixins/hidpi.css.scss")
+          "clearfix.scss.erb",
+          File.join("app/assets/stylesheets/mixins/clearfix.scss")
         )
       end
 
       def create_base_css
         template(
-          "base.css.scss.erb",
-          File.join("app/assets/stylesheets/components/base.css.scss")
+          "base.scss.erb",
+          File.join("app/assets/stylesheets/components/base.scss")
         )
       end
 

data/lib/rails/generators/pages_core/frontend/templates/application.js.erb

@@ -12,5 +12,4 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require modernizr
-//= require_tree .
+//= require_tree .

data/lib/rails/generators/pages_core/frontend/templates/clearfix.scss.erb

@@ -0,0 +1,7 @@
+%clearfix {
+  &:after {
+    content: "";
+    display: table;
+    clear: both;
+  }
+}

data/lib/rails/generators/pages_core/frontend/templates/layout.html.erb

@@ -2,9 +2,6 @@
   <%# default_meta_image "/images/facebook-share.png" %>
   <%= stylesheet_link_tag "application" %>
   <%= javascript_include_tag "application" %>
-  <!--[if lte IE 8]>
-  <%= javascript_include_tag 'selectivizr' %>
-  <![endif]-->
   <%= feed_tags %>
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <%# google_analytics_tags "UA-xxxxxxxx-1" %>

data/lib/rails/generators/pages_core/install/install_generator.rb

@@ -1,10 +1,10 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module PagesCore
   module Generators
     class InstallGenerator < Rails::Generators::Base
       desc "Creates the Pages configuration"
-      source_root File.expand_path("../templates", __FILE__)
+      source_root File.expand_path("templates", __dir__)
 
       def default_app_name
         Rails.root.to_s.split("/").last
@@ -19,101 +19,64 @@ module PagesCore
           "Default sender?",
           "no-reply@#{@domain_name}"
         )
-
-        @sphinx_port ||= ask_with_fallback("Sphinx port?", "3312")
-      end
-
-      def add_gem_source
-        add_source "http://gems.manualdesign.no/"
+        nil
       end
 
       def create_active_job_initializer
-        template(
-          "active_job_initializer.rb",
-          File.join("config/initializers/active_job.rb")
-        )
+        template("active_job_initializer.rb",
+                 File.join("config/initializers/active_job.rb"))
       end
 
       def create_application_controller
-        template(
-          "application_controller.rb",
-          File.join("app/controllers/application_controller.rb")
-        )
+        template("application_controller.rb",
+                 File.join("app/controllers/application_controller.rb"))
       end
 
       def create_application_helper
-        template(
-          "application_helper.rb",
-          File.join("app/helpers/application_helper.rb")
-        )
+        template("application_helper.rb",
+                 File.join("app/helpers/application_helper.rb"))
       end
 
       def create_frontend_controller
-        template(
-          "frontend_controller.rb",
-          File.join("app/controllers/frontend_controller.rb")
-        )
+        template("frontend_controller.rb",
+                 File.join("app/controllers/frontend_controller.rb"))
       end
 
       def create_frontend_helper
-        template(
-          "frontend_helper.rb",
-          File.join("app/helpers/frontend_helper.rb")
-        )
+        template("frontend_helper.rb",
+                 File.join("app/helpers/frontend_helper.rb"))
       end
 
       def create_pages_controller
-        template(
-          "pages_controller.rb",
-          File.join("app/controllers/pages_controller.rb")
-        )
+        template("pages_controller.rb",
+                 File.join("app/controllers/pages_controller.rb"))
       end
 
       def create_default_template
-        copy_file(
-          "default_page_template.html.erb",
-          File.join("app/views/pages/templates/index.html.erb")
-        )
+        copy_file("default_page_template.html.erb",
+                  File.join("app/views/pages/templates/index.html.erb"))
       end
 
       def create_delayed_job_script
         template "delayed_job", File.join("script/delayed_job")
-        File.chmod(0755, Rails.root.join("script/delayed_job"))
+        File.chmod(0o755, Rails.root.join("script/delayed_job"))
       end
 
       def create_delayed_job_initializer
-        template(
-          "delayed_job_initializer.rb",
-          File.join("config/initializers/delayed_job.rb")
-        )
+        template("delayed_job_initializer.rb",
+                 File.join("config/initializers/delayed_job.rb"))
       end
 
       def create_initializer_file
         read_configuration!
-        template(
-          "pages_initializer.rb",
-          File.join("config/initializers/pages.rb")
-        )
-      end
-
-      def create_cache_sweeper_initializer
-        read_configuration!
-        template(
-          "cache_sweeper_initializer.rb",
-          File.join("config/initializers/cache_sweeper.rb")
-        )
+        template("pages_initializer.rb",
+                 File.join("config/initializers/pages.rb"))
       end
 
       def create_template_initializer
         read_configuration!
-        template(
-          "page_templates_initializer.rb",
-          File.join("config/initializers/page_templates.rb")
-        )
-      end
-
-      def create_sphinx_config
-        template "thinking_sphinx.yml", File.join("config/thinking_sphinx.yml")
+        template("page_templates_initializer.rb",
+                 File.join("config/initializers/page_templates.rb"))
       end
 
       def create_gitignore
@@ -124,11 +87,7 @@ module PagesCore
 
       def ask_with_fallback(question, default)
         result = ask(question + " [#{default}]")
-        if result.blank?
-          default
-        else
-          result
-        end
+        result.presence || default
       end
     end
   end