jubatus 0.4.1 → 0.5.0

data/lib/jubatus/stat/client.rb

@@ -1,59 +1,58 @@
-# This file is auto-generated from stat.idl
+# This file is auto-generated from stat.idl(0.4.5-347-g86989a6) with jenerator version 0.4.5-418-gd2d5f04/develop
 # *** DO NOT EDIT ***
 
 require 'rubygems'
 require 'msgpack/rpc'
+require 'jubatus/common'
 require File.join(File.dirname(__FILE__), 'types')
 
 module Jubatus
+
 module Stat
 module Client
 
-class Stat
-  def initialize(host, port)
-    @cli = MessagePack::RPC::Client.new(host, port)
-  end
-  def get_client
-    @cli
-  end
-  def get_config(name)
-    @cli.call(:get_config, name)
-  end
-  def push(name, key, value)
-    @cli.call(:push, name, key, value)
-  end
-  def sum(name, key)
-    @cli.call(:sum, name, key)
+class Stat < Jubatus::Common::ClientBase
+  include Jubatus::Common
+  def initialize(host, port, name, timeout_sec=10)
+    super
   end
-  def stddev(name, key)
-    @cli.call(:stddev, name, key)
-  end
-  def max(name, key)
-    @cli.call(:max, name, key)
+
+  def push(key, value)
+    @jubatus_client.call("push", [key, value], TBool.new, [TString.new,
+        TFloat.new])
   end
-  def min(name, key)
-    @cli.call(:min, name, key)
+
+  def sum(key)
+    @jubatus_client.call("sum", [key], TFloat.new, [TString.new])
   end
-  def entropy(name, key)
-    @cli.call(:entropy, name, key)
+
+  def stddev(key)
+    @jubatus_client.call("stddev", [key], TFloat.new, [TString.new])
   end
-  def moment(name, key, degree, center)
-    @cli.call(:moment, name, key, degree, center)
+
+  def max(key)
+    @jubatus_client.call("max", [key], TFloat.new, [TString.new])
   end
-  def clear(name)
-    @cli.call(:clear, name)
+
+  def min(key)
+    @jubatus_client.call("min", [key], TFloat.new, [TString.new])
   end
-  def save(name, id)
-    @cli.call(:save, name, id)
+
+  def entropy(key)
+    @jubatus_client.call("entropy", [key], TFloat.new, [TString.new])
   end
-  def load(name, id)
-    @cli.call(:load, name, id)
+
+  def moment(key, degree, center)
+    @jubatus_client.call("moment", [key, degree, center], TFloat.new,
+        [TString.new, TInt.new(true, 4), TFloat.new])
   end
-  def get_status(name)
-    @cli.call(:get_status, name)
+
+  def clear
+    @jubatus_client.call("clear", [], TBool.new, [])
   end
 end
 
-end
-end
-end
+end  # Client
+end  # Stat
+
+end  # Jubatus

data/lib/jubatus/stat/types.rb

@@ -1,11 +1,12 @@
-# This file is auto-generated from stat.idl
+# This file is auto-generated from stat.idl(0.4.5-347-g86989a6) with jenerator version 0.4.5-418-gd2d5f04/develop
 # *** DO NOT EDIT ***
 
 require 'rubygems'
 require 'msgpack/rpc'
+require 'jubatus/common'
+
 module Jubatus
 module Stat
 
-end
-end
-
+end  # Stat
+end  # Jubatus

data/test/jubatus_test/common/client_test.rb

