pages_core 3.5.1 → 3.6.0

data/lib/pages_core/templates/configuration_handler.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module PagesCore
   module Templates
     class ConfigurationHandler
@@ -21,7 +19,7 @@ module PagesCore
       end
 
       def method_missing(method_name, *args, &block)
-        if self.class.handle_blocks.keys.include?(method_name)
+        if self.class.handle_blocks.key?(method_name)
           proxy = PagesCore::Templates::ConfigurationProxy.new(
             self.class.handle_blocks[method_name],
             self
@@ -39,6 +37,10 @@ module PagesCore
         proxy_object
       end
 
+      def respond_to_missing?(method_name)
+        self.class.handle_blocks.key?(method_name)
+      end
+
       def set(stack, value)
         @configuration ||= {}
         value = true  if value == :enabled
@@ -54,7 +56,7 @@ module PagesCore
       def get(*path)
         @configuration ||= {}
         path.inject(@configuration) do |value, key|
-          (value && value.is_a?(Hash) && value.key?(key)) ? value[key] : nil
+          value && value.is_a?(Hash) && value.key?(key) ? value[key] : nil
         end
       end
     end

data/lib/pages_core/templates/configuration_proxy.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module PagesCore
   module Templates
     class ConfigurationProxy
@@ -19,6 +17,10 @@ module PagesCore
           @callback.call(method_name, *args)
         end
       end
+
+      def respond_to_missing?
+        true
+      end
     end
   end
 end

data/lib/pages_core/templates/controller_actions.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module PagesCore
   module Templates
     module ControllerActions

data/lib/pages_core/templates/template_configuration.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module PagesCore
   module Templates
     class TemplateConfiguration
@@ -7,7 +5,38 @@ module PagesCore
 
       class << self
         def all_blocks
-          new(:index).all_blocks
+          (all_templates.map { |t| configured_block_names(t) } +
+           all_templates.map { |t| enabled_block_names(t) }).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 +45,7 @@ module PagesCore
       end
 
       def config
-        PagesCore::Templates.configuration
+        self.class.config
       end
 
       def value(*path)
@@ -37,9 +66,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,26 +89,8 @@ 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,
@@ -87,10 +98,6 @@ module PagesCore
           size:     :small
         }
       end
-
-      def all_templates
-        Array(config.get(:templates).try(&:keys))
-      end
     end
 
     class << self
@@ -120,12 +127,10 @@ module PagesCore
       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
@@ -133,13 +138,12 @@ module PagesCore
       def default_configuration(config)
         config.template :autodetect, root: "index"
         config.image :enabled, linkable: false
-        config.comments :disabled
-        config.comments_allowed :enabled
         config.files :disabled
         config.images :disabled
         config.text_filter :textile
-        config.enabled_blocks [:headline, :excerpt, :body]
+        config.enabled_blocks %i[headline excerpt body]
         config.tags :disabled
+        config.dates :disabled
       end
 
       def default_blocks

data/lib/pages_core/version.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module PagesCore
-  VERSION = "3.5.1".freeze unless PagesCore.const_defined?("VERSION")
+  VERSION = "3.6.0".freeze unless PagesCore.const_defined?("VERSION")
 end

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

@@ -1,15 +1,8 @@
-# encoding: utf-8
-
 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 +13,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 +31,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,8 @@
-# encoding: utf-8
-
 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,8 +17,7 @@ module PagesCore
           "Default sender?",
           "no-reply@#{@domain_name}"
         )
-
-        @sphinx_port ||= ask_with_fallback("Sphinx port?", "3312")
+        nil
       end
 
       def create_active_job_initializer
@@ -60,7 +57,7 @@ module PagesCore
 
       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
@@ -86,10 +83,6 @@ module PagesCore
                  File.join("config/initializers/page_templates.rb"))
       end
 
-      def create_sphinx_config
-        template "thinking_sphinx.yml", File.join("config/thinking_sphinx.yml")
-      end
-
       def create_gitignore
         template "gitignore.erb", File.join(".gitignore")
       end
@@ -98,11 +91,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

data/lib/rails/generators/pages_core/install/templates/application_controller.rb

@@ -1,6 +1,4 @@
-# encoding: utf-8
-
-class ApplicationController < PagesCore::ApplicationController
+class ApplicationController < PagesCore::BaseController
   # Put frontend specific code in frontend_controller.rb
 
   helper :all # include all helpers, all the time

data/lib/rails/generators/pages_core/install/templates/application_helper.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module ApplicationHelper
   include PagesCore::ApplicationHelper
 end

data/lib/rails/generators/pages_core/install/templates/cache_sweeper_initializer.rb

@@ -1,11 +1,6 @@
-# encoding: utf-8
-
 # Be sure to restart your web server when you modify this file.
 
 PagesCore::CacheSweeper.config do |sweeper|
-  # Observed models
-  # sweeper.observe  += [Artist, Song]
-
   # Path patterns
   # sweeper.patterns += [/^\/archive(.*)$/, /^\/tests(.*)$/]
 end

data/lib/rails/generators/pages_core/install/templates/delayed_job_initializer.rb

@@ -1,3 +1 @@
-# encoding: utf-8
-
 Delayed::Worker.backend = :active_record

data/lib/rails/generators/pages_core/install/templates/frontend_controller.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 # Abstract controller for all frontend controllers.
 class FrontendController < PagesCore::FrontendController
   layout "application"

data/lib/rails/generators/pages_core/install/templates/frontend_helper.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module FrontendHelper
   include PagesCore::FrontendHelper
 end

data/lib/rails/generators/pages_core/install/templates/page_templates_initializer.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 # Be sure to restart your web server when you modify this file.
 
 # Templates configuration
@@ -18,10 +16,7 @@ PagesCore::Templates.configure do |config|
         "Standfirst",
         description: "An introductory paragraph before the start of the body."
       )
-      block.body(
-        "Body",
-        size: :large
-      )
+      block.body("Body", size: :large)
       block.boxout(
         "Boxout",
         description: "Part of the page, usually background info or facts " \
@@ -36,19 +31,16 @@ PagesCore::Templates.configure do |config|
     default.image :enabled, linkable: false
 
     # Enables file uploads (default: :disabled)
-    default.files :disabled
-
-    # Enables comments (default: :disabled)
-    default.comments :disabled
-
-    # New pages are open for comments by default (default: :enabled)
-    default.comments_allowed :enabled
+    # default.files :enabled
 
     # Pages can have tags (default: :disabled)
-    default.tags :disabled
+    # default.tags :enabled
+
+    # Pages can have dates (default: :disabled)
+    # default.dates :enabled
 
     # Only use the blocks enabled here by default
-    default.enabled_blocks [:headline, :excerpt, :body]
+    default.enabled_blocks %i[headline excerpt body]
 
     # Subpages will have this template. Will fall back to default.template
     # unless specified. (default: nil)

data/lib/rails/generators/pages_core/install/templates/pages_controller.rb

@@ -1,4 +1,2 @@
-# encoding: utf-8
-
 class PagesController < PagesCore::Frontend::PagesController
 end