trailblazer-macro-contract 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44b6ac6ab9a1efc431188b24d22ce9882a9ca35ea3a726d14267be789bd66973
-  data.tar.gz: 77ad5f9fd06aa6b51117b2fa5d9ad037283e4107402b66cbc852a83423387a25
+  metadata.gz: 0f83a1f35a36e1e84cdc5075c91c7d564b860f2edcddec3665a2f391c9f253ed
+  data.tar.gz: 171070dc6bb8454986fa101d81905ab661ef51aebe13a935ffa8fa149d62eda4
 SHA512:
-  metadata.gz: 50d6644a6a4978bfe8ce4f49b973b36b38309221bcab324203cfd3fde5d542e348d52b03311a5b1d9e3ed959e83194921f51c4e0f66fa8aa33728235bcfdf9d9
-  data.tar.gz: a96051e482288a86001857773644f74c3a2749c975207016fe45efe09b5ec3f2b96edd491332f9baa9692c42eebf03bf265e09f15252dc43077c50ab664232de
+  metadata.gz: bf7333622c75b4f77636de44021e5d33ff80555042a2e772bf87a1db5e470a6a95afd29a1d84d61905b4f7e5108f3328731ee819e2d08ab87b589bbeba2f5f70
+  data.tar.gz: e3aad011ea7111117048736d2077c2b980959640e683a1259caf1f8a413d93737d08b6a00245ecaa64dd19dee1d17d9bbe97304f1688ef4df81f45040a0897d0

data/.github/workflows/ci.yml

@@ -1,3 +1,6 @@
+## This file is managed by Terraform.
+## Do not modify this file directly, as it may be overwritten.
+## Please open an issue instead.
 name: CI
 on: [push, pull_request]
 jobs:
@@ -5,13 +8,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
-        ruby: [2.6, 2.7, '3.0', jruby]
+        ruby: [2.7, '3.0', '3.1']
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+        bundler-cache: true
     - run: bundle exec rake

data/.github/workflows/ci_jruby.yml

@@ -0,0 +1,19 @@
+## This file is managed by Terraform.
+## Do not modify this file directly, as it may be overwritten.
+## Please open an issue instead.
+name: CI JRuby
+on: [push, pull_request]
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [jruby, jruby-head]
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - run: bundle exec rake

data/.github/workflows/ci_legacy.yml

@@ -0,0 +1,19 @@
+## This file is managed by Terraform.
+## Do not modify this file directly, as it may be overwritten.
+## Please open an issue instead.
+name: CI with EOL ruby versions
+on: [push, pull_request]
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [2.5, 2.6]
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - run: bundle exec rake

data/.github/workflows/ci_truffleruby.yml

@@ -0,0 +1,19 @@
+## This file is managed by Terraform.
+## Do not modify this file directly, as it may be overwritten.
+## Please open an issue instead.
+name: CI TruffleRuby
+on: [push, pull_request]
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [truffleruby, truffleruby-head]
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - run: bundle exec rake

data/CHANGES.md

@@ -1,3 +1,7 @@
+# 2.1.4
+
+* Use `trailblazer-activity-dsl-linear` 1.1.0.
+
 # 2.1.3
 
 * Use `trailblazer-activity-dsl-linear` >= 1.0.0.

data/lib/trailblazer/macro/contract/build.rb

@@ -2,22 +2,6 @@ require "reform"
 
 module Trailblazer
   module Macro
-    # This Circuit-task calls the {task} Option, then allows
-    # to run an arbitary block to process the option's result.
-    # @private
-    class CircuitTaskWithResultProcessing < Activity::TaskBuilder::Task # DISCUSS: extract to public?
-      def initialize(task, user_proc, block)
-        @block = block
-        super(task, user_proc)
-      end
-
-      def call_option(task_with_option_interface, (ctx, flow_options), **circuit_options)
-        result = super
-
-        @block.call(result, ctx)
-      end
-    end
-
     module Contract
       def self.Build(name: "default", constant: nil, builder: nil)
         contract_path     = :"contract.#{name}"
@@ -48,9 +32,7 @@ module Trailblazer
         task_option_proc = builder ? builder : default_contract_builder
 
         # after the builder proc is run, assign its result to {:"contract.default"}.