@@ -0,0 +1,104 @@
+require 'test/unit'
+require 'jubatus/common'
+require 'msgpack/rpc'
+
+module Jubatus
+module Common
+
+class DummyFuture
+  def initialize(result, error)
+    @result = result
+    @error = error
+    @handler = nil
+  end
+
+
+  def attach_error_handler(proc = nil, &block)
+    @handler = proc || block
+  end
+
+  def get
+    if @error
+        if @handler
+          @handler.call(@error, @result)
+        else
+          raise MessagePack::RPC::RPCError.create(@error, @result)
+        end
+    else
+      return @result
+    end
+  end
+end
+
+class DummyClient
+  def call_async_apply(method, args)
+      return send_request(method, args)
+  end
+end
+
+# When a given method is not supported, jubatus-rpc server returns error code 1
+class AlwaysRaiseUnknownMethod < DummyClient
+  def send_request(method, args)
+    DummyFuture.new(nil, 1)
+  end
+end
+
+# When given arguments cannot be parsed, jubatus-rpc server returns error code 2
+class AlwaysRaiseTypeMismatch < DummyClient
+  def send_request(method, args)
+    DummyFuture.new(nil, 2)
+  end
+end
+
+class AlwaysRaiseRemoteError < DummyClient
+  def send_request(method, args)
+    DummyFuture.new(nil, "error")
+  end
+end
+
+class Echo < DummyClient
+  def send_request(method, args)
+    DummyFuture.new(method, nil)
+  end
+end
+
+class AnyType
+  def to_msgpack(v)
+    return v
+  end
+
+  def from_msgpack( v)
+    return v
+  end
+end
+
+class ClientTest < Test::Unit::TestCase
+  def test_unknown_method
+    c = Jubatus::Common::Client.new(AlwaysRaiseUnknownMethod.new, "name")
+    assert_raise(Jubatus::Common::UnknownMethod) {
+      c.call("test", [], nil, [])
+    }
+  end
+
+  def test_type_mismatch
+    c = Jubatus::Common::Client.new(AlwaysRaiseTypeMismatch.new, "name")
+    assert_raise(Jubatus::Common::TypeMismatch) {
+      c.call("test", [], nil, [])
+    }
+  end
+
+  def test_remote_error
+    c = Jubatus::Common::Client.new(AlwaysRaiseRemoteError.new, "name")
+    assert_raise(MessagePack::RPC::RemoteError) {
+      c.call("test", [], nil, [])
+    }
+  end
+
+  def test_wrong_number_of_arguments
+    c = Jubatus::Common::Client.new(Echo.new, "name")
+    assert_equal("test", c.call("test", [], AnyType.new, []))
+  end
+end
+
+end
+end

data/test/jubatus_test/common/datum_test.rb

@@ -0,0 +1,43 @@
+require 'test/unit'
+require 'jubatus/common'
+require 'msgpack'
+
+module Jubatus
+module Common
+
+class DatumTest < Test::Unit::TestCase
+  def test_pack
+    assert_equal([[["name", "Taro"]], [["age", 20.0]], []].to_msgpack,
+                 Datum.new({"name" => "Taro", "age" => 20}).to_msgpack.to_msgpack)
+  end
+
+  def test_unpack
+    d = Datum.from_msgpack([[["name", "Taro"]], [["age", 20.0]], [["img", "0101"]]])
+    assert_equal([["name", "Taro"]],
+                 d.string_values)
+    assert_equal([["age", 20.0]],
+                 d.num_values)
+    assert_equal([["img", "0101"]],
+                 d.binary_values)
+  end
+
+  def test_empty
+    assert_equal([[], [], []].to_msgpack,
+                 Datum.new.to_msgpack.to_msgpack)
+  end
+
+  def test_invalid_key
+    assert_raise(TypeError) {
+      Datum.new(1 => "")
+    }
+  end
+
+  def test_invalid_value
+    assert_raise(TypeError) { Datum.new("" => nil) }
+    assert_raise(TypeError) { Datum.new("" => []) }
+  end
+
+end
+
+end
+end

data/test/jubatus_test/common/message_string_generator_test.rb

@@ -0,0 +1,50 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+require 'jubatus/common'
+
+module Jubatus
+module Common
+
+class MessageStringGeneratorTest < Test::Unit::TestCase
+
+  def test_empty
+    gen = MessageStringGenerator.new
+    gen.open("test")
+    gen.close
+
+    assert_equal("test{}", gen.to_s)
+  end
+
+  def test_one
+    gen = MessageStringGenerator.new
+    gen.open("test")
+    gen.add("k1", "v1")
+    gen.close
+
+    assert_equal("test{k1: v1}", gen.to_s)
+  end
+
+  def test_two
+    gen = MessageStringGenerator.new
+    gen.open("test")
+    gen.add("k1", "v1")
+    gen.add("k2", "v2")
+    gen.close
+
+    assert_equal("test{k1: v1, k2: v2}", gen.to_s)
+  end
+
+  def test_number
+    gen = MessageStringGenerator.new
+    gen.open("test")
+    gen.add("k1", 1)
+    gen.close
+
+    assert_equal("test{k1: 1}", gen.to_s)
+  end
+
+end
+
+end
+end

data/test/jubatus_test/common/types_test.rb

@@ -0,0 +1,73 @@
+#!/usr/bin/env ruby
+
+require 'jubatus/common/types'
+require 'test/unit'
+
+module Jubatus
+module Common
+
+class TypeCheckTest < Test::Unit::TestCase
+  def convert(type, value)
+    return type.from_msgpack(value)
+  end
+
+  def assertTypeOf(type, value)
+    assert_equal(value, convert(type, value))
+  end
+
+  def assertTypeError(type, value)
+    assert_raise(TypeError) { convert(type, value) }
+  end
+
+  def assertValueError(type, value)
+    assert_raise(ValueError) { convert(type, value) }
+  end
+    
+  def testInt()
+    assertTypeOf(TInt.new(true, 1), 1)
+    assertTypeError(TInt.new(true, 1), nil)
+    assertTypeError(TInt.new(true, 1), "")
+    assertValueError(TInt.new(true, 1), 128)
+    assertValueError(TInt.new(true, 1), -129)
+    assertValueError(TInt.new(false, 1), 256)
+    assertValueError(TInt.new(false, 1), -1)
+  end
+
+  def testFloat()
+    assertTypeOf(TFloat.new(), 1.3)
+    assertTypeError(TFloat.new(), nil)
+    assertTypeError(TFloat.new(), 1)
+  end
+
+  def testBool()
+    assertTypeOf(TBool.new(), true)
+    assertTypeError(TBool.new(), nil)
+    assertTypeError(TBool.new(), 1)
+  end
+
+  def testString()
+    assertTypeOf(TString.new(), "test")
+    assertTypeError(TString.new(), 1)
+  end
+
+  def testRaw()
+    assertTypeOf(TRaw.new(), "test")
+    assertTypeError(TRaw.new(), 1)
+  end
+
+  def testList()
+    assertTypeOf(TList.new(TInt.new(true, 8)), [1, 2, 3])
+    assertTypeOf(TList.new(TList.new(TInt.new(true, 8))), [[1, 2], [], [2, 3]])
+    assertTypeError(TList.new(TInt.new(true, 8)), nil)
+  end
+
+  def testTuple()
+    assertTypeOf(TTuple.new(TInt.new(true, 8), TTuple.new(TString.new(), TInt.new(true, 8))), [1, ["test", 1]])
+    assertTypeError(TTuple.new(TInt.new(true, 8)), ["test"])
+    assertTypeError(TTuple.new(TInt.new(true, 8)), [1, 2])
+  end
+end
+
+end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jubatus
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-15 00:00:00.000000000 Z
+date: 2013-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack-rpc
@@ -55,26 +55,42 @@ files:
 - README.rst
 - Rakefile
 - VERSION
+- integration_test/jubatus_test/anomaly/test.rb
+- integration_test/jubatus_test/classifier/test.rb
+- integration_test/jubatus_test/clustering/test.rb
+- integration_test/jubatus_test/error/test.rb
+- integration_test/jubatus_test/graph/test.rb
+- integration_test/jubatus_test/nearest_neighbor/test.rb
+- integration_test/jubatus_test/recommender/test.rb
+- integration_test/jubatus_test/regression/test.rb
+- integration_test/jubatus_test/stat/test.rb
+- integration_test/jubatus_test/test_util.rb
 - jubatus.gemspec
 - lib/jubatus/anomaly/client.rb
 - lib/jubatus/anomaly/types.rb
 - lib/jubatus/classifier/client.rb
 - lib/jubatus/classifier/types.rb
+- lib/jubatus/clustering/client.rb
+- lib/jubatus/clustering/types.rb
+- lib/jubatus/common.rb
+- lib/jubatus/common/client.rb
+- lib/jubatus/common/datum.rb
+- lib/jubatus/common/message_string_generator.rb
+- lib/jubatus/common/types.rb
 - lib/jubatus/graph/client.rb
 - lib/jubatus/graph/types.rb
+- lib/jubatus/nearest_neighbor/client.rb
+- lib/jubatus/nearest_neighbor/types.rb
 - lib/jubatus/recommender/client.rb
 - lib/jubatus/recommender/types.rb
 - lib/jubatus/regression/client.rb
 - lib/jubatus/regression/types.rb
 - lib/jubatus/stat/client.rb
 - lib/jubatus/stat/types.rb
-- test/jubatus_test/anomaly/test.rb
-- test/jubatus_test/classifier/test.rb
-- test/jubatus_test/graph/test.rb
-- test/jubatus_test/recommender/test.rb
-- test/jubatus_test/regression/test.rb
-- test/jubatus_test/stat/test.rb
-- test/jubatus_test/test_util.rb
+- test/jubatus_test/common/client_test.rb
+- test/jubatus_test/common/datum_test.rb
+- test/jubatus_test/common/message_string_generator_test.rb
+- test/jubatus_test/common/types_test.rb
 homepage: http://jubat.us
 licenses:
 - MIT
@@ -101,10 +117,7 @@ signing_key:
 specification_version: 3
 summary: Jubatus Ruby client
 test_files:
-- test/jubatus_test/anomaly/test.rb
-- test/jubatus_test/classifier/test.rb
-- test/jubatus_test/graph/test.rb
-- test/jubatus_test/recommender/test.rb
-- test/jubatus_test/regression/test.rb
-- test/jubatus_test/stat/test.rb
-- test/jubatus_test/test_util.rb
+- test/jubatus_test/common/client_test.rb
+- test/jubatus_test/common/datum_test.rb
+- test/jubatus_test/common/message_string_generator_test.rb
+- test/jubatus_test/common/types_test.rb

data/test/jubatus_test/recommender/test.rb

@@ -1,122 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'test/unit'
-
-require 'json'
-
-require 'jubatus/recommender/client'
-require 'jubatus/recommender/types'
-require 'jubatus_test/test_util'
-
-class RecommenderTest < Test::Unit::TestCase
-  HOST = "127.0.0.1"
-  PORT = 23003
-  TIMEOUT = 10
-
-  def setup
-    @config = {
-        "method" => "inverted_index",
-        "converter" => {
-            "string_filter_types" => {},
-            "string_filter_rules" => [],
-            "num_filter_types" => {},
-            "num_filter_rules" => [],
-            "string_types" => {},
-            "string_rules" => [{"key" => "*", "type" => "str",  "sample_weight" => "bin", "global_weight" => "bin"}],
-            "num_types" => {},
-            "num_rules" => [{"key" => "*", "type" => "num"}]
-        }
-    }
-
-    TestUtil.write_file("config_recommender.json", @config.to_json)
-    @srv = TestUtil.fork_process("recommender", PORT, "config_recommender.json")
-    @cli = Jubatus::Recommender::Client::Recommender.new(HOST, PORT)
-  end
-
-  def teardown
-    TestUtil.kill_process(@srv)
-  end
-
-  def test_get_client
-    assert_instance_of( MessagePack::RPC::Client, @cli.get_client )
-  end
-
-  def test_get_config
-    config = @cli.get_config("name")
-    assert_equal(JSON.parse(config), @config)
-  end
-
-  def test_complete_row
-    @cli.clear_row("name", "complete_row")
-    string_values = [["key1", "val1"], ["key2", "val2"]]
-    num_values = [["key1", 1.0], ["key2", 2.0]]
-    d = Jubatus::Recommender::Datum.new(string_values, num_values)
-    @cli.update_row("name", "complete_row", d)
-    d1 = @cli.complete_row_from_id("name", "complete_row")
-    d2 = @cli.complete_row_from_datum("name", d)
-  end
-
-  def test_get_similar_row
-    @cli.clear_row("name", "similar_row")
-    string_values = [["key1", "val1"], ["key2", "val2"]]
-    num_values = [["key1", 1.0], ["key2", 2.0]]
-    d = Jubatus::Recommender::Datum.new(string_values, num_values)
-    @cli.update_row("name", "similar_row", d)
-    s1 = @cli.similar_row_from_id("name", "similar_row", 10)
-    s2 = @cli.similar_row_from_datum("name", d, 10)
-  end
-
-  def test_decode_row
-    @cli.clear_row("name", "decode_row")
-    string_values = [["key1", "val1"], ["key2", "val2"]]
-    num_values = [["key1", 1.0], ["key2", 2.0]]
-    d = Jubatus::Recommender::Datum.new(string_values, num_values)
-    @cli.update_row("name", "decode_row", d)
-    decoded_row = @cli.decode_row("name", "decode_row")
-    assert_equal(d.string_values, decoded_row.string_values)
-    assert_equal(d.num_values, decoded_row.num_values)
-  end
-
-  def test_get_row
-    @cli.clear("name")
-    string_values = [["key1", "val1"], ["key2", "val2"]]
-    num_values = [["key1", 1.0], ["key2", 2.0]]
-    d = Jubatus::Recommender::Datum.new(string_values, num_values)
-    @cli.update_row("name", "get_row", d)
-    row_names = @cli.get_all_rows("name")
-    assert_equal(row_names, ["get_row"])
-  end
-
-
-  def test_clear
-    @cli.clear("name")
-  end
-
-  def test_calcs
-    string_values = [["key1", "val1"], ["key2", "val2"]]
-    num_values = [["key1", 1.0], ["key2", 2.0]]
-    d = Jubatus::Recommender::Datum.new(string_values, num_values)
-    assert_in_delta(@cli.calc_similarity("name", d, d), 1, 0.000001)
-    assert_in_delta(@cli.calc_l2norm("name", d), Math.sqrt(1*1 + 1*1+ 1*1 + 2*2), 0.000001)
-  end
-
-  def test_clear
-    @cli.clear("name")
-  end
-
-  def test_save
-    assert_equal(@cli.save("name", "recommender.save_test.model"), true)
-  end
-
-  def test_load
-    model_name = "recommender.load_test.model"
-    @cli.save("name", model_name)
-    assert_equal(@cli.load("name", model_name), true)
-  end
-
-  def test_get_status
-    @cli.get_status("name")
-  end
-
-end
-

data/test/jubatus_test/stat/test.rb

@@ -1,109 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'test/unit'
-
-require 'json'
-
-require 'jubatus/stat/client'
-require 'jubatus/stat/types'
-require 'jubatus_test/test_util'
-
-class StatTest < Test::Unit::TestCase
-  HOST = "127.0.0.1"
-  PORT = 23004
-  TIMEOUT = 10
-
-  def setup
-    @config = {
-        "window_size" => 10
-    }
-
-    TestUtil.write_file("config_stat.json", @config.to_json)
-    @srv = TestUtil.fork_process("stat", PORT, "config_stat.json")
-    @cli = Jubatus::Stat::Client::Stat.new(HOST, PORT)
-
-  end
-
-  def teardown
-    TestUtil.kill_process(@srv)
-  end
-
-  def test_get_client
-    assert_instance_of( MessagePack::RPC::Client, @cli.get_client )
-  end
-
-  def test_get_config
-    config = @cli.get_config("name")
-    assert_equal(JSON.parse(config), @config)
-  end
-
-  def test_stddev
-    @cli.push("name", "stddev", 1.0)
-    @cli.push("name", "stddev", 2.0)
-    @cli.push("name", "stddev", 3.0)
-    @cli.push("name", "stddev", 4.0)
-    @cli.push("name", "stddev", 5.0)
-    assert_equal(@cli.stddev("name", "stddev"), Math::sqrt(2.0))
-  end
-
-  def test_sum
-    @cli.push("name", "sum", 1.0)
-    @cli.push("name", "sum", 2.0)
-    @cli.push("name", "sum", 3.0)
-    @cli.push("name", "sum", 4.0)
-    @cli.push("name", "sum", 5.0)
-    assert_equal(@cli.sum("name", "sum"), 15.0)
-  end
-
-  def test_max
-    @cli.push("name", "max", 1.0)
-    @cli.push("name", "max", 2.0)
-    @cli.push("name", "max", 3.0)
-    @cli.push("name", "max", 4.0)
-    @cli.push("name", "max", 5.0)
-    assert_equal(@cli.max("name", "max"), 5.0)
-  end
-
-  def test_min
-    @cli.push("name", "min", 1.0)
-    @cli.push("name", "min", 2.0)
-    @cli.push("name", "min", 3.0)
-    @cli.push("name", "min", 4.0)
-    @cli.push("name", "min", 5.0)
-    assert_equal(@cli.min("name", "min"), 1.0)
-  end
-
-  def test_entropy
-    @cli.push("name", "entropy", 1.0)
-    @cli.push("name", "entropy", 2.0)
-    @cli.push("name", "entropy", 3.0)
-    @cli.push("name", "entropy", 4.0)
-    @cli.push("name", "entropy", 5.0)
-    assert_equal(@cli.entropy("name", "entropy"), 0.0)
-  end
-
-  def test_moment
-    @cli.push("name", "moment", 1.0)
-    @cli.push("name", "moment", 2.0)
-    @cli.push("name", "moment", 3.0)
-    @cli.push("name", "moment", 4.0)
-    @cli.push("name", "moment", 5.0)
-    assert_equal(@cli.moment("name", "moment", 3, 0.0), 45.0)
-  end
-
-  def test_save
-    assert_equal(@cli.save("name", "stat.save_test.model"), true)
-  end
-
-  def test_load
-    model_name = "stat.load_test.model"
-    @cli.save("name", model_name)
-    assert_equal(@cli.load("name", model_name), true)
-  end
-
-  def test_get_status
-    @cli.get_status("name")
-  end
-
-end
-