tdlib-ruby 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f80634d27d92b157b5ce20130ab8a947b4bddfd348268f4126c37abd2d5f8cbe
-  data.tar.gz: 4b08b602b04eba761bc97349f1ea8f546158fee97a32a1242728e1c768cb5924
+  metadata.gz: 6dd68f2d9b132ea200c2f239929ff224e4c3b2bc4510b8b49c1bd2607c03424e
+  data.tar.gz: e87a48b7fc213ce6402d5b12890ea332a14c4740d9d75d0afbf3825a6d2c7bca
 SHA512:
-  metadata.gz: 9ce2500cb3d549cd7e252e0f62341709958dbbbab7f4cdd298bd48cf84c41609641c9136b220b29c1bb749d6c65397f8db4aebd31249407b5d41de36d6cce072
-  data.tar.gz: 395f571bdbdb46621b4a3ab78f04e83e5c9dbb173ad9cf737c2b9380608d995003ff2d86af6cc8fbdfebe1f960b6ae0a109c7394e9ad9dced47b57c13d321efc
+  metadata.gz: 5be1229082a428085670ba952cd4832483363175ed07e43b3a63724a2243a5ca45c8d5def4ad75e25bd9ad9e57c0db3e059e8b57532c052c7c4f7cd37a47d213
+  data.tar.gz: 7ff810f120ab3875fee9db800ad466318135a371223b18f2a7101caadbba9c072e959d10389ce3269d7d71a12941cf3febb4e830599cdbd4f4b9a2c9d258b58e

data/ChangeLog.md

@@ -2,3 +2,11 @@
 
 * Initial release:
 
+Basic featues
+
+### 0.2.0 2018-02-16
+
+* Improved lib path detection
+
+* TD::Client#on_ready method
+

data/README.md

@@ -11,6 +11,18 @@ Ruby bindings and client for TDLib (Telegram database library).
 * Ruby 2.3+
 * Compiled [tdlib](https://github.com/tdlib/td)
 
+We have precompiled versions for CentOS 6 & 7 in our repositories:
+
+http://rpms.southbridge.ru/rhel7/stable/x86_64/
+
+http://rpms.southbridge.ru/rhel6/stable/x86_64/
+
+And also SRPMS:
+
+http://rpms.southbridge.ru/rhel7/stable/SRPMS/
+
+http://rpms.southbridge.ru/rhel6/stable/SRPMS/
+
 ## Install
 
 Add to your gemfile:
@@ -92,7 +104,7 @@ p @me
 
 ```ruby
 TD.configure do |config|
-  config.lib_path = 'path/to/dir_containing_libtdjson' # libtdson will be searched in this directory (*.so, *.dylib, *.dll are valid extensions). For Rails projects, if not set, will be considered as project_root_path/vendor
+  config.lib_path = 'path/to/dir_containing_libtdjson' # libtdson will be searched in this directory (*.so, *.dylib, *.dll are valid extensions). For Rails projects, if not set, will be considered as project_root_path/vendor. If not set and file doesn't exist in vendor, it will try to find lib by ldconfig (only on Linux).
   config.encryption_key = 'your_encryption_key' # it's not required
 
   config.client.api_id = 12345

data/lib/tdlib/api.rb

@@ -39,8 +39,6 @@ module TD::Api
     module_function
 
     def method_missing(method_name, *args)
-      raise TD::MissingLibPathError unless lib_path
-
       dlload(find_lib)
 
       extern 'void* td_json_client_create()'
@@ -55,19 +53,26 @@ module TD::Api
       public_send(method_name, *args)
     end
 
-    def lib_path
-      TD.config.lib_path || (defined?(Rails) ? Rails.root.join('vendor').to_s : nil)
-    end
-
     def find_lib
-      lib_extension =
-        case os
-        when :windows then 'dll'
-        when :macos then 'dylib'
-        when :linux then 'so'
-        else raise "#{os} OS is not supported"
+      file_name = "libtdjson.#{lib_extension}"
+      lib_path =
+        if TD.config.lib_path
+          TD.config.lib_path
+        elsif defined?(Rails) && File.exist?(Rails.root.join('vendor', file_name))
+          Rails.root.join('vendor')
         end
-      File.join(lib_path, "libtdjson.#{lib_extension}")
+      return `ldconfig -p | grep libtdjson`[/=> (.*?)\n/m, 1] if os == :linux && lib_path.nil?
+      raise TD::MissingLibPathError unless lib_path
+      File.join(lib_path, file_name)
+    end
+
+    def lib_extension
+      case os
+      when :windows then 'dll'
+      when :macos then 'dylib'
+      when :linux then 'so'
+      else raise "#{os} OS is not supported"
+      end
     end
 
     def os
@@ -86,6 +91,4 @@ module TD::Api
       end
     end
   end
-
-  private_constant :Dl
 end

data/lib/tdlib/client.rb

@@ -58,7 +58,7 @@
 #
 #   p @me
 class TD::Client
-  TIMEOUT = 10
+  TIMEOUT = 20
 
   def initialize(td_client = TD::Api.client_create,
                  update_manager = TD::UpdateManager.new(td_client),
@@ -130,6 +130,14 @@ class TD::Client
     @update_manager.add_handler(handler)
   end
 
+  def on_ready(&_)
+    Timeout.timeout(TIMEOUT) do
+      until @ready do
+      end
+    end
+    yield self
+  end
+
   # Stops update manager and destroys TDLib client
   def close
     @update_manager.stop
@@ -160,6 +168,7 @@ class TD::Client
         broadcast(encryption_key_query)
       else
         @update_manager.remove_handler(handler)
+        @ready = true
       end
     end
     @update_manager.add_handler(handler)

data/lib/tdlib/version.rb

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

data/spec/tdlib_spec.rb

@@ -6,3 +6,134 @@ describe TD do
     expect(subject.const_get('VERSION')).to_not be_empty
   end
 end
+
+class Base
+  def self.inherited(subclass)
+    subclass.prepend(Module.new do
+      define_method(:call) do |*args|
+        begin
+          super(*args)
+        ensure
+          p 'test1'
+        end
+      end
+    end)
+  end
+end
+
+class Test < Base
+  def call(a)
+    p a
+  end
+end
+
+p Test.new.('aaa')
+
+
+
+TD.configure do |config|
+  config.lib_path = Dir.home
+
+  config.client.api_id = 39991
+  config.client.api_hash = '89b13f68e3840ac787eaa9ba8236d983'
+end
+
+#raise TD.config.lib_path
+
+# TD::Api.set_log_verbosity_level(1)
+#TD::Api.set_log_file_path("#{Dir.home}/tdlib.log")
+
+client = TD::Client.new
+
+begin
+  state = nil
+
+  client.on('updateAuthorizationState') do |update|
+    next unless update.dig('authorization_state', '@type') == 'authorizationStateWaitPhoneNumber'
+    state = :wait_phone
+  end
+
+  client.on('updateAuthorizationState') do |update|
+    next unless update.dig('authorization_state', '@type') == 'authorizationStateWaitCode'
+    state = :wait_code
+  end
+
+  client.on('updateAuthorizationState') do |update|
+    next unless update.dig('authorization_state', '@type') == 'authorizationStateReady'
+    state = :ready
+  end
+
+  loop do
+    case state
+    when :wait_phone
+      p 'Please, enter your phone number:'
+      phone = STDIN.gets.strip
+      params = {
+        '@type' => 'setAuthenticationPhoneNumber',
+        'phone_number' => phone
+      }
+      client.broadcast_and_receive(params)
+    when :wait_code
+      p 'Please, enter code from SMS:'
+      code = STDIN.gets.strip
+      params = {
+        '@type' => 'checkAuthenticationCode',
+        'code' => code
+      }
+      a = client.broadcast_and_receive(params)
+    when :ready
+      client.on_ready do |client|
+        @me = client.broadcast_and_receive('@type' => 'getMe')
+        #@contacts = client.broadcast_and_receive('@type' => 'searchChatsOnServer', 'query' => 'BotFather', 'limit' => 25)
+        @user = client.broadcast_and_receive('@type' => 'getUser', user_id: 132916567)
+        @chat = client.broadcast_and_receive('@type' => 'createNewBasicGroupChat', user_ids: [132916567], title: '111')
+        @link = client.broadcast_and_receive('@type' => 'generateChatInviteLink', 'chat_id' => @chat['id'])
+        @chat2 = client.broadcast_and_receive('@type' => 'getBasicGroupFullInfo', 'basic_group_id' => @chat.dig('type', 'basic_group_id'))['members'].map { |m| m['user_id'] }
+        @toggle_admins= client.broadcast_and_receive('@type' => 'toggleBasicGroupAdministrators', 'basic_group_id' => @chat.dig('type', 'basic_group_id'), everyone_is_administrator: false)
+        @set_st = client.broadcast_and_receive('@type' => 'setChatMemberStatus',
+                                       'chat_id' => @chat['id'],
+                                       'user_id' => 132916567,
+                                       'status' => {'@type' => 'chatMemberStatusAdministrator'})
+        @del = client.broadcast_and_receive('@type' => 'setChatMemberStatus',
+                                       'chat_id' => @chat['id'],
+                                       'user_id' => @me['id'],
+                                       'status' => {'@type' => 'chatMemberStatusLeft'})
+        @del1 = client.broadcast_and_receive('@type' => 'setChatMemberStatus',
+                                       'chat_id' => @chat['id'],
+                                       'user_id' => 132916567,
+                                       'status' => {'@type' => 'chatMemberStatusLeft'})
+        # @chat = client.broadcast_and_receive('@type' => 'createNewSupergroupChat', 'title' => 'Test3')
+        # @link = client.broadcast_and_receive('@type' => 'generateChatInviteLink', 'chat_id' => @chat['id'])
+        # @chat2 = client.broadcast_and_receive('@type' => 'getChat', 'chat_id' => @chat['id'])
+        # admin = true
+        # status = { '@type' => (admin ? 'chatMemberStatusAdministrator' : 'chatMemberStatusMember'),
+        #  'can_edit_messages' => true,
+        # 'can_post_messages' => true,
+        # 'can_delete_messages' => true }
+        # @add_u = client.broadcast_and_receive('@type' => 'addChatMember',
+        #                                'chat_id' => @chat['id'],
+        #                                'user_id' => @user['id'])
+        # @set_st = client.broadcast_and_receive('@type' => 'setChatMemberStatus',
+        #                                'chat_id' => @chat['id'],
+        #                                'user_id' => @user['id'],
+        #                                'status' => status)
+        # supergroup_id = @chat2.dig('type', 'supergroup_id')
+        # #client.broadcast_and_receive('@type' => 'deleteSupergroup', 'supergroup_id' => supergroup_id)
+      end
+      break
+    end
+  end
+
+ensure
+  client.close
+end
+p @me
+p @chat
+p @link
+p @chat2
+p @toggle_admins
+p @add_u
+p @set_st
+p @del
+p @del1
+# p @chat

data/tdlib-ruby.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.license       = "MIT"
   gem.authors       = ["Southbridge"]
   gem.email         = "ask@southbridge.io"
-  gem.homepage      = "https://rubygems.org/gems/tdlib-ruby"
+  gem.homepage      = "https://github.com/centosadmin/tdlib-ruby"
 
   gem.files         = `git ls-files`.split($/)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tdlib-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Southbridge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-08 00:00:00.000000000 Z
+date: 2018-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
@@ -136,7 +136,7 @@ files:
 - spec/tdlib_spec.rb
 - spec/unit/client_spec.rb
 - tdlib-ruby.gemspec
-homepage: https://rubygems.org/gems/tdlib-ruby
+homepage: https://github.com/centosadmin/tdlib-ruby
 licenses:
 - MIT
 metadata: {}