trailblazer-macro 2.1.0.rc13 → 2.1.0.rc14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f650f559c9413f94e4ab3b847052cb86f8893f8e76621ca4f871378ba5459fcc
-  data.tar.gz: 81cd6d65a460a7e5117591a7512490d031fff59fe3599830013fe846dc56104a
+  metadata.gz: 257d35af044c9e6d7f243f1435d2f6caaf0a2c6fbc4099b6417c8c0f7c44bf39
+  data.tar.gz: 07e52e6cc9a2b94b686ddf12462deb2076df5b3e189ff5207fe4f2a0dbdafb48
 SHA512:
-  metadata.gz: '02853f1b5e504e22ab3ff29506b93b9e02db9834894b8ff6c80dcf35467e5ff6e2f549dc604ba1f18e52a549dd4e7d22d4e229fc09b52f2187bd4859b303257d'
-  data.tar.gz: b3458af49de52c383ad41108989109174d15dbccdea39d4f6a59fde42eb01b29003883022f6e2785fd0d606be1ef90f32780e77498ddd03aa66fc929bbb3574e
+  metadata.gz: be1d7c595f022b2d8df45e630b2d72082a3625fa0b685462ae86c5ada6adf428927373c82cc05b39bcbb24c2c098e48506cf071ea06483b21fb5625343e81f0d
+  data.tar.gz: 30ed38e17b3a5edfcecbfc831a668bf348c0ab1edff3684ae48d499e457ed73790f1205bf0e18a24f217d7e2fe92560beef20c0c332bae4d3253b5b949d9878d

data/CHANGES.md

@@ -1,3 +1,7 @@
+# 2.1.0.rc14
+
+* Remove the explicit `dsl-linear` dependency.
+
 # 2.1.0.rc13
 
 * Use symbol keys on `ctx`, only.

data/LICENSE

@@ -0,0 +1,9 @@
+Copyright (c) 2018 Trailblazer GmbH
+
+Trailblazer is an Open Source project licensed under the terms of
+the LGPLv3 license.  Please see <http://www.gnu.org/licenses/lgpl-3.0.html>
+for license text.
+
+Trailblazer PRO has a commercial-friendly license allowing private forks
+and modifications of Trailblazer.  Please see http://trailblazer.to/pro for
+more detail.

data/lib/trailblazer/macro/version.rb

@@ -1,7 +1,7 @@
 module Trailblazer
   module Version
     module Macro
-      VERSION = "2.1.0.rc13".freeze
+      VERSION = "2.1.0.rc14".freeze
     end
   end
 end

data/test/docs/guard_test.rb

@@ -6,13 +6,13 @@ class DocsGuardProcTest < Minitest::Spec
   #:proc
   class Create < Trailblazer::Operation
     step Policy::Guard(->(options, pass:, **) { pass })
-    #~pipeonly
+    #:pipeonly
     step :process
 
     def process(options, **)
       options[:x] = true
     end
-    #~pipeonly end
+    #:pipeonly end
   end
   #:proc end
 
@@ -46,13 +46,15 @@ class DocsGuardTest < Minitest::Spec
   #:callable-op
   class Create < Trailblazer::Operation
     step Policy::Guard( MyGuard.new )
-    #~pipe-only
+    #:pipe-only
     step :process
 
+    #~methods
     def process(options, **)
       options[:x] = true
     end
-    #~pipe-only end
+    #~methods end
+    #:pipe-only end
   end
   #:callable-op end
 
@@ -72,10 +74,11 @@ class DocsGuardMethodTest < Minitest::Spec
     end
     #~pipe-onlyy
     step :process
-
+    #~methods
     def process(options, **)
       options[:x] = true
     end
+    #~methods end
     #~pipe-onlyy end
   end
   #:method end

data/test/docs/nested_test.rb

@@ -16,22 +16,33 @@ class NestedInput < Minitest::Spec
     end
   end
 
-  it "Nested(Edit), without any options" do
-    edit = self.edit
-
-    create = Class.new(Trailblazer::Operation) do
-      step :a
-      step Nested( edit )
-      step :b
-
-      include T.def_steps(:a, :b)
-    end
+  class Validate < Trailblazer::Operation
+    step :validate
+    # ... more steps ...
+    include T.def_steps(:validate)
+  end
 
-    # this will print a DEPRECATION warning.
-  # success
-    create.(seq: []).inspect(:seq).must_equal %{<Result:true [[:a, :c, :b]] >}
-  # failure in Nested
-    create.(seq: [], c: false).inspect(:seq).must_equal %{<Result:false [[:a, :c]] >}
+  it "Nested(Edit), without any options" do
+      module A
+
+        create =
+        #:nested
+        class Create < Trailblazer::Operation
+          step :create
+          step Nested(Validate)
+          step :save
+          #~meths
+          include T.def_steps(:create, :save)
+          #~meths end
+        end
+        #:nested end
+
+        # this will print a DEPRECATION warning.
+      # success
+        create.(seq: []).inspect(:seq).must_equal %{<Result:true [[:create, :validate, :save]] >}
+      # failure in Nested
+        create.(seq: [], validate: false).inspect(:seq).must_equal %{<Result:false [[:create, :validate]] >}
+      end
   end
 
   it "Nested(Edit), with Output rewiring" do
@@ -52,32 +63,72 @@ class NestedInput < Minitest::Spec
   end
 
   it "Nested(:method)" do
