workarea-core 3.5.3 → 3.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ac90c6435c7d45c3c61ac035b3c3cb5b21877ac8349911ef40f43e62ec6069f
-  data.tar.gz: 793f17140668bc9abb8d7ac5a5b7acda6d5c555cdf07f5e32dab777bcbf680e1
+  metadata.gz: 8490f36459db38d3440f85a679bbc51aec0fe302563068a715fc51e78e130ab0
+  data.tar.gz: ba46602137e05b884f87a0169a75a896b9e7c7cb2601ce25130fac421dbd5a27
 SHA512:
-  metadata.gz: 50996a6fec1bc6b0ad0c8f2272334784255299d87d5f4bbfd4493c69126c9ef56e2a6cb80f74f1968f6f33494ccdaa02ecc5e62df59e78e4d8cf3fdfc8effdcc
-  data.tar.gz: 37997260c6d65ba8693cde1ef356eb2b0b962d2ecae6b732ccb6d6d644fe46427acff206bb50fcedf2a73b66771e2316b8f8b6f6f5c87afb6553b1bb13ccde64
+  metadata.gz: c4188e1edfb091422a9a871dfcd4819d7732e110bf45262d00c59ef532ebce574a64b8ab0e2c097c9a1442432de90b11dbf6acb3d419ca8b9e43da4e46e4b726
+  data.tar.gz: 24700c5024b1bbde51a34eca0108ddf71a2caa8cf8edaed22fd5041a51a109b5e7854f8c7a323b103b20ee99536f5b67fb697cdcb1685d50a09d13ff47134cae

data/app/assets/javascripts/workarea/core/modules/duplicate_id.js

@@ -54,13 +54,17 @@ WORKAREA.registerModule('duplicateId', (function () {
             }).toArray();
         },
 
