datapipes 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5da9524d54bee9ddd9316b41e8b0aae7a39b2515
-  data.tar.gz: bf301fe6740d050cb879137c47be2e0232b998e3
+  metadata.gz: 36fcf4de0a57bf1712ee266c6d99272ae5b823bf
+  data.tar.gz: 3c88fe0667cf777f8241cbf57c4f729046645092
 SHA512:
-  metadata.gz: 541820467ba42ecb78f51359554457c4e09dc7c5896e39ba784dcd52a83f26f750d3ddc8f3af4a6740ed7793f2e7a871e0efd935d62a1f2427ba9cf657139b65
-  data.tar.gz: a2378d84a6e3192a737c0dccabc2a19d6fce8d2653bcf96f56689fe8cf871d1fc4a8e998f5ba7727ec881b12dbc4adea34a4f7816f5c55c8fbae8a7048a880dd
+  metadata.gz: d79a8457b86cbc3f9e12128e7e08ef840d7e90fd9f230cc57c48e41b7997570dfec5865c60ee0256ccfc511cc2e6a985dda7038821379d59fd61863e17fb1c6f
+  data.tar.gz: 0a5a5a692c50f1814affee9caaf132e0c142951733147d7683c02ba83daa3db5c4ec0e4d13d2c74449408438293b5d8b410628856eac37aec4afd5cd83c2f0f4

data/.rspec

@@ -0,0 +1 @@
+-c

data/CHANGELOG.md

@@ -0,0 +1,4 @@
+## 0.1.0
+- Change Tube cmposing way. https://github.com/taiki45/datapipes/pull/4
+- Remove `accept?` methods from Tube and Sink. d966744f9
+- Composable now works fine. 47ed4b45b

data/README.md

@@ -18,7 +18,7 @@ a few objects sparated by its responsibility.
   Tube
    |    pipe is '|'
    |
-Consumer
+  Sink
 ```
 
 To handle multi streamings, datapipes offers composabiliy. Source, Tube and Sink

data/lib/datapipes/basics/print.rb

@@ -2,7 +2,7 @@ class Datapipes
   module Basics
     class Print < Sink
       def run(data)
-        puts data
+        puts data if accept? data
       end
 
       def accept?(data)

data/lib/datapipes/basics/triple.rb

@@ -2,7 +2,11 @@ class Datapipes
   module Basics
     class Triple < Tube
       def run(data)
-        [data, data, data]
+        if accept? data
+          [data, data, data]
+        else
+          data
+        end
       end
 
       def accept?(data)

data/lib/datapipes/composable.rb

@@ -2,9 +2,12 @@ class Datapipes
   module Composable
     attr_accessor :accumulated
 
-    def +(other)
+    def +(op2)
+      op1 = self
+      op1_acc = (op1.accumulated || [op1])
+      op2_acc = (op2.accumulated || [op2])
       self.class.new.tap do |o|
-        o.accumulated = [self, other] + (accumulated || [])
+        o.accumulated = op1_acc + op2_acc
       end
     end
   end

data/lib/datapipes/sink.rb

@@ -3,13 +3,10 @@ class Datapipes
   class Sink
     include Composable
 
+    # TODO: parallel
     def run_all(data)
       @accumulated ||= [self]
-      @accumulated.each {|sink| sink.run(data) if sink.accept? data }
-    end
-
-    def accept?(data)
-      true
+      @accumulated.each {|sink| sink.run(data) }
     end
   end
 end

data/lib/datapipes/tube.rb

@@ -3,22 +3,17 @@ class Datapipes
   #
   # Build your own tube logic in `run` method.
   class Tube
-    include Composable
-
-    def run_all(data)
-      @accumulated ||= [self]
-
-      @accumulated.reduce(data) do |d, tube|
-        if tube.accept? d
-          tube.run(d)
-        else
-          d
+    def >>(op2)
+      op1 = self
+      Tube.new.tap do |o|
+        o.define_singleton_method(:run) do |data|
+          op2.run(op1.run(data))
         end
       end
     end
 
-    def accept?(data)
-      true
+    def run(data)
+      data
     end
   end
 end

data/lib/datapipes/version.rb

@@ -1,3 +1,3 @@
 class Datapipes
-  VERSION = '0.0.4'
+  VERSION = '0.1.0'
 end

data/lib/datapipes.rb

@@ -6,6 +6,7 @@ require 'datapipes/pipe'
 require 'datapipes/version'
 
 class Datapipes
+  # TODO: optional tube and pipe
   def initialize(source, tube, sink, pipe)
     @source = source
     @tube = tube
@@ -34,7 +35,7 @@ class Datapipes
       loop do
         break if resource_ended? && @pipe.empty?
 
-        data = @tube.run_all(@pipe.pull)
+        data = @tube.run(@pipe.pull)
         @sink.run_all(data)
       end
       Thread.current.kill

data/spec/composable_spec.rb

@@ -1,69 +1,4 @@
 require 'spec_helper'
 
 describe Datapipes::Composable do
-  context 'with valid object' do
-    let(:class_a) do
-      Class.new do
-        include Datapipes::Composable
-
-        def call
-          one
-        end
-
-        def one
-          1
-        end
-
-        def exec
-          accumulated.map(&:call)
-        end
-      end
-    end
-
-    let(:class_b) do
-      Class.new do
-        include Datapipes::Composable
-
-        def call
-          five
-        end
-
-        def five
-          5
-        end
-      end
-    end
-
-    let(:a) { class_a.new }
-    let(:b) { class_b.new }
-    subject { a + b }
-
-    it 'remember defined body' do
-      expect(subject.exec).to eq [1, 5]
-    end
-  end
-
-  context 'with tube' do
-    let(:tube_a) do
-      Class.new(Datapipes::Tube) do
-        def run(data)
-          data + 2
-        end
-      end.new
-    end
-
-    let(:tube_b) do
-      Class.new(Datapipes::Tube) do
-        def run(data)
-          data * 3
-        end
-      end.new
-    end
-
-    subject { tube_a + tube_b }
-
-    it 'generates new tube' do
-      expect(subject.run_all(4)).to eq 18
-    end
-  end
 end

data/spec/sink_spec.rb

@@ -0,0 +1,71 @@
+require 'spec_helper'
+
+describe Datapipes::Sink do
+  describe 'composable' do
+    context 'with 3 sinks' do
+      subject { sink_a + sink_b + sink_c }
+
+      it 'composes' do
+        subject.run_all(5)
+        expect(list).to eq [8, 20, 6]
+      end
+    end
+
+    context 'with 4 sinks' do
+      subject { sink_a + sink_b + sink_c + sink_d }
+
+      it 'composes' do
+        subject.run_all(5)
+        expect(list).to eq [8, 20, 6, 50]
+      end
+    end
+
+    describe 'associative law' do
+      let(:a) { (sink_a + sink_b) + sink_c }
+      let(:b) { sink_a + (sink_b + sink_c) }
+
+      it 'keeps' do
+        expect(a.run_all(3)).to eq b.run_all(3)
+      end
+    end
+
+    let(:list) { [] }
+
+    let(:sink_a) do
+      list_ = list
+      Class.new(Datapipes::Sink) do
+        define_method(:run) do |data|
+          list_ << (data + 3)
+        end
+      end.new
+    end
+
+    let(:sink_b) do
+      list_ = list
+      Class.new(Datapipes::Sink) do
+        define_method(:run) do |data|
+          list_ << (data * 4)
+        end
+      end.new
+    end
+
+    let(:sink_c) do
+      list_ = list
+      Class.new(Datapipes::Sink) do
+        define_method(:run) do |data|
+          list_ << (data + 1)
+        end
+      end.new
+    end
+
+    let(:sink_d) do
+      list_ = list
+      Class.new(Datapipes::Sink) do
+        define_method(:run) do |data|
+          list_ << (data * 10)
+        end
+      end.new
+    end
+
+  end
+end

data/spec/tube_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe Datapipes::Tube do
+  describe 'composable' do
+    let(:tube_a) do
+      Class.new(Datapipes::Tube) do
+        def run(data)
+          data + 2
+        end
+      end.new
+    end
+
+    let(:tube_b) do
+      Class.new(Datapipes::Tube) do
+        def run(data)
+          data * 3
+        end
+      end.new
+    end
+
+    let(:tube_c) do
+      Class.new(Datapipes::Tube) do
+        def run(data)
+          data + 4
+        end
+      end.new
+    end
+
+    subject { tube_a >> tube_b >> tube_c }
+
+    it 'composes' do
+      expect(subject.run(4)).to eq 22
+    end
+
+    describe 'associative law' do
+      let(:a) { (tube_a >> tube_b) >> tube_c }
+      let(:b) { tube_a >> (tube_b >> tube_c) }
+
+      it 'keeps' do
+        expect(a.run(5)).to eq b.run(5)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datapipes
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Taiki ONO
@@ -74,7 +74,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -94,7 +96,9 @@ files:
 - lib/datapipes/version.rb
 - spec/basics_spec.rb
 - spec/composable_spec.rb
+- spec/sink_spec.rb
 - spec/spec_helper.rb
+- spec/tube_spec.rb
 homepage: https://github.com/taiki45/datapipes
 licenses:
 - MIT
@@ -122,5 +126,7 @@ summary: An asynchronous multi steamings library.
 test_files:
 - spec/basics_spec.rb
 - spec/composable_spec.rb
+- spec/sink_spec.rb
 - spec/spec_helper.rb
+- spec/tube_spec.rb
 has_rdoc: