datapipes 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36fcf4de0a57bf1712ee266c6d99272ae5b823bf
-  data.tar.gz: 3c88fe0667cf777f8241cbf57c4f729046645092
+  metadata.gz: e7320f603074b6f0907667850275091622de079d
+  data.tar.gz: f5c9b51dac1c2c63f7b8703ea7144eaecf5cee85
 SHA512:
-  metadata.gz: d79a8457b86cbc3f9e12128e7e08ef840d7e90fd9f230cc57c48e41b7997570dfec5865c60ee0256ccfc511cc2e6a985dda7038821379d59fd61863e17fb1c6f
-  data.tar.gz: 0a5a5a692c50f1814affee9caaf132e0c142951733147d7683c02ba83daa3db5c4ec0e4d13d2c74449408438293b5d8b410628856eac37aec4afd5cd83c2f0f4
+  metadata.gz: 0b98bee8388e04ff8f841e9d9cd5f9f07fc3faaed18d2513630cb38b060fc2e9f9d46b64373d6275af06c657ba80891512ef32ea58d86111f907718a6c3ddf1e
+  data.tar.gz: fdcd53dcc0be76ac8603bcf58a265753d496a60f0d45e5befef68a592a5cd4adf6957453134bc949dfb7123a083e5ab9617a97c97f0da92d2076b60797ba8937

data/.travis.yml

@@ -2,7 +2,6 @@ language: ruby
 rvm:
   - 2.1
   - 2.0
-  - 1.9.3
 branches:
   only:
     - master

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.1
+- Drop Ruby 1.9 supports.
+- Tube and Pipe are optional in making datapipe.
+
 ## 0.1.0
 - Change Tube cmposing way. https://github.com/taiki45/datapipes/pull/4
 - Remove `accept?` methods from Tube and Sink. d966744f9

data/examples/basics.rb

@@ -1,36 +1,14 @@
 require 'datapipes'
 
-class List < Datapipes::Source
-  def run
-    (1..10).each {|i| produce(i) }
-  end
-end
-
-class Triple < Datapipes::Tube
-  def run(data)
-    [data, data, data]
-  end
-
-  def accept?(data)
-    data.is_a? Integer and data > 3
-  end
-end
-
-class Print < Datapipes::Sink
-  def run(data)
-    puts data
-  end
-
-  def accept?(data)
-    data.is_a? Array and data[0] < 7
-  end
-end
+$: << File.expand_path('..', __FILE__)
+require 'list'
+require 'triple'
+require 'print'
 
 datapipe = Datapipes.new(
-  List.new,           # A source
-  Triple.new,         # A tube
-  Print.new,          # A sink
-  Datapipes::Pipe.new # A pipe
+  List.new,        # A source
+  Print.new,       # A sink
+  tube: Triple.new,
 )
 
 datapipe.run_resource

data/examples/list.rb

@@ -0,0 +1,5 @@
+class List < Datapipes::Source
+  def run
+    (1..10).each {|i| produce(i) }
+  end
+end

data/examples/print.rb

@@ -0,0 +1,9 @@
+class Print < Datapipes::Sink
+  def run(data)
+    puts data if accept? data
+  end
+
+  def accept?(data)
+    data.is_a? Array and data[0] < 7
+  end
+end

data/examples/triple.rb

@@ -0,0 +1,13 @@
+class Triple < Datapipes::Tube
+  def run(data)
+    if accept? data
+      [data, data, data]
+    else
+      data
+    end
+  end
+
+  def accept?(data)
+    data.is_a? Integer and data > 3
+  end
+end

data/lib/datapipes.rb

@@ -5,16 +5,14 @@ require 'datapipes/sink'
 require 'datapipes/pipe'
 require 'datapipes/version'
 
+Thread.abort_on_exception = true
+
 class Datapipes
-  # TODO: optional tube and pipe
-  def initialize(source, tube, sink, pipe)
+  def initialize(source, sink, tube: Tube.new, pipe: Pipe.new)
     @source = source
     @tube = tube
     @sink = sink
     @pipe = pipe
-
-    Thread.abort_on_exception = true
-    @flag = Queue.new
   end
 
   def run_resource
@@ -25,7 +23,7 @@ class Datapipes
     runners.each(&:join)
 
     notify_resource_ending
-    graceful_down(consumer)
+    consumer.join
   end
 
   private
@@ -33,27 +31,21 @@ class Datapipes
   def run_comsumer
     Thread.new do
       loop do
-        break if resource_ended? && @pipe.empty?
+        data = @pipe.pull
+        break if resource_ended?(data)
 
-        data = @tube.run(@pipe.pull)
-        @sink.run_all(data)
+        @sink.run_all(@tube.run(data))
       end
-      Thread.current.kill
     end
   end
 
   def notify_resource_ending
-    @flag.enq true
-    Thread.pass
+    @pipe.recieve Notification.new
   end
 
-  def resource_ended?
-    !@flag.empty?
+  def resource_ended?(data)
+    data.is_a? Notification
   end
 
-  def graceful_down(consumer)
-    sleep 0.1
-    consumer.kill if consumer.status == 'sleep'
-    consumer.join
-  end
+  Notification = Class.new
 end

data/lib/datapipes/version.rb

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

data/spec/basics_spec.rb

@@ -1,16 +1,19 @@
 require 'spec_helper'
-require 'datapipes/basics'
 
-describe Datapipes::Basics do
+$: << File.expand_path('../../examples', __FILE__)
+require 'list'
+require 'triple'
+require 'print'
+
+describe 'basic function' do
   before { $stdout = StringIO.new }
   after { $stdout = STDOUT }
 
   let(:datapipe) do
     Datapipes.new(
-      Datapipes::Basics::List.new,
-      Datapipes::Basics::Triple.new,
-      Datapipes::Basics::Print.new,
-      Datapipes::Pipe.new
+      List.new,
+      Print.new,
+      tube: Triple.new
     )
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datapipes
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Taiki ONO
@@ -83,11 +83,10 @@ files:
 - Rakefile
 - datapipes.gemspec
 - examples/basics.rb
+- examples/list.rb
+- examples/print.rb
+- examples/triple.rb
 - lib/datapipes.rb
-- lib/datapipes/basics.rb
-- lib/datapipes/basics/list.rb
-- lib/datapipes/basics/print.rb
-- lib/datapipes/basics/triple.rb
 - lib/datapipes/composable.rb
 - lib/datapipes/pipe.rb
 - lib/datapipes/sink.rb

data/lib/datapipes/basics.rb

@@ -1,3 +0,0 @@
-require 'datapipes/basics/list'
-require 'datapipes/basics/triple'
-require 'datapipes/basics/print'

data/lib/datapipes/basics/list.rb

@@ -1,9 +0,0 @@
-class Datapipes
-  module Basics
-    class List < Source
-      def run
-        (1..10).each {|i| produce(i) }
-      end
-    end
-  end
-end

data/lib/datapipes/basics/print.rb

@@ -1,13 +0,0 @@
-class Datapipes
-  module Basics
-    class Print < Sink
-      def run(data)
-        puts data if accept? data
-      end
-
-      def accept?(data)
-        data.is_a? Array and data[0] < 7
-      end
-    end
-  end
-end

data/lib/datapipes/basics/triple.rb

@@ -1,17 +0,0 @@
-class Datapipes
-  module Basics
-    class Triple < Tube
-      def run(data)
-        if accept? data
-          [data, data, data]
-        else
-          data
-        end
-      end
-
-      def accept?(data)
-        data.is_a? Integer and data > 3
-      end
-    end
-  end
-end