culturecode_stagehand 0.11.1 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24e3b40120cfab02ac8bce3d4516942a7fb9c3b5
-  data.tar.gz: 43c21541d06a5026b988e428169638992a33ace3
+  metadata.gz: c893dda09123a4ae10bf48b2ee8baccd9810faa3
+  data.tar.gz: e036f39b6df9eab7580afdeee075f43f6b32b621
 SHA512:
-  metadata.gz: b7ffb9b0682a49e40c57a7e52b522e559512036ee578cc7a8a9b01121580e1ca16f5ab74e489d94ffcfb26409ad8cc2ba6192dcecd7266d17a08347a2e5f62ad
-  data.tar.gz: dd987ebb5c3f9df98b88c21443dee227ddf99d96ad476b051a07715a1e8b0e69a5cecbb24cafa3b90a574864fce7f336c214c61662ad7031ba9a53fdef01f9d4
+  metadata.gz: 9946912b9989f00cd65c2de61439942d0f1bc09bc45b9e920914f01eb0cb34d21ed24add2596b3c9841ea2fb3261a84165cd46d1c8d3131d6cdfd40a9bd997df
+  data.tar.gz: d19d3a122766096414acc98c7c20ec4f3f404a214e9fe0fdf87ca449e6decb3c0b6c483392e40eec5c73528f44b5a50bdc83afcf46bb405c482732868f015887

data/lib/stagehand/staging/checklist.rb

@@ -12,13 +12,15 @@ module Stagehand
         related_entries(commit.entries).collect(&:commit_id).select(&:present?).uniq
       end
 
-      def self.related_entries(entries)
+      def self.related_entries(entries, relation_filter = nil)
         entries = Array.wrap(entries)
         related_entries = []
 
         entries_to_spider = Array.wrap(entries)
         while entries_to_spider.present?
           contained_matching = CommitEntry.contained.matching(entries_to_spider)
+          contained_matching = contained_matching.where(id: contained_matching.select(&relation_filter)) if relation_filter
+
           matching_commit_entries = CommitEntry.where(:commit_id => contained_matching.select(:commit_id))
 
           # Spider using content operations. Don't spider control operations to avoid extending the list of results unnecessarily
@@ -37,7 +39,7 @@ module Stagehand
         return related_entries
       end
 
-      def self.associated_records(entries)
+      def self.associated_records(entries, association_filter = nil)
         records = preload_records(compact_entries(entries)).select(&:record).flat_map do |entry|
           associated_associations(entry.record_class).flat_map do |association|
             entry.record.send(association)
@@ -47,6 +49,7 @@ module Stagehand
         records.uniq!
         records.compact!
         records.select! {|record| stagehand_class?(record.class) }
+        records.select!(&association_filter) if association_filter
 
         return records
       end
@@ -95,9 +98,11 @@ module Stagehand
 
       public
 
-      def initialize(subject, &confirmation_filter)
+      def initialize(subject, confirmation_filter: nil, association_filter: nil, relation_filter: nil)
         @subject = subject
         @confirmation_filter = confirmation_filter
+        @association_filter = association_filter
+        @relation_filter = relation_filter
         affected_entries # Init the affected_entries changes can be rolled back without affecting the checklist
       end
 
@@ -133,9 +138,9 @@ module Stagehand
 
       def affected_entries
         cache(:affected_entries) do
-          related = self.class.related_entries(@subject)
-          associated = self.class.associated_records(related)
-          associated_related = self.class.related_entries(associated)
+          related = self.class.related_entries(@subject, @relation_filter)
+          associated = self.class.associated_records(related, @association_filter)
+          associated_related = self.class.related_entries(associated, @relation_filter)
 
           (related + associated_related).uniq
         end

data/lib/stagehand/version.rb

@@ -1,3 +1,3 @@
 module Stagehand
-  VERSION = "0.11.1"
+  VERSION = "0.12.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: culturecode_stagehand
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.12.0
 platform: ruby
 authors:
 - Nicholas Jakobsen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-16 00:00:00.000000000 Z
+date: 2016-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails