trailblazer-macro-contract 2.1.0.rc12 → 2.1.0.rc13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f2399e629c5260000daee0f15c7a8ba6d8ffe0c0a473322d6f7aa836c4a643c
-  data.tar.gz: 49fe81ecd97abe875cbd946cda6c6699cad6cdda0271b75061164a62728a7d7a
+  metadata.gz: 2f0af3fbe015d0d25b32b8cf099fdd66a26e27fe23cde4adc216ae588932d0d7
+  data.tar.gz: f54ca3d0c5e8135737b1a90c6a90babf0b1d518885d43596fcc641d3e499cdf8
 SHA512:
-  metadata.gz: 521df8740916a7dd8404608b030f017144452ca497bf96b59dcf14f7420cd0386d1ee300ac1ed5d681b89458ba9878961348c528b9f8816e76cb5bf68f740e0e
-  data.tar.gz: 9ebdea5a3afebcff077f87cb5cc1490258b40b094b8106bf9a4da8e26fd968c0bd701c6a2b35fff1a9772d59882e9a6ed6a81d280786d99132e377c832851b0f
+  metadata.gz: 432875c4d2eb2c96c372c7e2ab5983bab79914a3b85ccf360590d56379549f3b98e0c3365bd3c360a53e877d6cc84fc63257a8030fe18f056b47c9ffd4bb3de7
+  data.tar.gz: 9e1c00d228337886d42fa69c571a329ddde3360f344041d5447a873f4681570f1af5b937d83d04873cee9fbdc07a0ba0059213adcf60be5a65f039fb4753da22

data/CHANGES.md

@@ -1,3 +1,7 @@
+# 2.1.0.rc13
+
+* Use symbol keys on `ctx`, only.
+
 # 2.1.0.rc12
 
 * Dependencies updated.

data/Gemfile

@@ -5,7 +5,7 @@ gemspec
 gem "dry-auto_inject"
 gem "dry-matcher"
 
-gem "trailblazer-operation", path: "../trailblazer-operation"
+# gem "trailblazer-operation", path: "../trailblazer-operation"
 # gem "trailblazer-macro", path: "../trailblazer-macro"
 # gem "trailblazer-activity", path: "../trailblazer-activity"
 # gem "trailblazer-activity-dsl-linear", path: "../trailblazer-activity-dsl-linear"

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

@@ -2,7 +2,7 @@ module Trailblazer
   module Version
     module Macro
       module Contract
-        VERSION = "2.1.0.rc12".freeze
+        VERSION = "2.1.0.rc13".freeze
       end
     end
   end

data/lib/trailblazer/operation/contract.rb

@@ -16,9 +16,9 @@ module Trailblazer
         # Build contract at runtime.
         def self.call(options, circuit_options, name: "default", constant: nil, builder: nil)
           # TODO: we could probably clean this up a bit at some point.
-          contract_class = constant || options["contract.#{name}.class"] # DISCUSS: Injection possible here?
+          contract_class = constant || options[:"contract.#{name}.class"] # DISCUSS: Injection possible here?
           model          = options[:model]
-          name           = "contract.#{name}"
+          name           = :"contract.#{name}"
 
           options[name] = if builder
                             call_builder(options, circuit_options, builder: builder, constant: contract_class, name: name)

data/lib/trailblazer/operation/persist.rb

@@ -2,7 +2,7 @@ module Trailblazer
   class Operation
     module Contract
       def self.Persist(method: :save, name: "default")
-        path = "contract.#{name}"
+        path = :"contract.#{name}"
         step = ->(options, **) { options[path].send(method) }
 
         task = Activity::TaskBuilder::Binary(step)

data/lib/trailblazer/operation/validate.rb

@@ -6,7 +6,7 @@ module Trailblazer
       # Deviate to left track if optional key is not found in params.
       # Deviate to left if validation result falsey.
       def self.Validate(skip_extract: false, name: "default", representer: false, key: nil, constant: nil) # DISCUSS: should we introduce something like Validate::Deserializer?
-        params_path = "contract.#{name}.params" # extract_params! save extracted params here.
+        params_path = :"contract.#{name}.params" # extract_params! save extracted params here.
 
         extract  = Validate::Extract.new(key: key, params_path: params_path).freeze
         validate = Validate.new(name: name, representer: representer, params_path: params_path, constant: constant).freeze
@@ -52,11 +52,11 @@ module Trailblazer
         end
 
         def validate!(options, representer: false, from: :document, params_path: nil)
-          path     = "contract.#{@name}"
+          path     = :"contract.#{@name}"
           contract = @constant || options[path]
 
           # this is for 1.1-style compatibility and should be removed once we have Deserializer in place:
-          options["result.#{path}"] = result =
+          options[:"result.#{path}"] = result =
             if representer
               # use :document as the body and let the representer deserialize to the contract.
               # this will be simplified once we have Deserializer.

data/test/docs/contract_test.rb

@@ -37,7 +37,7 @@ class DocsContractOverviewTest < Minitest::Spec
 =end
 
   it do
-    assert Create.(params: {})["contract.default"].must_be_instance_of DocsContractOverviewTest::Create::MyContract
+    assert Create.(params: {})[:"contract.default"].must_be_instance_of DocsContractOverviewTest::Create::MyContract
   end
 
   #- result
@@ -45,13 +45,13 @@ class DocsContractOverviewTest < Minitest::Spec
     #:result
     result = Create.(params: { length: "A" })
 
-    result["result.contract.default"].success?        #=> false
-    result["result.contract.default"].errors          #=> Errors object
-    result["result.contract.default"].errors.messages #=> {:length=>["is not a number"]}
+    result[:"result.contract.default"].success?        #=> false
+    result[:"result.contract.default"].errors          #=> Errors object
+    result[:"result.contract.default"].errors.messages #=> {:length=>["is not a number"]}
 
     #:result end
-    result["result.contract.default"].success?.must_equal false
-    result["result.contract.default"].errors.messages.must_equal ({:title=>["can't be blank"], :length=>["is not a number"]})
+    result[:"result.contract.default"].success?.must_equal false
+    result[:"result.contract.default"].errors.messages.must_equal ({:title=>["can't be blank"], :length=>["is not a number"]})
   end
 
   it "shows 2-level tracing" do
@@ -114,7 +114,7 @@ class DocsContractSeparateKeyTest < Minitest::Spec
     step Contract::Persist( method: :sync )
 
     def extract_params!(options, **)
-      options["contract.default.params"] = options[:params][type]
+      options[:"contract.default.params"] = options[:params][type]
     end
   end
   #:key-extr end
@@ -160,7 +160,7 @@ class ContractConstantTest < Minitest::Spec
     #:constant-result
     result = Song::Create.(params: { title: "A" })
     result.success? #=> false
-    result["contract.default"].errors.messages
+    result[:"contract.default"].errors.messages
     #=> {:title=>["is too short (minimum is 2 characters)"], :length=>["is not a number"]}
     #:constant-result end
 
