tdlib-ruby 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ae3602c33ec3fcc94afe086dfa85572d59d851b
-  data.tar.gz: 219b93cf45f05b909e276b6534b89be70a00f834
+  metadata.gz: c84fd6d3b63901223ca8b58a9bea70c0fb2cae9b
+  data.tar.gz: 154ea127f32e385caba187f87c23a117e98950b4
 SHA512:
-  metadata.gz: 0f24b6e7d8c1821d00db49b1e45f653f040bb31e792cc46871c2789ba5e3f62de28f2eaa3a2921d3b0929ce502aa17f56093d44b26fe8044d9700c310b24429d
-  data.tar.gz: 42ba3c0ba60e5b7ed0f51be08314e607adf2da3a22c64d0fbaf2a84ee573adfce2d09ac6f1e050152964e7cef5f52595ea33f62a316e5a0be4a36ee4a0492667
+  metadata.gz: fe38b4ed8eca764247be42b4dc66d45c7880ea15bdcba516923aa1668441b89f50c85ec46bcb6c085aa0a016618c44312c06f95b4f988bddbeb9335a751f4c34
+  data.tar.gz: 50c96aabe2d58139604c1f3590da3d8ac80723622cac02cfc64daa23f8af6d924da0be44a5e072dbd310f781ba1a6144332496d7984ff21959411271eced8db0

data/ChangeLog.md

@@ -1,3 +1,6 @@
+### 0.9.0 / 2018-04-25
+* Use Celluloid
+
 ### 0.8.0 / 2018-04-25
 
 * Fix await methods

data/lib/tdlib-ruby.rb

@@ -1,5 +1,6 @@
 require 'tdlib/version'
 require 'dry/configurable'
+require 'celluloid'
 
 module TD
   extend Dry::Configurable

data/lib/tdlib/client.rb

@@ -58,8 +58,6 @@
 #
 #   p @me
 class TD::Client
