pages_core 3.4.3 → 3.5.1

data/lib/pages_core/page_path_constraint.rb

@@ -0,0 +1,23 @@
+# encoding: utf-8
+
+module PagesCore
+  class PagePathConstraint
+    def matches?(request)
+      locale?(request.path_parameters[:locale]) &&
+        exists?(
+          request.path_parameters[:locale],
+          request.path_parameters[:path]
+        )
+    end
+
+    private
+
+    def locale?(str)
+      str.to_s =~ /\A[a-z]{2}\z/
+    end
+
+    def exists?(locale, path)
+      PagePath.get(locale, path) ? true : false
+    end
+  end
+end

data/lib/pages_core/pages_plugin.rb

@@ -2,6 +2,17 @@
 
 module PagesCore
   class PagesPlugin < Plugin
+    class << self
+      def configure_localizations!
+        unless @localizations_added
+          I18n.load_path += Dir[
+            new.root.join("config", "locales", "**", "*.{rb,yml}")
+          ]
+        end
+        @localizations_added = true
+      end
+    end
+
     paths["db/migrate"] = "db/migrate"
 
     admin_menu_item "News",  proc { news_admin_pages_path(@locale) }, :pages,

data/lib/pages_core/paginates.rb

@@ -51,7 +51,7 @@ module PagesCore
 
     # Returns true if collection is paginated
     def paginated?
-      (@paginated) ? true : false
+      @paginated ? true : false
     end
 
     # Returns next page, or nil if at last page.
@@ -61,7 +61,7 @@ module PagesCore
 
     # Returns true/false depending on if there's a next page
     def next_page?
-      (next_page) ? true : false
+      next_page ? true : false
     end
 
     # Returns previous page, or nil if at first page.
@@ -71,7 +71,7 @@ module PagesCore
 
     # Returns true/false depending on if there's a previous page
     def previous_page?
-      (previous_page) ? true : false
+      previous_page ? true : false
     end
 
     # Number of pages

data/lib/pages_core/plugin.rb

@@ -12,10 +12,7 @@ module PagesCore
       attr_accessor :called_from, :paths
 
       def inherited(plugin)
-        plugin.paths ||= {
-          "db/migrate"                    => "db/migrate",
-          "config/removed_migrations.yml" => "config/removed_migrations.yml"
-        }
+        plugin.paths ||= default_paths
         plugin.called_from = begin
           # Remove the line number from backtraces making sure we
           # don't leave anything behind
@@ -64,6 +61,15 @@ module PagesCore
           File.unlink Rails.root.join("db", "migrate", migration)
         end
       end
+
+      private
+
+      def default_paths
+        {
+          "db/migrate"                    => "db/migrate",
+          "config/removed_migrations.yml" => "config/removed_migrations.yml"
+        }
+      end
     end
 
     def root
@@ -88,8 +94,8 @@ module PagesCore
 
     def migrations
       Dir.entries(migrations_path)
-        .select { |f| f =~ /\.rb$/ }
-        .map { |f| migrations_path.join(f) }
+         .select { |f| f =~ /\.rb$/ }
+         .map { |f| migrations_path.join(f) }
     end
 
     def removed_migrations
@@ -103,13 +109,13 @@ module PagesCore
       root_path = self.class.called_from
 
       while root_path && File.directory?(root_path) &&
-          !File.exist?("#{root_path}/#{subfolder}")
+            !File.exist?("#{root_path}/#{subfolder}")
         parent = File.dirname(root_path)
         root_path = parent != root_path && parent
       end
 
       unless File.exist?("#{root_path}/#{subfolder}")
-        fail "Could not find root path for #{self}"
+        raise "Could not find root path for #{self}"
       end
 
       Pathname.new(root_path).realpath

data/lib/pages_core/templates.rb

@@ -1,11 +1,11 @@
 # encoding: utf-8
 
-load "pages_core/templates/block_configuration.rb"
-load "pages_core/templates/configuration_proxy.rb"
-load "pages_core/templates/configuration_handler.rb"
-load "pages_core/templates/configuration.rb"
-load "pages_core/templates/controller_actions.rb"
-load "pages_core/templates/template_configuration.rb"
+require "pages_core/templates/block_configuration"
+require "pages_core/templates/configuration_proxy"
+require "pages_core/templates/configuration_handler"
+require "pages_core/templates/configuration"
+require "pages_core/templates/controller_actions"
+require "pages_core/templates/template_configuration"
 
 module PagesCore
   module Templates

data/lib/pages_core/templates/block_configuration.rb

