trailblazer-operation 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: c0ec02e51e1d32a39bfcb2ae86381ada7fa9659a
-  data.tar.gz: eaa3b0ae603fa52a37e3f9cd9624a6522cd0d64d
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YWZkYzZlMjRkOGZkM2RlYzNiMmY2NGE1MjY3YTA2NTk0YWExNDNkYw==
+  data.tar.gz: !binary |-
+    ZTU3MGVjODM2NjdjNTQ4YmRjMDM1YmMxOGViNGYxMTg3MTY2ZGVjMw==
 SHA512:
-  metadata.gz: 7d6bfe1597f701fdbf17a581fe4edd2f52d304d46d0ac53d9d90544e9aa1fc30a522281fc02b4d67cf9ad0f278d89b3994336c58e6377ac306d0727fcbe51736
-  data.tar.gz: 4f21e43d502bc7abefa28b1f05261f34d90e2b4f32d72d1d63b5167a84e41637f4965d4fef7320344fc6f461844e9e73dd3db9ecebb57226b6cc2adeb1bee851
+  metadata.gz: !binary |-
+    YzgzNDY1YjhhNmZjMmJiYjBjYzEyNTRlMTY1ODYyZGVhOTFjYjQyZTY5ZDMy
+    ZGEzY2UwNWFkZWYyMjE0ODMwMWI2NjllYTU2NTAwOTZkN2IwNmJkMjA2ZTcw
+    MjA2MWIzY2IxZDFiNmQ5OTVmY2NkNWY2ZTM0ZGE4ZDJkN2FiYTQ=
+  data.tar.gz: !binary |-
+    NjE1ODZhMDI4YWM1MjZjZDY0NDhlMWZiN2ZkNWUzZmJkMTFhMTBkMzA2YzM3
+    YjgxZGE3NmMzNjE0YjZjYmFlZWUyMmFmYjEwOTE3NDc0OWVkMTIzNWI3ODc5
+    ODNlY2QzMmVhMDNlYTEzYzA3Nzc2NzdlYTA5NTM0NmFmZTE3OGI=

data/CHANGES.md

@@ -1,3 +1,16 @@
+## 0.0.8
+
+* Introduce a new keyword signature for steps:
+
+    ```ruby
+    step ->(options, params:, **) { options["x"] = params[:id] }
+    ```
+
+    The same API works for instance methods and `Callable`s.
+
+    Note that the implementation of `Option` and `Skills#to_hash` are improveable, but work just fine for now.
+
+
 ## 0.0.7
 
 * Simplify inheritance by basically removing it.

data/Rakefile

@@ -10,7 +10,7 @@ Rake::TestTask.new(:test) do |test|
   test_files = FileList['test/*_test.rb']
 
   if RUBY_VERSION == "1.9.3"
-    test_files = test_files - %w{test/dry_container_test.rb}
+    test_files = test_files - %w{test/dry_container_test.rb test/2.0.0-pipetree_test.rb}
   end
 
   test.test_files = test_files

data/lib/trailblazer/operation/1.9.3/option.rb

@@ -0,0 +1,36 @@
+class Trailblazer::Operation
+  # :private:
+  module Option
+    def self.call(proc, &block)
+      type = :proc
+
+      option =
+        if proc.is_a? Symbol
+          type = :symbol
+          ->(input, _options) { call_method(proc, input, _options) }
+        elsif proc.is_a? Proc
+          ->(input, _options) { call_proc(proc, input, _options) }
+        elsif proc.is_a? Uber::Callable
+          type = :callable
+          ->(input, _options) { call_callable(proc, input, _options) }
+        end
+
+      yield type if block_given?
+      option
+    end
+
+    def self.call_proc(proc, input, options)
+      proc.(options)
+    end
+
+    def self.call_method(proc, input, options)
+      input.send(proc, options)
+    end
+
+    def self.call_callable(callable, input, options)
+      callable.(options)
+    end
+
+    KW = Option
+  end # Option
+end

data/lib/trailblazer/operation/option.rb

@@ -0,0 +1,54 @@
+class Trailblazer::Operation
+  # :private:
+  # This code is not beautiful, but could also be worse.
+  # I'm expecting some of this to go to Uber, as we use this pattern everywhere.
+  class Option
+    def self.call(proc, &block)
+      type = :proc
+
+      option =
+        if proc.is_a? Symbol
+          type = :symbol
+          ->(input, *_options) { call_method(proc, input, *_options) }
+        elsif proc.is_a? Proc
+          ->(input, *_options) { call_proc(proc, input, *_options) }
+        elsif proc.is_a? Uber::Callable
+          type = :callable
+          ->(input, *_options) { call_callable(proc, input, *_options) }
+        end
+
+      yield type if block_given?
+      option
+    end
+
+    def self.call_proc(proc, input, *options)
+      proc.(*options)
+    end
+
+    def self.call_method(proc, input, *options)
+      input.send(proc, *options)
+    end
+
+    def self.call_callable(callable, input, *options)
+      callable.(*options)
+    end
+
+    # Call the option with keyword arguments. Ruby <= 2.0.
+    class KW < Option
+      def self.call_proc(proc, input, options)
+        return proc.(options) if proc.arity == 1
+        proc.(options, **options)
+      end
+
+      def self.call_method(proc, input, options)
+        return input.send(proc, options) if input.method(proc).arity == 1 # TODO: remove this
+        input.send(proc, options, **options)
+      end
+
+      def self.call_callable(callable, input, options)
+        return callable.(options) if callable.method(:call).arity == 1
+        callable.(options, **options)
+      end
+    end
+  end
+end

data/lib/trailblazer/operation/pipetree.rb

@@ -3,6 +3,12 @@ require "pipetree/flow"
 require "trailblazer/operation/result"
 require "uber/option"
 
+if RUBY_VERSION == "1.9.3"
+  require "trailblazer/operation/1.9.3/option" # TODO: rename to something better.
+else
+  require "trailblazer/operation/option" # TODO: rename to something better.
+end
+
 class Trailblazer::Operation
   New = ->(klass, options) { klass.new(options) } # returns operation instance.
 
@@ -66,39 +72,16 @@ class Trailblazer::Operation
         DSL.insert(self["pipetree"], operator, proc, options, definer_name: self.name)
       end
 
-      # :private:
-      module Option
-        def self.call(proc, &block)
-          type = :proc
-
-          option =
-            if proc.is_a? Symbol
-              type = :symbol
-              ->(input, *_options) { input.send(proc, *_options) }
-            elsif proc.is_a? Proc
-              # ->(input, options) { proc.(**options) }
-              ->(input, *_options) { proc.(*_options) }
-            elsif proc.is_a? Uber::Callable
-              type = :callable
-              ->(input, *_options) { proc.(*_options) }
-            end
-
-          yield type if block_given?
-          option
-        end
-      end
-
       # :public:
       # Wrap the step into a proc that only passes `options` to the step.
       # This is pure convenience for the developer and will be the default
       # API for steps. ATM, we also automatically generate a step `:name`.
       def self.insert(pipe, operator, proc, options={}, kws={}) # TODO: definer_name is a hack for debugging, only.
-        # proc = Uber::Option[proc]
         _proc =
           if options[:wrap] == false
             proc
           else
-            Option.(proc) do |type|
+            Option::KW.(proc) do |type|
               options[:name] ||= proc if type == :symbol
               options[:name] ||= "#{kws[:definer_name]}:#{proc.source_location.last}" if proc.is_a? Proc if type == :proc
               options[:name] ||= proc.class  if type == :callable

data/lib/trailblazer/operation/version.rb

@@ -1,5 +1,5 @@
 module Trailblazer
   class Operation
-    VERSION = "0.0.7"
+    VERSION = "0.0.8"
   end
 end

data/lib/trailblazer/skill.rb

@@ -30,6 +30,20 @@ module Trailblazer
       @mutable_options
     end
 
+    # Called when Ruby transforms options into kw args, via **options.
+    # TODO: this method has massive potential for speed improvements.
+    def to_hash
+      {}.tap do |h|
+        arr = to_runtime_data << to_mutable_data
+
+
+        arr.each { |hsh|
+         hsh.each { |k, v| h[k.to_sym] = v }
+        }
+
+      end
+    end
+
     # Look through a list of containers until you find the skill.
     class Resolver
     # alternative implementation:

data/test/2.0.0-pipetree_test.rb

@@ -0,0 +1,65 @@
+require "test_helper"
+
+class Ruby200PipetreeTest < Minitest::Spec
+  class Create < Trailblazer::Operation
+    consider ->(*, params:, **) { params["run"] }    # only test kws.
+    step     ->(options, params:nil, **) { options["x"] = params["run"] } # read and write.
+    step     ->(options) { options["y"] = options["params"]["run"] } # old API.
+  end
+
+  it { Create.("run" => false).inspect("x", "y").must_equal %{<Result:false [nil, nil] >} }
+  it { Create.("run" => true).inspect("x", "y").must_equal %{<Result:true [true, true] >} }
+
+  #- instance methods
+  class Update < Trailblazer::Operation
+    consider :params!    # only test kws.
+    step     :x! # read and write.
+    step     :y! # old API.
+
+    def params!(*, params:, **)
+      params["run"]
+    end
+
+    def x!(options, params:nil, **)
+      options["x"] = params["run"]
+    end
+
+    def y!(options)
+      options["y"] = options["params"]["run"]
+    end
+  end
+
+  it { Update.("run" => false).inspect("x", "y").must_equal %{<Result:false [nil, nil] >} }
+  it { Update.("run" => true).inspect("x", "y").must_equal %{<Result:true [true, true] >} }
+
+
+  class Delete < Trailblazer::Operation
+    class Params
+      extend Uber::Callable
+      def self.call(*, params:, **)
+        params["run"]
+      end
+    end
+
+    class X
+      extend Uber::Callable
+      def self.call(options, params:nil, **)
+        options["x"] = params["run"]
+      end
+    end
+
+    class Y
+      extend Uber::Callable
+      def self.call(options)
+        options["y"] = options["params"]["run"]
+      end
+    end
+
+    consider Params
+    step     X
+    step     Y
+  end
+
+  it { Delete.("run" => false).inspect("x", "y").must_equal %{<Result:false [nil, nil] >} }
+  it { Delete.("run" => true).inspect("x", "y").must_equal %{<Result:true [true, true] >} }
+end

data/test/gemfiles/Gemfile.ruby-1.9.lock

@@ -1,9 +1,9 @@
 PATH
   remote: ../../
   specs:
-    trailblazer-operation (0.0.6)
+    trailblazer-operation (0.0.8)
       declarative
-      pipetree (>= 0.0.4, < 0.1.0)
+      pipetree (>= 0.0.5, < 0.1.0)
       uber (>= 0.1.0, < 0.2.0)
 
 GEM
@@ -11,9 +11,10 @@ GEM
   specs:
     declarative (0.0.8)
       uber (>= 0.0.15)
-    minitest (5.9.1)
-    pipetree (0.0.4)
-    rake (11.3.0)
+    minitest (5.10.1)
+    pipetree (0.0.5)
+      uber
+    rake (12.0.0)
     uber (0.1.0)
 
 PLATFORMS

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-operation
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Nick Sutterer
@@ -14,96 +14,96 @@ dependencies:
   name: uber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.0
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.0
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: declarative
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pipetree
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.5
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.5
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   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
     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: minitest
   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'
 description: Trailblazer's operation object.
@@ -113,19 +113,22 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - CHANGES.md
 - Gemfile
 - README.md
 - Rakefile
 - lib/trailblazer/operation.rb
+- lib/trailblazer/operation/1.9.3/option.rb
 - lib/trailblazer/operation/generic.rb
+- lib/trailblazer/operation/option.rb
 - lib/trailblazer/operation/pipetree.rb
 - lib/trailblazer/operation/result.rb
 - lib/trailblazer/operation/skill.rb
 - lib/trailblazer/operation/version.rb
 - lib/trailblazer/skill.rb
+- test/2.0.0-pipetree_test.rb
 - test/benchmark/skill_resolver_benchmark.rb
 - test/call_test.rb
 - test/dry_container_test.rb
@@ -150,21 +153,22 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Trailblazer's operation object with dependency management and pipetree flow.
 test_files:
+- test/2.0.0-pipetree_test.rb
 - test/benchmark/skill_resolver_benchmark.rb
 - test/call_test.rb
 - test/dry_container_test.rb