zillabyte 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 13ef9e2915ce6842d0dd7e38ebc3f30d3a61eae2
-  data.tar.gz: f54c566d1fe9fac2fd0d8acee88e8180ae51820b
-SHA512:
-  metadata.gz: 6a926d4112bd1d096b0e50048c9e7fe9d28a7f15d0a644a647cf5989ac3028b27def66536cf1b22b46232c6b10478f05c5a696581c40dfc57efa370e667ebcf1
-  data.tar.gz: 28f625b349f8a8720983e21c82ddb76ee0f752fc473e2896f2a5191b1f2476743effafcb1a44a67094beae98a8b667592757f5e707f59f591ebf5f6916352c08
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZDgzZWY4MDg3YjI5MDg1YzQwZjNiNWNmYWM0M2E4Nzc2MTdkYzFlMg==
+  data.tar.gz: !binary |-
+    YzdhM2IwMzRjYmFjZTdiOGJjOTMxYmExZmJkNTMwODU3OTc1M2Q1MA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NTIwNTgyYjZkNGVkNGIyNDVjMjNlYTlhMTI3MGMyYWFjNjFjMjdkZjNmYjY2
+    OWFjNGRhZWE1ODg5NDdjNTgyOTc5MjY1MmExY2Q5NGJmYzI1NjBjOWFhODVj
+    MDI3YjkwNDJjZTQxMDg0NmIyNTM5NzAxNjg2MmY3NTVlMjYwYTg=
+  data.tar.gz: !binary |-
+    ZDYyZTFjM2M5MmNmNzY1NDU0ZDIwNmI2YmQwMmJiNmQ0ODZhZDMxNGQwNTM5
+    ZjFiYmNlYzBlODUzYzRmNTEzZmRjMTE5ZDUxMzg5NGVhODA3NDc1OTUxMTQy
+    MjUwN2Q2MGVhNTc4Yjg4NmQ2Njg1NDI2MjQyODQwNDI1ZDA4ZGY=

data/ruby/lib/zillabyte/harness/join.rb

@@ -32,13 +32,13 @@ class Zillabyte::Harness::Join
   class Node
     attr_accessor :_name, :_type, :_lhs_stream, :_rhs_stream, :_lhs_fields, :_rhs_fields, :_join_type, :_emits
 
-    def initialize(*args)
-      @_name = "join_"+Zillabyte::Harness::Counter.get()
+    def initialize(lhs_stream, rhs_stream, options = {})
+      @_name = options[:name] || "join_"+Zillabyte::Harness::Counter.get()
       @_type = 'join'
       @_join_type = :inner
-      @_lhs_stream = args[0]._name
-      @_rhs_stream = args[1]._name
-      options = args[2]
+      @_lhs_stream = lhs_stream._name
+      @_rhs_stream = rhs_stream._name
+      @_options = options
 
       options.symbolize_keys!
 

data/ruby/lib/zillabyte/harness/stream.rb

@@ -45,10 +45,20 @@ class Zillabyte::Harness::Stream
   end
 
   def join_with(*args)
+    
     lhs_stream = self
     rhs_stream = args[0]
+    options = args[1] || {}
+    
+    if rhs_stream.is_a?(Zillabyte::Harness::StreamBuilder)
+      rhs_stream = rhs_stream._last_stream
+    end
+    if lhs_stream.is_a?(Zillabyte::Harness::StreamBuilder)
+      lhs_stream = lhs_stream._last_stream
+    end
+    
     op = Zillabyte::Harness::OperationHandler.new(@_app, self.class)
-    op.build_multilang_operation("join", self, *args)
+    op.build_multilang_operation("join", lhs_stream, rhs_stream, options)
       .add_operation_properties_to_info(:name, :type, :lhs_fields, :rhs_fields, :join_type, :lhs_stream, :rhs_stream)
       .create_arc_info_from_stream(lhs_stream, :left)
       .create_arc_info_from_stream(rhs_stream, :right)
@@ -72,9 +82,10 @@ class Zillabyte::Harness::Stream
 
   def loop_back(*args, &block)
     # This is not a real operation, just telling the stream to loop back to the previous operation
-    loop_back_node = args[0]
+    @_vector_options, @_options = Zillabyte::Harness::Helper.get_vector_and_hashes(args)
+    loop_back_node = @_vector_options[0]
     Zillabyte::Harness::Helper.check_loop_back(self, loop_back_node, @_app._nodes)
-    Zillabyte::Harness::Helper.write_arc_to_file({"name" => self._name, "origin" => self._previous_node_name, "dest" => loop_back_node, "loop_back" => 1}, @_app._socket)
+    Zillabyte::Harness::Helper.write_arc_to_file({"name" => (@_options[:name] || self._name), "origin" => self._previous_node_name, "dest" => loop_back_node, "loop_back" => 1}, @_app._socket)
   end
 
   def sink(*args, &block)

data/ruby/lib/zillabyte/harness/stream_builder.rb

@@ -1,28 +1,60 @@
-class Zillabyte::Harness::StreamBuilder
-  attr_accessor :_name, :_app, :_previous_node_name
+class Zillabyte::Harness::StreamBuilder < Array
 
   def initialize(first_stream)
     @_streams = [first_stream]
   end
-
-
-  def [](v) 
-    raise "The previous operation did not emit a split stream."
+  
+  # Override these methods explicitly because they are provided by 'Array'
+  def each(*args, &block)
+    _handle_function(:each, *args, &block)
+  end
+  
+  def group_by(*args, &block)
+    _handle_function(:group_by, *args, &block)
+  end
+  
+  def map(*args, &block)
+    raise "Unsupported"
+  end
+  
+  
+  
+  def [](v)
+    if self.size == 0
+      raise "The previous operation did not emit a split stream"
+    else
+      return Zillabyte::Harness::StreamBuilder.new(super)
+    end
   end
 
-  # Ruby magic to automatically call 'method_name' on the last stream we collected
-  def method_missing(method_name, *args, &block)
+  def _handle_function(method_name, *args, &block)
+    
+    if self.size > 0
+      raise "The previous operation split the stream."
+    end
+    
     results = @_streams.last.send method_name, *args, &block
     if results.is_a?(Array)
       # Split stream... 
-      return results.map {|stream|
-        Zillabyte::Harness::StreamBuilder.new(stream)
-      }
+      results.each_with_index do |stream, i|
+        self[i] = stream
+      end
     else
       # Continue this stream... 
       @_streams << results
+      self.clear()
     end
     return self
   end
+
+
+  # Ruby magic to automatically call 'method_name' on the last stream we collected
+  def method_missing(method_name, *args, &block)
+    _handle_function(method_name, *args, &block)
+  end
+  
+  def _last_stream()
+    @_streams.last
+  end
   
 end

data/ruby/lib/zillabyte/version.rb

@@ -1,3 +1,3 @@
 module Zillabyte
-  VERSION = "0.9.5" unless defined?(VERSION)
+  VERSION = "0.9.6" unless defined?(VERSION)
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: zillabyte
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - zillabyte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-29 00:00:00.000000000 Z
+date: 2014-09-30 00:00:00.000000000 Z
 dependencies:
 - !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: zillabyte-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: 0.9.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: 0.9.6
 description: The Official Zillabyte Gem
 email:
 - gem@zillabyte.com
@@ -45,9 +45,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ruby/lib/zillabyte.rb
 - ruby/lib/zillabyte/common/progress.rb
-- ruby/lib/zillabyte/harness.rb
 - ruby/lib/zillabyte/harness/app.rb
 - ruby/lib/zillabyte/harness/base.rb
 - ruby/lib/zillabyte/harness/clump.rb
@@ -71,7 +69,9 @@ files:
 - ruby/lib/zillabyte/harness/stream.rb
 - ruby/lib/zillabyte/harness/stream_builder.rb
 - ruby/lib/zillabyte/harness/tuple.rb
+- ruby/lib/zillabyte/harness.rb
 - ruby/lib/zillabyte/version.rb
+- ruby/lib/zillabyte.rb
 homepage: http://www.zillabyte.com
 licenses:
 - MIT
@@ -82,17 +82,17 @@ require_paths:
 - ruby/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: The Official Zillabyte Gem