culturecode_stagehand 0.10.1 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 198fa7c00c0c7374576db8bc52a5e3263a0d7960
-  data.tar.gz: ba863f7b3aab4b7c969d3de8c718e932fab1af67
+  metadata.gz: bd8d168cfca3a30f6904f1f84fc27d7eec96d5d5
+  data.tar.gz: 4ae03b6e5e13aed6c1d13d85e5dc2fe3470dec26
 SHA512:
-  metadata.gz: 7dc0bf126e23ce4bfbf77eff18924e894bfd660b716f329c0bbb611cd92b44d383183ccbe4431e59a0ca2beed3f4a5baa30283fac15b801c8cc48d5e8b9f4ff8
-  data.tar.gz: 8f285239f66c670aa4d42ef99d9f870ba7b63d915fd83b5e52d50dc84a3063eb7900e67b6f3da99899dfe947f672628a917f3af22184351ebb05fba85d87f456
+  metadata.gz: cb78f8ebdb79f4b9441cf79ecf81577428efe58a90cfd664f6f8ed5716c5b2984098fb3575c8d25859c06b728d4c53140ba006a510bec5bfdb65fbd16f81e097
+  data.tar.gz: 18f250b45b7f14dc3437c6121766c1215b8aeaf1b5b84225990732962ce70483621880d04278503cfb2b73d43bb44d2dff7621c12bd02127391dd1f0dcd1b3e1

data/lib/stagehand/staging/checklist.rb

@@ -95,10 +95,9 @@ module Stagehand
 
       public
 
-      def initialize(subject, preconfirm_subject: true, &confirmation_filter)
+      def initialize(subject, &confirmation_filter)
         @subject = subject
         @confirmation_filter = confirmation_filter
-        @preconfirm_subject = preconfirm_subject
         affected_entries # Init the affected_entries changes can be rolled back without affecting the checklist
       end
 
@@ -146,21 +145,24 @@ module Stagehand
 
       def grouped_required_confirmation_entries
         cache(:grouped_required_confirmation_entries) do
-          staging_record_start_operation_ids = affected_entries.select do |entry|
-            entry.start_operation? && entry.matches?(@subject)
-          end.collect(&:id)
-
           entries = affected_entries.dup
-
-          # Don't need to confirm entries that match the checklist subject
-          entries.reject! {|entry| entry.matches?(@subject) } if @preconfirm_subject
-
-          # Don't need to confirm entries that are part of a commits whose subject is the checklist subject
-          entries.reject! {|entry| staging_record_start_operation_ids.include?(entry.commit_id) }
+          subject_entries, subject_records = Array.wrap(@subject).partition {|model| model.is_a?(CommitEntry) }
 
           # Don't need to confirm entries that were not part of a commit
           entries.select!(&:commit_id)
 
+          # Don't need to confirm entries that exactly match a subject commit entry
+          entries -= subject_entries
+
+          # Don't need to confirm entries that match the checklist subject records
+          entries.reject! {|entry| entry.matches?(subject_records) }
+
+          # Don't need to confirm entries that are part of a commits whose subject is a checklist subject record
+          staging_record_start_operation_ids = affected_entries.select do |entry|
+            entry.start_operation? && entry.matches?(subject_records)
+          end.collect(&:id)
+          entries.reject! {|entry| staging_record_start_operation_ids.include?(entry.commit_id) }
+
           entries = self.class.compact_entries(entries)
           entries = filter_entries(entries)
           entries = self.class.group_entries(entries)

data/lib/stagehand/staging/synchronizer.rb

@@ -13,7 +13,7 @@ module Stagehand
         raise SyncBlockRequired unless block_given?
 
         Database.transaction do
-          checklist = Checklist.new(Commit.capture(subject_record, &block).entries, :preconfirm_subject => false)
+          checklist = Checklist.new(Commit.capture(subject_record, &block).entries)
           sync_checklist(checklist) unless checklist.requires_confirmation?
         end
       end

data/lib/stagehand/version.rb

@@ -1,3 +1,3 @@
 module Stagehand
-  VERSION = "0.10.1"
+  VERSION = "0.10.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: culturecode_stagehand
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors:
 - Nicholas Jakobsen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-07 00:00:00.000000000 Z
+date: 2016-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Simplify the management of a sandbox database that can sync content to a