-        ctx_assign_block = ->(result, ctx) { ctx[contract_path] = result }
-
-        task = CircuitTaskWithResultProcessing.new(Trailblazer::Option(task_option_proc), task_option_proc, ctx_assign_block)
+        task = Macro.task_adapter_for_decider(task_option_proc, variable_name: contract_path)
 
         {
           task:   task, id: "contract.build",

data/lib/trailblazer/macro/contract/persist.rb

@@ -5,7 +5,7 @@ module Trailblazer
         path = :"contract.#{name}"
         step = ->(options, **) { options[path].send(method) }
 
-        task = Activity::TaskBuilder::Binary(step)
+        task = Activity::Circuit::TaskAdapter.for_step(step)
 
         {task: task, id: "persist.save"}
       end

data/lib/trailblazer/macro/contract/version.rb

@@ -2,7 +2,7 @@ module Trailblazer
   module Version
     module Macro
       module Contract
-        VERSION = "2.1.3"
+        VERSION = "2.1.4"
       end
     end
   end

data/test/docs/contract_test.rb

@@ -56,20 +56,20 @@ class DocsContractOverviewTest < Minitest::Spec
 
   it "shows 2-level tracing" do
     result = Create.trace( params: { length: "A" } )
-    result.wtf.gsub(/0x\w+/, "").must_equal %{`-- DocsContractOverviewTest::Create
-    |-- Start.default
-    |-- model.build
-    |-- contract.build
-    |-- contract.default.validate
-    |   |-- Start.default
-    |   |-- contract.default.params_extract
-    |   |-- contract.default.call
-    |   `-- End.failure
-    `-- End.failure}
+    result.wtf.gsub(/0x\w+/, "").must_equal %{DocsContractOverviewTest::Create
+|-- Start.default
+|-- model.build
+|-- contract.build
+|-- contract.default.validate
+|   |-- Start.default
+|   |-- contract.default.params_extract
+|   |-- contract.default.call
+|   `-- End.failure
+`-- End.failure}
   end
 
   # internal variables from {:builder} are excluded in public ctx.
-  it { Create.(params: {}).keys.inspect.must_equal %{[:params, :model, :\"result.model\", :\"contract.default\", :\"contract.default.params\", :\"representer.default.class\", :\"result.contract.default\"]} }
+  it { Create.(params: {}).keys.inspect.must_equal %{[:params, :model, :\"contract.default\", :\"contract.default.params\", :\"representer.default.class\", :\"result.contract.default\"]} }
 end
 
 #---
@@ -594,7 +594,7 @@ class DocContractBuilderTest < Minitest::Spec
   it { Create.(params: {}).inspect(:model).must_equal %{<Result:false [#<struct DocContractBuilderTest::Song id=nil, title=nil>] >} }
   it { Create.(params: { title: "title"}, current_user: Module).inspect(:model).must_equal %{<Result:true [#<struct DocContractBuilderTest::Song id=nil, title="title">] >} }
   # internal variables from {:builder} are excluded in public ctx.
-  it { Create.(params: {}).keys.inspect.must_equal %{[:params, :model, :\"result.model\", :\"contract.default\", :\"contract.default.params\", :\"representer.default.class\", :\"result.contract.default\"]} }
+  it { Create.(params: {}).keys.inspect.must_equal %{[:params, :model, :\"contract.default\", :\"contract.default.params\", :\"representer.default.class\", :\"result.contract.default\"]} }
 end
 
 class DocContractTest < Minitest::Spec

data/trailblazer-macro-contract.gemspec

@@ -23,14 +23,14 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "dry-validation"
   spec.add_development_dependency "reform-rails", "~> 0.2.0.rc2"
-  spec.add_development_dependency "trailblazer-macro", ">= 2.1.9"
+  spec.add_development_dependency "trailblazer-macro", ">= 2.1.12"
   spec.add_development_dependency "trailblazer-developer"
   spec.add_development_dependency "activemodel", "~> 6.0.0" # FIXME: we still don't support the Rails 6.1 errors object.
 
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "rake"
 
-  spec.add_dependency "trailblazer-activity-dsl-linear", ">= 1.0.0", "< 1.1.0"
+  spec.add_dependency "trailblazer-activity-dsl-linear", ">= 1.1.0", "< 1.2.0"
 
   spec.required_ruby_version = ">= 2.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-macro-contract
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-22 00:00:00.000000000 Z
+date: 2022-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reform
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.9
+        version: 2.1.12
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.9
+        version: 2.1.12
 - !ruby/object:Gem::Dependency
   name: trailblazer-developer
   requirement: !ruby/object:Gem::Requirement
@@ -148,20 +148,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 description: Operation macros for form objects
 email:
 - apotonick@gmail.com
@@ -170,6 +170,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/ci.yml"
+- ".github/workflows/ci_jruby.yml"
+- ".github/workflows/ci_legacy.yml"
+- ".github/workflows/ci_truffleruby.yml"
 - ".gitignore"
 - ".rubocop-https---raw-githubusercontent-com-trailblazer-meta-master-rubocop-yml"
 - ".rubocop.yml"