pages_core 3.4.3 → 3.5.1

data/lib/pages_core/admin_menu_item.rb

@@ -6,17 +6,30 @@ module PagesCore
 
     class << self
       def items
-        @items ||= []
+        return [] unless @menu_items
+        @menu_items.map { |_, v| v }
       end
 
       def register(label, path, group = :custom, options = {})
         entry = new(label, path, group, options)
-        items << entry unless items.include?(entry)
+        @menu_items ||= {}
+        @menu_items[[group, label]] = entry
       end
     end
 
     def initialize(label, path, group = :custom, options = {})
-      @label, @path, @group, @options = label, path, group, options
+      @label = label
+      @path = path
+      @group = group
+      @options = options
+    end
+
+    def ==(other)
+      other &&
+        other.label == label &&
+        other.path == path &&
+        other.group == group &&
+        other.options == options
     end
   end
 end

data/lib/pages_core/archive_finder.rb

@@ -3,7 +3,8 @@
 module PagesCore
   class ArchiveFinder
     def initialize(relation, options = {})
-      @relation, @options = relation, options
+      @relation = relation
+      @options = options
     end
 
     def by_year(year)
@@ -24,17 +25,14 @@ module PagesCore
     end
 
     def months_in_year(year)
-      by_year(year)
-        .reorder("#{timestamp_attribute} ASC")
-        .group("MONTH(#{timestamp_attribute})")
-        .map { |record| record[timestamp_attribute].month }
+      select_months(by_year(year)).map(&:to_i).sort
     end
 
     def months_in_year_with_count(year)
-      by_year(year)
-        .group("MONTH(#{timestamp_attribute})")
+      group_by_month(by_year(year))
         .count
         .to_a
+        .sort { |a, b| a.first <=> b.first }
     end
 
     def timestamp_attribute
@@ -42,14 +40,15 @@ module PagesCore
     end
 
     def years
-      @relation
-        .reorder("#{timestamp_attribute} ASC")
-        .group("YEAR(#{timestamp_attribute})")
-        .map { |record| record[timestamp_attribute].year }
+      select_years(@relation).map(&:to_i).sort
     end
 
     private
 
+    def group_by_month(relation)
+      relation.reorder("").group(month_part)
+    end
+
     def filter_by_time(range)
       @relation.where(
         "#{timestamp_attribute} >= ? AND #{timestamp_attribute} <= ?",
@@ -58,18 +57,46 @@ module PagesCore
       )
     end
 
+    def month_part
+      if mysql?
+        "MONTH(#{timestamp_attribute})"
+      else
+        "date_part('month', #{timestamp_attribute})"
+      end
+    end
+
+    def mysql?
+      ActiveRecord::Base.connection.adapter_name.downcase.starts_with?("mysql")
+    end
+
     def range_for_year(year)
-      date_time = DateTime.new(year.to_i, 1, 1)
+      date_time = DateTime.new(year.to_i, 1, 1).utc
       date_time..date_time.end_of_year
     end
 
     def range_for_year_and_month(year, month)
-      date_time = DateTime.new(year.to_i, month.to_i, 1)
+      date_time = DateTime.new(year.to_i, month.to_i, 1).utc
       date_time..date_time.end_of_month
     end
 
+    def select_months(relation)
+      relation.reorder("").pluck("DISTINCT #{month_part}")
+    end
+
+    def select_years(relation)
+      relation.reorder("").pluck("DISTINCT #{year_part}")
+    end
+
     def ordered_relation
       @relation.reorder("#{timestamp_attribute} DESC")
     end
+
+    def year_part
+      if mysql?
+        "YEAR(#{timestamp_attribute})"
+      else
+        "date_part('year', #{timestamp_attribute})"
+      end
+    end
   end
 end

data/lib/pages_core/cache_sweeper.rb

@@ -17,20 +17,6 @@ module PagesCore
         PagesCore::SweepCacheJob.perform_later
       end
 
-      # Returns the default configuration.
-      def default_config
-        OpenStruct.new(
-          cache_path: ActionController::Base.page_cache_directory,
-          observe: [Page, PageComment, Image],
-          patterns: [
-            /^\/index\.[\w]+$/,
-            /^\/sitemap\.[\w]+$/,
-            %r{^/pages/[\w]{2,3}[/\.](.*)$},
-            %r{^/[\w]{2,3}/(.*)$}
-          ]
-        )
-      end
-
       # Returns the configuration. Accepts a block, ie:
       #
       #   PagesCore::CacheSweeper.config do |c|
@@ -46,27 +32,16 @@ module PagesCore
         @configuration
       end
 
-      def extend_observed_models!
-        config.observe.each do |klass|
-          if klass.is_a?(Symbol) || klass.is_a?(String)
-            klass = klass.to_s.camelize.constantize
-          end
-          unless klass.include?(PagesCore::Sweepable)
-            klass.send(:include, PagesCore::Sweepable)
-          end
-        end
-      end
-
       # Purge the entire pages cache
       def purge!
         cache_dir = config.cache_path
-        `rm -rf "#{cache_dir}/*"` if File.exist?(cache_dir)
+        FileUtils.rm_rf(Dir.glob("#{cache_dir}/*")) if File.exist?(cache_dir)
       end
 
       # Sweep all cached pages
       def sweep!
         return [] unless enabled
-        cache_dirs.flat_map { |d| sweep_dir(d)  }
+        cache_dirs.flat_map { |d| sweep_dir(d) }
       end
 
       private
@@ -74,39 +49,91 @@ module PagesCore
       def cache_dirs
         if PagesCore.config(:domain_based_cache)
           Dir.entries(config.cache_path)
-            .select { |d| visible_dir?(d) }
-            .map { |d| File.join(config.cache_path, d) }
-            .map(&:to_s)
+             .select { |d| visible_dir?(d) }
+             .map { |d| File.join(config.cache_path, d).to_s }
         else
           [config.cache_path.to_s]
         end
       end
 
+      # Returns the default configuration.
+      def default_config
+        OpenStruct.new(cache_path: ActionController::Base.page_cache_directory,
+                       observe: [Page, PageComment, Image],
+                       patterns: [%r{^/index\.[\w]+$},
+                                  %r{^/sitemap\.[\w]+$},
+                                  %r{^/pages/[\w]{2,3}[/\.](.*)$},
+                                  %r{^/[\w]{2,3}/(.*)$}])
+      end
+
+      def extend_observed_models!
+        config.observe.each do |klass|
+          if klass.is_a?(Symbol) || klass.is_a?(String)
+            klass = klass.to_s.camelize.constantize
+          end
+          klass.send(:include, PagesCore::Sweepable)
+        end
+      end
+
       def visible_dir?(dir)
         !(dir =~ /^\./) && File.directory?(File.join(config.cache_path, dir))
       end
 
       def sweep_dir(cache_dir)
-        return [] unless File.exist?(cache_dir)
-        swept_files = []
-        Find.find(cache_dir + "/") do |path|
-          Find.prune if skip_path?(cache_dir, path)
-          file = path.gsub(Regexp.new("^#{cache_dir}"), "")
-          config.patterns.each do |p|
-            if file =~ p && File.exist?(path)
-              swept_files << path
-              FileUtils.rm_rf(path)
-            end
-          end
+        PagesCore::CacheSweeper.new(cache_dir).sweep!
+      end
+    end
+
+    attr_reader :cache_dir
+
+    self.enabled ||= true
+
+    def initialize(cache_dir)
+      @cache_dir = cache_dir
+    end
+
+    def sweep!
+      return [] unless File.exist?(cache_dir)
+      swept_files = []
+
+      Find.find(cache_dir + "/") do |path|
+        Find.prune if skip_path?(path) || !File.exist?(path)
+
+        if sweep_file?(path)
+          swept_files << path
+          FileUtils.rm_rf(path)
         end
-        swept_files
       end
+      swept_files
+    end
+
+    private
+
+    def locales
+      return [I18n.default_locale.to_s] unless PagesCore.config.locales
 
-      def skip_path?(cache_dir, path)
-        path =~ Regexp.new("^#{cache_dir}/dynamic_image[s]?")
+      ([I18n.default_locale.to_s] +
+        PagesCore.config.locales.keys.map(&:to_s)).uniq
+    end
+
+    def page_path_files
+      @page_path_files ||= PagePath.all.flat_map do |p|
+        ["/#{p.path}.html"] +
+          locales.map { |l| "/#{l}/#{p.path}.html" }
       end
     end
 
-    self.enabled ||= true
+    def pattern_match?(path)
+      PagesCore::CacheSweeper.config.patterns.select { |p| p =~ path }.any?
+    end
+
+    def skip_path?(path)
+      path =~ Regexp.new("^#{cache_dir}/dynamic_image[s]?")
+    end
+
+    def sweep_file?(path)
+      relative = path.gsub(Regexp.new("^#{cache_dir}"), "")
+      pattern_match?(relative) || page_path_files.include?(relative)
+    end
   end
 end