@@ -10,7 +10,7 @@ module PagesCore
       end
 
       def large?
-        (small?) ? false : true
+        small? ? false : true
       end
     end
   end

data/lib/pages_core/templates/configuration.rb

@@ -34,23 +34,13 @@ module PagesCore
       def configure_template(template_name, setting, value, options = {})
         template_name = template_name.to_sym
         setting = setting.to_sym
-        if valid_template_options.include?(setting)
-          value = true  if value == :enabled
-          value = false if value == :disabled
-          template_config = {
-            setting => {
-              value:   value,
-              options: options
-            }
-          }
-          if template_name == :_defaults
-            set([:default], template_config)
-          else
-            set([:templates, template_name], template_config)
-          end
-        else
-          fail "Invalid template configuration value: #{setting.inspect}"
+        unless valid_template_options.include?(setting)
+          raise "Invalid template configuration value: #{setting.inspect}"
         end
+        set(
+          template_path(template_name),
+          template_config(setting, value, options)
+        )
       end
 
       def blocks(template_name = :_defaults, &block)
@@ -60,22 +50,31 @@ module PagesCore
       end
 
       def templates(*tpl_args, &block)
-        template_names = tpl_args.flatten.map(&:to_sym)
+        names = tpl_args.flatten.map(&:to_sym)
         proxy(block) do |name, *args|
           if name == :blocks
             proxy(args.first.is_a?(Proc) ? args.first : nil) do |n2, *a2|
-              template_names.each do |template_name|
-                configure_block(template_name, n2, *a2)
-              end
+              names.each { |t| configure_block(t, n2, *a2) }
             end
           else
-            template_names.each do |template_name|
-              configure_template(template_name, name, *args)
-            end
+            names.each { |t| configure_template(t, name, *args) }
           end
         end
       end
-      alias_method :template, :templates
+      alias template templates
+
+      private
+
+      def template_config(setting, value, options)
+        value = true if value == :enabled
+        value = false if value == :disabled
+        { setting => { value: value, options: options } }
+      end
+
+      def template_path(name)
+        return [:default] if name == :_defaults
+        [:templates, name]
+      end
     end
   end
 end

data/lib/pages_core/templates/configuration_handler.rb

@@ -26,7 +26,7 @@ module PagesCore
             self.class.handle_blocks[method_name],
             self
           )
-          block.call(proxy) if block
+          yield(proxy) if block
           proxy
         else
           super

data/lib/pages_core/templates/configuration_proxy.rb

@@ -9,18 +9,14 @@ module PagesCore
       end
 
       def method_missing(method_name, *args, &block)
-        if @parent
-          if block_given?
-            @callback.call(@parent, method_name, block)
-          else
-            @callback.call(@parent, method_name, *args)
-          end
+        if @parent && block_given?
+          @callback.call(@parent, method_name, block)
+        elsif @parent
+          @callback.call(@parent, method_name, *args)
+        elsif block_given?
+          @callback.call(method_name, block)
         else
-          if block_given?
-            @callback.call(method_name, block)
-          else
-            @callback.call(method_name, *args)
-          end
+          @callback.call(method_name, *args)
         end
       end
     end

data/lib/pages_core/templates/template_configuration.rb

@@ -108,15 +108,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,7 +117,7 @@ module PagesCore
         load_default_configuration unless defined? @configuration
         @configuration
       end
-      alias_method :config, :configuration
+      alias config configuration
 
       def metadata_block_names
         [
@@ -138,61 +130,63 @@ module PagesCore
 
       private
 
+      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.tags :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.keys.each 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
 
 module PagesCore
-  VERSION = "3.4.3" unless PagesCore.const_defined?("VERSION")
+  VERSION = "3.5.1".freeze unless PagesCore.const_defined?("VERSION")
 end

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

@@ -23,57 +23,39 @@ module PagesCore
         @sphinx_port ||= ask_with_fallback("Sphinx port?", "3312")
       end
 
-      def add_gem_source
-        add_source "http://gems.manualdesign.no/"
-      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
@@ -82,34 +64,26 @@ module PagesCore
       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")
-        )
+        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("cache_sweeper_initializer.rb",
+                 File.join("config/initializers/cache_sweeper.rb"))
       end
 
       def create_template_initializer
         read_configuration!
-        template(
-          "page_templates_initializer.rb",
-          File.join("config/initializers/page_templates.rb")
-        )
+        template("page_templates_initializer.rb",
+                 File.join("config/initializers/page_templates.rb"))
       end
 
       def create_sphinx_config