@@ -181,7 +181,7 @@ class ContractConstantTest < Minitest::Spec
   #:constant-new end
 
   it { Song::New.(params: {}).inspect(:model).must_equal %{<Result:true [#<struct ContractConstantTest::Song title=nil, length=nil>] >} }
-  it { Song::New.(params: {})["contract.default"].model.inspect.must_equal %{#<struct ContractConstantTest::Song title=nil, length=nil>} }
+  it { Song::New.(params: {})[:"contract.default"].model.inspect.must_equal %{#<struct ContractConstantTest::Song title=nil, length=nil>} }
   it do
     #:constant-new-result
     result = Song::New.(params: {})
@@ -218,8 +218,8 @@ class ContractConstantTest < Minitest::Spec
     result = Song::ValidateOnly.(params: { title: "Rising Force", length: 13 })
 
     result.success? #=> true
-    result["model"] #=> #<struct Song title=nil, length=nil>
-    result["contract.default"].title #=> "Rising Force"
+    result[:model] #=> #<struct Song title=nil, length=nil>
+    result[:"contract.default"].title #=> "Rising Force"
     #:validate-only-result end
   end
 end
@@ -320,7 +320,7 @@ class ContractNamedConstantTest < Minitest::Spec
   it do
     #:name-res
     result = Song::Create.(params: { title: "A" })
-    result["contract.form"].errors.messages #=> {:title=>["is too short (minimum is 2 ch...
+    result[:"contract.form"].errors.messages #=> {:title=>["is too short (minimum is 2 ch...
     #:name-res end
   end
 end
@@ -349,12 +349,12 @@ class ContractInjectConstantTest < Minitest::Spec
     #:di-contract-call
     Create.(
       params: { title: "Anthony's Song" },
-      "contract.default.class" => MyContract
+      :"contract.default.class" => MyContract
     )
     #:di-contract-call end
   end
-  it { Create.(params: { title: "A" }, "contract.default.class" => MyContract).inspect(:model).must_equal %{<Result:false [#<struct ContractInjectConstantTest::Song id=nil, title=nil>] >} }
-  it { Create.(params: { title: "Anthony's Song" }, "contract.default.class" => MyContract).inspect(:model).must_equal %{<Result:true [#<struct ContractInjectConstantTest::Song id=nil, title="Anthony's Song">] >} }
+  it { Create.(params: { title: "A" }, :"contract.default.class" => MyContract).inspect(:model).must_equal %{<Result:false [#<struct ContractInjectConstantTest::Song id=nil, title=nil>] >} }
+  it { Create.(params: { title: "Anthony's Song" }, :"contract.default.class" => MyContract).inspect(:model).must_equal %{<Result:true [#<struct ContractInjectConstantTest::Song id=nil, title="Anthony's Song">] >} }
 end
 
 class DryValidationContractTest < Minitest::Spec
@@ -391,12 +391,12 @@ class DryValidationContractTest < Minitest::Spec
 
   puts "@@@@@ #{Trailblazer::Developer.railway(Create, style: :rows)}"
 
-  it { Create.(params: {}).inspect("result.contract.default").must_include "Result:false"}
-  it { Create.(params: {}).inspect("result.contract.default").must_include "errors={:id=>[\"must be filled\""}
+  it { Create.(params: {}).inspect(:"result.contract.default").must_include "Result:false"}
+  it { Create.(params: {}).inspect(:"result.contract.default").must_include "errors={:id=>[\"must be filled\""}
 
-  it { Create.(params: { id: 1 }).inspect(:model, "result.contract.default").must_include "Result:false"}
-  it { Create.(params: { id: 1 }).inspect(:model, "result.contract.default").must_include "errors={:title=>[\"must be filled\", \"size cannot be less than 2\"]}"}
-  it { Create.(params: { id: 1 }).inspect(:model, "result.contract.default").wont_include ":id=>[\"must be filled\""}
+  it { Create.(params: { id: 1 }).inspect(:model, :"result.contract.default").must_include "Result:false"}
+  it { Create.(params: { id: 1 }).inspect(:model, :"result.contract.default").must_include "errors={:title=>[\"must be filled\", \"size cannot be less than 2\"]}"}
+  it { Create.(params: { id: 1 }).inspect(:model, :"result.contract.default").wont_include ":id=>[\"must be filled\""}
 
   it { Create.(params: { id: 1, title: "" }).inspect(:model).must_equal %{<Result:false [#<struct DryValidationContractTest::Song id=nil, title=nil>] >} }
   it { Create.(params: { id: 1, title: "Y" }).inspect(:model).must_equal %{<Result:false [#<struct DryValidationContractTest::Song id=nil, title=nil>] >} }
@@ -420,7 +420,7 @@ class DryValidationContractTest < Minitest::Spec
   it "shows error messages" do
     result = OpWithSchema.(params: {song: { title: nil }})
 
-    result["result.contract.default"].errors.must_equal(title: ["must be filled"])
+    result[:"result.contract.default"].errors.must_equal(title: ["must be filled"])
   end
   # key not found
   it { OpWithSchema.(params: {}).success?.must_equal false }

data/test/operation/contract_test.rb

@@ -26,16 +26,16 @@ class ContractTest < Minitest::Spec
     it do
       result = Update.(params: {title: "SVG"})
       result.success?.must_equal true
-      result["result.contract.default"].success?.must_equal true
-      result["result.contract.default"].errors.messages.must_equal({})
+      result[:"result.contract.default"].success?.must_equal true
+      result[:"result.contract.default"].errors.messages.must_equal({})
     end
 
     # failure
     it do
       result = Update.(params: {title: nil})
       result.success?.must_equal false
-      result["result.contract.default"].success?.must_equal false
-      result["result.contract.default"].errors.messages.must_equal({:title=>["can't be blank"]})
+      result[:"result.contract.default"].success?.must_equal false
+      result[:"result.contract.default"].errors.messages.must_equal({:title=>["can't be blank"]})
     end
 
     #---
@@ -63,7 +63,7 @@ class ContractTest < Minitest::Spec
     #---
     # contract.default.params gets set (TODO: change in 2.1)
     it { Upsert.( params: {song: { title: "SVG" }})[:params].must_equal({:song=>{:title=>"SVG"}} ) }
-    it { Upsert.( params: {song: { title: "SVG" }})["contract.default.params"].must_equal({:title=>"SVG"} ) }
+    it { Upsert.( params: {song: { title: "SVG" }})[:"contract.default.params"].must_equal({:title=>"SVG"} ) }
 
     #---
     #- inheritance

data/test/operation/persist_test.rb

@@ -42,7 +42,7 @@ class PersistTest < Minitest::Spec
   class Update < Create
   end
 
-  it { Trailblazer::Developer.railway( Update ).must_equal %{[>model.build,>contract.build,>contract.default.validate,<<PersistTest::Create::Fail1,>persist.save,<<PersistTest::Create::Fail2]} }
+  it { Trailblazer::Developer.railway(Update).must_equal %{[>model.build,>contract.build,>contract.default.validate,<<PersistTest::Create::Fail1,>persist.save,<<PersistTest::Create::Fail2]} }
 
   #---
   it do

data/test/test_helper.rb

@@ -3,6 +3,7 @@ require 'delegate'
 require "trailblazer/developer"
 require "trailblazer/macro"
 require "trailblazer-macro-contract"
+require "trailblazer/developer/render/linear"
 require "minitest/autorun"
 
 # TODO: convert tests to non-rails.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-macro-contract
 version: !ruby/object:Gem::Version
-  version: 2.1.0.rc12
+  version: 2.1.0.rc13
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-19 00:00:00.000000000 Z
+date: 2019-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reform
@@ -184,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: 'Macros for form-objects: Build, Validate, Persist'