pageflow 15.0.0.beta4 → 15.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d560645e2e193e2dfa432c87cecd36ebdbc8575e413385f72336146334f69071
-  data.tar.gz: fb87d0203fd1a13e9bf4752480ff08352c6edcaf91e226ba143076f6219bc1e5
+  metadata.gz: 2328aa20c05ac19c8b9d217322207e33a0751f9e65fb45f7c62b68259f6dcfee
+  data.tar.gz: b92268ef8ac71fe3bca26300f37f62e8e564b08fa0154319bf4889e1753f564a
 SHA512:
-  metadata.gz: 0dda5b907258c4f47c9a58baf325b901947016e4e6131a24aff510cfa5b930aafec648d5fd9742fc84f9c2936449ae9b5857e065cda380e696019853d6e02c72
-  data.tar.gz: 2b089e0b8b26ca54b376925bfcdc001dafb13fb98048d772ce7a46ee468fc0aaff574b3bb4cf3c66d41aeeb43f4be8a15ebee6552ded244dea339d02feedb14c
+  metadata.gz: 40293af4ee3184592998a3b11a2a95425d054307303ea8fcbd372b08c81091b90db79ede4028113a68e6a2808b3fb02cf397ba8c0e49b79d79da35bc69e4cb43
+  data.tar.gz: 62b1563f80f888654a930f041bf239d71ba238ae6524b0e1a14fef0713173beec369456c978d8a51f115f77a4645bd17e7a1a433e518e443fa0aa23bf407fede

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # CHANGELOG
 
+### Version 15.0.0.rc1
+
+2019-10-28
+
+[Compare changes](https://github.com/codevise/pageflow/compare/14-x-stable...v15.0.0.rc1)
+
+- Prevent perma_id clashes for concurrently created revision components
+  ([#1225](https://github.com/codevise/pageflow/pull/1225))
+- Ensure caching of generated stylesheet is invaliated when files are
+  added.
+  ([#1224](https://github.com/codevise/pageflow/pull/1224))
+
 ### Version 15.0.0.beta4
 
 2019-10-24

data/app/models/concerns/pageflow/reusable_file.rb

@@ -13,6 +13,10 @@ module Pageflow
       has_many :using_accounts, :through => :using_entries, :source => :account
 
       validate :parent_allows_type_for_nesting, :parent_belongs_to_same_entry
+
+      after_save do
+        usages.each(&:touch) if ready?
+      end
     end
 
     def parent_allows_type_for_nesting

data/lib/pageflow/engine.rb

@@ -10,6 +10,7 @@ require 'jbuilder'
 require 'htmlentities'
 require 'kramdown'
 require 'react-rails'
+require 'with_advisory_lock'
 
 require 'active_admin'
 require 'activeadmin-searchable_select'

data/lib/pageflow/revision_component.rb

@@ -7,8 +7,12 @@ module Pageflow
   module RevisionComponent
     extend ActiveSupport::Concern
 
+    ADVISORY_LOCK_TIMEOUT_SECONDS = 5
+
+    class PermaIdGenerationAdvisoryLockTimeout < StandardError; end
+
     included do
-      belongs_to :revision, class_name: 'Pageflow::Revision'
+      belongs_to :revision, class_name: 'Pageflow::Revision', touch: true
       before_save :ensure_perma_id
     end
 
@@ -22,6 +26,35 @@ module Pageflow
       self.perma_id ||= (self.class.maximum(:perma_id) || 0) + 1
     end
 
+    def save(*)
+      with_advisory_lock_for_perma_id_generation! do
+        super
+      end
+    end
+
+    def save!(*)
+      with_advisory_lock_for_perma_id_generation! do
+        super
+      end
+    end
+
+    private
+
+    def with_advisory_lock_for_perma_id_generation!(&block)
+      return yield if perma_id.present?
+
+      r = with_advisory_lock_result_for_perma_id_generation(&block)
+      raise(PermaIdGenerationAdvisoryLockTimeout) unless r.lock_was_acquired?
+
+      r.result
+    end
+
+    def with_advisory_lock_result_for_perma_id_generation(&block)
+      self.class.with_advisory_lock_result("#{self.class.table_name}_perma_id",
+                                           timeout_seconds: ADVISORY_LOCK_TIMEOUT_SECONDS,
+                                           &block)
+    end
+
     module ClassMethods
       def all_for_revision(revision)
         where(revision_id: revision.id)

data/lib/pageflow/version.rb

@@ -1,3 +1,3 @@
 module Pageflow
-  VERSION = '15.0.0.beta4'.freeze
+  VERSION = '15.0.0.rc1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pageflow
 version: !ruby/object:Gem::Version
-  version: 15.0.0.beta4
+  version: 15.0.0.rc1
 platform: ruby
 authors:
 - Codevise Solutions Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-24 00:00:00.000000000 Z
+date: 2019-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -136,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.1'
+- !ruby/object:Gem::Dependency
+  name: with_advisory_lock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.6'
 - !ruby/object:Gem::Dependency
   name: zencoder
   requirement: !ruby/object:Gem::Requirement