trailblazer-macro-contract 2.1.2 → 2.1.3.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88187712c7881802a2e78f5b21107505d78cb3a7fec0727503f92b02d6064115
-  data.tar.gz: 4a661ef7c3041fe6abad2222f913e32d86ee705e5c33d13496dd12f067520ee7
+  metadata.gz: c9c3c0092a4bd1f8b71d4506ed24e77af326b28d2991a88bdb45d67586dad746
+  data.tar.gz: 6de99c14b4bc553a0e32e568a9c31a74abf839f0d82f36dac33884300d979777
 SHA512:
-  metadata.gz: 929fe8f1bc30baacfea1e0b256bd73f3c522593ffac98c44ff02ebea3a93c9e4e871b2fc426502e98c71f5b0909f04cbc4d2863136da000eec0197b06db83911
-  data.tar.gz: b348716b5567c9288b1909282c9c058c53fb775650cff6b10ed19eb6ad7dac179f379508012fa7ce50dca6f67ca671397d8cb9d546551a0ff07d4d4b35341fca
+  metadata.gz: 15de139140c545de9ab6d1b6d19a83053815b78b7e4ae990a9b5a57dea89e77566524d2eb84326694f5399f41d3d7f367a761572badf465fdaa58cd32c2e1a79
+  data.tar.gz: 4b9fc7eb3a4f30a7f57f2ec95c6b0459ad5ccff8e4adbfd3ddc324570d8647b1046277e61f7f1b402bbbb663e28fbe3b1161d649db5036e74c91da66b9e6b8c1

data/.github/workflows/ci.yml

@@ -6,7 +6,7 @@ jobs:
       fail-fast: false
       matrix:
         # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
-        ruby: [2.5, 2.6, 2.7, '3.0', head, jruby, jruby-head]
+        ruby: [2.6, 2.7, '3.0', jruby]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2

data/CHANGES.md

@@ -1,3 +1,8 @@
+# 2.1.3
+
+* Use `trailblazer-activity-dsl-linear` >= 1.0.0.
+* Use Inject() API instead of `:inject`, `:input` etc in macros.
+
 # 2.1.2
 
 * Refactor `Contract::Build` to use TRB mechanics:

data/Gemfile

@@ -9,6 +9,8 @@ gem "dry-matcher"
 # gem "trailblazer-macro", path: "../trailblazer-macro"
 # gem "trailblazer-activity", path: "../trailblazer-activity"
 # gem "trailblazer-activity-dsl-linear", path: "../trailblazer-activity-dsl-linear"
+# gem "trailblazer-errors", path: "../trailblazer-errors"
+# gem "trailblazer-developer", path: "../trailblazer-developer"
 
 gem "minitest-line"
 

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

@@ -22,14 +22,25 @@ module Trailblazer
       def self.Build(name: "default", constant: nil, builder: nil)
         contract_path     = :"contract.#{name}"
 
-        build_injections  = {"#{contract_path}.class": ->(*) { constant }} # default to {constant} if not injected.
+        injections = {
+          Activity::Railway.Inject() => {
+            "#{contract_path}.class": ->(*) { constant }, # default to {constant} if not injected.
+          }
+        }
 
-        input = ->(ctx, **) do
-          ctx.to_hash.merge(
-            constant: constant,
-            name:     contract_path
-          )
-        end
+        # DISCUSS: can we force-default this via Inject()?
+        input = {
+          Activity::Railway.In() => ->(ctx, **) do
+            ctx.to_hash.merge(
+              constant: constant,
+              name:     contract_path
+            )
+          end
+        }
+
+        output = {
+          Activity::Railway.Out() => [contract_path]
+        }
 
         default_contract_builder = ->(ctx, model: nil, **) { ctx[:"#{contract_path}.class"].new(model) }
 
@@ -43,10 +54,10 @@ module Trailblazer
 
         {
           task:   task, id: "contract.build",
-          inject: [build_injections],
-          input:  input,
-          output: [contract_path]
-        }
+        }.
+          merge(injections).
+          merge(input).
+          merge(output)
       end
 
       module DSL

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

@@ -20,8 +20,8 @@ module Trailblazer
 
         # Build a simple Railway {Activity} for the internal flow.
         activity = Class.new(Activity::Railway(name: "Contract::Validate")) do
-          step extract,  id: "#{params_path}_extract", Output(:failure) => End(:extract_failure), inject: [extract_injections] unless skip_extract# || representer
-          step validate, id: "contract.#{name}.call", inject: [validate_injections]
+          step extract,  id: "#{params_path}_extract", Output(:failure) => End(:extract_failure), Activity::Railway.Inject() => extract_injections unless skip_extract# || representer
+          step validate, id: "contract.#{name}.call", Activity::Railway.Inject() => validate_injections
         end
 
         options = activity.Subprocess(activity)

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

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

data/lib/trailblazer/macro/contract.rb

@@ -13,7 +13,5 @@ module Trailblazer
 
   # All macros sit in the {Trailblazer::Macro::Contract} namespace, where we forward calls from
   # operations and activities to.
-  module Activity::DSL::Linear::Helper
-    Contract = Macro::Contract
-  end
+  Activity::DSL::Linear::Helper::Constants::Contract = Macro::Contract
 end

data/test/docs/contract_test.rb

@@ -294,7 +294,7 @@ class DocsContractInjectedKeyTest < Minitest::Spec
       "contract.default.extract_key": "song"
     )
     #:inject-key-call end
-    .inspect(:model).must_equal %{<Result:true [#<struct DocsContractInjectedKeyTest::Song title=\"SVG\", length=13>] >} }
+    res.inspect(:model).must_equal %{<Result:true [#<struct DocsContractInjectedKeyTest::Song title=\"SVG\", length=13>] >} }
 end
 
 #---
@@ -517,30 +517,47 @@ class DryValidationContractTest < Minitest::Spec
   it { Create.(params: { id: 1, title: "Y" }).inspect(:model).must_equal %{<Result:false [#<struct DryValidationContractTest::Song id=nil, title=nil>] >} }
   it { Create.(params: { id: 1, title: "Yo" }).inspect(:model).must_equal %{<Result:true [#<struct DryValidationContractTest::Song id=1, title="Yo">] >} }
 
-  #---
+  ##---
   # Contract::Validate(constant: DrySchema)
-  class OpWithSchema < Trailblazer::Operation
-    Schema = Dry::Validation.Contract do
-      params do
-        required(:title).filled
+
+  #:dry-schema-contract
+  module Song::Operation
+    class Archive < Trailblazer::Operation
+      Schema = Dry::Validation.Contract do
+        params do
+          required(:id).filled
+        end
       end
-    end
 
-    step Model( Song, :new ) # FIXME.
-    step Contract::Validate( constant: Schema, key: :song) # generic validate call for you.
+      # step Model(Song, :new)                              # You don't need {ctx[:model]}.
+      step Contract::Validate(constant: Schema, key: :song) # Your validation.
+      #~methods
+      # step Contract::Persist()                            # this is not possible!
+      #~methods end
+    end
   end
+  #:dry-schema-contract end
 
   # success
-  it { OpWithSchema.(params: {song: { title: "SVG" }}).success?.must_equal true }
+  it { _(Song::Operation::Archive.(params: {song: {id: "SVG"}}).success?).must_equal true }
   # failure
-  it { OpWithSchema.(params: {song: { title: nil }}).success?.must_equal false }
+  it { _(Song::Operation::Archive.(params: {song: {id: nil}}).success?).must_equal false }
+  # shows error messages
   it "shows error messages" do
-    result = OpWithSchema.(params: {song: { title: nil }})
+    #:dry-contract-call
+    result = Song::Operation::Archive.(params: {song: {id: nil}})
+    #:dry-contract-call end
+
+    _(result[:"result.contract.default"].errors.inspect).must_equal %{#<Dry::Validation::MessageSet messages=[#<Dry::Schema::Message text=\"must be filled\" path=[:id] predicate=:filled? input=nil>] options={:source=>[#<Dry::Schema::Message text=\"must be filled\" path=[:id] predicate=:filled? input=nil>], :hints=>false}>}
 
-    result[:"result.contract.default"].errors.inspect.must_equal %{#<Dry::Validation::MessageSet messages=[#<Dry::Schema::Message text=\"must be filled\" path=[:title] predicate=:filled? input=nil>] options={:source=>[#<Dry::Schema::Message text=\"must be filled\" path=[:title] predicate=:filled? input=nil>], :hints=>false}>}
+    # raise result[:"result.contract.default"].errors.messages[0].to_s.inspect
+    assert_equal result[:"result.contract.default"].errors[:id].inspect, %{["must be filled"]}
+    #:dry-contract-result
+    result[:"result.contract.default"].errors[:id] #=> ["must be filled"]
+    #:dry-contract-result end
   end
   # key not found
-  it { OpWithSchema.(params: {}).success?.must_equal false }
+  it { _(Song::Operation::Archive.(params: {}).success?).must_equal false }
 end
 
 class DocContractBuilderTest < Minitest::Spec

data/trailblazer-macro-contract.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "rake"
 
-  spec.add_dependency "trailblazer-activity-dsl-linear", ">= 0.5.0", "< 0.6.0"
+  spec.add_dependency "trailblazer-activity-dsl-linear", ">= 1.0.0.beta1", "< 1.1.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.2
+  version: 2.1.3.beta1
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-13 00:00:00.000000000 Z
+date: 2022-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reform
@@ -148,20 +148,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 1.0.0.beta1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 1.0.0.beta1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 1.1.0
 description: Operation macros for form objects
 email:
 - apotonick@gmail.com
@@ -207,9 +207,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.2.3
 signing_key: