trailblazer 2.1.0.beta2 → 2.1.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06ab38e2e1e0ab6f3f33f99c67339bdac6968899
-  data.tar.gz: 99665d7f89a35e6233be5b60840b3fc9bf9371c3
+  metadata.gz: 36d27170113024b0c2af51f22fc1abc6042c6a68
+  data.tar.gz: 7483dd6c7482d06e332dd4b0ff9b74dd6afe4d91
 SHA512:
-  metadata.gz: 054a5b83293c9f19cf84503a8b250f48efd0f3c981c83bb74270bbd4995ac7e069ba7d71c0f813fad6a20bb17cb31dc732e3961753cfc119c4bf6431ca5ee5b4
-  data.tar.gz: 11013047208e46130eeed97575ec35b80825f59136e3ce188ffe00b1e855b46e7b34718d177959bfba36b1cd880fc244ee6dc7cd35e7dd11674d10862df543e9
+  metadata.gz: b05d29959550818ae9103231ac9716f3ebb8a074139d1b4a0e5b0f3a8e48e724dfe348e09fc18356412b9874dd4be930ba91148736b49c930946316fa54e358a
+  data.tar.gz: e5d373cd46eb4b2823df61256e03aa68ed98df9ad84a58b6ac96add3520fafc5577cfbcfa9adcf1dd460698db6219f9aa4136430f2ff8d632eaa0a01f6b6d744

data/CHANGES.md

@@ -29,6 +29,10 @@ document Task API and define step API
 deprecate step->(options) ?
 injectable, per-operation step arguments strategy?
 
+# 2.1.0.beta3
+
+* More simplifications because of `activity`.
+
 # 2.1.0.beta2
 
 * Simplify `Nested` and several other internals by using the new `Activity` API.

data/lib/trailblazer/operation/nested.rb

@@ -20,10 +20,10 @@ module Trailblazer
       end
 
       {
-        task:           task,
-        id:             id,
-        extension:      [ Trailblazer::Activity::TaskWrap::Merge.new(task_wrap_extensions) ],
-        plus_poles:     Activity::Magnetic::DSL::PlusPoles.from_outputs(operation.outputs) # @needs operation#outputs
+        task:      task,
+        id:        id,
+        extension: [ Trailblazer::Activity::TaskWrap::Merge.new(task_wrap_extensions) ],
+        outputs:   operation.outputs
       }
     end
 
@@ -56,8 +56,8 @@ module Trailblazer
         def initialize(nested_activity)
           @nested_activity = Trailblazer::Option::KW(nested_activity)
           @outputs         = {
-            :success => Activity::Output( Railway::End::Success.new(:success), :success ),
-            :failure => Activity::Output( Railway::End::Failure.new(:failure), :failure ),
+            :success => Activity::Output( Railway::End::Success.new(semantic: :success), :success ),
+            :failure => Activity::Output( Railway::End::Failure.new(semantic: :failure), :failure ),
           }
         end
 

data/lib/trailblazer/operation/validate.rb

@@ -22,7 +22,7 @@ module Trailblazer
         # activity, _ = activity.decompose
 
         # DISCUSS: use Nested here?
-        { task: activity, id: "contract.#{name}.validate", plus_poles: Activity::Magnetic::DSL::PlusPoles.from_outputs(activity.outputs) }
+        { task: activity, id: "contract.#{name}.validate", outputs: activity.outputs }
       end
 
       class Validate

data/lib/trailblazer/operation/wrap.rb

@@ -8,7 +8,7 @@ class Trailblazer::Operation
 
     # connect `false` as an end event, when an exception stopped the wrap, for example.
 
-    { task: wrapped, id: id, plus_poles: Trailblazer::Activity::Magnetic::DSL::PlusPoles.from_outputs(operation_class.outputs) }
+    { task: wrapped, id: id, outputs: operation_class.outputs }
     # TODO: Nested could have a better API and do the "merge" for us!
   end
 
@@ -28,7 +28,7 @@ class Trailblazer::Operation
 
       def call( (options, flow_options), **circuit_options )
         block_calling_wrapped = -> {
-          activity = @operation.decompose[:activity]
+          activity = @operation.to_h[:activity]
 
           activity.( [options, flow_options], **circuit_options )
         }

data/lib/trailblazer/version.rb

@@ -1,3 +1,3 @@
 module Trailblazer
-  VERSION = "2.1.0.beta2"
+  VERSION = "2.1.0.beta3"
 end

data/test/docs/contract_test.rb

