pipetree 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13019affb084e0a3dc4470feec4f21c904a1af83
-  data.tar.gz: ea2b5913c8afad622ad624cd77736c9b6a601304
+  metadata.gz: fa9de99071c198cb1ac6254f7c5fc9eddbc3eaa1
+  data.tar.gz: ceb3b6450907aeccd607e8704fc78a24fbcd2b87
 SHA512:
-  metadata.gz: 521d4af02d44620e9a510a8e9703d843cda87aaccc02962d9b194881c837f56d3d1b4d9d77d0e5d127c66f9f24333ccabc94af763679eea3b98709b28d4ccf98
-  data.tar.gz: f49f1e93b4371a6282f71bfc24ab6241a86d118810cf0ab35a44f88f43adcd12529e6ad8fbac6ac8bbc156897ede6ad1fd9eabdcc368b70adc9b0f426373ce00
+  metadata.gz: d57ed120a07f1ab17b84c96539eefad984a702156f72dfd4d3e86aa03e6185df9b1786ffe7af666d75a4dfd1168ffd4b090ffd89b98a8d1f757dbc2fc1c1012a
+  data.tar.gz: 75183aa0a9538807dbd9e3d7fc832d7645618d6275be743ff9234aa4fbd4512d937917e24a73ea6351734572758adf3a71668a43af0a2186460e0b20afa9e067

data/CHANGES.md

@@ -1,3 +1,7 @@
+# 0.0.5
+
+* `Flow` doesn't inherit from `Array` anymore. Temporarily use `Uber::Delegates` to achieve the same interface. This will change in 0.1.x when `Insert` works against an array. This makes `Flow.new` the new canonical constructor which allows us to initialize `step@proc` properly.
+
 # 0.0.3
 
 * Improved insert semantics.

data/lib/pipetree/flow.rb

@@ -1,10 +1,17 @@
 class Pipetree < Array
-  class Flow < Array # yes, we could inherit, and so on.
+  class Flow
     require "pipetree/flow/inspect"
     include Inspect
     require "pipetree/flow/step_map"
     require "pipetree/insert"
 
+    def initialize(*args)
+      @steps     = Array.new(*args)
+      @step2proc = StepMap.new
+    end
+
+    # TODO: don't inherit from Array, because we don't want Array[].
+
     module Operators
       # Optimize the most common steps with Stay/And objects that are faster than procs.
       def <(proc, options={})
@@ -37,15 +44,20 @@ class Pipetree < Array
         options = { append: true }.merge(options)
 
         insert!(step, options).tap do
-          @step2proc ||= StepMap.new
           @step2proc[step] = options[:name], original_proc, operator
         end
+
+        self
       end
 
       # :private:
       def index(proc) # @step2proc: { <On @proc> => {proc: @proc, name: "trb.validate", operator: "&"} }
-        on = @step2proc.find_proc(proc) and return super(on)
+        on = @step2proc.find_proc(proc) and return @steps.index(on)
       end
+
+      require "uber/delegates"
+      extend Uber::Delegates
+      delegates :@steps, :<<, :each_with_index, :[]=, :delete_at, :insert, :unshift # FIXME: make Insert properly decoupled!
     end
     include Operators
 
@@ -53,7 +65,7 @@ class Pipetree < Array
     def call(input, options)
       input = [Right, input]
 
-      inject(input) do |memooo, step|
+      @steps.inject(input) do |memooo, step|
         last, memo = memooo
         step.call(last, memo, options)
       end

data/lib/pipetree/version.rb

@@ -1,3 +1,3 @@
 class Pipetree < Array
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/pipetree.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "uber"
+
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"

data/test/altering_test.rb

@@ -37,12 +37,12 @@ class FlowInsertTest < Minitest::Spec
   B = ->{ }
   C = ->{ }
 
-  it { pipe = Pipetree::Flow[].>(A).>(B).inspect.must_equal %{[>A,>B]} }
-  it { pipe = Pipetree::Flow[].>(A).>(B, before: A).inspect.must_equal %{[>B,>A]} }
-  it { pipe = Pipetree::Flow[].>(A).>(B).>(C, after: A).inspect.must_equal %{[>A,>C,>B]} }
-  it { pipe = Pipetree::Flow[].>(A).>(C, append: true).inspect.must_equal %{[>A,>C]} }
-  it { pipe = Pipetree::Flow[].>(A).>(C, prepend: true).inspect.must_equal %{[>C,>A]} }
-  it { pipe = Pipetree::Flow[].>(A).>(C, replace: A).inspect.must_equal %{[>C]} }
-  it { pipe = Pipetree::Flow[].>(A)._insert(A, {delete: true}, nil, nil).inspect.must_equal %{[]} }
+  it { pipe = Pipetree::Flow.new.>(A).>(B).inspect.must_equal %{[>A,>B]} }
+  it { pipe = Pipetree::Flow.new.>(A).>(B, before: A).inspect.must_equal %{[>B,>A]} }
+  it { pipe = Pipetree::Flow.new.>(A).>(B).>(C, after: A).inspect.must_equal %{[>A,>C,>B]} }
+  it { pipe = Pipetree::Flow.new.>(A).>(C, append: true).inspect.must_equal %{[>A,>C]} }
+  it { pipe = Pipetree::Flow.new.>(A).>(C, prepend: true).inspect.must_equal %{[>C,>A]} }
+  it { pipe = Pipetree::Flow.new.>(A).>(C, replace: A).inspect.must_equal %{[>C]} }
+  it { pipe = Pipetree::Flow.new.>(A)._insert(A, {delete: true}, nil, nil).inspect.must_equal %{[]} }
   # FIXME: add :delete and :replace.
 end

data/test/flow_test.rb

@@ -74,7 +74,7 @@ class FlowTest < Minitest::Spec
   #---
   # return value is new input.
   it do
-    pipe = Pipetree::Flow[
+    pipe = Pipetree::Flow.new [
       Pipetree::Flow::On.new(Pipetree::Flow::Right, ->(last, value, options) { [Pipetree::Flow::Right, value.reverse] } )
     ]
     pipe.("Hello", {}).must_equal [Pipetree::Flow::Right, "olleH"]
@@ -129,6 +129,9 @@ class FlowTest < Minitest::Spec
     it { pipe.index(Aaa).must_equal 0 }
     # with alias
     it { pipe.index("a.triple").must_equal 2 }
+
+    # without steps
+    it { Pipetree::Flow.new.index(B).must_equal nil }
   end
 
   #---

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: pipetree
 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-09 00:00:00.000000000 Z
+date: 2016-12-12 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: uber
+  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: bundler
   requirement: !ruby/object:Gem::Requirement