-  include Concurrent
-
   TIMEOUT = 10
 
   def initialize(td_client = TD::Api.client_create,
@@ -68,6 +66,7 @@ class TD::Client
     @td_client = td_client
     @update_manager = update_manager
     @config = TD.config.client.to_h.merge(extra_config)
+    @ready = Celluloid::Condition.new
     authorize
     @update_manager.run
   end
@@ -93,19 +92,15 @@ class TD::Client
   # @param [Hash] query
   # @return [Hash]
   def broadcast_and_receive(query, timeout: TIMEOUT)
-    result = nil
+    condition = Celluloid::Condition.new
     extra = TD::Utils.generate_extra(query)
-    handler = ->(update) { result = update if update['@extra'] == extra }
+    handler = ->(update) { condition.signal(update) if update['@extra'] == extra }
     @update_manager.add_handler(handler)
     query['@extra'] = extra
     TD::Api.client_send(@td_client, query)
-    time_start = Time.now
-    loop do
-      sleep 0.1
-      break if result
-      raise TD::TimeoutError if Time.now - time_start > timeout
-    end
-    result
+    condition.wait(timeout)
+  rescue Celluloid::ConditionError
+    raise TD::TimeoutError
   end
 
   # Synchronously executes TDLib request
@@ -133,13 +128,10 @@ class TD::Client
   end
 
   def on_ready(timeout: TIMEOUT, &_)
-    time_start = Time.now
-    loop do
-      sleep 0.1
-      break if @ready
-      raise TD::TimeoutError if Time.now - time_start > timeout
-    end
+    @ready.wait(timeout)
     yield self
+  rescue Celluloid::ConditionError
+    raise TD::TimeoutError
   end
 
   # Stops update manager and destroys TDLib client
@@ -172,7 +164,7 @@ class TD::Client
         broadcast(encryption_key_query)
       else
         @update_manager.remove_handler(handler)
-        @ready = true
+        @ready.signal(true)
       end
     end
     @update_manager.add_handler(handler)

data/lib/tdlib/version.rb

@@ -1,4 +1,4 @@
 module TD
   # tdlib-ruby version
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

data/spec/integration/tdlib_spec.rb

@@ -36,7 +36,7 @@ describe TD::Client do
 
       it 'runs block on update' do
         subject
-        sleep 3
+        sleep 1
         expect(@result).to include('@type', 'entities')
       end
     end
@@ -58,7 +58,7 @@ describe TD::Client do
 
     it 'runs block on update' do
       subject
-      sleep 3
+      sleep 1
       expect(@result).to include('@type', 'entities')
     end
   end

data/tdlib-ruby.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.add_runtime_dependency 'dry-configurable', '~> 0.7'
-  gem.add_runtime_dependency 'concurrent-ruby', '~> 1.0'
+  gem.add_runtime_dependency 'celluloid', '~> 0.17'
 
   gem.add_development_dependency 'bundler', '~> 1.10'
   gem.add_development_dependency 'rake', '12.3.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tdlib-ruby
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Southbridge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-25 00:00:00.000000000 Z
+date: 2018-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
-  name: concurrent-ruby
+  name: celluloid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.17'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -147,9 +147,7 @@ files:
 - lib/tdlib/version.rb
 - spec/integration/tdlib_spec.rb
 - spec/spec_helper.rb
-- spec/support/update_manager_stub.rb
 - spec/tdlib_spec.rb
-- spec/unit/client_spec.rb
 - tdlib-ruby.gemspec
 homepage: https://github.com/centosadmin/tdlib-ruby
 licenses:
@@ -178,6 +176,4 @@ summary: Ruby bindings and client for TDlib
 test_files:
 - spec/integration/tdlib_spec.rb
 - spec/spec_helper.rb
-- spec/support/update_manager_stub.rb
 - spec/tdlib_spec.rb
-- spec/unit/client_spec.rb

data/spec/support/update_manager_stub.rb

@@ -1,19 +0,0 @@
-class UpdateManagerStub
-  attr_reader :handlers
-
-  def initialize(td_client, update)
-    @td_client, @update, @handlers = td_client, update, []
-  end
-
-  def run
-  end
-
-  def add_handler(handler)
-    @handlers << handler
-    handler.call(@update)
-  end
-
-  def remove_handler(handler)
-    @handlers.delete(handler)
-  end
-end

data/spec/unit/client_spec.rb

@@ -1,73 +0,0 @@
-require 'spec_helper'
-require 'tdlib-ruby'
-require 'support/update_manager_stub'
-
-Thread.abort_on_exception = true
-
-describe TD::Client do
-  let(:client) { described_class.new(td_client, update_manager) }
-  let(:td_client) { double }
-  let(:update_manager) { UpdateManagerStub.new(td_client, update) }
-  let(:query) { { '@type' => 'type' } }
-  let(:send_result) { 'send_result' }
-  let(:update) { { '@type' => 'update' } }
-  let(:extra) { 'extra' }
-
-  before do
-    allow(TD::Api).to receive(:client_create).and_return(td_client)
-    allow(TD::Api).to receive(:client_send).with(td_client, query).and_return(send_result)
-    allow(TD::Api).to receive(:client_execute).with(td_client, query).and_return(send_result)
-    allow(TD::Api).to receive(:client_receive).with(td_client).and_return(update)
-
-    allow(TD::Utils).to receive(:generate_extra).with(query).and_return(extra)
-  end
-
-  describe '#broadcast' do
-    context 'when no block given' do
-      subject { client.broadcast(query) }
-
-      it { is_expected.to eq(send_result) }
-    end
-
-    context 'when block given' do
-      subject { client.broadcast(query) { |update| raise update.to_s } }
-
-      it 'adds @extra key to query' do
-        subject
-        expect(query.keys).to include('@extra')
-      end
-
-      it { is_expected.to eq(send_result) }
-    end
-  end
-
-  describe '#broadcast_and_receive' do
-    let(:update) { { '@type' => 'update', '@extra' => extra } }
-
-    subject { client.broadcast_and_receive(query) }
-
-    it { is_expected.to eq(update) }
-  end
-
-  describe '#execute' do
-    subject { client.execute(query) }
-
-    it { is_expected.to eq(send_result) }
-  end
-
-  describe '#on' do
-    subject { client.on('update') { |update| update } }
-
-    context 'when update type matches passed type' do
-      let(:update) { { '@type' => 'update', '@extra' => extra } }
-
-      it { is_expected.to eq(update) }
-    end
-
-    context 'when update type does not match passed type' do
-      let(:update) { { '@type' => 'not_update', '@extra' => extra } }
-
-      it { is_expected.not_to eq(update) }
-    end
-  end
-end