trailblazer-circuit 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f95ca61bfed92118f9831c970dd69d6a7295588d
-  data.tar.gz: 16c1a84d09e530d319f831cf8c381d6f683f71d0
+  metadata.gz: e4720cd4250498f880e6d24166a0abaf2bf9281e
+  data.tar.gz: de3f4d50b0dc2ac8a68cb5d870723dce2dabc959
 SHA512:
-  metadata.gz: 7cd64582812530676cdd18c1389d811b0c2d97e38c4aa11561d427349fe8563fe345cb3ce64232690c9ed8a4aab8237078fa3d893387b21203c2baf35a187b79
-  data.tar.gz: e26c00db184a221e78d3685e8dcc055afc0fcf044a97a6f4e238273222b00a085f525d0acf76daa6d549225f355e18a8ef7b9107be668c07bdc3cf3a2d36b37e
+  metadata.gz: 2afcf342be6a11ffa098eb934d4b938cd4a71cce30843818d6121891b2d0189a70df99ebcf7cb7a9c287b477c6dc455ec78012007b2f0b8c9177270b05ad83eb
+  data.tar.gz: 49f4d688f2dc7ca968904d8b949285f0f12855963bbf28c7ce3158a4b2880593ea4fb16c91ebb139cf80c801605fa0a5f779bffeb81619209f49ec8147d2fb2b

data/CHANGES.md

@@ -1,3 +1,8 @@
+# 0.0.10
+
+* Introduce `Context::ContainerChain` to eventually replace the heavy-weight `Skill` object.
+* Fix a bug in `Option` where wrong args were passed when used without `flow_options`.
+
 # 0.0.9
 
 * Fix `Context#[]`, it returned `nil` when it should return `false`.

data/lib/trailblazer/circuit.rb

@@ -127,3 +127,4 @@ require "trailblazer/circuit/present"
 require "trailblazer/circuit/wrap"
 
 require "trailblazer/context"
+require "trailblazer/container_chain"

data/lib/trailblazer/circuit/version.rb

@@ -1,5 +1,5 @@
 module Trailblazer
   class Circuit
-    VERSION = "0.0.9"
+    VERSION = "0.0.10"
   end
 end

data/lib/trailblazer/container_chain.rb

@@ -0,0 +1,42 @@
+class Trailblazer::Context::ContainerChain # used to be called Resolver.
+  # Keeps a list of containers. When looking up a key/value, containers are traversed in
+  # the order they were added until key is found.
+  #
+  # Required Container interface: `#key?`, `#[]`.
+  #
+  # @note ContainerChain is an immutable data structure, it does not support writing.
+  # @param containers Array of <Container> objects (splatted)
+  def initialize(*containers)
+    @containers = containers
+  end
+
+  # @param name Symbol or String to lookup a value stored in one of the containers.
+  def [](name)
+    self.class.find(@containers, name)
+  end
+
+  # @private
+  def key?(name)
+    @containers.find { |container| container.key?(name) }
+  end
+
+  def self.find(containers, name)
+    containers.find { |container| container.key?(name) && (return container[name]) }
+  end
+
+
+
+
+
+  def to_hash
+    # FIXME: dry container, etc?
+    @containers.each_with_object({}) { |container, hash| hash.merge!(container.to_hash) }
+  end
+end
+
+# alternative implementation:
+# containers.reverse.each do |container| @mutable_options.merge!(container) end
+#
+# benchmark, merging in #initialize vs. this resolver.
+#                merge     39.678k (± 9.1%) i/s -    198.700k in   5.056653s
+#             resolver     68.928k (± 6.4%) i/s -    342.836k in   5.001610s

data/lib/trailblazer/context.rb

@@ -30,8 +30,7 @@ module Trailblazer
     end
 
     def [](name)
-      return @mutable_options[name] if @mutable_options.key?(name)
-      @wrapped_options[name]
+      ContainerChain.find( [@mutable_options, @wrapped_options], name )
     end
 
     def []=(name, value)
@@ -47,30 +46,23 @@ module Trailblazer
     # Return the Context's two components. Used when computing the new output for
     # the next activity.
     def decompose
-      # it would be cool if that could "destroy" the original object.
-      # also, if those hashes were immutable, that'd be amazing.
       [ @wrapped_options, @mutable_options ]
     end
 
+
+
+
     # TODO: massive performance bottleneck. also, we could already "know" here what keys the
     # transformation wants.
+    # FIXME: ToKeywordArguments()
     def to_hash
       {}.tap do |hash|
-        # arr = to_runtime_data << to_mutable_data << tmp_options
-
         # the "key" here is to call to_hash on all containers.
         [ @wrapped_options.to_hash, @mutable_options.to_hash ].each do |options|
           options.each { |k, v| hash[k.to_sym] = v }
         end
       end
     end
-
-    def Build
-      wrapped_options, mutable_options = *decompose
-      wrapped_options = yield(wrapped_options, mutable_options) if block_given?
-
-      Trailblazer::Context(wrapped_options)
-    end
   end
 
   def self.Context(wrapped_options, mutable_options={})

data/lib/trailblazer/option.rb

@@ -1,5 +1,3 @@
-# TODO: test all this, for christ's sake.
-
 module Trailblazer
   # @note This might go to trailblazer-args along with `Context` at some point.
   def self.Option(proc)
@@ -29,7 +27,7 @@ module Trailblazer
     # Note that both #evaluate_callable and #evaluate_method drop most of the args.
     # If you need those, override this class.
     # @private
-    def self.evaluate_callable(proc, *args)
+    def self.evaluate_callable(proc, *args, **flow_options)
       call!(proc, *args)
     end
 
@@ -67,6 +65,7 @@ module Trailblazer
       Option.build(KW, proc)
     end
 
+    # TODO: It would be cool if call! was typed and had `options SymbolizedHash` or something.
     class KW < Option
       # A different call implementation that calls `proc` with a "step interface".
       #   your_code.(options, **options)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-circuit
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-18 00:00:00.000000000 Z
+date: 2017-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -104,6 +104,7 @@ files:
 - lib/trailblazer/circuit/trace.rb
 - lib/trailblazer/circuit/version.rb
 - lib/trailblazer/circuit/wrap.rb
+- lib/trailblazer/container_chain.rb
 - lib/trailblazer/context.rb
 - lib/trailblazer/option.rb
 - trailblazer-circuit.gemspec