+        hasIdValue = function (_, element) {
+            return element.id !== '';
+        },
+
         /**
          * @method
          * @name init
          * @memberof WORKAREA.duplicateId
          */
         init = function () {
-            var $elements = $('[id]'),
+            var $elements = $('[id]').filter(hasIdValue),
                 ids = getIdValues($elements);
 
             if (_.isEmpty($elements) || noDuplicateIds(ids)) { return; }

data/app/models/workarea/release.rb

@@ -186,7 +186,8 @@ module Workarea
       self.publish_at = nil
       save!
 
-      changesets.each(&:publish!)
+      ordered_changesets.each(&:publish!)
+      touch_releasables
     end
 
     def set_publish_job
@@ -207,6 +208,18 @@ module Workarea
       StatusCalculator.new(calculators, self).results
     end
 
+    # Get changesets ordered based on publish priority set by configuration.
+    #
+    # @return [Array<Workarea::Release::Changeset>]
+    #
+    def ordered_changesets
+      ordering = Workarea.config.release_changeset_ordering
+
+      changesets.sort_by do |changeset|
+        ordering[changeset.releasable_type].presence || 999
+      end
+    end
+
     private
 
     def publish_at_status
@@ -225,5 +238,15 @@ module Workarea
       Scheduler.delete(publish_job_id)
       self.publish_job_id = nil
     end
+
+    def touch_releasables
+      Sidekiq::Callbacks.disable do
+        changesets
+          .map(&:releasable_from_document_path)
+          .compact
+          .uniq
+          .each(&:touch)
+      end
+    end
   end
 end

data/app/models/workarea/release/changeset.rb

@@ -106,15 +106,6 @@ module Workarea
         releasable_from_document_path.reload
       end
 
-      private
-
-      def apply_changeset(model, changeset)
-        changeset.each do |field, new_value|
-          model.send(:attribute_will_change!, field) # required for correct dirty tracking
-          model.attributes[field] = new_value
-        end
-      end
-
       def releasable_from_document_path
         return @releasable_from_document_path if defined?(@releasable_from_document_path)
 
@@ -125,6 +116,15 @@ module Workarea
             nil
           end
       end
+
+      private
+
+      def apply_changeset(model, changeset)
+        changeset.each do |field, new_value|
+          model.send(:attribute_will_change!, field) # required for correct dirty tracking
+          model.attributes[field] = new_value
+        end
+      end
     end
   end
 end

data/lib/workarea/configuration.rb

@@ -1276,6 +1276,21 @@ module Workarea
 
       # How long a password reset URL stays valid
       config.password_reset_timeout = 2.hours
+
+      # Define the priority order that releasable models' changesets get
+      # published in. Workarea::Navigation::Menu should always be last. Any
+      # model without a defined position will automatically set as 999.
+      config.release_changeset_ordering = {
+        'Workarea::Pricing::Price' => 0,
+        'Workarea::Pricing::Sku' => 1,
+        'Workarea::Catalog::Variant' => 2,
+        'Workarea::Catalog::Product' => 3,
+        'Workarea::Content::Block' => 4,
+        'Workarea::Content' => 5,
+        'Workarea::Content::Page' => 6,
+        'Workarea::Catalog::Category' => 7,
+        'Workarea::Navigation::Menu' => 1_000
+      }
     end
   end
 end

data/lib/workarea/version.rb

@@ -2,7 +2,7 @@ module Workarea
   module VERSION
     MAJOR = 3
     MINOR = 5
-    PATCH = 3
+    PATCH = 4
     PRE   = nil
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')
 

data/test/javascripts/duplicate_id_spec.js

@@ -1,4 +1,5 @@
 //= require workarea/core/modules/environment
+//= require workarea/core/modules/string
 //= require workarea/core/modules/duplicate_id
 
 (function () {
@@ -7,9 +8,14 @@
     describe('WORKAREA.duplicateId', function () {
         describe('init', function () {
             it('throws error on duplicate ids', function () {
-                this.fixtures = fixture.load('duplicate_id.html');
+                this.fixtures = fixture.load('duplicate_id_fail.html');
                 expect(WORKAREA.duplicateId.init).to.throw(Error, /foo|bar/);
             });
+
+            it('should allow for empty ID values', function () {
+                this.fixtures = fixture.load('duplicate_id_pass.html');
+                expect(WORKAREA.duplicateId.init).to.not.throw(Error);
+            });
         });
     });
 }());

data/test/javascripts/fixtures/{duplicate_id.html.haml → duplicate_id_fail.html.haml}

@@ -4,3 +4,4 @@
   #bar
   #foo
 #baz
+

data/test/javascripts/fixtures/duplicate_id_pass.html.haml

@@ -0,0 +1,2 @@
+%div{ id: '' }
+%div{ id: '' }

data/test/models/workarea/release_test.rb

@@ -160,62 +160,32 @@ module Workarea
       assert(release.published?)
     end
 
-    def test_scheduled_before
-      one_week_from_now = 1.week.from_now
-
-      one = create_release(publish_at: one_week_from_now)
-      two = create_release(publish_at: nil)
-      three = create_release(publish_at: 8.days.from_now)
-      four = create_release(publish_at: 6.days.from_now)
-      five = create_release(publish_at: one_week_from_now)
-      six = create_release(publish_at: 4.days.from_now)
-
-      assert_equal([six, four, five], one.scheduled_before)
-      assert_equal([], two.scheduled_before)
-      assert_equal([six, four, one, five], three.scheduled_before)
-      assert_equal([six], four.scheduled_before)
-      assert_equal([six, four, one], five.scheduled_before)
-      assert_equal([], six.scheduled_before)
-    end
-
-    def test_scheduled_after
-      one_week_from_now = 1.week.from_now
-
-      one = create_release(name: '1', publish_at: one_week_from_now)
-      two = create_release(name: '2', publish_at: nil)
-      three = create_release(name: '3', publish_at: 8.days.from_now)
-      four = create_release(name: '4', publish_at: 6.days.from_now)
-      five = create_release(name: '5', publish_at: one_week_from_now)
-      six = create_release(name: '6', publish_at: 4.days.from_now)
-
-      assert_equal([five, three], one.scheduled_after)
-      assert_equal([], two.scheduled_after)
-      assert_equal([], three.scheduled_after)
-      assert_equal([one, five, three], four.scheduled_after)
-      assert_equal([one, three], five.scheduled_after)
-      assert_equal([four, one, five, three], six.scheduled_after)
-    end
-
-    def test_previous
+    def test_ordered_changesets
       release = create_release
-      assert_nil(release.previous)
-
-      release.update_attributes!(publish_at: 1.week.from_now)
-      assert_nil(release.previous)
-
-      first = create_release(publish_at: 1.day.from_now)
-      assert_equal(first, release.previous)
-
-      third = create_release(publish_at: 2.days.from_now)
-      assert_equal(third, release.previous)
-    end
-
-    def test_build_undo
-      release = create_release
-      undo = release.build_undo
-      assert(undo.name.present?)
-      assert_equal(undo, release.undo)
-      assert_equal(release, undo.undoes)
+      [
+        { releasable_type: 'Workarea::Catalog::Category', releasable_id: '123' },
+        { releasable_type: 'Workarea::Catalog::Product', releasable_id: 'PROD1' },
+        { releasable_type: 'Workarea::Catalog::Variant', releasable_id: 'VAR1' },
+        { releasable_type: 'Workarea::Content::Page', releasable_id: 'PAGE1' },
+        { releasable_type: 'Workarea::Navigation::Menu', releasable_id: 'NAV1' },
+        { releasable_type: 'Workarea::Content', releasable_id: 'CON1' },
+        { releasable_type: 'Workarea::Search::Customization', releasable_id: 'CUS1' },
+        { releasable_type: 'Workarea::Content::Block', releasable_id: 'BLC1' }
+      ].each { |changeset| release.changesets.build(changeset) }
+
+      assert_equal(
+        %w(
+          Workarea::Catalog::Variant
+          Workarea::Catalog::Product
+          Workarea::Content::Block
+          Workarea::Content
+          Workarea::Content::Page
+          Workarea::Catalog::Category
+          Workarea::Search::Customization
+          Workarea::Navigation::Menu
+        ),
+        release.ordered_changesets.map(&:releasable_type)
+      )
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-core
 version: !ruby/object:Gem::Version
-  version: 3.5.3
+  version: 3.5.4
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-07 00:00:00.000000000 Z
+date: 2020-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -896,22 +896,22 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.10.1
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.10.3
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.10.1
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.10.3
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.10.1
 - !ruby/object:Gem::Dependency
   name: countries
   requirement: !ruby/object:Gem::Requirement
@@ -2056,7 +2056,8 @@ files:
 - test/javascripts/deletion_forms_spec.js
 - test/javascripts/duplicate_id_spec.js
 - test/javascripts/fixtures/deletion_forms.html.haml
-- test/javascripts/fixtures/duplicate_id.html.haml
+- test/javascripts/fixtures/duplicate_id_fail.html.haml
+- test/javascripts/fixtures/duplicate_id_pass.html.haml
 - test/javascripts/fixtures/form_submitting_controls.html.haml
 - test/javascripts/fixtures/reveal_password.html.haml
 - test/javascripts/fixtures/workarea_scope.html.haml
@@ -2717,7 +2718,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Core of the Workarea Commerce Platform