trailblazer-operation 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 228e261fc19eec5d741437141b0eae01552aaaf08caa617c2ad2a3f226e5fa94
-  data.tar.gz: f316ca1a182fc7f8b730f89d59b0e575e9a43365b571486079f7b95e6749717d
+  metadata.gz: 569ffef484d0783c9f16d35ce6848f8506687140e3fede28f15ab506d832ad5c
+  data.tar.gz: e646b0c9b05dbaba40c136d8345c896727b30cfeba1ee62b5f180e87ff6c05b8
 SHA512:
-  metadata.gz: ca04555c63aabc959539399ae7daf3e11b79c5ffb946326abb9abbf1db284379f4bacc19f7ee9013bacbb7735f35b350e42f2e17b38278fed9f9c259524264b1
-  data.tar.gz: 54ba90ec3dd1f4977fffc95ab20a93a625b341fd74f110416ae4dd28cd3a9fb2e6960378e6e3deb93ac7b39decccc4011c7e5716233ab928ca70e0295206c628
+  metadata.gz: 4d1f804fb97272a858374a5204b033e4ef3ee0a8fe29e29a36e6c3c9f0314b1059b4731b32e9aaf35a9e921b3158cfed53302e6b58fa3070bd3b89b239e49365
+  data.tar.gz: 03353eadeaa413e25ba9deb4847ddedf07827f8b71d16f943a5bf980c499eed231fa8158e60e4492bf449bdbc341c711c109c4fbbb77ade2c858e816a7aff0c9

data/CHANGES.md

@@ -1,3 +1,7 @@
+## 0.6.1
+
+* Reintroduce `ClassDependencies` by leveraging `State.fields`.
+
 ## 0.6.0
 
 * Require newest `activity` gem.

data/Gemfile

@@ -10,7 +10,7 @@ gem "dry-auto_inject"
 gem "benchmark-ips"
 gem "minitest-line"
 
-# gem "trailblazer-developer", path: "../trailblazer-developer"
+# gem "trailblazer-developer", path: "../developer"
 # gem "trailblazer-developer", git: "https://github.com/trailblazer/trailblazer-developer"
 # gem "trailblazer-activity", path: "../trailblazer-activity"
 # gem "trailblazer-activity-dsl-linear", path: "../trailblazer-activity-dsl-linear"

data/lib/trailblazer/operation.rb

@@ -2,7 +2,6 @@ require "trailblazer/option"
 require "trailblazer/context"
 require "trailblazer/container_chain"
 
-require "trailblazer/activity"
 require "trailblazer/activity/dsl/linear"
 
 

data/lib/trailblazer/operation/class_dependencies.rb

@@ -1,25 +1,34 @@
 # Dependencies can be defined on the operation. class level
 class Trailblazer::Operation
-  module Skill
-    # The class-level skill container: Operation::[], ::[]=.
-    module Accessors
-      # :private:
-      def skills
-        @skills ||= {}
-      end
+  # The use of this module is currently not encouraged and it is only here for backward-compatibility.
+  # Instead, please pass dependencies via containers, locals, or macros into the respective steps.
+  module ClassDependencies
+    def [](field)
+      @state.to_h[:fields][field]
+    end
 
-      extend Forwardable
-      def_delegators :skills, :[], :[]=
+    def []=(field, value)
+      options = @state.to_h[:fields].merge(field => value)
+      @state.update_options(options)
+    end
+
+    def options_for_public_call(options, *)
+      ctx = super
+      context_for_fields(class_fields, ctx)
+    end
+
+    private def class_fields
+      @state.to_h[:fields]
+    end
+
+    private def context_for_fields(fields, ctx)
+      ctx_with_fields = Trailblazer::Context.implementation.build(fields, ctx, [ctx, {}], {}) # TODO: redundant to otions_for_public_call. how to inject aliasing etc?
     end
-  end
 
-  # The use of this module is not encouraged and it is only here for backward-compatibility.
-  # Instead, please pass dependencies via containers, locals, or macros into the respective steps.
-  module ClassDependencies
     def call_with_circuit_interface((ctx, flow_options), **circuit_options)
-      @skills.each { |name, value| ctx[name] ||= value } # this resembles the behavior in 2.0. we didn't say we liked it.
+      ctx_with_fields = context_for_fields(class_fields, ctx)
 
-      super
+      super([ctx_with_fields, flow_options], circuit_options) # FIXME: should we unwrap here?
     end
   end
 end

data/lib/trailblazer/operation/trace.rb

@@ -24,7 +24,7 @@ module Trailblazer
 
       # Presentation of the traced stack via the returned result object.
       # This object is wrapped around the original result in {Trace.call}.
-      class Result < SimpleDelegator
+      class Result < ::SimpleDelegator
         def initialize(result, stack)
           super(result)
           @stack = stack

data/lib/trailblazer/operation/version.rb

@@ -1,7 +1,7 @@
 module Trailblazer
   module Version
     module Operation
-      VERSION = "0.6.0"
+      VERSION = "0.6.1"
     end
   end
 end

data/test/class_dependencies_test.rb

@@ -3,13 +3,32 @@ require "test_helper"
 class ClassDependenciesTest < Minitest::Spec
   #- Operation[] and Operation[]=
 
-  # class Index < Trailblazer::Operation
-  #   extend ClassDependencies
+  class Index < Trailblazer::Operation
+    extend ClassDependencies
 
-  #   self["model.class"] = Module
+    self["model.class"] = Module
 
-  #   step ->(options, **) { options["a"] = options["model.class"] }
-  # end
+    step ->(options, **) { options["a"] = options["model.class"] }
+  end
 
-  it { skip "https://trello.com/c/t8bUJlqb/25-op-class-dependencies"; Index.({}).inspect("a", "model.class").must_equal %{<Result:true [Module, Module] >} }
+  it { Index.({}).inspect("a", "model.class").must_equal %{<Result:true [Module, Module] >} }
+
+  it "creates separate ctx for circuit interface" do
+    signal, (ctx, _) = Index.([{}, {}], {})
+
+    ctx["model.class"].inspect.must_equal %{Module} # FIXME: should this be here?
+    ctx[:a].inspect.must_equal %{Module}
+  end
+
+  describe "inheritance" do
+    it "reader/setter read from separate config" do
+      subclass = Class.new(Index)
+
+      subclass["model.class"].must_equal Module
+      subclass["model.class"] = Class
+      subclass["model.class"].must_equal Class
+      Index["model.class"].must_equal Module
+    end
+
+  end
 end

data/test/docs/class_dependencies_test.rb

@@ -0,0 +1,54 @@
+require "test_helper"
+
+class DocsClassFieldsTest < Minitest::Spec
+  module A
+    class AlwaysTrue
+      def self.call(params)
+        true
+      end
+    end
+
+
+    class Insert < Trailblazer::Operation
+      extend ClassDependencies
+
+      self[:name] = :insert
+    end
+
+    #:create
+    class Create < Trailblazer::Operation
+      extend ClassDependencies
+
+      # Configure some dependency on class level
+      self[:validator] = AlwaysTrue
+
+      step :validate
+      step Subprocess(Insert)
+
+      #:validate
+      def validate(ctx, validator:, params:, **)
+        validator.(params)
+      end
+      #:validate end
+    end
+    #:create end
+  end
+
+  it "what" do
+    Create = A::Create
+
+    ctx = {params: {name: "Yogi"}}
+
+    #:invoke
+    signal, (ctx, _) = Create.([ctx, {}])
+
+    puts ctx[:validator] #=> AlwaysTrue
+    #:invoke end
+
+    puts ctx[:name]      #=> insert
+
+    signal.inspect.must_equal %{#<Trailblazer::Activity::Railway::End::Success semantic=:success>}
+    ctx[:validator].inspect.must_equal %{DocsClassFieldsTest::A::AlwaysTrue}
+    ctx[:name].inspect.must_equal %{:insert}
+  end
+end

data/test/trace_test.rb

@@ -28,30 +28,30 @@ class TraceTest < Minitest::Spec
     puts output = Trailblazer::Developer::Trace::Present.(stack)
 
     output.gsub(/0x\w+/, "").gsub(/@.+_test/, "").must_equal %{`-- TraceTest::Create
-   |-- Start.default
-   |-- Create.task.a
-   |-- MyNested
-   |   |-- Start.default
-   |   |-- B.task.b
-   |   |-- B.task.e
-   |   `-- End.success
-   |-- Create.task.c
-   |-- Create.task.params
-   `-- End.failure}
+    |-- Start.default
+    |-- Create.task.a
+    |-- MyNested
+    |   |-- Start.default
+    |   |-- B.task.b
+    |   |-- B.task.e
+    |   `-- End.success
+    |-- Create.task.c
+    |-- Create.task.params
+    `-- End.failure}
   end
 
   it "Operation::trace" do
     result = Create.trace(params: {x: 1}, a_return: true)
     result.wtf.gsub(/0x\w+/, "").gsub(/@.+_test/, "").must_equal %{`-- TraceTest::Create
-   |-- Start.default
-   |-- Create.task.a
-   |-- MyNested
-   |   |-- Start.default
-   |   |-- B.task.b
-   |   |-- B.task.e
-   |   `-- End.success
-   |-- Create.task.c
-   |-- Create.task.params
-   `-- End.success}
+    |-- Start.default
+    |-- Create.task.a
+    |-- MyNested
+    |   |-- Start.default
+    |   |-- B.task.b
+    |   |-- B.task.e
+    |   `-- End.success
+    |-- Create.task.c
+    |-- Create.task.params
+    `-- End.success}
   end
 end

data/trailblazer-operation.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "trailblazer-activity-dsl-linear", ">= 0.2.1", "< 1.0.0"
+  spec.add_dependency "trailblazer-activity-dsl-linear", ">= 0.2.6", "< 1.0.0"
   spec.add_dependency "trailblazer-activity", ">= 0.10.0", "< 1.0.0"
   spec.add_dependency "trailblazer-developer", ">= 0.0.8"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-operation
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-23 00:00:00.000000000 Z
+date: 2020-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trailblazer-activity-dsl-linear
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.6
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.6
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -150,6 +150,7 @@ files:
 - test/call_test.rb
 - test/callable_test.rb
 - test/class_dependencies_test.rb
+- test/docs/class_dependencies_test.rb
 - test/docs/doormat_test.rb
 - test/docs/macaroni_test.rb
 - test/docs/operation_test.rb
@@ -193,8 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Trailblazer's operation object with railway flow and integrated error handling.
@@ -203,6 +203,7 @@ test_files:
 - test/call_test.rb
 - test/callable_test.rb
 - test/class_dependencies_test.rb
+- test/docs/class_dependencies_test.rb
 - test/docs/doormat_test.rb
 - test/docs/macaroni_test.rb
 - test/docs/operation_test.rb