jubatus 0.1.0 → 0.4.0

data/.gitignore

@@ -1,3 +1,4 @@
+lib/
 *.gem
 *.rbc
 .bundle
@@ -11,6 +12,8 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+*.model.js
+*.json
 
 # YARD artifacts
 .yardoc

data/LICENSE

@@ -1,23 +1,7 @@
-Copyright (c) 2012, Jubatus Team All rights reserved.
+Copyright (c) 2012 NTT Corporation & Preferred Infrastructure.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of the <organization> nor the
-      names of its contributors may be used to endorse or promote products
-      derived from this software without specific prior written permission.
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rst

@@ -0,0 +1,22 @@
+Jubatus Ruby Client
+===================
+
+Template of Jubatus client in Ruby.
+See `RubyGems <http://rubygems.org/gems/jubatus>`_ for the latest release.
+
+All codes are generated by `MessagePack IDL <https://github.com/msgpack/msgpack-haskell/tree/master/msgpack-idl>`_ .
+
+
+Install
+=======
+
+::
+
+  $ gem install jubatus
+
+
+License
+=======
+
+MIT License
+

data/Rakefile

@@ -1,17 +1,22 @@
+require 'rubygems'
 require 'bundler'
-Bundler::GemHelper.install_tasks
-
+require 'simplecov' # for Ruby 1.9
 require 'rake/testtask'
+#require 'ci/reporter/rake/test_unit'
 
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.test_files = FileList['test/*.rb']
-  test.verbose = true
-end
+Bundler::GemHelper.install_tasks
 
-task :coverage do |t|
-  ENV['SIMPLE_COV'] = '1'
-  Rake::Task["test"].invoke
+task :test do |test|
+  Rake::TestTask.new(:test) do |t|
+    t.libs << 'lib' << 'test'
+    t.test_files = FileList['test/**/*.rb']
+    t.verbose = true
+  end
 end
 
+## for Ruby 1.8
+#task :coverage do |coverage|
+#  system("rcov -o test/coverage -I lib:test  --exclude . --include-file lib/jubatus --aggregate coverage.info test/**/*.rb")
+#end
+
 task :default => [:build]

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.4.0

data/generate.sh

@@ -0,0 +1,31 @@
+#!/bin/bash -ue
+
+JUBATUS_DIR="jubatus-generate"
+JUBATUS_BRANCH="master"
+CLIENT_DIR="$(dirname "${0}")"
+
+[ $# -eq 0 ] || JUBATUS_BRANCH="${1}"
+
+rm -rf "${JUBATUS_DIR}"
+git clone https://github.com/jubatus/jubatus.git "${JUBATUS_DIR}"
+pushd "${JUBATUS_DIR}"
+git checkout "${JUBATUS_BRANCH}"
+popd
+
+# Ruby
+
+capitalize() {
+  echo "$(echo ${1:0:1} | tr 'a-z' 'A-Z')${1:1}"
+}
+
+rm -rf "${CLIENT_DIR}/lib"
+for IDL in "${JUBATUS_DIR}/src/server"/*.idl; do
+  NAMESPACE="$(capitalize $(basename "${IDL}" ".idl"))"
+  mpidl ruby "${IDL}" -m "Jubatus::${NAMESPACE}" -o "${CLIENT_DIR}/lib/jubatus"
+done
+
+for PATCH in "${CLIENT_DIR}/patch"/*.patch; do
+  patch -p0 --directory "${CLIENT_DIR}" < "${PATCH}"
+done
+
+rm -rf "${JUBATUS_DIR}"

data/jubatus.gemspec

@@ -3,19 +3,23 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name        = "jubatus"
-  gem.description = "Jubatus client for Ruby"
-  gem.homepage    = "https://github.com/jubatus/jubatus-ruby-client"
-  gem.summary     = gem.description
+  gem.description = "Jubatus is a distributed processing framework and streaming machine learning library. This is the Jubatus client in Ruby."
+  gem.homepage    = "http://jubat.us"
+  gem.summary     = "Jubatus Ruby client"
   gem.version     = File.read("VERSION").strip
-  gem.authors     = ["Jubatus Team"]
+  gem.authors     = ["PFI & NTT"]
   gem.email       = "jubatus@googlegroups.com"
   gem.has_rdoc    = false
-  #gem.platform    = Gem::Platform::RUBY
-  gem.files       = `git ls-files`.split("\n")
-  gem.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
-  gem.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  gem.license     = "MIT"
+
+  files = `git ls-files`.split("\n")
+  excludes = ["patch/*"]
+
+  gem.files       = files.reject { |f| excludes.any? { |e| File.fnmatch(e, f) } }
+  gem.test_files  = gem.files.grep(%r{^(test|spec|features)/})
+  gem.executables = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.require_paths = ['lib']
 
-  gem.add_dependency "msgpack-rpc", "~> 0.4.5"
+  gem.add_dependency "msgpack-rpc", "~> 0.5.1"
   gem.add_development_dependency "rake", ">= 0.9.2"
 end

data/lib/jubatus/classifier/client.rb

@@ -1,25 +1,4 @@
-# 
-# Copyright (c) 2012 Preferred Infrastructure, inc.
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-# 
-# This file is auto-generated from ./jubatus/jubatus.github/src/server//classifier.idl
+# This file is auto-generated from jubatus-generate/src/server/classifier.idl
 # *** DO NOT EDIT ***
 
 require 'rubygems'
@@ -27,17 +6,15 @@ require 'msgpack/rpc'
 require File.join(File.dirname(__FILE__), 'types')
 
 module Jubatus
+module Classifier
 module Client
 
 class Classifier
   def initialize(host, port)
     @cli = MessagePack::RPC::Client.new(host, port)
   end
-  def set_config(name, c)
-    @cli.call(:set_config, name, c)
-  end
   def get_config(name)
-    Config_data.from_tuple(@cli.call(:get_config, name))
+    @cli.call(:get_config, name)
   end
   def train(name, data)
     @cli.call(:train, name, data)
@@ -58,3 +35,4 @@ end
 
 end
 end
+end

data/lib/jubatus/classifier/types.rb

@@ -1,60 +1,10 @@
-# 
-# Copyright (c) 2012 Preferred Infrastructure, inc.
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-# 
-# This file is auto-generated from ./jubatus/jubatus.github/src/server//classifier.idl
+# This file is auto-generated from jubatus-generate/src/server/classifier.idl
 # *** DO NOT EDIT ***
 
 require 'rubygems'
 require 'msgpack/rpc'
 module Jubatus
-
-class Param_t
-  def Param_t.from_tuple(tuple)
-    tuple.each_with_object({}) {|(k,v),h| h[k] = v }
-  end
-  def to_tuple(o)
-    o
-  end
-end
-
-class Config_data
-  def initialize(method, config)
-     @method = method 
-     @config = config 
-  end
-  def to_tuple    
-    [@method,
-     @config]
-  end
-  def to_msgpack(out = '')
-    to_tuple.to_msgpack(out)
-  end
-  def Config_data.from_tuple(tuple)
-    Config_data.new(
-      tuple[0],
-      tuple[1]
-    )
-  end
-  attr_accessor :method, :config
-end
+module Classifier
 
 class Datum
   def initialize(string_values, num_values)
@@ -78,13 +28,13 @@ class Datum
 end
 
 class Estimate_result
-  def initialize(label, prob)
+  def initialize(label, score)
      @label = label 
-     @prob = prob 
+     @score = score 
   end
   def to_tuple    
     [@label,
-     @prob]
+     @score]
   end
   def to_msgpack(out = '')
     to_tuple.to_msgpack(out)
@@ -95,8 +45,9 @@ class Estimate_result
       tuple[1]
     )
   end
-  attr_accessor :label, :prob
+  attr_accessor :label, :score
 end
 
 end
+end
 

data/lib/jubatus/graph/client.rb

@@ -1,25 +1,4 @@
-# 
-# Copyright (c) 2012 Preferred Infrastructure, inc.
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-# 
-# This file is auto-generated from ./jubatus/jubatus.github/src/server//graph.idl
+# This file is auto-generated from jubatus-generate/src/server/graph.idl
 # *** DO NOT EDIT ***
 
 require 'rubygems'
@@ -27,47 +6,51 @@ require 'msgpack/rpc'
 require File.join(File.dirname(__FILE__), 'types')
 
 module Jubatus
+module Graph
 module Client
 
 class Graph
   def initialize(host, port)
     @cli = MessagePack::RPC::Client.new(host, port)
   end
+  def get_config(name)
+    @cli.call(:get_config, name)
+  end
   def create_node(name)
     @cli.call(:create_node, name)
   end
-  def remove_node(name, nid)
-    @cli.call(:remove_node, name, nid)
+  def remove_node(name, node_id)
+    @cli.call(:remove_node, name, node_id)
   end
-  def update_node(name, nid, p)
-    @cli.call(:update_node, name, nid, p)
+  def update_node(name, node_id, property)
+    @cli.call(:update_node, name, node_id, property)
   end
-  def create_edge(name, nid, ei)
-    @cli.call(:create_edge, name, nid, ei)
+  def create_edge(name, node_id, e)
+    @cli.call(:create_edge, name, node_id, e)
   end
-  def update_edge(name, nid, eid, ei)
-    @cli.call(:update_edge, name, nid, eid, ei)
+  def update_edge(name, node_id, edge_id, e)
+    @cli.call(:update_edge, name, node_id, edge_id, e)
   end
-  def remove_edge(name, nid, e)
-    @cli.call(:remove_edge, name, nid, e)
+  def remove_edge(name, node_id, edge_id)
+    @cli.call(:remove_edge, name, node_id, edge_id)
   end
-  def centrality(name, nid, ct, q)
-    @cli.call(:centrality, name, nid, ct, q)
+  def get_centrality(name, node_id, centrality_type, query)
+    @cli.call(:get_centrality, name, node_id, centrality_type, query)
   end
-  def add_centrality_query(name, q)
-    @cli.call(:add_centrality_query, name, q)
+  def add_centrality_query(name, query)
+    @cli.call(:add_centrality_query, name, query)
   end
-  def add_shortest_path_query(name, q)
-    @cli.call(:add_shortest_path_query, name, q)
+  def add_shortest_path_query(name, query)
+    @cli.call(:add_shortest_path_query, name, query)
   end
-  def remove_centrality_query(name, q)
-    @cli.call(:remove_centrality_query, name, q)
+  def remove_centrality_query(name, query)
+    @cli.call(:remove_centrality_query, name, query)
   end
-  def remove_shortest_path_query(name, q)
-    @cli.call(:remove_shortest_path_query, name, q)
+  def remove_shortest_path_query(name, query)
+    @cli.call(:remove_shortest_path_query, name, query)
   end
-  def shortest_path(name, r)
-    @cli.call(:shortest_path, name, r)
+  def get_shortest_path(name, query)
+    @cli.call(:get_shortest_path, name, query)
   end
   def update_index(name)
     @cli.call(:update_index, name)
@@ -75,34 +58,32 @@ class Graph
   def clear(name)
     @cli.call(:clear, name)
   end
-  def get_node(name, nid)
-    Node_info.from_tuple(@cli.call(:get_node, name, nid))
+  def get_node(name, node_id)
+    Node.from_tuple(@cli.call(:get_node, name, node_id))
   end
-  def get_edge(name, nid, e)
-    Edge_info.from_tuple(@cli.call(:get_edge, name, nid, e))
+  def get_edge(name, node_id, edge_id)
+    Edge.from_tuple(@cli.call(:get_edge, name, node_id, edge_id))
   end
-  def save(name, arg1)
-    @cli.call(:save, name, arg1)
+  def save(name, id)
+    @cli.call(:save, name, id)
   end
-  def load(name, arg1)
-    @cli.call(:load, name, arg1)
+  def load(name, id)
+    @cli.call(:load, name, id)
   end
   def get_status(name)
     @cli.call(:get_status, name)
   end
-  def create_node_here(name, nid)
-    @cli.call(:create_node_here, name, nid)
-  end
-  def create_global_node(name, nid)
-    @cli.call(:create_global_node, name, nid)
+  def create_node_here(name, node_id)
+    @cli.call(:create_node_here, name, node_id)
   end
-  def remove_global_node(name, nid)
-    @cli.call(:remove_global_node, name, nid)
+  def remove_global_node(name, node_id)
+    @cli.call(:remove_global_node, name, node_id)
   end
-  def create_edge_here(name, eid, ei)
-    @cli.call(:create_edge_here, name, eid, ei)
+  def create_edge_here(name, edge_id, e)
+    @cli.call(:create_edge_here, name, edge_id, e)
   end
 end
 
 end
 end
+end