ntl-orchestra 0.9.2 → 0.9.3

data/lib/orchestra/run_list.rb

@@ -1,52 +1,52 @@
 module Orchestra
   class RunList
-    def self.build nodes, result, input_names
+    def self.build steps, result, input_names
       builder = Builder.new result, input_names
-      builder.merge! nodes
+      builder.merge! steps
       builder.build
     end
 
     include Enumerable
 
-    def initialize nodes
-      @nodes = nodes
-      @nodes.freeze
+    def initialize steps
+      @steps = steps
+      @steps.freeze
       freeze
     end
 
     def each &block
       return to_enum :each unless block_given?
-      @nodes.each &block
+      @steps.each &block
     end
 
-    def node_names
-      @nodes.keys
+    def step_names
+      @steps.keys
     end
 
     def dependencies
-      optional = collect_from_nodes :optional_dependencies
-      required = collect_from_nodes :required_dependencies
+      optional = collect_from_steps :optional_dependencies
+      required = collect_from_steps :required_dependencies
       (optional + required).uniq
     end
 
     def optional_dependencies
-      collect_from_nodes :optional_dependencies
+      collect_from_steps :optional_dependencies
     end
 
     def provisions
-      collect_from_nodes :provisions
+      collect_from_steps :provisions
     end
 
     def required_dependencies
-      required_deps = collect_from_nodes :required_dependencies
+      required_deps = collect_from_steps :required_dependencies
       required_deps - optional_dependencies - provisions
     end
 
     private
 
-    def collect_from_nodes method_name
-      set = @nodes.each_with_object Set.new do |(_, node), set|
-        deps = node.public_send method_name
+    def collect_from_steps method_name
+      set = @steps.each_with_object Set.new do |(_, step), set|
+        deps = step.public_send method_name
         deps.each &set.method(:<<)
       end
       set.to_a.tap &:sort!
@@ -57,89 +57,89 @@ module Orchestra
 
       def initialize result, input_names = []
         @input_names = input_names
-        @nodes_hash = {}
+        @steps_hash = {}
         @required = [result]
         @result = result
         freeze
       end
 
-      def merge! nodes
-        nodes.each do |name, node|
-          self[name] = node
+      def merge! steps
+        steps.each do |name, step|
+          self[name] = step
         end
       end
 
-      def []= name, node
-        @nodes_hash[name] = node
+      def []= name, step
+        @steps_hash[name] = step
       end
 
-      def node_names
-        @nodes_hash.keys
+      def step_names
+        @steps_hash.keys
       end
 
-      def nodes
-        @nodes_hash.values
+      def steps
+        @steps_hash.values
       end
 
       def build
         sort!
         prune!
-        RunList.new @nodes_hash
+        RunList.new @steps_hash
       end
 
       def sort!
-        sorter = Sorter.new @nodes_hash
+        sorter = Sorter.new @steps_hash
         sorter.sort!
       end
 
       def prune!
-        nodes.reverse_each.with_object [] do |node, removed|
-          removed.<< remove node and next unless required? node
-          require node
+        steps.reverse_each.with_object [] do |step, removed|
+          removed.<< remove step and next unless required? step
+          require step
         end
       end
 
-      def remove node
-        @nodes_hash.reject! do |_, n| n == node end
-        node
+      def remove step
+        @steps_hash.reject! do |_, n| n == step end
+        step
       end
 
-      def require node
+      def require step
         supplied_by_input = input_names.method :include?
-        deps = node.required_dependencies.reject &supplied_by_input
+        deps = step.required_dependencies.reject &supplied_by_input
         @required.concat deps
         true
       end
 
-      def required? node
+      def required? step
         required = @required.method :include?
-        node.provisions.any? &required
+        step.provisions.any? &required
       end
 
       class Sorter
         include TSort
 
-        def initialize nodes_hash
-          @nodes = nodes_hash
+        def initialize steps_hash
+          @steps = steps_hash
         end
 
         def sort!
           build_dependency_tree
           tsort.each do |name|
-            @nodes[name] = @nodes.delete name
+            @steps[name] = @steps.delete name
           end
         rescue TSort::Cyclic
           raise CircularDependencyError.new
         end
 
         def build_dependency_tree
-          @hsh = @nodes.each_with_object Hash.new do |(name, node), hsh|
-          hsh[name] = build_dependencies_for node
+          @hsh = @steps.each_with_object Hash.new do |(name, step), hsh|
+          hsh[name] = build_dependencies_for step
           end
         end
 
-        def build_dependencies_for node
-          node.required_dependencies.each_with_object Set.new do |dep, set|
+        def build_dependencies_for step
+          step.required_dependencies.each_with_object Set.new do |dep, set|
             provider = provider_for dep
             set << provider if provider
           end
@@ -155,15 +155,15 @@ module Orchestra
         end
 
         def provider_for dep
-          @nodes.each do |name, node|
-            provisions = effective_provisions_for node, dep
+          @steps.each do |name, step|
+            provisions = effective_provisions_for step, dep
             return name if provisions.include? dep
           end
           nil
         end
 
-        def effective_provisions_for node, dep
-          node.optional_dependencies | node.provisions
+        def effective_provisions_for step, dep
+          step.optional_dependencies | step.provisions
         end
       end
     end

data/lib/orchestra/{node → step}/output.rb

@@ -1,25 +1,25 @@
 module Orchestra
-  class Node
+  class Step
     class Output
-      attr :hsh, :node, :raw
+      attr :hsh, :step, :raw
 
-      def self.process node, raw
-        instance = new node, raw
+      def self.process step, raw
+        instance = new step, raw
         instance.massage
         instance.hsh
       end
 
-      def initialize node, raw
-        @node = node
+      def initialize step, raw
+        @step = step
         @raw = raw
       end
 
       def provisions
-        node.provisions
+        step.provisions
       end
 
       def collection?
-        node.collection?
+        step.collection?
       end
 
       def massage

data/lib/orchestra/{node.rb → step.rb}

@@ -1,7 +1,5 @@
 module Orchestra
-  class Node
-    autoload :Output, "orchestra/node/output"
-
+  class Step
     attr :collection, :dependencies, :provisions
 
     def initialize args = {}
@@ -27,16 +25,15 @@ module Orchestra
       collection ? true : false
     end
 
-    def perform input = {}
-      performance = Performance.new Conductor.new, {}, input
-      Performance::Movement.perform self, performance
+    def execute input = {}
+      Execution.execute_step self, input
     end
 
     def process raw_output
       Output.process self, raw_output
     end
 
-    class DelegateNode < Node
+    class ObjectStep < Step
       attr :adapter
 
       def initialize adapter, args = {}
@@ -53,32 +50,32 @@ module Orchestra
       end
     end
 
-    class InlineNode < Node
+    class InlineStep < Step
       def self.build &block
-        builder = DSL::Nodes::Builder.new
-        DSL::Nodes::Context.evaluate builder, &block
-        builder.build_node
+        builder = DSL::Steps::Builder.new
+        DSL::Steps::Context.evaluate builder, &block
+        builder.build_step
       end
 
-      attr :context_class, :defaults, :perform_block
+      attr :context_class, :defaults, :execute_block
 
       def initialize args = {}
         @defaults = args.delete :defaults do {} end
-        @perform_block = args.fetch :perform_block
-        args.delete :perform_block
+        @execute_block = args.fetch :execute_block
+        args.delete :execute_block
         super args
         @context_class = build_execution_context_class
         validate!
       end
 
       def validate!
-        unless perform_block
-          raise ArgumentError, "expected inline node to define a perform block"
+        unless execute_block
+          raise ArgumentError, "expected inline step to define a execute block"
         end
       end
 
       def build_execution_context_class
-        context = Class.new ExecutionContext
+        context = Class.new InlineContext
         context.class_exec dependencies, collection do |deps, collection|
           deps.each do |dep| define_dependency dep end
           alias_method :fetch_collection, collection if collection
@@ -88,7 +85,7 @@ module Orchestra
 
       def build_context input
         state = apply_defaults input
-        execution_context = context_class.new state, perform_block
+        execution_context = context_class.new state, execute_block
       end
 
       def apply_defaults input
@@ -103,7 +100,7 @@ module Orchestra
         defaults.keys
       end
 
-      class ExecutionContext
+      class InlineContext
         def self.define_dependency dep
           define_method dep do
             ivar = "@#{dep}"
@@ -112,16 +109,16 @@ module Orchestra
           end
         end
 
-        def initialize state, perform_block
-          @__perform_block__ = perform_block
+        def initialize state, execute_block
+          @__execute_block__ = execute_block
           @__state__ = state
         end
 
