trailblazer-activity-dsl-linear 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b02157ace82f52b99fb1360d907e39b67cfb0c2c180a6047a153fbb035811b3
-  data.tar.gz: c0a1bf7d269c9d561eac2e89fdade0c3fe3ffb4cbc15a5cb50de63d1c21dc3fb
+  metadata.gz: 2eccbd6b077b017f81d57ddc1dbc564c903fec72a83e4496118e31098be0a06e
+  data.tar.gz: 92ed613fe58920562d059b2b3affc155b07aca0f1a7c0a20813d45da1f6be5b5
 SHA512:
-  metadata.gz: c091e63f94d367b504fe7a70acb6b4f67f331e28297346ec2e7f264013e7dd9f3822bfe1506ccc13139d30730f515c543b897245cbd4ac7847dc8a7e0b2581c0
-  data.tar.gz: 9ed5b5dc59547e4200d5e9d5d8972bf6b21e5279bcedcbfaad37be40015001ca431fcba0ec185007a2c02347c2b3be49127758cbfe783bb8279708babd641248
+  metadata.gz: 68564dcce8e6b423868b5633e5ab7cb1c46402e1d74b963eb4898e994aadc605d75f365f172436aa59b20c074f1b65440b68af4cc1e623be789a33dc0adb299e
+  data.tar.gz: 695efbb135d86cc05d93387e9b24ee422806a3fb5a98099b29a4bc034f58d385d18670994131aa442ce92bd547980caded1a1e65bbf0d5c2297c501c176a8e87

data/CHANGES.md

@@ -1,6 +1,10 @@
+# 0.1.7
+
+* Add `:connect_to` option to `Path()` to allow re-joining a branched activity.
+
 # 0.1.6
 
-* Use `activity-0.1.6`.
+* Use `activity-0.8.3`.
 
 # 0.1.5
 

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

@@ -38,7 +38,7 @@ module Trailblazer
         Id.new(id).freeze
       end
 
-      def Path(track_color: "track_#{rand}", end_id:, **options, &block)
+      def Path(track_color: "track_#{rand}", end_id:"path_end_#{rand}", connect_to:nil, **options, &block)
         # DISCUSS: here, we use the global normalizer and don't allow injection.
         state = Activity::Path::DSL::State.new(Activity::Path::DSL.OptionsForState(track_name: track_color, end_id: end_id, **options)) # TODO: test injecting {:normalizers}.
 
@@ -47,7 +47,25 @@ module Trailblazer
 
         seq = state.to_h[:sequence]
 
-        seq = Linear.strip_start_and_ends(seq, end_id: nil) # don't cut off end.
+        _end_id =
+          if connect_to
+            end_id
+          else
+            nil
+          end
+
+        seq = Linear.strip_start_and_ends(seq, end_id: _end_id) # don't cut off end unless {:connect_to} is set.
+
+        if connect_to
+          output, _ = seq[-1][2][0].(seq, seq[-1]) # FIXME: the Forward() proc contains the row's Output, and the only current way to retrieve it is calling the search strategy. It should be Forward#to_h
+
+          searches = [Linear::Search.ById(output, connect_to.value)]
+
+          row = seq[-1]
+          row = row[0..1] + [searches] + [row[3]] # FIXME: not mutating an array is so hard: we only want to replace the "searches" element, index 2
+
+          seq = seq[0..-2] + [row]
+        end
 
         # Add the path before End.success - not sure this is bullet-proof.
         adds = seq.collect do |row|
@@ -57,6 +75,7 @@ module Trailblazer
           }
         end
 
+        # Connect the Output() => Track(path_track)
         return Track.new(track_color, adds)
       end
 

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

@@ -115,6 +115,7 @@ module Trailblazer
           end
 
           # Compile the actual {Seq::Row}'s {wiring}.
+          # This combines {:connections} and {:outputs}
           def compile_wirings((ctx, flow_options), *)
             connections = ctx[:connections] || raise # FIXME
             outputs = ctx[:outputs] || raise # FIXME

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

@@ -3,7 +3,7 @@ module Trailblazer
     module Activity
       module DSL
         module Linear
-          VERSION = "0.1.6"
+          VERSION = "0.1.7"
         end
       end
     end

data/trailblazer-activity-dsl-linear.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Nick Sutterer"]
   spec.email         = ["apotonick@gmail.com"]
 
-  spec.summary       = %q(Simple DSL to compile Trailblazer activities.)
-  spec.description   = %q(Simple DSL to compile Trailblazer activities with arbitrary wirings.)
+  spec.summary       = %q(Simple DSL to define Trailblazer activities.)
+  spec.description   = %q(Simple DSL to define Trailblazer activities with arbitrary wirings.)
   spec.homepage      = "http://trailblazer.to"
   spec.licenses      = ["LGPL-3.0"]
 
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "trailblazer-activity", ">= 0.8.3", "< 1.0.0"
 
-  spec.add_development_dependency "bundler", "~> 1.14"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "trailblazer-developer", ">= 0.0.3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-activity-dsl-linear
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-19 00:00:00.000000000 Z
+date: 2019-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trailblazer-activity
@@ -34,16 +34,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -86,7 +86,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.3
-description: Simple DSL to compile Trailblazer activities with arbitrary wirings.
+description: Simple DSL to define Trailblazer activities with arbitrary wirings.
 email:
 - apotonick@gmail.com
 executables: []
@@ -138,5 +138,5 @@ rubyforge_project:
 rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
-summary: Simple DSL to compile Trailblazer activities.
+summary: Simple DSL to define Trailblazer activities.
 test_files: []