trailblazer-activity-dsl-linear 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36d9e093365ba01dad631acf3435eaab26230d348edc12ac2691d984ec5fe1f3
-  data.tar.gz: 50aa04fe0e5214fc8021ea8436a4153df8dd69361bd9f9468a18b38e7309f85f
+  metadata.gz: 48015005cd4c2e881df17be4be592445bdf9c528bd4b720bd521a4b96551c646
+  data.tar.gz: 6d9ed497b87bae7ebb106beb99e508eefd0c8f2bc3b5b2a07cf6fdf582f1aac1
 SHA512:
-  metadata.gz: 45f9ec2af2d4af584608d22f3a613495c199d6f665a1e312302f4e0c615871a96b67b8f80b92df597615dd1d7bb0faf142d43084d83e278e8ce1b85a184b0472
-  data.tar.gz: 55f68875e60eb8669a711e0d175e4a690ebe6b8e9be13df8c34426788652ebf34e8f48b84aa9f6b0161d4aca25eefb4272179233e7c5dcb80807befd34ecc106
+  metadata.gz: b221f07fccc51338300aa8bba4435edf4990e366667d381d060a5b31f1dff3badd6888ff6d5db0597fc378538bda1d6658d7c1e30073397c08f58f459ca87954
+  data.tar.gz: 2ea9893cfbf3ac551e01128c4e14adf524c84235d4129d7e7cb1f9f84bf1a9b665c4f4a920fa36d557fcc837f2adfd6ac12eb72c61c8e300476ac6a3f72cc901

data/CHANGES.md

@@ -1,3 +1,8 @@
+# 0.4.2
+
+* Don't allow duplicate activities in Sequence (#47) :ghost:
+* {:inherit} will only inherit the wirings supported in child activity (#48)
+
 # 0.4.1
 
 * Updrading `trailblazer-activity` to use shiny `trailblazer-option`.

data/lib/trailblazer/activity/dsl/linear/normalizer.rb

@@ -246,13 +246,21 @@ module Trailblazer
             index = Linear::Insert.find_index(sequence, id)
             row   = sequence[index] # from this row we're inheriting options.
 
-            extensions = (row[3][:extensions]||[]) + (ctx[:extensions]||[]) # FIXME: DEFAULTING, FOR FUCK'S SAKE
+            connections = get_inheritable_connections(ctx, row[3][:connections])
+            extensions  = Array(row[3][:extensions]) + Array(ctx[:extensions])
 
-            ctx = ctx.merge(connections: row[3][:connections], extensions: extensions) # "inherit"
+            ctx = ctx.merge(connections: connections, extensions: extensions) # "inherit"
 
             return Trailblazer::Activity::Right, [ctx, flow_options]
           end
 
+          # return connections from {parent} step which are supported by current step
+          private def get_inheritable_connections(ctx, parent_connections)
+            return parent_connections unless ctx[:outputs]
+
+            parent_connections.slice(*ctx[:outputs].keys)
+          end
+
           # TODO: make this extendable!
           def cleanup_options((ctx, flow_options), *)
             # new_ctx = ctx.reject { |k, v| [:connections, :outputs, :end_id, :step_interface_builder, :failure_end, :track_name, :sequence].include?(k) }

data/lib/trailblazer/activity/dsl/linear/version.rb

@@ -3,7 +3,7 @@ module Trailblazer
     module Activity
       module DSL
         module Linear
-          VERSION = "0.4.1"
+          VERSION = "0.4.2"
         end
       end
     end

data/lib/trailblazer/activity/path.rb

@@ -81,12 +81,27 @@ module Trailblazer
           }
         end
 
+        def normalize_duplications((ctx, flow_options), *)
+          return Right, [ctx, flow_options] if ctx[:replace]
+
+          signal, (ctx, flow_options) = raise_on_duplicate_id([ctx, flow_options])
+          signal, (ctx, flow_options) = clone_duplicate_activity([ctx, flow_options])
+
+          return signal, [ctx, flow_options]
+        end
+
         def raise_on_duplicate_id((ctx, flow_options), *)
-          id, sequence, insert = ctx[:id], ctx[:sequence], ctx[:sequence_insert][0] # DISCUSS: should we use Replace here or rather the option(s)?
+          id, sequence = ctx[:id], ctx[:sequence]
+          raise "ID #{id} is already taken. Please specify an `:id`." if sequence.find { |row| row[3][:id] == id }
 
-          if insert != Linear::Insert.method(:Replace)
-            raise "ID #{id} is already taken. Please specify an `:id`." if sequence.find { |row| row[3][:id] == id }
-          end
+          return Right, [ctx, flow_options]
+        end
+
+        def clone_duplicate_activity((ctx, flow_options), *)
+          return Right, [ctx, flow_options] unless ctx[:task].is_a?(Class)
+
+          task, sequence = ctx[:task], ctx[:sequence]
+          ctx = ctx.merge(task: task.clone) if sequence.find { |row| row[1] == task }
 
           return Right, [ctx, flow_options]
         end
@@ -104,12 +119,12 @@ module Trailblazer
           prepend_to_path(
             sequence,
 
-            "path.outputs"          => method(:merge_path_outputs),
-            "path.connections"      => method(:merge_path_connections),
-            "path.sequence_insert"  => method(:normalize_sequence_insert),
-            "path.raise_on_duplicate_id"  => method(:raise_on_duplicate_id),
-            "path.magnetic_to"      => method(:normalize_magnetic_to),
-            "path.wirings"          => Linear::Normalizer.method(:compile_wirings),
+            "path.outputs"                => method(:merge_path_outputs),
+            "path.connections"            => method(:merge_path_connections),
+            "path.sequence_insert"        => method(:normalize_sequence_insert),
+            "path.normalize_duplications" => method(:normalize_duplications),
+            "path.magnetic_to"            => method(:normalize_magnetic_to),
+            "path.wirings"                => Linear::Normalizer.method(:compile_wirings),
           )
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-activity-dsl-linear
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-04 00:00:00.000000000 Z
+date: 2021-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trailblazer-activity