roma-client 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3882ceb6dec6a018d78a0f23d25b6fc5c2f2596a
-  data.tar.gz: 3cd22d1e1be6fd376547c32c4505152cb7dfe48b
+SHA256:
+  metadata.gz: cb5d75ac6fd6ae1afe804171d6e9d4b64bb734c6245e91ae89349ac09aa1d6ed
+  data.tar.gz: 5b62386df9e8e179deed3b740c5982ea43d30638b53456e6b1153979a20ae258
 SHA512:
-  metadata.gz: 1502d199fbaa1018cb3dd083c4b7ae0f3b6800ce81fc7a51f59d0ad3b897fbcbeb6d6af5ebd101888c33b05ae73ed9ef1b0d7136632bcafc6590088c87d32ce6
-  data.tar.gz: 446d8fd9ea5021e539da7743b579ca6083bc7597688b61e208e8b9775daf4ecdd45abbebaae15189ccf7e19f585c9f737bed47bf10fd767dad3df42dd6e93c04
+  metadata.gz: ce830cf733b74d7daa035e7c38e6eaea8dc345ccdb905fafa4e02436b0d9e4eba24d717de282836a128829c0f139eefbca32997978ee9424ccaf9d435fa033b9
+  data.tar.gz: dc7e4c89e63d3bf73d43ed5064997c621b25b00b6e80537209486c1260d6c133ae05b2bf5a03e7a0a542679694ea7c2a20af2caea32f6124202e9059285f3cbd

data/CHANGELOG.md

@@ -1,22 +1,29 @@
-# 0.4.4 (Aug 23 2016)
+# CHANGELOG
 
-* Started use Travis CI [#8](https://github.com/roma/roma-ruby-client/pull/8)
-* Replace the deprecated method `Object.timeout` with `Timeout.timeout` [#9](https://github.com/roma/roma-ruby-client/pull/9)
+## 0.4.5 (Jun 17 2019)
 
-# 0.4.3 (Aug 19 2015)
+- Remove RoutingData since it's not used [#16](https://github.com/roma/roma-ruby-client/pull/16)
+- Remove dependencies on roma server from test [#15](https://github.com/roma/roma-ruby-client/pull/15)
 
-* Change interface of Stat object and refactoring [Hiroki Matsue] 7438faf
-* Add tests for argumetns of stats [Hiroki Matsue] 9939760
-* Refactor codes [Hiroki Matsue] 3d37030
-* Support stat command [Hiroki Matsue] 1d75694
+## 0.4.4 (Aug 23 2016)
 
-# 0.4.2 (Mar 31 2015)
+- Started use Travis CI [#8](https://github.com/roma/roma-ruby-client/pull/8)
+- Replace the deprecated method `Object.timeout` with `Timeout.timeout` [#9](https://github.com/roma/roma-ruby-client/pull/9)
 
-* Add gemspec and convert "should" to "expect" on rspec tests. [Hiroki Matsue] 4c7c465
-* modify to reproduce environment with Gemfile [tarr1124] 2205ed7
+## 0.4.3 (Aug 19 2015)
 
-# 0.4.1 (Feb 20 2012)
+- Change interface of Stat object and refactoring [Hiroki Matsue] 7438faf
+- Add tests for argumetns of stats [Hiroki Matsue] 9939760
+- Refactor codes [Hiroki Matsue] 3d37030
+- Support stat command [Hiroki Matsue] 1d75694
 
-* add client plugin files. [junji torii] caa2201
-* 0.4.0
-* support ClientPool
+## 0.4.2 (Mar 31 2015)
+
+- Add gemspec and convert "should" to "expect" on rspec tests. [Hiroki Matsue] 4c7c465
+- modify to reproduce environment with Gemfile [tarr1124] 2205ed7
+
+## 0.4.1 (Feb 20 2012)
+
+- add client plugin files. [junji torii] caa2201
+- 0.4.0
+- support ClientPool

data/Gemfile

@@ -1,3 +1,5 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem 'coveralls', require: nil

data/Gemfile.lock

@@ -1,39 +1,55 @@
 PATH
   remote: .
   specs:
-    roma-client (0.4.4)
+    roma-client (0.4.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.2.5)
+    coveralls (0.8.23)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.16.1)
+      term-ansicolor (~> 1.3)
+      thor (>= 0.19.4, < 2.0)
+      tins (~> 1.6)
+    diff-lcs (1.3)
+    docile (1.3.2)
     eventmachine (1.0.9.1)
     jaro_winkler (1.3.7)
-    json (1.8.3)
-    rake (11.2.2)
-    rdoc (4.2.2)
-      json (~> 1.4)
+    json (2.2.0)
+    rake (12.3.2)
+    rdoc (6.1.1)
     roma (1.3.0)
       eventmachine (~> 1.0.0)
       jaro_winkler (~> 1.3.5)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.2)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.1)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.4)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.2)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    term-ansicolor (1.7.1)
+      tins (~> 1.0)
+    thor (0.20.3)
+    tins (1.20.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  coveralls
   rake
   rdoc
   roma
@@ -41,4 +57,4 @@ DEPENDENCIES
   rspec
 
 BUNDLED WITH
-   1.12.5
+   2.0.1

data/README.md

@@ -1,5 +1,9 @@
 # ROMA Client for Ruby
 
+[![Build Status](https://travis-ci.org/roma/roma-ruby-client.svg?branch=master)](https://travis-ci.org/roma/roma-ruby-client)
+[![Gem Version](https://badge.fury.io/rb/roma-client.svg)](https://badge.fury.io/rb/roma-client)
+[![Coverage Status](https://coveralls.io/repos/github/roma/roma-ruby-client/badge.svg?branch=master)](https://coveralls.io/github/roma/roma-ruby-client?branch=master)
+
 ROMA is one of the data storing systems for distributed key-value stores in Ruby.
 The gem `roma-client` is Ruby client to talk with ROMA severs.
 

data/lib/roma/client/client_pool.rb

@@ -17,24 +17,23 @@ module Roma
       attr_accessor :servers
       attr_accessor :default_hash_name
       attr_accessor :start_sync_routing_proc
-
-      @@client_pools = {}
+      attr_accessor :max_pool_size
 
       # get ClientPool instance
       # type:: identifier for client groups.
       def self.instance(type = :default)
-        @@client_pools[type] ||= new
-        @@client_pools[type]
+        client_pools[type] ||= new
+        client_pools[type]
       end
 
       # get all pool
       def self.client_pools
-        @@client_pools
+        @@client_pools ||= {}
       end
 
       # release all pool
       def self.release_all
-        @@client_pools.each do |k,v|
+        client_pools.each do |k,v|
           v.release
         end
       end
@@ -46,21 +45,22 @@ module Roma
       def client
         c = nil
         if @clients.empty?
-          client = Roma::Client::RomaClient.new(servers,
+          c = Roma::Client::RomaClient.new(servers,
                                                 plugin_modules,
                                                 start_sync_routing_proc)
-          client.default_hash_name = default_hash_name
-          c = client
+          c.default_hash_name = default_hash_name
         else
           c = @clients.pop
         end
 
-        return c unless block_given?
-
-        begin
-          yield c
-        ensure
-          push_client(c)
+        if block_given?
+          begin
+            yield c
+          ensure
+            push_client(c)
+          end
+        else
+          return c
         end
       end
 
@@ -82,16 +82,6 @@ module Roma
         end
       end
 
-      # get max pool size
-      def max_pool_size
-        @max_pool_size
-      end
-
-      # set max_pool_size
-      def max_pool_size=(count)
-        @max_pool_size = count
-      end
-
       # get all clients
       def clients
         @clients

data/lib/roma/client/client_rttable.rb

@@ -1,6 +1,5 @@
 require 'yaml'
 require 'digest/sha1'
-require 'roma/client/routing/routing_data'
 
 module Roma
   module Client
@@ -38,7 +37,7 @@ module Roma
         d & @search_mask
       end
 
-      # Returns a node-is list at the vnode. 
+      # Returns a node-is list at the vnode.
       # +vn+: vnode-id
       def search_nodes(vn)
         @rd.v_idx[vn].clone

data/lib/roma/client/tools/showbalance.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
 require 'roma/client/sender'
-require 'roma/client/routing/routing_data'
 
 if ARGV.length < 1
   STDERR.puts "usage:#{$0} node-id"

data/lib/roma/client/version.rb

@@ -12,7 +12,7 @@ module Roma #:nodoc:
 
       MINOR = 4
 
-      TINY  = 4
+      TINY  = 5
 
       STRING = [MAJOR, MINOR, TINY].join('.')
     end

data/spec/roma/client/client_pool_spec.rb

@@ -1,127 +1,153 @@
-require File.expand_path(File.join('..', '..', 'spec_helper'), File.dirname(__FILE__))
+require 'spec_helper'
 
 describe Roma::Client::ClientPool do
-  before(:all) do
-    start_roma
-  end
-
-  after(:all) do
-    stop_roma
-  end
 
-  def get_nodes
+  let(:test_nodes) do
     DEFAULT_PORTS.map { |port| "#{DEFAULT_HOST}:#{port}" }
   end
 
   context 'Singleton' do
     subject { Roma::Client::ClientPool.instance(:test) }
-    it { expect(subject.class).to eq(Roma::Client::ClientPool) }
 
+    it { expect(subject.class).to eq(Roma::Client::ClientPool) }
     it { expect(subject).to be_equal Roma::Client::ClientPool.instance(:test) }
-
     it { expect(subject).not_to be_equal Roma::Client::ClientPool.instance(:test2) }
-
     it do
       expect { Roma::Client::ClientPool.new }.to raise_error(NoMethodError,
         "private method `new' called for Roma::Client::ClientPool:Class")
     end
   end
 
-  context 'max pool size of default' do
-    subject { Roma::Client::ClientPool.instance(:test) }
+  describe '#max_pool_size' do
+    context 'max pool size of default' do
+      subject { Roma::Client::ClientPool.instance(:test) }
+
+      describe '#max_pool_size' do
+        subject { super().max_pool_size }
 
-    describe '#max_pool_size' do
-      subject { super().max_pool_size }
-      it { is_expected.to eq(1) }
+        it { is_expected.to eq(1) }
+      end
     end
-  end
 
-  context 'set max pool size ' do
-    it do
-      pool = Roma::Client::ClientPool.instance(:test)
-      expect(pool.max_pool_size).to eq(1)
-      pool.max_pool_size = 3
-      expect(pool.max_pool_size).to eq(3)
+    context 'set max pool size ' do
+      it do
+        pool = Roma::Client::ClientPool.instance(:test)
+        expect(pool.max_pool_size).to eq(1)
+        pool.max_pool_size = 3
+        expect(pool.max_pool_size).to eq(3)
 
-      pool2 = Roma::Client::ClientPool.instance(:test2)
-      expect(pool2.max_pool_size).to eq(1)
+        pool2 = Roma::Client::ClientPool.instance(:test2)
+        expect(pool2.max_pool_size).to eq(1)
+      end
     end
   end
 
-  context 'servers default' do
-    subject { Roma::Client::ClientPool.instance(:test) }
+  describe '#servers' do
+    subject { Roma::Client::ClientPool.instance(:test).servers }
 
-    describe '#servers' do
-      subject { super().servers }
-      it { is_expected.to be_nil }
-    end
-  end
+    it { is_expected.to be_nil }
 
-  context 'servers set' do
-    it do
-      pool = Roma::Client::ClientPool.instance(:test_servers_set)
-      expect(pool.servers).to be_nil
-      nodes = get_nodes
-      pool.servers = nodes
-      expect(pool.servers).to eq(nodes)
+    context 'servers set' do
+      it do
+        pool = Roma::Client::ClientPool.instance(:test_servers_set)
+        expect(pool.servers).to be_nil
+        nodes = test_nodes
+        pool.servers = nodes
+        expect(pool.servers).to eq(nodes)
 
-      expect(Roma::Client::ClientPool.instance(:test_ini_nodes_set2).servers).to be_nil
+        expect(Roma::Client::ClientPool.instance(:test_ini_nodes_set2).servers).to be_nil
+      end
     end
   end
 
-  context 'client' do
+  describe '#client' do
     subject do
       pool = Roma::Client::ClientPool.instance(:test_client)
-      pool.servers = get_nodes
+      pool.max_pool_size = 1
+      pool.servers = test_nodes
       pool
     end
 
-    it { expect(subject.pool_count).to eq(0) }
-    it do
-      client = subject.client
-      expect(client.class).to eq(Roma::Client::RomaClient)
-      subject.push_client(client)
-      expect(subject.pool_count).to eq(1)
+    before do
+      subject.release
     end
-    it { expect(subject.servers).to eq(get_nodes) }
-  end
 
-  context 'client multi pool' do
-    subject do
-      pool = Roma::Client::ClientPool.instance(:test_client2)
-      pool.servers = get_nodes
-      pool
+    context 'When the pool is empty' do
+      it 'should generate client instance' do
+        dummy_client = double(:client).as_null_object
+        expect(Roma::Client::RomaClient).to receive(:new).and_return(dummy_client)
+
+        subject.client
+      end
+
+      context 'When the pool is full' do
+        let(:pushed_client) { double('pushed_client') }
+        let(:ignored_client) { double('new dummy client to be ignored') }
+
+        before do
+          subject.push_client(pushed_client)
+          subject.push_client(ignored_client)
+        end
+
+        it 'the last pushed client is ignored' do
+          expect(subject.pool_count).to eq(1)
+          expect(subject.clients).to include(pushed_client)
+          expect(subject.clients).to_not include(ignored_client)
+        end
+      end
     end
 
-    it do
-      expect(subject.pool_count).to eq(0)
-      client  = subject.client
-      expect(client).not_to be_nil
+    context 'client multi pool' do
+      subject do
+        pool = Roma::Client::ClientPool.instance(:test_client2)
+        pool.servers = test_nodes
+        pool
+      end
 
-      client2 = subject.client
-      expect(client2).not_to be_nil
+      it do
+        dummy_client = double(:client).as_null_object
+        expect(Roma::Client::RomaClient).to receive(:new).and_return(dummy_client).twice
 
-      subject.push_client(client)
-      expect(subject.pool_count).to eq(1)
+        expect(subject.pool_count).to eq(0)
+        client = subject.client
+        expect(client).not_to be_nil
 
-      subject.push_client(client2)
-      expect(subject.pool_count).to eq(1)
+        client2 = subject.client
+        expect(client2).not_to be_nil
 
-      expect(client).to be_equal subject.client
-      expect(subject.pool_count).to eq(0)
+        subject.push_client(client)
+        expect(subject.pool_count).to eq(1)
+
+        subject.push_client(client2)
+        expect(subject.pool_count).to eq(1)
+
+        expect(client).to be_equal subject.client
+        expect(subject.pool_count).to eq(0)
+      end
     end
-  end
 
-  context 'plugin modules' do
-    module TestPlugin
-      def test_plugin
-        'test_plugin'
+    context 'When block is given' do
+      it do
+        dummy_client = double(:client).as_null_object
+        expect(Roma::Client::RomaClient).to receive(:new).and_return(dummy_client)
+
+        expect { |b| subject.client(&b) }.to yield_with_args(dummy_client)
       end
     end
+  end
 
-    module TestPlugin2
-      def test_plugin2
-        'test_plugin2'
+  describe '#plugin_modules' do
+    before do
+      module TestPlugin
+        def test_plugin
+          'test_plugin'
+        end
+      end
+
+      module TestPlugin2
+        def test_plugin2
+          'test_plugin2'
+        end
       end
     end
 
@@ -132,34 +158,34 @@ describe Roma::Client::ClientPool do
       pool.add_plugin_module(TestPlugin)
       expect(pool.plugin_modules).not_to be_nil
       expect(pool.plugin_modules.size).to eq(1)
-      pool.plugin_modules[0] == TestPlugin
+      expect(pool.plugin_modules[0]).to eq(TestPlugin)
     end
 
-    it do
-      pool = Roma::Client::ClientPool.instance(:pms_test)
-      expect(pool.plugin_modules).to be_nil
+    context 'the pool has some plugin moudles' do
+      let(:pool) { Roma::Client::ClientPool.instance(:pms_test) }
 
-      pool.plugin_modules = [TestPlugin, TestPlugin2]
-      expect(pool.plugin_modules.size).to eq(2)
-      pool.plugin_modules[0] == TestPlugin
-      pool.plugin_modules[1] == TestPlugin2
-    end
+      before do
+        pool.plugin_modules = [TestPlugin, TestPlugin2]
+      end
 
-    it do
-      pool = Roma::Client::ClientPool.instance(:pms_test2)
-      pool.servers = get_nodes
-      expect(pool.plugin_modules).to be_nil
+      it do
+        expect(pool.plugin_modules.size).to eq(2)
+        expect(pool.plugin_modules).to contain_exactly(TestPlugin, TestPlugin2)
+      end
+
+      it 'pool.client generates roma client with pool.plugin_modules' do
+        client = double('roma client').as_null_object
+        expect(Roma::Client::RomaClient).to receive(:new).
+          with(pool.servers, pool.plugin_modules, pool.start_sync_routing_proc).and_return(client)
 
-      pool.plugin_modules = [TestPlugin, TestPlugin2]
-      client = pool.client
-      expect(client).not_to be_nil
-      expect(client.test_plugin).to eq('test_plugin')
-      expect(client.test_plugin2).to eq('test_plugin2')
+        pool.client
+      end
     end
   end
 
   context 'default type' do
     subject { Roma::Client::ClientPool.instance }
+
     it { is_expected.not_to be_nil }
     it { expect(subject.class).to eq(Roma::Client::ClientPool) }
     it { expect(subject).to be_equal Roma::Client::ClientPool.instance(:default) }
@@ -170,7 +196,7 @@ describe Roma::Client::ClientPool do
 
     subject do
       pool = Roma::Client::ClientPool.instance
-      pool.servers = get_nodes
+      pool.servers = test_nodes
       pool
     end
 
@@ -181,112 +207,46 @@ describe Roma::Client::ClientPool do
       expect(Roma::Client::ClientPool.instance.default_hash_name).to eq('new_name')
       expect(Roma::Client::ClientPool.instance(:other).default_hash_name).to eq('roma')
 
-      client = subject.client
-      expect(client.default_hash_name).to eq('new_name')
+      client = double('roma client').as_null_object
+      expect(client).to receive(:default_hash_name=).with('new_name')
+      expect(Roma::Client::RomaClient).to receive(:new).and_return(client)
+      subject.client
     end
   end
 
   context 'release' do
     subject do
       pool = Roma::Client::ClientPool.instance(:release_test)
-      pool.servers = get_nodes
+      pool.servers = test_nodes
       pool
     end
 
     it do
-      expect(subject.pool_count).to eq(0)
-      subject.client do |client|
-      end
-
+      subject.push_client(double('dummy client'))
       expect(subject.pool_count).to eq(1)
       expect(subject.release).to be_truthy
       expect(subject.pool_count).to eq(0)
     end
   end
 
-  context 'client block' do
-    before(:each) do
-      pool = Roma::Client::ClientPool.instance(:client_block)
-      pool.release
-    end
-
-    subject do
-      pool = Roma::Client::ClientPool.instance(:client_block)
-      pool.servers = get_nodes
-      pool
-    end
-
-    it 'use block'do
-      expect(subject.pool_count).to eq(0)
-      subject.client do |client|
-        expect(client.set('test', 'value')).to eq('STORED')
-      end
-      expect(subject.pool_count).to eq(1)
-    end
-
-    it 'raise exception in block, but pool certainly' do
-      expect(subject.pool_count).to eq(0)
-      subject.client do |client|
-        expect(client.set('test', 'value')).to eq('STORED')
-      end
-      expect(subject.pool_count).to eq(1)
-
-      expect do
-        subject.client do |client|
-          raise 'test error'
-        end
-      end.to raise_error RuntimeError, 'test error'
-
-      expect(subject.pool_count).to eq(1)
-    end
-  end
-
-  context 'start sync routing proc' do
-    it do
-      pool = Roma::Client::ClientPool.instance(:sync_test)
-      pool.servers = get_nodes
-      old_thread_count = Thread.list.length
-      pool.client do |c|
-      end
-
-      expect(pool.pool_count).to eq(1)
-      expect(Thread.list.length).to eq(old_thread_count + 1)
-    end
-
-    it do
-      pool = Roma::Client::ClientPool.instance(:no_sync_test)
-      pool.servers = get_nodes
-      pool.start_sync_routing_proc = false
-      old_thread_count = Thread.list.length
-      pool.client do |c|
-      end
-
-      expect(pool.pool_count).to eq(1)
-      expect(Thread.list.length).to eq(old_thread_count)
-    end
-  end
-
   context 'release all' do
     it do
       pool = Roma::Client::ClientPool.instance(:release_all_1)
-      pool.servers = get_nodes
-      pool.client do |c|
-      end
+      pool.servers = test_nodes
+      pool.push_client(double('dummy client 1'))
       expect(Roma::Client::ClientPool.instance(:release_all_1).pool_count).to eq(1)
 
       pool = Roma::Client::ClientPool.instance(:release_all_2)
-      pool.servers = get_nodes
-      pool.client do |c|
-      end
+      pool.servers = test_nodes
+      pool.push_client(double('dummy client 1'))
       expect(pool.pool_count).to eq(1)
       expect(Roma::Client::ClientPool.instance(:release_all_2).pool_count).to eq(1)
 
       Roma::Client::ClientPool.release_all
       expect(Roma::Client::ClientPool.instance(:release_all_1).pool_count).to eq(0)
       expect(Roma::Client::ClientPool.instance(:release_all_2).pool_count).to eq(0)
-
-      expect(Roma::Client::ClientPool.instance(:release_all_1).servers).to eq(get_nodes)
-      expect(Roma::Client::ClientPool.instance(:release_all_2).servers).to eq(get_nodes)
+      expect(Roma::Client::ClientPool.instance(:release_all_1).servers).to eq(test_nodes)
+      expect(Roma::Client::ClientPool.instance(:release_all_2).servers).to eq(test_nodes)
     end
   end
 end