trailblazer-operation 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06580a6dc8f0356b1c6b8216728703e5c994e0e1
-  data.tar.gz: c8f45a4f5066f203a59c04620fe90a2f464ded39
+  metadata.gz: 518732c6417e754d620873510361cd17958defb1
+  data.tar.gz: a77e4f2314161fb500b15017c79e81e1d53ffb09
 SHA512:
-  metadata.gz: 31fe5767c979b2224b6b06c18ffb76e3a60e99543788f219cc744cad361d69d1c710c18295835091c1e299a8966a5e81f2ca9eb02b295e5d273ae3ef8590e67d
-  data.tar.gz: c844b16ab00e425c533e9bc867520c4b88fb437ef63ddf949a41260a5a851af0b4577acb02d05fc7392235aa1d05ac9481a7516b3b1f3a2e906cd6e5c155058d
+  metadata.gz: 0b88e57e5469ab4f41f13954a4c92469f98c661c883c8c1bb1a3f192a32a9f8389e3d941768c867faa9a40d119cf671bca666389a2da704f4957cb7cffcb785d
+  data.tar.gz: e265e9034e34e802d0364ad3402ab2c5d9f02e1ce5bff8a72a9f78341aa3f1c04abd84625d40cd3abce9d64c54a8455b4a4281809cc2ce5351ac758066c688f1

data/CHANGES.md

@@ -1,3 +1,7 @@
+## 0.0.5
+
+* `_insert` provides better API now.
+
 ## 0.0.4
 
 * Don't pass the operation into `Result`, but the `Skill` options hash, only.

data/lib/trailblazer/operation/pipetree.rb

@@ -4,9 +4,10 @@ require "trailblazer/operation/result"
 require "uber/option"
 
 class Trailblazer::Operation
-  New     = ->(klass, options)     { klass.new(options) }                   # returns operation instance.
-  Process = ->(operation, options) { operation.process(options["params"]) }
+  New = ->(klass, options)     { klass.new(options) } # returns operation instance.
 
+  # Implements the API to populate the operation's pipetree and
+  # `Operation::call` to invoke the latter.
   # http://trailblazer.to/gems/operation/2.0/pipetree.html
   module Pipetree
     def self.included(includer)
@@ -14,7 +15,7 @@ class Trailblazer::Operation
       includer.extend DSL          # ::|, ::> and friends.
 
       includer.initialize_pipetree!
-      includer.>> New, name: "operation.new"
+      includer.>> New, name: "operation.new", wrap: false
     end
 
     module ClassMethods
@@ -47,9 +48,27 @@ class Trailblazer::Operation
       def <(*args); _insert(:<, *args) end
 
       # :private:
+      # High-level user step API that allows ->(options) procs.
       def _insert(operator, proc, options={})
         heritage.record(:_insert, operator, proc, options)
-        self["pipetree"].send(operator, Uber::Option[proc], options) # ex: pipetree.> Validate, after: Model::Build
+
+        # proc = Uber::Option[proc]
+        _proc =
+          if options[:wrap] == false
+            proc
+          elsif proc.is_a? Symbol
+            options[:name] ||= proc
+            ->(input, _options) { input.send(proc, _options) }
+          elsif proc.is_a? Proc
+            options[:name] ||= "#{self.name}:#{proc.source_location.last}" if proc.is_a? Proc
+            # ->(input, options) { proc.(**options) }
+            ->(input, _options) { proc.(_options) }
+          elsif proc.is_a? Uber::Callable
+            options[:name] ||= proc.class
+            ->(input, _options) { proc.(_options) }
+          end
+
+        self["pipetree"].send(operator, _proc, options) # ex: pipetree.> Validate, after: Model::Build
       end
 
       def ~(cfg)
@@ -71,6 +90,8 @@ class Trailblazer::Operation
 
       # Try to abstract as much as possible from the imported module. This is for
       # forward-compatibility.
+      # Note that Import#call will push the step directly on the pipetree which gives it the
+      # low-level (input, options) interface.
       Import = Struct.new(:operation, :user_options) do
         def call(operator, step, options)
           operation["pipetree"].send operator, step, options.merge(user_options)

