trailblazer-macro 2.1.0.beta4 → 2.1.0.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54ea3a5f8a3ac3510dbb5d2b3784a9c5218f0a8b52d7949eed340c4ca2b3e60f
-  data.tar.gz: f52e3036bbe026fe87d40521caad3a74edc54330857aacfe89d5ac7fdac81ed2
+  metadata.gz: 00614cb0bcb127cf89ff6c1e199fa6fc8f080ac7492a41155adfb9c90a4b55bd
+  data.tar.gz: 84d68e15a27452b1833679ff80f898f3158f908222ed2aa6a8fa288dc22b474d
 SHA512:
-  metadata.gz: ef37c64abde92f3216c31505bb84a5d83e56ef40271a8ec729acbca9ae982d60a8dc81b0ddaa447588b60d7260669d056a3646414603156f37abb3c09f4767ed
-  data.tar.gz: 0e9bfe23cd682728fb5b40bde817b16615c2073f0698dddddbf385db91ddc029be199de0d01bc7343f7d821c4df9b99ff3cf43ffb1354d721f9fa90c98180f8a
+  metadata.gz: c348fb564c7d873c716886c4764a7297d654acb1f31bfadc3568e5b2110ad01a3d6f12ade831db98c4ceae9e44a7fcd02a29ed8ab0aea533a6a546ab344d16f8
+  data.tar.gz: cc6be5f0b0b0ec3f5499dcfaaa846e4ef0d9afb8aa818e7ccaf02798a997f0b796d396acd2de05be4a1f7de16e4da975f603cf1a9e859e4c6d8523575c8c38dc

data/CHANGES.md

@@ -1,3 +1,9 @@
+# 2.1.0.beta6
+
+* Use newest operation.
+
+# 2.1.0.beta5
+
 # 2.1.0.beta4
 
 * New operation version.

data/Gemfile

@@ -4,11 +4,10 @@ source 'https://rubygems.org'
 gemspec
 
 # gem "trailblazer", github: "trailblazer/trailblazer"
+# gem "trailblazer-activity", path: "../trailblazer-activity"
 # gem "trailblazer-operation", path: "../operation"
-# gem "trailblazer-operation", github: "trailblazer/trailblazer-operation"
-gem "trailblazer-activity"#, github: "trailblazer/trailblazer-activity"
+# gem "trailblazer-activity"#, github: "trailblazer/trailblazer-activity"
 # gem "trailblazer-macro-contract", git: "https://github.com/trailblazer/trailblazer-macro-contract"
-gem "trailblazer-macro-contract", path: "../trailblazer-macro-contract"
 
 gem "minitest-line"
 gem "rubocop", require: false

data/lib/trailblazer-macro.rb

@@ -0,0 +1,2 @@
+require "trailblazer/macro/version"
+require "trailblazer/macro"

data/lib/trailblazer/macro.rb

@@ -1,4 +1,3 @@
-require "trailblazer/macro/version"
 require "trailblazer/operation"
 
 require "trailblazer/operation/inject"

data/lib/trailblazer/macro/version.rb

@@ -1,5 +1,5 @@
 module Trailblazer
   module Macro
-    VERSION = "2.1.0.beta4"
+    VERSION = "2.1.0.beta6".freeze
   end
 end

data/lib/trailblazer/operation/model.rb

@@ -10,7 +10,7 @@ class Trailblazer::Operation
       )
     )
 
-    { task: task, id: "model.build", extension: [extension] }
+    { task: task, id: "model.build", Trailblazer::Activity::DSL::Extension.new(extension) => true }
   end
 
   class Model
@@ -27,7 +27,7 @@ class Trailblazer::Operation
         action        = options["model.action"] || :new
         model_class   = options["model.class"]
         find_by_key   = options["model.find_by_key"] || :id
-        action        = :pass_through unless %i[new find_by find].include?(action)
+        action        = :pass_through unless %i[new find_by].include?(action)
 
         send("#{action}!", model_class, params, options["model.action"], find_by_key)
       end
@@ -36,18 +36,14 @@ class Trailblazer::Operation
         model_class.new
       end
 
-      def find!(model_class, params, *)
-        model_class.find(params[:id])
-      end
-
       # Doesn't throw an exception and will return false to divert to Left.
       def find_by!(model_class, params, action, find_by_key, *)
         model_class.find_by(find_by_key.to_sym => params[find_by_key])
       end
 
-      # Call any method on the model class and pass :id.
-      def pass_through!(model_class, params, action, *)
-        model_class.send(action, params[:id])
+      # Call any method on the model class and pass find_by_key, for example find(params[:id]).
+      def pass_through!(model_class, params, action, find_by_key, *)
+        model_class.send(action, params[find_by_key])
       end
     end
   end

data/lib/trailblazer/operation/nested.rb

@@ -22,7 +22,7 @@ module Trailblazer
       {
         task:      task,
         id:        id,
-        extension: [Trailblazer::Activity::TaskWrap::Merge.new(task_wrap_extensions)],
+        Trailblazer::Activity::DSL::Extension.new(Trailblazer::Activity::TaskWrap::Merge.new(task_wrap_extensions)) => true,
         outputs:   operation.outputs
       }
     end
@@ -36,7 +36,7 @@ module Trailblazer
         # The returned {Nested} instance is a valid circuit element and will be `call`ed in the circuit.
         # It simply returns the nested activity's `signal,options,flow_options` return set.
         # The actual wiring - where to go with that - is done by the step DSL.
-        return Trailblazer::Operation::Callable(nested_operation, call: :__call__), nested_operation, false
+        return nested_operation, nested_operation, false
       end
 
       def self.nestable_object?(object)
@@ -71,7 +71,7 @@ module Trailblazer
 
           # Overwrite :task so task_wrap.call_task will call this activity.
           # This is a trick so we don't have to repeat logic from #call_task here.
-          wrap_ctx[:task] = Trailblazer::Operation::Callable( activity, call: :__call__ )
+          wrap_ctx[:task] = activity
 
           return Activity::Right, [wrap_ctx, original_args]
         end

data/lib/trailblazer/operation/policy.rb

@@ -38,7 +38,7 @@ class Trailblazer::Operation
         )
       )
 
-      { task: task, id: path, extension: [extension] }
+      { task: task, id: path, Trailblazer::Activity::DSL::Extension.new(extension) => true }
     end
   end
 end

data/test/docs/guard_test.rb

@@ -37,8 +37,6 @@ end
 class DocsGuardTest < Minitest::Spec
   #:callable
   class MyGuard
-    include Uber::Callable
-
     def call(options, pass:, **)
       pass
     end

data/test/test_helper.rb

@@ -1,13 +1,8 @@
 require "pp"
+require "delegate" # Ruby 2.2
 require "trailblazer/macro"
 require "minitest/autorun"
 
-require "reform"
-require "reform/form/active_model/validations"
-Reform::Form.class_eval do
-  include Reform::Form::ActiveModel::Validations
-end
-
 module Mock
   class Result
     def initialize(bool); @bool = bool end

data/trailblazer-macro.gemspec

@@ -19,14 +19,9 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler"
 
-  spec.add_development_dependency "trailblazer-operation", ">= 0.2.5", "< 0.3.0"
-  spec.add_development_dependency "trailblazer-macro-contract", ">= 2.1.0.beta1", "< 2.2.0"
-
-  spec.add_development_dependency "reform"
-  spec.add_development_dependency "reform-rails"
+  spec.add_development_dependency "trailblazer-operation", ">= 0.3.0", "< 0.4.0"
 
   spec.add_development_dependency "minitest"
-  spec.add_development_dependency "nokogiri"
   spec.add_development_dependency "rake"
 
   spec.add_development_dependency "roar"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-macro
 version: !ruby/object:Gem::Version
-  version: 2.1.0.beta4
+  version: 2.1.0.beta6
 platform: ruby
 authors:
 - Nick Sutterer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-23 00:00:00.000000000 Z
+date: 2018-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,69 +30,21 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.5
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.5
-    - - "<"
       - !ruby/object:Gem::Version
         version: 0.3.0
-- !ruby/object:Gem::Dependency
-  name: trailblazer-macro-contract
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.0.beta1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0.beta1
+        version: 0.3.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.2.0
-- !ruby/object:Gem::Dependency
-  name: reform
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: reform-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -107,20 +59,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -181,6 +119,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- lib/trailblazer-macro.rb
 - lib/trailblazer/macro.rb
 - lib/trailblazer/macro/version.rb
 - lib/trailblazer/operation/guard.rb