@@ -62,15 +62,15 @@ class DocsContractOverviewTest < Minitest::Spec
 
   it "shows 2-level tracing" do
     result = Create.trace( params: { length: "A" } )
-    result.wtf.gsub(/0x\w+/, "").must_equal %{|-- #<Trailblazer::Activity::Start:>
+    result.wtf.gsub(/0x\w+/, "").must_equal %{|-- #<Trailblazer::Activity::Start semantic=:default>
 |-- model.build
 |-- contract.build
 |-- contract.default.validate
-|   |-- #<Trailblazer::Activity::Start:>
+|   |-- #<Trailblazer::Activity::Start semantic=:default>
 |   |-- contract.default.params_extract
 |   |-- contract.default.call
-|   `-- #<Trailblazer::Activity::End:>
-`-- #<Trailblazer::Operation::Railway::End::Failure:>}
+|   `-- #<Trailblazer::Activity::End semantic=:failure>
+`-- #<Trailblazer::Operation::Railway::End::Failure semantic=:failure>}
   end
 end
 

data/test/docs/trace_test.rb

@@ -38,10 +38,10 @@ class DocsTraceTest < Minitest::Spec
     # `-- End.success
     #:trace end
 
-    result.wtf.gsub(/0x\w+/, "").must_equal %{|-- #<Trailblazer::Activity::Start:>
+    result.wtf.gsub(/0x\w+/, "").must_equal %{|-- #<Trailblazer::Activity::Start semantic=:default>
 |-- model.build
 |-- contract.build
-`-- #<Trailblazer::Operation::Railway::End::Success:>}
+`-- #<Trailblazer::Operation::Railway::End::Success semantic=:success>}
   end
 
   it do

data/test/variables_test.rb

@@ -141,18 +141,18 @@ the scoping.
   it "with tracing" do
     result = DiscreetOrganization.trace("public_opinion" => "Freedom!")
 
-    result.wtf.gsub(/0x\w+/, "").gsub(/\d+/, "").must_equal %{|-- #<Trailblazer::Activity::Start:>
+    result.wtf.gsub(/0x\w+/, "").gsub(/\d+/, "").must_equal %{|-- #<Trailblazer::Activity::Start semantic=:default>
 |-- set.rumours
 |-- set.secret
 |-- Nested(VariablesTest::Whistleblower)
-|   |-- #<Trailblazer::Activity::Start:>
+|   |-- #<Trailblazer::Activity::Start semantic=:default>
 |   |-- edward.public_opinion
 |   |-- edward.secret
 |   |-- edward.test
 |   |-- edward.read.public_knowledge
-|   `-- #<Trailblazer::Operation::Railway::End::Success:>
+|   `-- #<Trailblazer::Operation::Railway::End::Success semantic=:success>
 |-- read.edward.rumours
 |-- read.edward.secret
-`-- #<Trailblazer::Operation::Railway::End::Failure:>}
+`-- #<Trailblazer::Operation::Railway::End::Failure semantic=:failure>}
   end
 end

data/trailblazer.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.version       = Trailblazer::VERSION
   spec.authors       = ["Nick Sutterer"]
   spec.email         = ["apotonick@gmail.com"]
-  spec.description   = %q{A high-level architecture for Ruby introducing new abstractions such as operations, form objects or policies.}
+  spec.description   = %q{A high-level architecture introducing new abstractions such as control flow, operations, form objects or policies.}
   spec.summary       = %q{A high-level architecture for Ruby and Rails.}
   spec.homepage      = "http://trailblazer.to"
   spec.license       = "LGPL-3.0"
@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "trailblazer-operation", ">= 0.2.0", "< 0.3.0"
+  spec.add_dependency "trailblazer-activity",  ">= 0.4.3", "< 0.6.0"
+
   spec.add_dependency "reform", ">= 2.2.0", "< 3.0.0"
   spec.add_dependency "declarative"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer
 version: !ruby/object:Gem::Version
-  version: 2.1.0.beta2
+  version: 2.1.0.beta3
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-23 00:00:00.000000000 Z
+date: 2018-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trailblazer-operation
@@ -30,6 +30,26 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: trailblazer-activity
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: reform
   requirement: !ruby/object:Gem::Requirement
@@ -148,8 +168,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A high-level architecture for Ruby introducing new abstractions such
-  as operations, form objects or policies.
+description: A high-level architecture introducing new abstractions such as control
+  flow, operations, form objects or policies.
 email:
 - apotonick@gmail.com
 executables: []