data/lib/trailblazer/operation/version.rb

@@ -1,5 +1,5 @@
 module Trailblazer
   class Operation
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/test/call_test.rb

@@ -18,7 +18,7 @@ class CallTest < Minitest::Spec
     #---
     # success?
     class Update < Trailblazer::Operation
-      self.& ->(input, options) { input["params"] }, after: "operation.new"
+      self.& ->(options) { options["params"] }, after: "operation.new"
     end
 
     it { Update.(true).success?.must_equal true }

data/test/operation_skill_test.rb

@@ -12,12 +12,11 @@ class OperationSkillTest < Minitest::Spec
 end
 
 class OperationCompetenceTest < Minitest::Spec
-  Call = ->(input, options) { input.call }
   # Operation#[]
   # Operation#[]=
   # arbitrary options can be saved via Op#[].
   class Create < Trailblazer::Operation
-    self.> Call
+    self.> :call
 
     def call(*)
       self["drink"] = "Little Creatures"
@@ -38,7 +37,7 @@ class OperationCompetenceTest < Minitest::Spec
   # Operation::[]
   # Operation::[]=
   class Update < Trailblazer::Operation
-    self.> Call
+    self.> :call
 
     self["drink"] = "Beer"
 
@@ -57,7 +56,7 @@ class OperationCompetenceTest < Minitest::Spec
 
   # instance can override class-level
   class Delete < Trailblazer::Operation
-    self.> Call
+    self.> :call
 
     self["drink"] = "Beer"
 

data/test/pipetree_test.rb

@@ -54,29 +54,42 @@ class PipetreeTest < Minitest::Spec
   # ::>, ::<, ::>>, :&
   # with proc, method, callable.
   class Right < Trailblazer::Operation
-    self.> ->(input, options) { options[">"] = options["params"][:id] }
+    MyProc = ->(*) { }
+    self.> ->(options) { options[">"] = options["params"][:id] }, better_api: true
 
     self.> :method_name!
     def method_name!(options); self["method_name!"] = options["params"][:id] end
 
     class MyCallable
       include Uber::Callable
-      def call(operation, options); operation["callable"] = options["params"][:id] end
+      def call(options); options["callable"] = options["params"][:id] end
     end
     self.> MyCallable.new
   end
 
   it { Right.( id: 1 ).slice(">", "method_name!", "callable").must_equal [1, 1, 1] }
-  it { Right["pipetree"].inspect.must_equal %{[>>operation.new,>self,>return,>#<PipetreeTest::Right::MyCallable:>]} }
+  it { Right["pipetree"].inspect.must_equal %{[>>operation.new,>PipetreeTest::Right:58,>method_name!,>PipetreeTest::Right::MyCallable]} }
 
   #---
   # inheritance
   class Righter < Right
-    self.> ->(input, options) { options["righter"] = true }
+    self.> ->(options) { options["righter"] = true }
   end
 
   it { Righter.( id: 1 ).slice(">", "method_name!", "callable", "righter").must_equal [1, 1, 1, true] }
 end
 
+#---
+#- kw args
+class OperationKwArgsTest < Minitest::Spec
+  Song = Struct.new(:id)
 
-# args: operation, skills
+  class Create < Trailblazer::Operation
+    self.> ->(options) { options["model"] = "Object" }
+    # self.> ->(model:) { snippet }
+  end
+
+  it {
+    skip
+    Create.() }
+end

data/test/result_test.rb

@@ -17,7 +17,7 @@ class ResultTest < Minitest::Spec
   it { Result.new(true, "x"=> true, "y"=>1, "z"=>2).inspect("z", "y").must_equal %{<Result:true [2, 1] >} }
 
   class Create < Trailblazer::Operation
-    self.> ->(input, options) { input.call }
+    self.> :call
 
     def call(*)
       self[:message] = "Result objects are actually quite handy!"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-operation
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-29 00:00:00.000000000 Z
+date: 2016-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uber