-        def perform item = nil
-          if @__perform_block__.arity == 0
-            instance_exec &@__perform_block__
+        def execute item = nil
+          if @__execute_block__.arity == 0
+            instance_exec &@__execute_block__
           else
-            instance_exec item, &@__perform_block__
+            instance_exec item, &@__execute_block__
           end
         end
       end

data/lib/orchestra/thread_pool.rb

@@ -28,7 +28,7 @@ module Orchestra
       job
     end
 
-    def perform &work
+    def execute &work
       job = enqueue &work
       job.wait
     end
@@ -99,7 +99,7 @@ module Orchestra
     def thread_loop
       Thread.current.abort_on_exception = false
       until (job = queue.pop) == :terminate
-        job.perform
+        job.execute
         Thread.pass
       end
     rescue => error
@@ -127,7 +127,7 @@ module Orchestra
         not @output_queue.empty?
       end
 
-      def perform
+      def execute
         @output_queue.push block.call
       end
 

data/lib/orchestra/version.rb

@@ -1,3 +1,3 @@
 module Orchestra
-  VERSION = "0.9.2" unless defined? VERSION
+  VERSION = "0.9.3" unless defined? VERSION
 end

data/lib/orchestra.rb

@@ -10,8 +10,8 @@ module Orchestra
     Configuration.module_eval &block
   end
 
-  def perform operation, inputs = {}
-    Conductor.new.perform operation, inputs
+  def execute operation, inputs = {}
+    Conductor.new.execute operation, inputs
   end
 
   def replay_recording operation, store, input = {}

data/test/examples/fizz_buzz.rb

@@ -1,17 +1,17 @@
 module Examples
   FizzBuzz = Orchestra::Operation.new do
-    node :make_array do
+    step :make_array do
       depends_on :up_to
       provides :array
-      perform do
+      execute do
         up_to.times.to_a
       end
     end
 
-    node :apply_fizzbuzz do
+    step :apply_fizzbuzz do
       iterates_over :array
       provides :fizzbuzz
-      perform do |num|
+      execute do |num|
         next if num == 0 # filter 0 from the output
         str = ''
         str << "Fizz" if num % 3 == 0
@@ -24,7 +24,7 @@ module Examples
     finally :print do
       depends_on :io
       iterates_over :fizzbuzz
-      perform do |str|
+      execute do |str|
         io.puts str
       end
     end

data/test/examples/invitation_service.rb

@@ -3,28 +3,28 @@ module Examples
     DEFAULT_MESSAGE = "I would really love for you to try out MyApp."
     ROBOT_FOLLOWER_THRESHHOLD = 500
 
-    node :fetch_followers do
+    step :fetch_followers do
       depends_on :account_name, :http
       provides :followers
-      perform do
+      execute do
         json = http.get "flutter.io", "/users/#{account_name}/followers"
           JSON.parse json
       end
     end
 
-    node :fetch_blacklist do
+    step :fetch_blacklist do
       depends_on :db
       provides :blacklist
-      perform do
+      execute do
         rows = db.execute "SELECT account_name FROM blacklists"
         rows.map do |row| row.fetch 0 end
       end
     end
 
-    node :remove_blacklisted_followers do
+    step :remove_blacklisted_followers do
       depends_on :blacklist
       modifies :followers
-      perform do
+      execute do
         followers.reject! do |follower|
           account_name = follower.fetch 'username'
           blacklist.include? account_name
@@ -32,10 +32,10 @@ module Examples
       end
     end
 
-    node :filter_robots do
+    step :filter_robots do
       depends_on :http
       modifies :followers, :collection => true
-      perform do |follower|
+      execute do |follower|
         account_name = follower.fetch 'username'
         json = http.get "flutter.io", "/users/#{account_name}"
         account = JSON.load json
@@ -48,7 +48,7 @@ module Examples
     finally :deliver_emails do
       depends_on :smtp, :message => DEFAULT_MESSAGE
       iterates_over :followers
-      perform do |follower|
+      execute do |follower|
         email = follower.fetch 'email_address'
         smtp.deliver message, :to => email
       end

data/test/integration/multithreading_test.rb

@@ -3,10 +3,10 @@ class MultithreadingTest < Minitest::Test
 
   def setup
     @operation = Orchestra::Operation.new do
-      node :map_thread_ids do
+      step :map_thread_ids do
         iterates_over :list
         provides :thread_ids
-        perform do |item|
+        execute do |item|
           raise CustomError, "blow up" if item == :blow_up
           Thread.current.object_id
         end
@@ -22,12 +22,12 @@ class MultithreadingTest < Minitest::Test
   def test_multithreading
     list = (1..1000).to_a
 
-    thread_ids = @conductor.perform @operation, :list => list
+    thread_ids = @conductor.execute @operation, :list => list
 
     assert_equal(
       @conductor.thread_count,
       thread_ids.uniq.size,
-      "performance must be spread across threads",
+      "execution must be spread across threads",
     )
   end
 
@@ -36,7 +36,7 @@ class MultithreadingTest < Minitest::Test
     list[23] = :blow_up
 
     assert_raises CustomError do
-      @conductor.perform @operation, :list => list
+      @conductor.execute @operation, :list => list
     end
   end
 end

data/test/integration/recording_telemetry_test.rb

@@ -3,7 +3,7 @@ class RecordingTelemetryTest < Minitest::Test
     output = StringIO.new
     telemetry = {}
 
-    perform_with_telemetry telemetry, output
+    execute_with_telemetry telemetry, output
 
     assert_equal_telemetry expected_telemetry, telemetry
   end
@@ -73,14 +73,11 @@ class RecordingTelemetryTest < Minitest::Test
     }
   end
 
-  def perform_with_telemetry telemetry, io
+  def execute_with_telemetry telemetry, io
     conductor = Orchestra::Conductor.new :io => io
 
     conductor.add_observer TelemetryRecorder.new telemetry
 
-    conductor.perform(
-      Examples::FizzBuzz,
-      :up_to => 16,
-    )
+    conductor.execute Examples::FizzBuzz, :up_to => 16
   end
 end

data/test/integration/replayable_operation_test.rb

@@ -2,8 +2,8 @@ class ReplayableOperationTest < Minitest::Test
   include Examples::InvitationService::TestSetup
 
   def test_replaying_an_operation_from_a_previous_recording
-    # Perform the operation against real services, saving a recording
-    recording = perform_for_real
+    # Execute the operation against real services, saving a recording
+    recording = execute_for_real
 
     # Write the recording out to a file. In this case, a StringIO is used for
     # simplicity, and we serialize into JSON
@@ -29,7 +29,7 @@ class ReplayableOperationTest < Minitest::Test
 
   private
 
-  def perform_for_real
+  def execute_for_real
     mock_smtp = build_example_smtp
     db = build_example_database
     stub_followers_request
@@ -48,6 +48,6 @@ class ReplayableOperationTest < Minitest::Test
 
     db.close
 
-    recording.to_h
+    recording
   end
 end

data/test/lib/console.rb

@@ -15,7 +15,7 @@ develompent environments that rely on binstubs.
 The example operations located in `test/examples` are loaded for you. To try one
 out:
 
-    [1] pry(Orchestra)> Orchestra.perform Examples::FizzBuzz, :up_to => 16, :io => $stdout
+    [1] pry(Orchestra)> Orchestra.execute Examples::FizzBuzz, :up_to => 16, :io => $stdout
 
 See the README.md as well as the examples themselves for more information. You
 will need to reload the examples after raking (or invoking reload!)

data/test/support/telemetry_recorder.rb

@@ -16,11 +16,11 @@ class TelemetryRecorder
 
   def handle_operation_entered operation_name, input
     return if embedded?
-    @nodes = Hash.new do |hsh, key| hsh[key] = {} end
+    @steps = Hash.new do |hsh, key| hsh[key] = {} end
     @store.update(
       :input => input,
-      :movements => @nodes,
-      :performance_name => operation_name,
+      :movements => @steps,
+      :operation_name => operation_name,
       :service_calls => [],
     )
     @embedded = true
@@ -31,12 +31,12 @@ class TelemetryRecorder
     @embedded = false
   end
 
-  def handle_node_entered name, input
-    @nodes[name][:input] = input
+  def handle_step_entered name, input
+    @steps[name][:input] = input
   end
 
-  def handle_node_exited name, output
-    @nodes[name][:output] = output
+  def handle_step_exited name, output
+    @steps[name][:output] = output
   end
 
   def handle_error_raised error