-    create = Class.new(Trailblazer::Operation) do
-      step :a
-      step Nested(:compute_edit)
-      step :b
-
-      def compute_edit(ctx, what:, **)
-        what
+    module B
+      create =
+      #:nested-dynamic
+      class Create < Trailblazer::Operation
+        step :create
+        step Nested(:compute_nested)
+        step :save
+
+        def compute_nested(ctx, params:, **)
+          params.is_a?(Hash) ? Validate : JsonValidate
+        end
+        #~meths
+        include T.def_steps(:create, :save)
+        #~meths end
       end
+      #:nested-dynamic end
 
-      include T.def_steps(:a, :b)
-    end
-
+      class JsonValidate < Validate
+        step :json
+        include T.def_steps(:json)
+      end
     # `edit` and `update` can be called from Nested()
 
   # edit/success
-    create.(seq: [], what: edit).inspect(:seq).must_equal %{<Result:true [[:a, :c, :b]] >}
+    create.(seq: [], params: {}).inspect(:seq).must_equal %{<Result:true [[:create, :validate, :save]] >}
 
   # update/success
-    create.(seq: [], what: update).inspect(:seq).must_equal %{<Result:true [[:a, :d, :b]] >}
+    create.(seq: [], params: nil).inspect(:seq).must_equal %{<Result:true [[:create, :validate, :json, :save]] >}
 
 
 # wiring of fail:
   # edit/failure
-    create.(seq: [], what: edit, c: false).inspect(:seq).must_equal %{<Result:false [[:a, :c]] >}
+    create.(seq: [], params: {}, validate: false).inspect(:seq).must_equal %{<Result:false [[:create, :validate]] >}
   # update/failure
-    create.(seq: [], what: update, d: false).inspect(:seq).must_equal %{<Result:false [[:a, :d]] >}
+    create.(seq: [], params: nil, json: false).inspect(:seq).must_equal %{<Result:false [[:create, :validate, :json]] >}
+    end
+  end
+
+  it "Nested(:method), input: :my_input" do
+    module C
+      #:nested-dynamic
+      class Create < Trailblazer::Operation
+        step :create
+        step Nested(:compute_nested), input: ->(ctx, *) {{foo: :bar, seq: ctx[:seq]}}
+        step :save
+
+        def compute_nested(ctx, params:, **)
+          params.is_a?(Hash) ? Validate : JsonValidate
+        end
+
+        #~meths
+        include T.def_steps(:create, :save)
+        #~meths end
+      end
+      #:nested-dynamic end
+
+      class JsonValidate < Validate
+        step :json
+        include T.def_steps(:json)
+      end
+
+    # `edit` and `update` can be called from Nested()
+    end
+
+    C::Create.(seq: [], params: {}).inspect(:seq).must_equal %{<Result:true [[:create, :validate, :save]] >}
+    C::Create.(seq: [], params: nil).inspect(:seq).must_equal %{<Result:true [[:create, :validate, :json, :save]] >}
   end
 
   let(:compute_edit) {

data/test/docs/wrap_test.rb

@@ -174,10 +174,12 @@ When raise:   return {Railway.fail!} or {Railway.pass!}
     #:transaction
     class Memo::Create < Trailblazer::Operation
       step :find_model
+      #:wrap-only
       step Wrap( MyTransaction ) {
         step :update
         step :rehash
       }
+      #:wrap-only end
       step :notify
       fail :log_error
       #~methods

data/trailblazer-macro.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.description   = "Macros for Trailblazer's operation"
   spec.summary       = "Macros for Trailblazer's operation: Policy, Wrap, Rescue and more."
   spec.homepage      = "http://trailblazer.to"
-  spec.license       = "MIT"
+  spec.license       = "LGPL-3.0"
 
   spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -18,9 +18,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler"
-
-  # spec.add_development_dependency "trailblazer-operation", ">= 0.4.1", "< 0.5.0"
-
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "rake"
 
@@ -28,7 +25,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "roar"
   spec.add_development_dependency "trailblazer-developer"
 
-  spec.add_dependency "trailblazer-activity-dsl-linear", ">= 0.1.6", "< 0.2.0"  # TODO: this dependency will be removed.
   spec.add_dependency "trailblazer-operation", ">= 0.5.2" # TODO: this dependency will be removed.
 
   spec.required_ruby_version = ">= 2.0.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-macro
 version: !ruby/object:Gem::Version
-  version: 2.1.0.rc13
+  version: 2.1.0.rc14
 platform: ruby
 authors:
 - Nick Sutterer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-24 00:00:00.000000000 Z
+date: 2019-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,26 +95,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: trailblazer-activity-dsl-linear
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.6
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.6
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: trailblazer-operation
   requirement: !ruby/object:Gem::Requirement
@@ -143,7 +123,7 @@ files:
 - ".travis.yml"
 - CHANGES.md
 - Gemfile
-- LICENSE.txt
+- LICENSE
 - README.md
 - Rakefile
 - lib/trailblazer-macro.rb
@@ -170,7 +150,7 @@ files:
 - trailblazer-macro.gemspec
 homepage: http://trailblazer.to
 licenses:
-- MIT
+- LGPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []

data/LICENSE.txt

@@ -1,27 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2018 Trailblazer GmbH
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
----------
-
-Trailblazer Enterprise has a commercial-friendly license allowing private forks
-and modifications of Trailblazer.  Please see http://trailblazer.to/enterprise/ for
-more detail.