pageflow 15.0.0.rc1 → 15.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2328aa20c05ac19c8b9d217322207e33a0751f9e65fb45f7c62b68259f6dcfee
-  data.tar.gz: b92268ef8ac71fe3bca26300f37f62e8e564b08fa0154319bf4889e1753f564a
+  metadata.gz: f05fa676c8be9632e20359a7285033181a6735ca53aa89f93fdbe233fbc0ede2
+  data.tar.gz: b3ebfdd01b595a904f5b0e53ac211d69d4fa5d81ea34f518bd12e11f6076b3df
 SHA512:
-  metadata.gz: 40293af4ee3184592998a3b11a2a95425d054307303ea8fcbd372b08c81091b90db79ede4028113a68e6a2808b3fb02cf397ba8c0e49b79d79da35bc69e4cb43
-  data.tar.gz: 62b1563f80f888654a930f041bf239d71ba238ae6524b0e1a14fef0713173beec369456c978d8a51f115f77a4645bd17e7a1a433e518e443fa0aa23bf407fede
+  metadata.gz: 013af6a873ca83977d0e6a4a1be59467d213ba15b747b77e0a74cfc4bed8195a920bde202bf3175f1d51f3a617f01f857fe4b8eef11ef62c8b4a99ddfb9a60db
+  data.tar.gz: 2a86d385c5edf76330454590ee701fa9027525b69930e4dea16d8d97f0485c75b68d0ef8417813245b5e63c5589894311fd68f9d488f229af6edd204675409d5

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # CHANGELOG
 
+### Version 15.0.0.rc2
+
+2019-10-31
+
+[Compare changes](https://github.com/codevise/pageflow/compare/v15.0.0.rc1...v15.0.0.rc2)
+
+- Tweak import/export zip options
+  ([#1234](https://github.com/codevise/pageflow/pull/1234))
+- Prevent further cases of perma id clashes
+  ([#1233](https://github.com/codevise/pageflow/pull/1233))
+- Add active class color styling for mobile share panel
+  ([#1232](https://github.com/codevise/pageflow/pull/1232))
+
 ### Version 15.0.0.rc1
 
 2019-10-28

data/app/assets/stylesheets/pageflow/themes/default/mobile_navigation.scss

@@ -100,5 +100,13 @@ $mobile-navigation-pictogram-visibility: $standard-page-pictogram-visibility !de
     svg {
       fill: $mobile-navigation-share-link-color;
     }
+
+    &.active {
+      color: $main-color;
+
+      svg {
+        fill: $main-color;
+      }
+    }
   }
 }

data/app/models/pageflow/draft_entry.rb

@@ -47,7 +47,8 @@ module Pageflow
         f.entry = entry
       end
 
-      usage = @draft.file_usages.create(file: file, configuration: attributes[:configuration])
+      usage = @draft.file_usages.create_with_lock!(file: file,
+                                                   configuration: attributes[:configuration])
       UsedFile.new(file, usage)
     end
 

data/lib/pageflow/entry_export_import/zip_archive.rb

@@ -5,6 +5,9 @@ module Pageflow
     # Read and write files from and to zip archives
     class ZipArchive
       def initialize(file_name)
+        Zip.force_entry_names_encoding = 'UTF-8'
+        Zip.write_zip64_support = true
+
         @file = Zip::File.open(file_name, Zip::File::CREATE)
       end
 

data/lib/pageflow/revision_component.rb

@@ -26,36 +26,16 @@ 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
+    module ClassMethods
+      # Recommended way to create revision components. Uses an
+      # advisory lock to ensure concurrently created records are not
+      # assigned the same perma id.
+      def create_with_lock!(attributes, &block)
+        with_advisory_lock_for_perma_id_generation! do
+          create!(attributes, &block)
+        end
       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)
       end
@@ -67,6 +47,21 @@ module Pageflow
           find_by_revision_id_and_perma_id(revision.id, perma_id)
         end.compact
       end
+
+      private
+
+      def with_advisory_lock_for_perma_id_generation!(&block)
+        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)
+        with_advisory_lock_result("#{table_name}_perma_id",
+                                  timeout_seconds: ADVISORY_LOCK_TIMEOUT_SECONDS,
+                                  &block)
+      end
     end
   end
 end

data/lib/pageflow/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pageflow
 version: !ruby/object:Gem::Version
-  version: 15.0.0.rc1
+  version: 15.0.0.rc2
 platform: ruby
 authors:
 - Codevise Solutions Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-28 00:00:00.000000000 Z
+date: 2019-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails