pages_core 3.6.1 → 3.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09440a3d279449e162f521750dd736cd1865cd1ee63809c00806e95db2a0c05a'
-  data.tar.gz: 1e0282864ebf0667bf0abbfdf3574b9a2fc6192b98cc7c931eadb02adc8ebcf9
+  metadata.gz: 537e618c3f5f182e0e23ccd5178037c2a71a89e61ca0950a862a1801b0f23ce9
+  data.tar.gz: be1896eb7eafd63271d6d25821b7ca386980bdd0b69347db27bfb947e5a41c9b
 SHA512:
-  metadata.gz: da9e5ecc3a26209b01fc7452210933782224a465bd76fc8349149c44225cd73d0e7e704eb232bab16db2fbbcc5bb721a7384fd9093ecd72d1b97ea27e78152f1
-  data.tar.gz: de1f492e63bbf8ca71fe770d02213ffb2da05f27732e5eb9b46926af2339b2709efb691b24c29c27163e16a4d53d8bd25feff6286f809cff5f0d514c4ecda6ed
+  metadata.gz: e41a054282acbdd004aad81c839bffebf9c55c05b3a47bd1c98d08dd8af3bb8ce227f77a11ae3a1bb8c680f72f8b3e34c5ac2f1710aef3b34bae1a59c5e03afb
+  data.tar.gz: d06e26f9d9f20990f1a982f29fba091d24a9c43b8962a98c4209bbecfb9540a5f3c1fda8c462e1f412f832334d811ec29771a1ffa9831c95cf6cb43850bc2190

data/app/controllers/admin/pages_controller.rb

@@ -4,7 +4,7 @@ module Admin
 
     before_action :find_categories
     before_action :find_page, only: %i[show edit update destroy
-                                       delete_meta_image move]
+                                       move]
 
     require_authorization
 
@@ -69,12 +69,6 @@ module Admin
       redirect_to admin_pages_url(@locale)
     end
 
-    def delete_meta_image
-      @page.meta_image.destroy
-      flash[:notice] = "The image was deleted"
-      redirect_to edit_admin_page_url(@locale, @page, anchor: "metadata")
-    end
-
     private
 
     def build_page(locale, attributes = nil, categories = nil)
@@ -92,7 +86,8 @@ module Admin
     def page_attributes
       %i[template user_id status feed_enabled published_at redirect_to
          image_link news_page unique_name pinned parent_page_id serialized_tags
-         meta_image starts_at ends_at all_day image_id]
+         meta_image_id starts_at ends_at all_day image_id path_segment
+         meta_title meta_description open_graph_title open_graph_description]
     end
 
     def page_params

data/app/controllers/pages_core/frontend/pages_controller.rb

@@ -8,14 +8,12 @@ module PagesCore
       include PagesCore::PreviewPagesController
       include PagesCore::RssController
 
-      caches_page :index if PagesCore.config(:page_cache)
-
       before_action :load_root_pages
       before_action :find_page_by_path, only: [:show]
       before_action :find_page, only: %i[show preview]
       before_action :require_page, only: %i[show preview]
       before_action :canonicalize_url, only: [:show]
-      after_action :cache_page_request, only: [:show]
+      after_action :cache_page_request, only: %i[index show]
 
       def index
         respond_to do |format|
@@ -50,6 +48,10 @@ module PagesCore
         redirect_to(canonical_path(@page), status: :moved_permanently)
       end
 
+      def disable_page_cache!
+        @page_cache_disabled = true
+      end
+
       def render(*args)
         @already_rendered = true
         super
@@ -83,14 +85,11 @@ module PagesCore
 
       # Cache pages by hand. This is dirty, but it works.
       def cache_page_request
-        status_code = response.status.try(&:to_i)
-        unless status_code == 200 &&
-               PagesCore.config(:page_cache) &&
-               @page && @locale
-          return
-        end
+        return if @page_cache_disabled || !PagesCore.config(:page_cache)
+        return if response.status&.to_i != 200
+        return unless @page && @locale
 
-        self.class.cache_page response.body, request.path
+        self.class.cache_page(response.body, request.path)
       end
 
       def find_page_by_path

data/app/views/admin/pages/_edit_metadata.html.erb

@@ -27,18 +27,7 @@
     Will fall back to the primary image if absent.
     Recommended size is at least 1200x630.
   </p>
-  <% if @page.meta_image %>
-    <p>
-      <%= dynamic_image_tag @page.meta_image, size: "250x" %>
-      <br>
-      <%= link_to("Delete image",
-                  delete_meta_image_admin_page_path(@locale, @page),
-                  method: "delete",
-                  class: "delete",
-                  data: { confirm: "Are you sure?" }) %>
-    </p>
-  <% end %>
-  <%= f.file_field :meta_image %>
+  <%= f.image_uploader :meta_image %>
 </div>
 
 <% @page.template_config.metadata_blocks do |block_name, block_options| %>

data/config/routes.rb

@@ -83,7 +83,6 @@ Rails.application.routes.draw do
 
         member do
           put "move"
-          delete "delete_meta_image"
         end
 
         get "new/:parent", action: "new"

data/db/migrate/20190318115000_fix_page_file_ids.rb

@@ -1,19 +1,34 @@
 class FixPageFileIds < ActiveRecord::Migration[5.0]
   def change
-    attachment_id = execute(
-      "SELECT MAX(attachment_id) AS max_id FROM page_files"
-    )[0]["max_id"]
-    pf_id = execute("SELECT MAX(id) AS max_id FROM page_files")[0]["max_id"]
-
+    attachment_id = max_id(:attachment_id, :page_files)
+    pf_id = max_id(:id, :page_files)
 
     if attachment_id && pf_id
       max_id = [attachment_id, pf_id].max
 
       execute("UPDATE page_files SET id = id + #{max_id + 1}")
       execute("UPDATE page_files SET id = attachment_id")
-      execute("ALTER SEQUENCE page_files_id_seq RESTART WITH #{attachment_id + 1}")
+      if mysql2?
+        execute(
+          "ALTER SEQUENCE page_files_id_seq RESTART WITH #{attachment_id + 1}"
+        )
+      end
 
       PageFile.all.each { |pf| pf.touch }
     end
   end
+
+  def max_id(attr, table)
+    query = "SELECT MAX(#{attr}) AS max_id FROM #{table}"
+    if mysql2?
+      execute(query).first[0]
+    else
+      execute(query)[0]["max_id"]
+    end
+  end
+
+  def mysql2?
+    Object.const_defined?("ActiveRecord::ConnectionAdapters::Mysql2Adapter") &&
+      connection.instance_of?(ActiveRecord::ConnectionAdapters::Mysql2Adapter)
+  end
 end

data/lib/pages_core/version.rb

@@ -1,3 +1,3 @@
 module PagesCore
-  VERSION = "3.6.1".freeze unless PagesCore.const_defined?("VERSION")
+  VERSION = "3.6.2".freeze unless PagesCore.const_defined?("VERSION")
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pages_core
 version: !ruby/object:Gem::Version
-  version: 3.6.1
+  version: 3.6.2
 platform: ruby
 authors:
 - Inge Jørgensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-19 00:00:00.000000000 Z
+date: 2019-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement