quartz 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebfd7d4019c4952c5fa8c089d1e40c7bd99d3383
-  data.tar.gz: 7383e1077dc7f67d1040b7249c84cf7504da6c41
+  metadata.gz: e8f6c9a4a2b1be439b263d6e8edcf851a7dff9bc
+  data.tar.gz: 6c289fdd3023c9c331352779eef346c2c7259371
 SHA512:
-  metadata.gz: 6d2874247cf7b5f25156452ccdb81c9a3d0a749fdeb125498e628f911edbf6c0c14fc1f24108579056b5bb3202011e2376d864dc7b31ebfd33b3fb23639e5641
-  data.tar.gz: 28c083a54b0191ece7ab3e735de9b41aa8d459535a8ca2bc2ef7db01ad19036fa0d6d2509ed7bb0969f189460bb594db5d9127099472ece45a25c18f6e1f0667
+  metadata.gz: 7ab102e4110877642bb02c149548f2e8746e258797ab85f2637d9ebc439fb8f634a451e686607d3dc7633ae20d6344045ae3c6669d1048cd4a71204df363043e
+  data.tar.gz: f923a2061e727caecb1e8a3bd12b17e5003cc6c7404c1ff4a552d773795a45bfa9eda42b6704dff052a441315d3fa33ae79d4f086d4ec710ce2ac1616d8db6bb

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.2.6
+- [#13] Meaningful exception types
+- [#20] Speed up Go Quartz process boot time
+- [#22] Handle large buffers
+
 # 0.2.5
 - [#12] Make seeds in Go process wrappers threadsafe
 - Destroy socket files upon exit inside Go processes

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/lib/quartz/exceptions.rb

@@ -0,0 +1,7 @@
+module Quartz
+  class ArgumentError < StandardError; end
+  class ConfigError < StandardError; end
+  class GoResponseError < StandardError; end
+  class GoServerError < StandardError; end
+  class ResponseError < StandardError; end
+end

data/lib/quartz/go_process.rb

@@ -16,7 +16,7 @@ class Quartz::GoProcess
     elsif opts[:bin_path]
       @go_process = IO.popen(opts[:bin_path])
     else
-      raise 'Missing go binary'
+      raise Quartz::ConfigError, 'Missing go binary'
     end
 
     block_until_server_starts
@@ -27,7 +27,7 @@ class Quartz::GoProcess
     @temp_file_path = "/tmp/quartz_runner_#{seed}"
 
     unless system('go', 'build', '-o', @temp_file_path, path)
-      raise 'Go compilation failed'
+      raise Quartz::ConfigError, 'Go compilation failed'
     end
 
     @go_process = IO.popen(@temp_file_path)
@@ -42,14 +42,14 @@ class Quartz::GoProcess
   end
 
   def block_until_server_starts
-    max_retries = 10
+    max_retries = 20
     retries = 0
-    delay = 0.1 # seconds
+    delay = 0.001 # seconds
 
     loop do
-      raise 'RPC server not starting' if retries > max_retries
       return if File.exists?(@socket_path)
-      sleep(delay * retries * 2**retries)
+      raise Quartz::GoServerError, 'RPC server not starting' if retries > max_retries
+      sleep(delay * 2**retries)
       retries += 1
     end
   end
@@ -67,7 +67,7 @@ class Quartz::GoProcess
     response = read
 
     if response['error']
-      raise "Metadata error: #{read['error']}"
+      raise Quartz::GoResponseError, "Metadata error: #{read['error']}"
     end
 
     response['result']
@@ -83,10 +83,26 @@ class Quartz::GoProcess
     read
   end
 
-  MAX_MESSAGE_SIZE = 1_000_000_000 # Bytes
+  if ['1.9.3', '2.0.0'].include?(RUBY_VERSION)
+    READ_EXCEPTION  = IO::WaitReadable
+  else
+    READ_EXCEPTION  = IO::EAGAINWaitReadable
+  end
+
+  MAX_MESSAGE_SIZE = 8192 # Bytes
 
   def read
-    JSON(socket.recv(MAX_MESSAGE_SIZE))
+    value = ''
+    loop do
+      begin
+        value << socket.recv_nonblock(MAX_MESSAGE_SIZE)
+        break if value.end_with?("\n")
+      rescue READ_EXCEPTION
+        IO.select([socket], [], [])
+      end
+    end
+
+    JSON(value)
   end
 
   def cleanup

data/lib/quartz/go_struct.rb

@@ -16,7 +16,7 @@ class Quartz::GoStruct
 
   def call(method_name, args)
     unless @struct_methods.include?(method_name)
-      raise "Invalid method: #{method_name}"
+      raise Quartz::ArgumentError, "Invalid method: #{method_name}"
     end
 
     arg_info = @method_name_to_arg_info[method_name]
@@ -24,7 +24,7 @@ class Quartz::GoStruct
     # Validate arguments
     args.each do |k, v|
       unless arg_info.include?(k)
-        raise "Invalid argument: #{k}"
+        raise Quartz::ArgumentError, "Invalid argument: #{k}"
       end
 
       # TODO: validate types

data/lib/quartz/validations.rb

@@ -7,7 +7,7 @@ module Quartz::Validations
       File.exist?(File.join(directory, 'go'))
     end
 
-    raise 'Go not installed.' unless go_exists
+    raise Quartz::ConfigError, 'Go not installed.' unless go_exists
   end
 
   def self.check_go_quartz_version
@@ -18,7 +18,7 @@ module Quartz::Validations
     end[0]
 
     unless installed_quartz_dir
-      raise "GOPATH not configured."
+      raise Quartz::ConfigError, "GOPATH not configured."
     end
 
     installed_quartz = File.read(File.join(installed_quartz_dir,

data/lib/quartz.rb

@@ -3,9 +3,9 @@ require 'securerandom'
 require 'socket'
 
 module Quartz
-  class ResponseError < StandardError; end
 end
 
+require 'quartz/exceptions'
 require 'quartz/go_process'
 require 'quartz/go_struct'
 require 'quartz/client'

data/quartz.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: quartz 0.2.5 ruby lib
+# stub: quartz 0.2.6 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "quartz"
-  s.version = "0.2.5"
+  s.version = "0.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["David Huie"]
-  s.date = "2015-02-02"
+  s.date = "2015-02-28"
   s.description = "A gem for calling Go code from Ruby"
   s.email = "dahuie@gmail.com"
   s.extra_rdoc_files = [
@@ -39,11 +39,14 @@ Gem::Specification.new do |s|
     "go/quartz/util.go",
     "lib/quartz.rb",
     "lib/quartz/client.rb",
+    "lib/quartz/exceptions.rb",
     "lib/quartz/go_process.rb",
     "lib/quartz/go_struct.rb",
     "lib/quartz/validations.rb",
     "quartz.gemspec",
     "spec/client_spec.rb",
+    "spec/examples/long_json.go",
+    "spec/examples_spec.rb",
     "spec/go_process_spec.rb",
     "spec/go_struct_spec.rb",
     "spec/spec_helper.rb",

data/spec/examples/long_json.go

@@ -0,0 +1,28 @@
+package main
+
+import "github.com/DavidHuie/quartz/go/quartz"
+
+type Example struct{}
+
+type ExampleArgs struct {
+	Num int
+}
+
+type Response struct {
+	Output []string
+}
+
+func (t *Example) LongJson(args ExampleArgs, response *Response) error {
+	result := []string{}
+	for i := 0; i < 8192; i++ {
+		result = append(result, "Test")
+	}
+	*response = Response{result}
+	return nil
+}
+
+func main() {
+	example := &Example{}
+	quartz.RegisterName("example", example)
+	quartz.Start()
+}

data/spec/examples_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe 'examples' do
+
+  describe 'json' do
+    it 'should handle long strings of json' do
+      client = Quartz::Client.new(file_path: 'spec/examples/long_json.go')
+      res = client[:example].call('LongJson', {})['Output']
+      expect(res.count).to eq(8192)
+      expect(res.first).to eq("Test")
+    end
+
+    it 'should handle many calls' do
+      results = []
+      client = Quartz::Client.new(file_path: 'spec/examples/long_json.go')
+
+      100.times do
+        results.concat(client[:example].call('LongJson', {})['Output'])
+      end
+
+      expect(results.count).to eq(819_200)
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quartz
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - David Huie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2015-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
@@ -94,11 +94,14 @@ files:
 - go/quartz/util.go
 - lib/quartz.rb
 - lib/quartz/client.rb
+- lib/quartz/exceptions.rb
 - lib/quartz/go_process.rb
 - lib/quartz/go_struct.rb
 - lib/quartz/validations.rb
 - quartz.gemspec
 - spec/client_spec.rb
+- spec/examples/long_json.go
+- spec/examples_spec.rb
 - spec/go_process_spec.rb
 - spec/go_struct_spec.rb
 - spec/spec_helper.rb