trailblazer-activity 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8acff4e1b4e5f3e922e9e368cf5885de56dcc2b5
-  data.tar.gz: 3a1a10d63d5cbe7236f0ffac21f4774add92954a
+  metadata.gz: 989cc224fca29c0d3150922613537af4a89bab2e
+  data.tar.gz: e0937bd45f8804d7f9ad6329256fb7c7140d0523
 SHA512:
-  metadata.gz: 6e13c839f0ca6215fe069299de99ead0910557412fb24b40ecc4a1c9e25884108f105bdaa2cc6302a1ad96b83d425932d0cad0d1a2c5e016177eeb087e8278ea
-  data.tar.gz: f6a774594e754bb0c4ba4082b4a285421850e6d79450d00a5729d96c85c171627aa35dfc14fead7b47190069cebab893eb6ad57150cf10c186f63bd566842107
+  metadata.gz: 7714ebf879a4f1f4fa95ce9b5937e3bfcb5419e1be5e38a244a5ef0e86feaed8d0619cc82e2a84a9e6b615d176896116173502b449d933c5409f9baa4fb06f35
+  data.tar.gz: 21708524bbc25844a5b6e3d2209d73ea4224bbbacb6e7784ef4c389208bca12c6366cbe15c4bfcded4c98d8fbcf276beea661f98cf665f95ca59dae002926f39

data/CHANGES.md

@@ -1,3 +1,8 @@
+# 0.3.1
+
+* Allow passing a `:normalizer` to the DSL.
+* Builders don't have to provide `keywords` as we can filter them automatically.
+
 # 0.2.2
 
 * Remove `Activity#end_events`.

data/lib/trailblazer/activity/magnetic/builder/fast_track.rb

@@ -84,11 +84,6 @@ module Trailblazer
           Railway.default_plus_poles(*args)
         end
 
-        def self.keywords
-          [:fail_fast, :pass_fast, :fast_track, :type, :override]
-        end
-
-
         # Adds the End.fail_fast and End.pass_fast end to the Railway sequence.
         def self.InitialAdds(pass_fast_end: Activity.End("pass_fast", :pass_fast), fail_fast_end: Activity.End("fail_fast", :fail_fast), **builder_options)
           path_adds = Railway.InitialAdds(**builder_options)

data/lib/trailblazer/activity/magnetic/builder/path.rb

@@ -18,13 +18,8 @@ module Trailblazer
           plan_for( *Path.for(normalizer, options), &block )
         end
 
-
-        def self.keywords
-          [:type]
-        end
-
         def task(task, options={}, &block)
-          polarizations = Path.TaskPolarizations( @builder_options.merge(type: options[:type]) ) # DISCUSS: handle :type here? Really?
+          polarizations = Path.TaskPolarizations( @builder_options.merge( type: options[:type] ) ) # DISCUSS: handle :type here? Really?
 
           insert_element( Path, polarizations, task, options, &block )
         end

data/lib/trailblazer/activity/magnetic/builder/railway.rb

@@ -14,10 +14,6 @@ module Trailblazer
           plan_for( *Railway.for(normalizer, options), &block )
         end
 
-        def self.keywords
-          [:type]
-        end
-
         def step(task, options={}, &block)
           insert_element( Railway, Railway.StepPolarizations(@builder_options), task, options, &block )
         end

data/lib/trailblazer/activity/magnetic/builder.rb

@@ -57,12 +57,9 @@ module Trailblazer
 
       # Internal top-level entry point to add task(s) and connections.
       def insert_element(impl, polarizations, task, options, &block)
-        adds, *returned_options = Builder.adds_for(polarizations, @normalizer, impl.keywords, task, options, &block)
-      end
+        normalizer = options[:normalizer] || @normalizer # DISCUSS: do this at a deeper point?
 
-      # Options valid for all DSL calls with this Builder framework.
-      def self.generic_keywords
-        [ :id, :plus_poles, :magnetic_to, :adds ]
+        adds, *returned_options = Builder.adds_for(polarizations, normalizer, task, options, &block)
       end
 
       def self.sequence_keywords
@@ -81,8 +78,8 @@ module Trailblazer
       # @return Adds
       # High level interface for DSL calls like ::task or ::step.
       # TODO: RETURN ALL OPTIONS
-      def self.adds_for(polarizations, normalizer, keywords, task, options, &block)
-        task, local_options, options, sequence_options = normalize_options(normalizer, keywords, task, options)
+      def self.adds_for(polarizations, normalizer, task, options, &block)
+        task, local_options, options, sequence_options = normalize_options(normalizer, task, options)
 
         initial_plus_poles = local_options[:plus_poles]
         magnetic_to        = local_options[:magnetic_to]
@@ -97,16 +94,23 @@ module Trailblazer
       end
 
       # @private
-      def self.normalize_options(normalizer, keywords, task, options)
+      def self.normalize_options(normalizer, task, options)
+        keywords = extract_dsl_keywords(options)
+
          # sort through the "original" user DSL options.
-        options, local_options    = normalize( options, generic_keywords+keywords ) # DISCUSS:
-        options, sequence_options = normalize( options, sequence_keywords )
+        options, local_options          = normalize( options, keywords ) # DISCUSS:
+        local_options, sequence_options = normalize( local_options, sequence_keywords )
 
         task, local_options, options, sequence_options = normalizer.(task, local_options, options, sequence_options)
 
         return task, local_options, options, sequence_options
       end
 
+      # Filter out connections, e.g. `Output(:fail_fast) => :success` and return only the keywords like `:id` or `:replace`.
+      def self.extract_dsl_keywords(options, connection_classes = [Activity::Output, DSL::Output::Semantic])
+        options.keys - options.keys.find_all { |k| connection_classes.include?( k.class ) }
+      end
+
       # Low-level interface for DSL calls (e.g. Start, where "you know what you're doing")
       # @private
       def self.adds(id, task, initial_plus_poles, polarization, polarizations_from_user_options, options, sequence_options, magnetic_to = nil)

data/lib/trailblazer/activity/version.rb

@@ -1,5 +1,5 @@
 module Trailblazer
   class Activity
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-activity
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Nick Sutterer