data/lib/pages_core/configuration.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
-load "pages_core/configuration/base.rb"
-load "pages_core/configuration/pages.rb"
+require "pages_core/configuration/base"
+require "pages_core/configuration/pages"
 
 module PagesCore
   module Configuration

data/lib/pages_core/configuration/base.rb

@@ -13,11 +13,7 @@ module PagesCore
         settings[key] = OpenStruct.new(type: type, default: default)
 
         define_method key do |*args|
-          if args.length > 0
-            set(key, *args)
-          else
-            get(key)
-          end
+          args.any? ? set(key, *args) : get(key)
         end
 
         define_method "#{key}=" do |value|
@@ -30,7 +26,7 @@ module PagesCore
       end
 
       def get(key)
-        fail InvalidConfigurationKey unless setting?(key)
+        raise InvalidConfigurationKey unless setting?(key)
         if configuration.key?(key)
           configuration[key]
         else
@@ -39,10 +35,10 @@ module PagesCore
       end
 
       def set(key, value)
-        fail InvalidConfigurationKey unless setting?(key)
+        raise InvalidConfigurationKey unless setting?(key)
         value = parse_value(key, value)
         unless valid_type?(key, value)
-          fail(
+          raise(
             ArgumentError,
             "expected #{self.class.settings[key].type}, got #{value.class}"
           )

data/lib/pages_core/configuration/pages.rb

@@ -1,9 +1,11 @@
 # encoding: utf-8
 
+require "pages_core/file_embedder"
+
 module PagesCore
   module Configuration
     class Pages < Base
-      setting :site_name,             :string,  "Pages Site"
+      setting :site_name,             :string, "Pages Site"
       setting :default_sender,        :string
       setting :localizations,         :boolean, false
       setting :locales,               :hash
@@ -13,11 +15,12 @@ module PagesCore
       setting :rss_fulltext,          :boolean, true
       setting :image_fallback_url,    :string
       setting :default_author,        :string
-      setting :comment_notifications, :array,   []
+      setting :comment_notifications, :array, []
       setting :close_comments_after,  :integer
       setting :comment_honeypot,      :boolean, false
       setting :recaptcha,             :boolean, false
-      setting :pages_path_scope,      :string
+      setting :error_404_layout,      :string
+      setting :file_embedder,         :object, PagesCore::FileEmbedder
     end
   end
 end

data/lib/pages_core/engine.rb

@@ -2,8 +2,16 @@
 
 module PagesCore
   class Engine < Rails::Engine
+    # config.autoload_paths += Dir["#{config.root}/lib/"]
+    # config.autoload_paths += Dir["#{config.root}/lib/pages_core/**/"]
+    # config.eager_load_paths += Dir["#{config.root}/lib/pages_core/**/"]
+
     initializer :active_job do |_config|
-      ActiveJob::Base.queue_adapter = :delayed_job
+      ActiveJob::Base.queue_adapter = if Rails.env.test?
+                                        :test
+                                      else
+                                        :delayed_job
+                                      end
     end
 
     initializer :append_migrations do |app|
@@ -21,7 +29,21 @@ module PagesCore
         pages/admin.css
         pages/admin/print.css
         pages/errors.css
+        pages/*.gif
+        pages/*.png
+        pages/*.jpg
       )
     end
+
+    initializer :handle_exceptions do |app|
+      app.config.exceptions_app = app.routes
+    end
+
+    # React configuration
+    initializer :react do |app|
+      app.config.react.jsx_transform_options = {
+        harmony: true
+      }
+    end
   end
 end

data/lib/pages_core/extensions.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 
-load "pages_core/extensions/hash_extensions.rb"
-load "pages_core/extensions/string_extensions.rb"
+require "pages_core/extensions/hash_extensions"
+require "pages_core/extensions/string_extensions"

data/lib/pages_core/file_embedder.rb

@@ -0,0 +1,40 @@
+# encoding: utf-8
+
+module PagesCore
+  class FileEmbedder
+    include ActionView::Helpers::AssetTagHelper
+
+    attr_reader :files
+
+    def initialize(files)
+      @files = Array(files)
+    end
+
+    def to_html
+      embed_files(files.map { |f| embed_file(f) })
+    end
+
+    def embed_files(embedded_files)
+      embedded_files.join(", ")
+    end
+
+    def embed_file(file)
+      content_tag(
+        :a,
+        file.name,
+        class: "file",
+        href: file_path(file)
+      )
+    end
+
+    private
+
+    def file_path(file)
+      Rails.application.routes.url_helpers.page_file_path(
+        file.locale,
+        file.page,
+        file
+      )
+    end
+  end
+end